# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1443626915 -7200
# Node ID 0052aa6ed733daae7b81b81d721b3076d558a0db
# Parent  072dc455f35e21501803e7591bce301c09fe456c
work around for Eclipse bug 477597

diff -r 072dc455f35e -r 0052aa6ed733 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java	Wed Sep 30 15:50:25 2015 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java	Wed Sep 30 17:28:35 2015 +0200
@@ -22,7 +22,6 @@
  */
 package com.oracle.graal.compiler.common;
 
-import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.LIREagerSSADestruction;
 import jdk.internal.jvmci.options.DerivedOptionValue;
 import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier;
 import jdk.internal.jvmci.options.Option;
@@ -79,7 +78,7 @@
             if (UserOptions.LIROptSSILinearScan.getValue()) {
                 return LSRAVariant.SSI_LSRA;
             }
-            if (GraalOptions.SSA_LIR.getValue() && !LIREagerSSADestruction.getValue()) {
+            if (GraalOptions.SSA_LIR.getValue() && !UserOptions.LIREagerSSADestruction.getValue()) {
                 return LSRAVariant.SSA_LSRA;
             }
             return LSRAVariant.NONSSA_LSAR;
diff -r 072dc455f35e -r 0052aa6ed733 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Wed Sep 30 15:50:25 2015 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Wed Sep 30 17:28:35 2015 +0200
@@ -32,7 +32,6 @@
 import static com.oracle.graal.compiler.common.GraalOptions.OptLoopTransform;
 import static com.oracle.graal.compiler.common.GraalOptions.PartialEscapeAnalysis;
 import static com.oracle.graal.compiler.common.GraalOptions.UseGraalQueries;
-import static com.oracle.graal.compiler.phases.HighTier.Options.Inline;
 import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
 import jdk.internal.jvmci.options.Option;
 import jdk.internal.jvmci.options.OptionType;
@@ -74,7 +73,7 @@
             appendPhase(canonicalizer);
         }
 
-        if (Inline.getValue()) {
+        if (Options.Inline.getValue()) {
             appendPhase(new InliningPhase(canonicalizer));
             appendPhase(new DeadCodeEliminationPhase(Optional));
 
diff -r 072dc455f35e -r 0052aa6ed733 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java	Wed Sep 30 15:50:25 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java	Wed Sep 30 17:28:35 2015 +0200
@@ -22,8 +22,6 @@
  */
 package com.oracle.graal.phases.common;
 
-import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Options.ReduceDCE;
-
 import java.util.function.BiConsumer;
 
 import jdk.internal.jvmci.options.Option;
@@ -75,7 +73,7 @@
 
     @Override
     public void run(StructuredGraph graph) {
-        if (optional && ReduceDCE.getValue()) {
+        if (optional && Options.ReduceDCE.getValue()) {
             return;
         }
 
diff -r 072dc455f35e -r 0052aa6ed733 graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java	Wed Sep 30 15:50:25 2015 +0200
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java	Wed Sep 30 17:28:35 2015 +0200
@@ -22,8 +22,6 @@
  */
 package com.oracle.graal.printer;
 
-import static com.oracle.graal.printer.NoDeadCodeVerifyHandler.Options.NDCV;
-
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -64,7 +62,7 @@
     private static final Map<String, Boolean> discovered = new ConcurrentHashMap<>();
 
     public void verify(Object object, String message) {
-        if (NDCV.getValue() != OFF && object instanceof StructuredGraph) {
+        if (Options.NDCV.getValue() != OFF && object instanceof StructuredGraph) {
             StructuredGraph graph = (StructuredGraph) object;
             List<Node> before = graph.getNodes().snapshot();
             new DeadCodeEliminationPhase().run(graph);
@@ -75,12 +73,12 @@
                     before.removeAll(after);
                     String prefix = message == null ? "" : message + ": ";
                     JVMCIError error = new JVMCIError("%sfound dead nodes in %s: %s", prefix, graph, before);
-                    if (NDCV.getValue() == INFO) {
+                    if (Options.NDCV.getValue() == INFO) {
                         System.out.println(error.getMessage());
-                    } else if (NDCV.getValue() == VERBOSE) {
+                    } else if (Options.NDCV.getValue() == VERBOSE) {
                         error.printStackTrace(System.out);
                     } else {
-                        assert NDCV.getValue() == FATAL;
+                        assert Options.NDCV.getValue() == FATAL;
                         throw error;
                     }
                 }
diff -r 072dc455f35e -r 0052aa6ed733 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java	Wed Sep 30 15:50:25 2015 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java	Wed Sep 30 17:28:35 2015 +0200
@@ -24,7 +24,6 @@
 
 import static com.oracle.graal.compiler.common.GraalOptions.EscapeAnalysisIterations;
 import static com.oracle.graal.compiler.common.GraalOptions.EscapeAnalyzeOnly;
-import static com.oracle.graal.virtual.phases.ea.PartialEscapePhase.Options.OptEarlyReadElimination;
 
 import java.util.Set;
 
@@ -55,11 +54,11 @@
     private final BasePhase<PhaseContext> cleanupPhase;
 
     public PartialEscapePhase(boolean iterative, CanonicalizerPhase canonicalizer) {
-        this(iterative, OptEarlyReadElimination.getValue(), canonicalizer, null);
+        this(iterative, Options.OptEarlyReadElimination.getValue(), canonicalizer, null);
     }
 
     public PartialEscapePhase(boolean iterative, CanonicalizerPhase canonicalizer, BasePhase<PhaseContext> cleanupPhase) {
-        this(iterative, OptEarlyReadElimination.getValue(), canonicalizer, cleanupPhase);
+        this(iterative, Options.OptEarlyReadElimination.getValue(), canonicalizer, cleanupPhase);
     }
 
     public PartialEscapePhase(boolean iterative, boolean readElimination, CanonicalizerPhase canonicalizer, BasePhase<PhaseContext> cleanupPhase) {