# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1412761916 -7200
# Node ID 4ab45518048beef11e52a2694fe9abb575d7f5c4
# Parent  9fb3791586e8767f75a52360b6dad3b90e935a72
removed MemoryAwareScheduling option (since non-memory aware scheduling currently generates invalid code)

diff -r 9fb3791586e8 -r 4ab45518048b graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java	Tue Oct 07 19:09:25 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java	Wed Oct 08 11:51:56 2014 +0200
@@ -217,9 +217,6 @@
     @Option(help = "")
     public static final OptionValue<Boolean> CanOmitFrame = new OptionValue<>(true);
 
-    @Option(help = "")
-    public static final OptionValue<Boolean> MemoryAwareScheduling = new OptionValue<>(true);
-
     // Translating tableswitch instructions
     @Option(help = "")
     public static final OptionValue<Integer> MinimumJumpTableSize = new OptionValue<>(5);
diff -r 9fb3791586e8 -r 4ab45518048b graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Tue Oct 07 19:09:25 2014 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Wed Oct 08 11:51:56 2014 +0200
@@ -279,7 +279,7 @@
     }
 
     public SchedulePhase(SchedulingStrategy strategy) {
-        this.memsched = MemoryAwareScheduling.getValue() ? MemoryScheduling.OPTIMAL : MemoryScheduling.NONE;
+        this.memsched = MemoryScheduling.OPTIMAL;
         this.selectedStrategy = strategy;
     }