Mercurial > hg > truffle

changeset 2952:ec86f14be4cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed System.out and System.err rewiring in Sandbox, removed duplicate deopts in GraphBuilderPhase
author Lukas Stadler <lukas.stadler@jku.at>
date Wed, 15 Jun 2011 09:50:02 +0200
parents 0c0e407faa39
children 445233cd91df 228276b7813b
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java	Tue Jun 14 16:47:31 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java	Wed Jun 15 09:50:02 2011 +0200
@@ -820,7 +820,7 @@
                 LoadField load = new LoadField(container, field, graph);
                 appendOptimizedLoadField(kind, load);
             } else {
-                append(new Deoptimize(DeoptAction.InvalidateRecompile, graph));
+                // deopt will be generated by genTypeOrDeopt, not needed here
                 frameState.push(kind.stackKind(), append(Constant.defaultForKind(kind, graph)));
             }
         }
@@ -834,7 +834,7 @@
             StoreField store = new StoreField(container, field, value, graph);
             appendOptimizedStoreField(store);
         } else {
-            append(new Deoptimize(DeoptAction.InvalidateRecompile, graph));
+            // deopt will be generated by genTypeOrDeopt, not needed here
         }
     }
 
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java	Tue Jun 14 16:47:31 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/VMExitsNative.java	Wed Jun 15 09:50:02 2011 +0200
@@ -103,11 +103,12 @@
     public abstract class Sandbox {
 
         public void start() throws Throwable {
-            PrintStream oldOut = System.out;
-            PrintStream oldErr = System.err;
+            // (ls) removed output and error stream rewiring, this influences applications and, for example, makes dacapo tests fail.
+//            PrintStream oldOut = System.out;
+//            PrintStream oldErr = System.err;
             run();
-            System.setOut(oldOut);
-            System.setErr(oldErr);
+//            System.setOut(oldOut);
+//            System.setErr(oldErr);
         }
 
         protected abstract void run() throws Throwable;