Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorcoleenp
Mon, 25 Jun 2012 18:59:52 -0700
changeset 13098 c9b2dc03b271
parent 13097 c146b608d91f (current diff)
parent 13096 8a01a0702816 (diff)
child 13099 64752e56d721
Merge
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Mon Jun 25 21:33:35 2012 -0400
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Mon Jun 25 18:59:52 2012 -0700
@@ -585,7 +585,7 @@
     _o = klassOop_if_java_lang_Class(o);
 
     // object size
-    _obj_size = _o->size() * wordSize;
+    _obj_size = (jlong)_o->size() * wordSize;
 
     // record the context
     _tag_map = tag_map;
jdk-sandbox