changeset 2440:6ee92b277bc5

Merge
author twisti
date Wed, 04 May 2011 00:46:22 -0700
parents eae35325e5e1 8d944991dbf9
children 0139aac70fb5
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/sparc/vm/methodHandles_sparc.cpp	Tue May 03 20:56:35 2011 -0700
+++ b/src/cpu/sparc/vm/methodHandles_sparc.cpp	Wed May 04 00:46:22 2011 -0700
@@ -645,9 +645,10 @@
 
       // Live at this point:
       // - G5_klass        :  klass required by the target method
+      // - O0_argslot      :  argslot index in vmarg; may be required in the failing path
       // - O1_scratch      :  argument klass to test
       // - G3_method_handle:  adapter method handle
-      __ check_klass_subtype(O1_scratch, G5_klass, O0_argslot, O2_scratch, done);
+      __ check_klass_subtype(O1_scratch, G5_klass, O2_scratch, O3_scratch, done);
 
       // If we get here, the type check failed!
       __ load_heap_oop(G3_amh_argument,        O2_required);  // required class
--- a/src/share/vm/memory/genOopClosures.hpp	Tue May 03 20:56:35 2011 -0700
+++ b/src/share/vm/memory/genOopClosures.hpp	Wed May 04 00:46:22 2011 -0700
@@ -175,7 +175,7 @@
  protected:
   template <class T> inline void do_oop_work(T* p) {
     oop obj = oopDesc::load_decode_heap_oop(p);
-    guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, obj));
+    guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, (oopDesc*) obj));
   }
  public:
   virtual void do_oop(oop* p);