Mercurial > hg > truffle

diff src/cpu/sparc/vm/methodHandles_sparc.cpp @ 6740:75f33eecc1b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7196681: NPG: Some JSR 292 tests crash in Windows exception handler Summary: There was a rogue os::breakpoint() call in log_dependency left over from the jsr292 merge. Also changed verify_oop() calls for metadata to verify_{method,klass}_ptr. Reviewed-by: kvn, twisti
author coleenp
date Tue, 11 Sep 2012 20:20:38 -0400
parents da91efe96a93
children 2cb2f30450c7
line wrap: on
line diff
--- a/src/cpu/sparc/vm/methodHandles_sparc.cpp	Tue Sep 11 16:20:57 2012 +0200
+++ b/src/cpu/sparc/vm/methodHandles_sparc.cpp	Tue Sep 11 20:20:38 2012 -0400
@@ -346,7 +346,7 @@
         // load receiver klass itself
         __ null_check(receiver_reg, oopDesc::klass_offset_in_bytes());
         __ load_klass(receiver_reg, temp1_recv_klass);
-        __ verify_oop(temp1_recv_klass);
+        __ verify_klass_ptr(temp1_recv_klass);
       }
       BLOCK_COMMENT("check_receiver {");
       // The receiver for the MemberName must be in receiver_reg.
@@ -354,14 +354,14 @@
       if (VerifyMethodHandles && iid == vmIntrinsics::_linkToSpecial) {
         // Did not load it above...
         __ load_klass(receiver_reg, temp1_recv_klass);
-        __ verify_oop(temp1_recv_klass);
+        __ verify_klass_ptr(temp1_recv_klass);
       }
       if (VerifyMethodHandles && iid != vmIntrinsics::_linkToInterface) {
         Label L_ok;
         Register temp2_defc = temp2;
         __ load_heap_oop(member_clazz, temp2_defc);
         load_klass_from_Class(_masm, temp2_defc, temp3, temp4);
-        __ verify_oop(temp2_defc);
+        __ verify_klass_ptr(temp2_defc);
         __ check_klass_subtype(temp1_recv_klass, temp2_defc, temp3, temp4, L_ok);
         // If we get here, the type check failed!
         __ STOP("receiver class disagrees with MemberName.clazz");
@@ -438,7 +438,7 @@
       Register temp3_intf = temp3;
       __ load_heap_oop(member_clazz, temp3_intf);
       load_klass_from_Class(_masm, temp3_intf, temp2, temp4);
-      __ verify_oop(temp3_intf);
+      __ verify_klass_ptr(temp3_intf);
 
       Register G5_index = G5_method;
       __ ld_ptr(member_vmindex, G5_index);
@@ -458,7 +458,7 @@
                                  temp2, no_sethi_temp,
                                  L_no_such_interface);
 
-      __ verify_oop(G5_method);
+      __ verify_method_ptr(G5_method);
       jump_from_method_handle(_masm, G5_method, temp2, temp3, for_compiler_entry);
 
       __ bind(L_no_such_interface);
@@ -479,7 +479,7 @@
       // After figuring out which concrete method to call, jump into it.
       // Note that this works in the interpreter with no data motion.
       // But the compiled version will require that rcx_recv be shifted out.
-      __ verify_oop(G5_method);
+      __ verify_method_ptr(G5_method);
       jump_from_method_handle(_masm, G5_method, temp1, temp3, for_compiler_entry);
     }
   }