# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1358343664 -3600
# Node ID 729a79037bd5fc73233850ec61767995ad294aaf
# Parent  989155e2d07a497d7ad6f6bb6eee0d97f1931afa
Fixes after merge with hs25-b15.

diff -r 989155e2d07a -r 729a79037bd5 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Wed Jan 16 01:34:24 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Wed Jan 16 14:41:04 2013 +0100
@@ -130,7 +130,8 @@
     @Override
     public int getMaxLocals() {
         HotSpotVMConfig config = HotSpotGraalRuntime.getInstance().getConfig();
-        return unsafe.getShort(metaspaceMethod + config.methodMaxLocalsOffset) & 0xFFFF;
+        long metaspaceConstMethod = unsafe.getLong(metaspaceMethod + config.methodConstMethodOffset);
+        return unsafe.getShort(metaspaceConstMethod + config.methodMaxLocalsOffset) & 0xFFFF;
     }
 
     @Override
diff -r 989155e2d07a -r 729a79037bd5 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Wed Jan 16 01:34:24 2013 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Wed Jan 16 14:41:04 2013 +0100
@@ -636,7 +636,7 @@
   set_int("ageMaskInPlace", (int) markOopDesc::age_mask_in_place);
   set_int("epochMaskInPlace", (int) markOopDesc::epoch_mask_in_place);
   set_int("biasedLockPattern", (int) markOopDesc::biased_lock_pattern);
-  set_int("methodMaxLocalsOffset", in_bytes(Method::size_of_locals_offset()));
+  set_int("methodMaxLocalsOffset", in_bytes(ConstMethod::size_of_locals_offset()));
   set_int("methodConstMethodOffset", in_bytes(Method::const_offset()));
   set_int("constMethodMaxStackOffset", in_bytes(ConstMethod::max_stack_offset()));
   set_int("extraStackEntries", Method::extra_stack_entries());
diff -r 989155e2d07a -r 729a79037bd5 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Wed Jan 16 01:34:24 2013 +0100
+++ b/src/share/vm/runtime/thread.cpp	Wed Jan 16 14:41:04 2013 +0100
@@ -2207,7 +2207,7 @@
           RegisterMap reg_map(this, UseBiasedLocking);
           frame compiled_frame = f.sender(&reg_map);
           if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) {
-            Deoptimization::deoptimize(this, compiled_frame, &reg_map);
+            Deoptimization::deoptimize(this, compiled_frame, &reg_map, Deoptimization::Reason_constraint);
           }
         }
       }