# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1305819406 -7200
# Node ID 2ef23785ca93e3dae0797e559535ff287492e305
# Parent  beea26b73b3fd36abc2f2808f9e90f85aa48710c# Parent  027adfafd47e2551e1a9c76bceb8f7aefd6b5f2a
Merge.

diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java	Thu May 19 17:36:46 2011 +0200
@@ -25,14 +25,13 @@
 
 import java.util.*;
 
+import com.oracle.graal.graph.*;
 import com.oracle.max.asm.*;
-import com.oracle.graal.graph.*;
 import com.sun.c1x.alloc.*;
 import com.sun.c1x.asm.*;
 import com.sun.c1x.gen.*;
-import com.sun.c1x.gen.LIRGenerator.DeoptimizationStub;
+import com.sun.c1x.gen.LIRGenerator.*;
 import com.sun.c1x.graph.*;
-import com.sun.c1x.ir.*;
 import com.sun.c1x.lir.*;
 import com.sun.c1x.observer.*;
 import com.sun.c1x.value.*;
@@ -167,7 +166,6 @@
      * @return the block map for the specified method
      */
     public BlockMap getBlockMap(RiMethod method) {
-        // PERF: cache the block map for methods that are compiled or inlined often
         BlockMap map = new BlockMap(method);
         map.build();
         if (compiler.isObserved()) {
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java	Thu May 19 17:36:46 2011 +0200
@@ -39,8 +39,6 @@
     // Checkstyle: resume
 
     // inlining settings
-    public static boolean OptInline                          = ____;
-
     public static int     MaximumInstructionCount            = 37000;
     public static float   MaximumInlineRatio                 = 0.90f;
     public static int     MaximumInlineSize                  = 35;
@@ -64,16 +62,21 @@
 
     // printing settings
     public static boolean PrintHIR                           = ____;
-    public static boolean PrintInliningFailures              = ____;
     public static boolean PrintLIR                           = ____;
     public static boolean PrintCFGToFile                     = ____;
+
+    // DOT output settings
     public static boolean PrintDOTGraphToFile                = ____;
     public static boolean PrintDOTGraphToPdf                 = ____;
+    public static boolean OmitDOTFrameStates                 = true;
+
+    // Ideal graph visualizer output settings
     public static int     PrintIdealGraphLevel               = 0;
     public static boolean PrintIdealGraphFile                = ____;
     public static String  PrintIdealGraphAddress             = "127.0.0.1";
     public static int     PrintIdealGraphPort                = 4444;
-    public static boolean OmitDOTFrameStates                 = true;
+
+    // Other printing settings
     public static boolean PrintMetrics                       = ____;
     public static boolean PrintTimers                        = ____;
     public static boolean PrintCompilation                   = ____;
@@ -88,74 +91,38 @@
     public static boolean TraceLIRVisit                      = ____;
     public static boolean TraceAssembler                     = ____;
     public static int     TraceBytecodeParserLevel           = 0;
-    public static boolean PrintAssumptions                   = ____;
     public static boolean QuietBailout                       = ____;
 
-    // optimistic optimization settings
-    public static boolean UseAssumptions                = true;
-
     // state merging settings
-    public static boolean AssumeVerifiedBytecode        = ____;
-    public static boolean PhiLoopStores                 = true;
-
-    // miscellaneous settings
-    public static boolean SupportObjectConstants        = true;
+    public static boolean AssumeVerifiedBytecode             = ____;
 
     // Linear scan settings
-    public static boolean CopyPointerStackArguments     = true;
+    public static boolean CopyPointerStackArguments          = true;
 
     // Code generator settings
-    public static boolean GenLIR                        = true;
-    public static boolean GenCode                       = true;
+    public static boolean GenLIR                             = true;
+    public static boolean GenCode                            = true;
 
-    public static boolean UseConstDirectCall            = false;
+    public static boolean UseConstDirectCall                 = false;
 
-    public static boolean GenSpecialDivChecks           = ____;
-    public static boolean GenAssertionCode              = ____;
-    public static boolean AlignCallsForPatching         = true;
-    public static boolean NullCheckUniquePc             = ____;
-    public static boolean InvokeSnippetAfterArguments   = ____;
-    public static boolean ResolveClassBeforeStaticInvoke = true;
+    public static boolean GenSpecialDivChecks                = ____;
+    public static boolean GenAssertionCode                   = ____;
+    public static boolean AlignCallsForPatching              = true;
+    public static boolean NullCheckUniquePc                  = ____;
+    public static boolean InvokeSnippetAfterArguments        = ____;
+    public static boolean ResolveClassBeforeStaticInvoke     = true;
 
     // Translating tableswitch instructions
-    public static int     SequentialSwitchLimit         = 4;
-    public static int     RangeTestsSwitchDensity       = 5;
+    public static int     SequentialSwitchLimit              = 4;
+    public static int     RangeTestsSwitchDensity            = 5;
 
-    public static int     InitialCodeBufferSize         = 232;
-    public static boolean DetailedAsserts               = true;
+    public static boolean DetailedAsserts                    = ____;
 
     // Runtime settings
-    public static int     ReadPrefetchInstr             = 0;
-    public static int     StackShadowPages              = 2;
+    public static int     ReadPrefetchInstr                  = 0;
+    public static int     StackShadowPages                   = 2;
 
     // Assembler settings
-    public static boolean CommentedAssembly             = ____;
-    public static boolean PrintLIRWithAssembly          = ____;
-    public static int     Atomics                       = 0;
-    public static boolean UseNormalNop                  = true;
-    public static boolean UseAddressNop                 = true;
-    public static boolean UseIncDec                     = ____;
-    public static boolean UseXmmLoadAndClearUpper       = ____;
-    public static boolean UseXmmRegToRegMoveAll         = ____;
-
-    public static boolean StressImplicitExceptions       = ____;
-
-    static {
-        setOptimizationLevel(1);
-    }
-
-    public static void setOptimizationLevel(int level) {
-        final boolean l = (level >= 1);
-        final boolean ll = (level >= 2);
-        final boolean lll = (level >= 3);
-
-        // Level 1 optimizations
-        PhiLoopStores                   = l;
-
-        // Level 2 optimizations
-        OptInline                       = ll;
-
-        // Level 3 optimizations
-        UseAssumptions                  = lll;
-    }
+    public static boolean CommentedAssembly                  = ____;
+    public static boolean PrintLIRWithAssembly               = ____;
 }
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java
--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 17:36:46 2011 +0200
@@ -28,19 +28,17 @@
 import java.util.*;
 
 import com.sun.c1x.*;
-import com.sun.c1x.alloc.Interval.RegisterBinding;
-import com.sun.c1x.alloc.Interval.RegisterPriority;
-import com.sun.c1x.alloc.Interval.SpillState;
+import com.sun.c1x.alloc.Interval.*;
 import com.sun.c1x.debug.*;
 import com.sun.c1x.gen.*;
 import com.sun.c1x.graph.*;
 import com.sun.c1x.ir.*;
 import com.sun.c1x.lir.*;
-import com.sun.c1x.lir.LIRInstruction.OperandMode;
+import com.sun.c1x.lir.LIRInstruction.*;
 import com.sun.c1x.observer.*;
 import com.sun.c1x.util.*;
 import com.sun.c1x.value.*;
-import com.sun.c1x.value.FrameState.ValueProcedure;
+import com.sun.c1x.value.FrameState.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java
--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java	Thu May 19 17:36:46 2011 +0200
@@ -27,16 +27,12 @@
 import java.util.*;
 
 import com.sun.c1x.*;
-import com.sun.c1x.alloc.Interval.RegisterBinding;
-import com.sun.c1x.alloc.Interval.RegisterPriority;
-import com.sun.c1x.alloc.Interval.SpillState;
-import com.sun.c1x.alloc.Interval.State;
+import com.sun.c1x.alloc.Interval.*;
 import com.sun.c1x.debug.*;
-import com.sun.c1x.ir.*;
 import com.sun.c1x.lir.*;
 import com.sun.c1x.util.*;
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiRegister.RegisterFlag;
+import com.sun.cri.ci.CiRegister.*;
 
 /**
  *
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java
--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java	Thu May 19 17:36:46 2011 +0200
@@ -26,7 +26,6 @@
 
 import com.sun.c1x.*;
 import com.sun.c1x.debug.*;
-import com.sun.c1x.ir.*;
 import com.sun.c1x.lir.*;
 import com.sun.c1x.util.*;
 import com.sun.cri.ci.*;
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Thu May 19 17:36:46 2011 +0200
@@ -32,7 +32,7 @@
 import com.oracle.max.asm.*;
 import com.sun.c1x.*;
 import com.sun.c1x.alloc.*;
-import com.sun.c1x.alloc.OperandPool.VariableFlag;
+import com.sun.c1x.alloc.OperandPool.*;
 import com.sun.c1x.debug.*;
 import com.sun.c1x.globalstub.*;
 import com.sun.c1x.graph.*;
@@ -41,18 +41,11 @@
 import com.sun.c1x.opt.*;
 import com.sun.c1x.util.*;
 import com.sun.c1x.value.*;
-import com.sun.c1x.value.FrameState.PhiProcedure;
 import com.sun.cri.bytecode.*;
-import com.sun.cri.bytecode.Bytecodes.MemoryBarriers;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
-import com.sun.cri.xir.CiXirAssembler.XirConstant;
-import com.sun.cri.xir.CiXirAssembler.XirInstruction;
-import com.sun.cri.xir.CiXirAssembler.XirOperand;
-import com.sun.cri.xir.CiXirAssembler.XirParameter;
-import com.sun.cri.xir.CiXirAssembler.XirRegister;
-import com.sun.cri.xir.CiXirAssembler.XirTemp;
 import com.sun.cri.xir.*;
+import com.sun.cri.xir.CiXirAssembler.*;
 
 /**
  * This class traverses the HIR instructions and generates LIR instructions from them.
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/graph/BlockMap.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/BlockMap.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/BlockMap.java	Thu May 19 17:36:46 2011 +0200
@@ -313,7 +313,7 @@
                 }
 
                 case WIDE: {
-                    if (canTrap != null && ProfileInformationStub.trappedFrequently(method, bci)) {
+                    if (canTrap != null) {
                         canTrap.set(bci);
                     }
 
@@ -322,7 +322,7 @@
                 }
 
                 default: {
-                    if (canTrap != null && ProfileInformationStub.trappedFrequently(method, bci)) {
+                    if (canTrap != null) {
                         canTrap.set(bci);
                     }
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Thu May 19 17:36:46 2011 +0200
@@ -38,7 +38,7 @@
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
-import com.sun.cri.ri.RiType.Representation;
+import com.sun.cri.ri.RiType.*;
 
 /**
  * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph.
@@ -434,8 +434,6 @@
             updateDispatchChain(dispatch.otherSuccessor(), mergedState, bci);
         } else if (dispatchEntry.next() instanceof Deoptimize) {
             // deoptimizing handler
-            Deoptimize deopt = (Deoptimize) dispatchEntry.next();
-            //deopt.setStateBefore(mergedState.duplicate(bci));
             dispatchEntry.end().setStateAfter(mergedState.duplicate(bci));
             updateDispatchChain(dispatchEntry.end().blockSuccessor(0), mergedState, bci);
         } else if (dispatchEntry.next() instanceof Unwind) {
@@ -923,23 +921,6 @@
         return exact;
     }
 
-    private RiType getAssumedLeafType(RiType type) {
-        if (isFinal(type.accessFlags())) {
-            return type;
-        }
-        RiType assumed = null;
-        if (C1XOptions.UseAssumptions) {
-            assumed = type.uniqueConcreteSubtype();
-            if (assumed != null) {
-                if (C1XOptions.PrintAssumptions) {
-                    TTY.println("Recording concrete subtype assumption in context of " + type.name() + ": " + assumed.name());
-                }
-                compilation.assumptions.recordConcreteSubtype(type, assumed);
-            }
-        }
-        return assumed;
-    }
-
     private void callRegisterFinalizer() {
         Value receiver = frameState.loadLocal(0);
         RiType declaredType = receiver.declaredType();
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/graph/IR.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Thu May 19 17:36:46 2011 +0200
@@ -24,7 +24,6 @@
 
 import java.util.*;
 
-import com.oracle.graal.graph.*;
 import com.sun.c1x.*;
 import com.sun.c1x.debug.*;
 import com.sun.c1x.ir.*;
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/graph/ProfileInformationStub.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/ProfileInformationStub.java	Thu May 19 17:24:23 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.c1x.graph;
-
-import static com.sun.cri.bytecode.Bytecodes.*;
-
-import com.sun.c1x.*;
-import com.sun.cri.bytecode.*;
-import com.sun.cri.ri.*;
-
-/**
- * A temporary placeholder to bring in profile information to Graal, until we have a definitive interface.
- * That allows us to mark dependencies in code that will need fixup in the future.
- *
- * TODO this class and the signature of its methods i temporary
- */
-public class ProfileInformationStub {
-
-    public static boolean trappedFrequently(RiMethod method, int bci) {
-
-        // TODO: Currently, the runtime system does not support deoptimization when a call trhows an exception,
-        // so mark is a trapping so that explicit exception handler edges are generated.
-        switch (Bytes.beU1(method.code(), bci)) {
-            case INVOKESTATIC:
-            case INVOKESPECIAL:
-            case INVOKEVIRTUAL:
-            case INVOKEINTERFACE: {
-                return true;
-            }
-        }
-
-        if (C1XOptions.StressImplicitExceptions && canTrap(method.code()[bci])) {
-            return true;
-        }
-
-        return false;
-    }
-
-}
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 17:36:46 2011 +0200
@@ -25,7 +25,6 @@
 import java.util.*;
 
 import com.oracle.graal.graph.*;
-import com.oracle.max.asm.*;
 import com.sun.c1x.*;
 import com.sun.c1x.debug.*;
 import com.sun.c1x.lir.*;
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java	Thu May 19 17:36:46 2011 +0200
@@ -31,7 +31,7 @@
 import com.sun.c1x.util.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiCallingConvention.Type;
+import com.sun.cri.ci.CiCallingConvention.*;
 import com.sun.cri.ri.*;
 import com.sun.cri.util.*;
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java	Thu May 19 17:36:46 2011 +0200
@@ -30,12 +30,12 @@
 import com.sun.c1x.debug.*;
 import com.sun.c1x.gen.*;
 import com.sun.c1x.ir.*;
-import com.sun.c1x.lir.FrameMap.StackBlock;
+import com.sun.c1x.lir.FrameMap.*;
 import com.sun.c1x.util.*;
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiTargetMethod.Mark;
+import com.sun.cri.ci.CiTargetMethod.*;
 import com.sun.cri.ri.*;
-import com.sun.cri.xir.CiXirAssembler.XirMark;
+import com.sun.cri.xir.CiXirAssembler.*;
 
 /**
  * The {@code LIRAssembler} class definition.
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java	Thu May 19 17:36:46 2011 +0200
@@ -25,9 +25,9 @@
 import java.util.*;
 
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiTargetMethod.Mark;
+import com.sun.cri.ci.CiTargetMethod.*;
 import com.sun.cri.ri.*;
-import com.sun.cri.xir.CiXirAssembler.XirMark;
+import com.sun.cri.xir.CiXirAssembler.*;
 
 /**
  * This class represents a call instruction; either to a {@linkplain CiRuntimeCall runtime method},
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java	Thu May 19 17:36:46 2011 +0200
@@ -27,9 +27,7 @@
 import java.util.*;
 
 import com.sun.c1x.*;
-import com.sun.c1x.ir.*;
-import com.sun.c1x.lir.LIROperand.LIRAddressOperand;
-import com.sun.c1x.lir.LIROperand.LIRVariableOperand;
+import com.sun.c1x.lir.LIROperand.*;
 import com.sun.cri.ci.*;
 
 /**
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java	Thu May 19 17:36:46 2011 +0200
@@ -32,10 +32,10 @@
 import com.sun.c1x.globalstub.*;
 import com.sun.c1x.ir.*;
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiTargetMethod.Mark;
+import com.sun.cri.ci.CiTargetMethod.*;
 import com.sun.cri.ri.*;
-import com.sun.cri.xir.CiXirAssembler.XirMark;
 import com.sun.cri.xir.*;
+import com.sun.cri.xir.CiXirAssembler.*;
 
 /**
  * This class represents a list of LIR instructions and contains factory methods for creating and appending LIR
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java	Thu May 19 17:36:46 2011 +0200
@@ -22,7 +22,6 @@
  */
 package com.sun.c1x.lir;
 
-import com.sun.c1x.ir.*;
 import com.sun.cri.ci.*;
 
 /**
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java
--- a/graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java	Thu May 19 17:36:46 2011 +0200
@@ -22,7 +22,7 @@
  */
 package com.sun.c1x.opt;
 
-import com.sun.c1x.graph.IR;
+import com.sun.c1x.graph.*;
 import com.sun.c1x.ir.*;
 import com.sun.c1x.value.*;
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java
--- a/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java	Thu May 19 17:36:46 2011 +0200
@@ -33,15 +33,10 @@
 import com.sun.c1x.asm.*;
 import com.sun.c1x.globalstub.*;
 import com.sun.cri.ci.*;
-import com.sun.cri.ci.CiRegister.RegisterFlag;
+import com.sun.cri.ci.CiRegister.*;
 import com.sun.cri.ri.*;
 import com.sun.cri.xir.*;
-import com.sun.cri.xir.CiXirAssembler.XirConstant;
-import com.sun.cri.xir.CiXirAssembler.XirConstantOperand;
-import com.sun.cri.xir.CiXirAssembler.XirOperand;
-import com.sun.cri.xir.CiXirAssembler.XirParameter;
-import com.sun.cri.xir.CiXirAssembler.XirRegister;
-import com.sun.cri.xir.CiXirAssembler.XirTemp;
+import com.sun.cri.xir.CiXirAssembler.*;
 
 public class AMD64GlobalStubEmitter implements GlobalStubEmitter {
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Thu May 19 17:36:46 2011 +0200
@@ -22,6 +22,8 @@
  */
 package com.sun.c1x.value;
 
+import static com.sun.c1x.value.ValueUtil.*;
+
 import java.util.*;
 
 import com.oracle.graal.graph.*;
@@ -30,8 +32,6 @@
 import com.sun.c1x.ir.*;
 import com.sun.cri.ci.*;
 
-import static com.sun.c1x.value.ValueUtil.*;
-
 /**
  * The {@code FrameState} class encapsulates the frame state (i.e. local variables and
  * operand stack) at a particular point in the abstract interpretation.
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Thu May 19 17:36:46 2011 +0200
@@ -22,6 +22,9 @@
  */
 package com.sun.c1x.value;
 
+import static com.sun.c1x.value.ValueUtil.*;
+import static java.lang.reflect.Modifier.*;
+
 import java.util.*;
 
 import com.oracle.graal.graph.*;
@@ -30,9 +33,6 @@
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
 
-import static com.sun.c1x.value.ValueUtil.*;
-import static java.lang.reflect.Modifier.*;
-
 
 public class FrameStateBuilder implements FrameStateAccess {
 
diff -r 027adfafd47e -r 2ef23785ca93 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java	Thu May 19 17:24:23 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java	Thu May 19 17:36:46 2011 +0200
@@ -31,7 +31,6 @@
 public class HotSpotOptions {
 
     public static void setDefaultOptions() {
-        C1XOptions.setOptimizationLevel(3);
         C1XOptions.DetailedAsserts = false;
         C1XOptions.CommentedAssembly = false;
         C1XOptions.MethodEndBreakpointGuards = 2;