# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1365000431 -7200
# Node ID 10163579bbae893a0f26ef0eacbfdc61f5739f3b
# Parent  516e35a8eed83748bfa36d55deaace9f9d2e8d74# Parent  832b9a115a2df002ea9c3d68bca50648c6cd0ad7
Merge

diff -r 832b9a115a2d -r 10163579bbae graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/IterativeInliningTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/IterativeInliningTest.java	Wed Apr 03 15:01:48 2013 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/IterativeInliningTest.java	Wed Apr 03 16:47:11 2013 +0200
@@ -101,7 +101,7 @@
     private void processMethod(final String snippet) {
         graph = parse(snippet);
         new ComputeProbabilityPhase().apply(graph);
-        GraalOptions.PEAReadCache = true;
+        GraalOptions.OptEarlyReadElimination = true;
         new IterativeInliningPhase(runtime(), new Assumptions(false), null, getDefaultPhasePlan(), OptimisticOptimizations.ALL).apply(graph);
     }
 }
diff -r 832b9a115a2d -r 10163579bbae graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java	Wed Apr 03 15:01:48 2013 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java	Wed Apr 03 16:47:11 2013 +0200
@@ -204,7 +204,7 @@
         new ComputeProbabilityPhase().apply(graph);
         Assumptions assumptions = new Assumptions(false);
         new InliningPhase(runtime(), null, assumptions, null, getDefaultPhasePlan(), OptimisticOptimizations.ALL).apply(graph);
-        GraalOptions.PEAReadCache = true;
+        GraalOptions.OptEarlyReadElimination = true;
         new PartialEscapeAnalysisPhase(runtime(), assumptions, false).apply(graph);
     }
 }
diff -r 832b9a115a2d -r 10163579bbae 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	Wed Apr 03 15:01:48 2013 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Wed Apr 03 16:47:11 2013 +0200
@@ -68,7 +68,6 @@
     public static int     EscapeAnalysisIterations           = 2;
     public static String  EscapeAnalyzeOnly                  = null;
     public static int     MaximumEscapeAnalysisArrayLength   = 32;
-    public static boolean PEAReadCache                       = ____;
     public static boolean PEAInliningHints                   = ____;
 
     public static double  TailDuplicationProbability         = 0.5;
@@ -191,6 +190,7 @@
     public static boolean OptAssumptions                     = true;
     public static boolean OptConvertDeoptsToGuards           = true;
     public static boolean OptReadElimination                 = true;
+    public static boolean OptEarlyReadElimination            = true;
     public static boolean OptCanonicalizer                   = true;
     public static boolean OptScheduleOutOfLoops              = true;
     public static boolean OptEliminateGuards                 = true;
diff -r 832b9a115a2d -r 10163579bbae graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeAnalysisPhase.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeAnalysisPhase.java	Wed Apr 03 15:01:48 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeAnalysisPhase.java	Wed Apr 03 16:47:11 2013 +0200
@@ -76,7 +76,7 @@
             return;
         }
 
-        if (!GraalOptions.PEAReadCache) {
+        if (!GraalOptions.OptEarlyReadElimination) {
             boolean analyzableNodes = false;
             for (Node node : graph.getNodes()) {
                 if (node instanceof VirtualizableAllocation) {
diff -r 832b9a115a2d -r 10163579bbae graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Wed Apr 03 15:01:48 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Wed Apr 03 16:47:11 2013 +0200
@@ -110,7 +110,7 @@
                 trace("%s ", node);
                 deleted = false;
             }
-            if (GraalOptions.PEAReadCache) {
+            if (GraalOptions.OptEarlyReadElimination) {
                 if (!deleted) {
                     if (node instanceof StoreFieldNode) {
                         METRIC_STOREFIELD_RECORDED.increment();