# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1354045006 -3600
# Node ID 413f9352cdfd56142719c10de7ba2fb3282fd3de
# Parent  c37022832f1a0df74ec2ba845de3fc62111d9281# Parent  aee0e8fa81744f8f7728e06db347586d5f141424
Merge.

diff -r c37022832f1a -r 413f9352cdfd graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Tue Nov 27 20:34:15 2012 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Tue Nov 27 20:36:46 2012 +0100
@@ -231,7 +231,7 @@
         //  - has no callee-saved registers
         //  - has no incoming arguments passed on the stack
         //  - has no instructions with debug info
-        boolean canOmitFrame =
+        boolean canOmitFrame = GraalOptions.CanOmitFrame &&
             frameMap.frameSize() == frameMap.initialFrameSize &&
             frameMap.registerConfig.getCalleeSaveLayout().registers.length == 0 &&
             !lir.hasArgInCallerFrame() &&
diff -r c37022832f1a -r 413f9352cdfd graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Tue Nov 27 20:34:15 2012 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Tue Nov 27 20:36:46 2012 +0100
@@ -170,6 +170,7 @@
     public static boolean GenAssertionCode                   = ____;
     public static boolean AlignCallsForPatching              = true;
     public static boolean ResolveClassBeforeStaticInvoke     = true;
+    public static boolean CanOmitFrame                       = true;
 
     // Translating tableswitch instructions
     public static int     SequentialSwitchLimit              = 4;