# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1307455988 -7200
# Node ID a4fbfbc3c8585c17da3b3dedd49365301f00dd9b
# Parent  a97605b0489bd6b7c8525ddaa1e34f8619e4b1a7
Temporarily disabled inlining.

diff -r a97605b0489b -r a4fbfbc3c858 graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java	Tue Jun 07 16:11:26 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java	Tue Jun 07 16:13:08 2011 +0200
@@ -39,7 +39,7 @@
     // Checkstyle: resume
 
     // inlining settings
-    public static boolean Inline                             = true;
+    public static boolean Inline                             = ____;
     public static int     MaximumInstructionCount            = 37000;
     public static float   MaximumInlineRatio                 = 0.90f;
     public static int     MaximumInlineSize                  = 35;
diff -r a97605b0489b -r a4fbfbc3c858 graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java
--- a/graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java	Tue Jun 07 16:11:26 2011 +0200
+++ b/graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java	Tue Jun 07 16:13:08 2011 +0200
@@ -47,7 +47,7 @@
 
     @Override
     public Node set(int index, Node node) {
-        assert node == Node.Null || node.graph == self().graph;
+        assert node == Node.Null || node.graph == self().graph : "node is from different graph";
         assert node == Node.Null || node.id() != Node.DeletedID : "inserted node must not be deleted";
         Node old = nodes[index];