Mercurial > hg > truffle

changeset 16474:000a1a014bd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset: cec5a97ba1e4
author Andreas Woess <andreas.woess@jku.at>
date Fri, 11 Jul 2014 02:57:34 +0200
parents f681a647246c
children 6ce37ad3ea47
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Thu Jul 10 20:43:26 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Fri Jul 11 02:57:34 2014 +0200
@@ -202,7 +202,7 @@
                         }
 
                         StructuredGraph inlineGraph = replacements.getMethodSubstitution(methodCallTargetNode.targetMethod());
-                        if (inlineGraph == null && canBeInlined(methodCallTargetNode)) {
+                        if (inlineGraph == null && !methodCallTargetNode.targetMethod().isNative() && methodCallTargetNode.targetMethod().canBeInlined()) {
                             inlineGraph = parseGraph(methodCallTargetNode.targetMethod(), methodCallTargetNode.arguments(), assumptions, phaseContext, false);
                         }
 
@@ -242,10 +242,6 @@
         }
     }
 
-    private static boolean canBeInlined(MethodCallTargetNode methodCallTargetNode) {
-        return !methodCallTargetNode.targetMethod().isNative() && methodCallTargetNode.targetMethod().getAnnotation(TruffleCallBoundary.class) == null;
-    }
-
     private StructuredGraph parseGraph(final ResolvedJavaMethod targetMethod, final NodeInputList<ValueNode> arguments, final Assumptions assumptions, final PhaseContext phaseContext,
                     boolean ignoreSlowPath) {