# HG changeset patch
# User vlivanov
# Date 1362500238 28800
# Node ID 4f553e24b3b53207ca90e54f926d26f1c46f5b62
# Parent  c40fbf634c90b54adb4f49d345d753bb722209ec# Parent  571076d3c79dac3632a9b3438a166002ebf0c32f
Merge

diff -r 571076d3c79d -r 4f553e24b3b5 src/share/vm/runtime/frame.cpp
--- a/src/share/vm/runtime/frame.cpp	Tue Mar 05 04:24:50 2013 -0800
+++ b/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;
 }