Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiEnv.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
305 305
306 if (mirror->klass() == SystemDictionary::Class_klass() && 306 if (mirror->klass() == SystemDictionary::Class_klass() &&
307 !java_lang_Class::is_primitive(mirror)) { 307 !java_lang_Class::is_primitive(mirror)) {
308 Klass* k = java_lang_Class::as_Klass(mirror); 308 Klass* k = java_lang_Class::as_Klass(mirror);
309 assert(k != NULL, "class for non-primitive mirror must exist"); 309 assert(k != NULL, "class for non-primitive mirror must exist");
310 *size_ptr = k->size() * wordSize; 310 *size_ptr = (jlong)k->size() * wordSize;
311 } else { 311 } else {
312 *size_ptr = mirror->size() * wordSize; 312 *size_ptr = (jlong)mirror->size() * wordSize;
313 } 313 }
314 return JVMTI_ERROR_NONE; 314 return JVMTI_ERROR_NONE;
315 } /* end GetObjectSize */ 315 } /* end GetObjectSize */
316 316
317 // 317 //