Mercurial > hg > truffle

changeset 20161:6adad2a0a24d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore ResolvedJavaMethod.canBeInlined when parsing Snippets or Replacements
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Fri, 03 Apr 2015 17:49:43 +0200
parents 90b5605032bc
children ba0f264a71cf
files graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Fri Apr 03 13:27:13 2015 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Fri Apr 03 17:49:43 2015 +0200
@@ -1327,7 +1327,8 @@
 
             private boolean tryInline(ValueNode[] args, ResolvedJavaMethod targetMethod, InvokeKind invokeKind, JavaType returnType) {
                 InlineInvokePlugin plugin = graphBuilderConfig.getPlugins().getInlineInvokePlugin();
-                if (plugin == null || !invokeKind.isDirect() || !targetMethod.canBeInlined()) {
+                boolean canBeInlined = parsingReplacement() || targetMethod.canBeInlined();
+                if (plugin == null || !invokeKind.isDirect() || !canBeInlined) {
                     return false;
                 }
                 InlineInfo inlineInfo = plugin.getInlineInfo(this, targetMethod, args, returnType);