# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1329837528 -3600
# Node ID ac9ab44b75fd60e84ab8ef39e620ffc60ca4bf18
# Parent  bdf2eb70ef3e8fb741b5f5070ae764edfd0c72e6
Disable propagate types phase. Fix intrinsification of an invoke with a deoptimize node.

Show debug dump scope name when printing context information.

diff -r bdf2eb70ef3e -r ac9ab44b75fd graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Mon Feb 20 19:19:12 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Tue Feb 21 16:18:48 2012 +0100
@@ -141,7 +141,7 @@
     public static boolean AssumeVerifiedBytecode             = true;
 
     // Code generator settings
-    public static boolean PropagateTypes                     = true;
+    public static boolean PropagateTypes                     = ____;
     public static boolean UseBranchPrediction                = true;
     public static boolean UseExceptionProbability            = true;
     public static boolean AllowExplicitExceptionChecks       = true;
diff -r bdf2eb70ef3e -r ac9ab44b75fd graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugDumpScope.java
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugDumpScope.java	Mon Feb 20 19:19:12 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugDumpScope.java	Tue Feb 21 16:18:48 2012 +0100
@@ -33,4 +33,9 @@
     public String getName() {
         return name;
     }
+
+    @Override
+    public String toString() {
+        return "DebugDumpScope[" + name + "]";
+    }
 }
diff -r bdf2eb70ef3e -r ac9ab44b75fd graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeNode.java
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeNode.java	Mon Feb 20 19:19:12 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/InvokeNode.java	Tue Feb 21 16:18:48 2012 +0100
@@ -129,6 +129,7 @@
                 this.replaceAtPredecessors(node);
                 this.replaceAtUsages(null);
                 GraphUtil.killCFG(this);
+                return;
             } else {
                 ((StructuredGraph) graph()).replaceFixed(this, node);
             }