Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiEnv.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Wed, 15 Oct 2014 16:02:50 +0200 |
| parents | 4ca6dc0799b6 997fd9660dd5 |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnv.cpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/prims/jvmtiEnv.cpp Wed Oct 15 16:02:50 2014 +0200 @@ -307,9 +307,9 @@ !java_lang_Class::is_primitive(mirror)) { Klass* k = java_lang_Class::as_Klass(mirror); assert(k != NULL, "class for non-primitive mirror must exist"); - *size_ptr = k->size() * wordSize; + *size_ptr = (jlong)k->size() * wordSize; } else { - *size_ptr = mirror->size() * wordSize; + *size_ptr = (jlong)mirror->size() * wordSize; } return JVMTI_ERROR_NONE; } /* end GetObjectSize */