Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiEnvBase.cpp @ 6988:2cb439954abf
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 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.cpp Sun Nov 18 22:45:43 2012 +0100 +++ b/src/share/vm/prims/jvmtiEnvBase.cpp Mon Nov 19 15:36:13 2012 +0100 @@ -590,7 +590,7 @@ jclass JvmtiEnvBase::get_jni_class_non_null(Klass* k) { assert(k != NULL, "k != NULL"); - return (jclass)jni_reference(Klass::cast(k)->java_mirror()); + return (jclass)jni_reference(k->java_mirror()); } #ifndef JVMTI_KERNEL @@ -1365,7 +1365,7 @@ // Method return type signature. char* ty_sign = 1 + strchr(signature->as_C_string(), ')'); - if (!VM_GetOrSetLocal::is_assignable(ty_sign, Klass::cast(ob_kh()), current_thread)) { + if (!VM_GetOrSetLocal::is_assignable(ty_sign, ob_kh(), current_thread)) { return JVMTI_ERROR_TYPE_MISMATCH; } *ret_ob_h = ob_h;