Mercurial > hg > truffle

changeset 2859:a4fbfbc3c858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Temporarily disabled inlining.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Tue, 07 Jun 2011 16:13:08 +0200
parents a97605b0489b
children e1be0d206934
files graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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];