Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiEnvBase.cpp @ 6988:2cb439954abf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 15:36:13 +0100
parents e522a00b91aa 070d523b96a7
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
6963:dd0dd0321e2a 6988:2cb439954abf
588 588
589 589
590 jclass 590 jclass
591 JvmtiEnvBase::get_jni_class_non_null(Klass* k) { 591 JvmtiEnvBase::get_jni_class_non_null(Klass* k) {
592 assert(k != NULL, "k != NULL"); 592 assert(k != NULL, "k != NULL");
593 return (jclass)jni_reference(Klass::cast(k)->java_mirror()); 593 return (jclass)jni_reference(k->java_mirror());
594 } 594 }
595 595
596 #ifndef JVMTI_KERNEL 596 #ifndef JVMTI_KERNEL
597 597
598 // 598 //
1363 NULL_CHECK(ob_kh, JVMTI_ERROR_INVALID_OBJECT); 1363 NULL_CHECK(ob_kh, JVMTI_ERROR_INVALID_OBJECT);
1364 1364
1365 // Method return type signature. 1365 // Method return type signature.
1366 char* ty_sign = 1 + strchr(signature->as_C_string(), ')'); 1366 char* ty_sign = 1 + strchr(signature->as_C_string(), ')');
1367 1367
1368 if (!VM_GetOrSetLocal::is_assignable(ty_sign, Klass::cast(ob_kh()), current_thread)) { 1368 if (!VM_GetOrSetLocal::is_assignable(ty_sign, ob_kh(), current_thread)) {
1369 return JVMTI_ERROR_TYPE_MISMATCH; 1369 return JVMTI_ERROR_TYPE_MISMATCH;
1370 } 1370 }
1371 *ret_ob_h = ob_h; 1371 *ret_ob_h = ob_h;
1372 } 1372 }
1373 return JVMTI_ERROR_NONE; 1373 return JVMTI_ERROR_NONE;