Mercurial > hg > truffle

changeset 21883:2d97ac4c3df5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: allow non-constant Assumption checks
author Christian Humer <christian.humer@oracle.com>
date Tue, 09 Jun 2015 20:24:19 +0200
parents 90e3fecd4143
children 525c4df9428b
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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");
                 }
             }
         };