# HG changeset patch
# User coleenp
# Date 1340675992 25200
# Node ID 36b2d4cfcf0313795abfb9f26a5b3e6616356f4a
# Parent  246d977b51f2d45160cfbee686044e600956fa54# Parent  588f559105c18be00460688109e22fcdf823aee1
Merge

diff -r 246d977b51f2 -r 36b2d4cfcf03 src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Mon Jun 25 21:33:35 2012 -0400
+++ b/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;