Merge
authorvlivanov
Tue, 05 Mar 2013 08:17:18 -0800
changeset 15872 02481313d596
parent 15870 370c3b74c642 (diff)
parent 15871 b04dd94da4e6 (current diff)
child 15873 5ce4f526e0ba
Merge
--- a/hotspot/src/share/vm/runtime/frame.cpp	Tue Mar 05 04:24:50 2013 -0800
+++ b/hotspot/src/share/vm/runtime/frame.cpp	Tue Mar 05 08:17:18 2013 -0800
@@ -1070,7 +1070,12 @@
 
   // First consult the ADLC on where it puts parameter 0 for this signature.
   VMReg reg = SharedRuntime::name_for_receiver();
-  oop r = *caller.oopmapreg_to_location(reg, reg_map);
+  oop* oop_adr = caller.oopmapreg_to_location(reg, reg_map);
+  if (oop_adr == NULL) {
+    guarantee(oop_adr != NULL, "bad register save location");
+    return NULL;
+  }
+  oop r = *oop_adr;
   assert(Universe::heap()->is_in_or_null(r), err_msg("bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", (intptr_t) r, (intptr_t) r));
   return r;
 }