Merge

Mon, 25 Jun 2012 18:59:52 -0700

author
coleenp
date
Mon, 25 Jun 2012 18:59:52 -0700
changeset 3876
36b2d4cfcf03
parent 3875
246d977b51f2
parent 3874
588f559105c1
child 3877
74533f63b116

Merge

     1.1 --- a/src/share/vm/prims/jvmtiTagMap.cpp	Mon Jun 25 21:33:35 2012 -0400
     1.2 +++ b/src/share/vm/prims/jvmtiTagMap.cpp	Mon Jun 25 18:59:52 2012 -0700
     1.3 @@ -585,7 +585,7 @@
     1.4      _o = klassOop_if_java_lang_Class(o);
     1.5  
     1.6      // object size
     1.7 -    _obj_size = _o->size() * wordSize;
     1.8 +    _obj_size = (jlong)_o->size() * wordSize;
     1.9  
    1.10      // record the context
    1.11      _tag_map = tag_map;

mercurial