# HG changeset patch
# User Christian Humer <christian.humer@oracle.com>
# Date 1433874259 -7200
# Node ID 2d97ac4c3df54aa8ca47d4ba9225ef72eb0735c3
# Parent  90e3fecd4143f5b029e3c89f37ccf55fb969ad30
Truffle: allow non-constant Assumption checks

diff -r 90e3fecd4143 -r 2d97ac4c3df5 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Tue Jun 09 17:29:15 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Tue Jun 09 20:24:19 2015 +0200
@@ -61,7 +61,7 @@
 public class TruffleGraphBuilderPlugins {
     public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins, boolean canDelayIntrinsification, SnippetReflectionProvider snippetReflection) {
 
-        registerOptimizedAssumptionPlugins(plugins, canDelayIntrinsification, snippetReflection);
+        registerOptimizedAssumptionPlugins(plugins, snippetReflection);
         registerExactMathPlugins(plugins);
         registerCompilerDirectivesPlugins(plugins);
         registerCompilerAssertsPlugins(plugins, canDelayIntrinsification);
@@ -76,7 +76,7 @@
 
     }
 
-    public static void registerOptimizedAssumptionPlugins(InvocationPlugins plugins, boolean canDelayIntrinsification, SnippetReflectionProvider snippetReflection) {
+    public static void registerOptimizedAssumptionPlugins(InvocationPlugins plugins, SnippetReflectionProvider snippetReflection) {
         Registration r = new Registration(plugins, OptimizedAssumption.class);
         InvocationPlugin plugin = new InvocationPlugin() {
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
@@ -99,10 +99,8 @@
                         }
                     }
                     return true;
-                } else if (canDelayIntrinsification) {
+                } else {
                     return false;
-                } else {
-                    throw b.bailout("assumption could not be reduced to a constant");
                 }
             }
         };