Mercurial > hg > truffle

changeset 11252:d91d7d3ae393

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
create null check for MacroSubstitution + MethodSubstitution case
author Lukas Stadler <lukas.stadler@jku.at>
date Wed, 07 Aug 2013 18:34:19 +0200
parents e428ffc7a0ad
children 252958589b2b
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java	Wed Aug 07 18:33:44 2013 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java	Wed Aug 07 18:34:19 2013 +0200
@@ -80,16 +80,18 @@
 
     @Override
     public void lower(LoweringTool tool, LoweringType loweringType) {
+        boolean nullCheck = false;
         StructuredGraph replacementGraph = getSnippetGraph(tool);
         if (replacementGraph == null) {
             replacementGraph = getSubstitutionGraph(tool);
+            nullCheck = true;
         }
 
         InvokeNode invoke = replaceWithInvoke();
         assert invoke.verify();
 
         if (replacementGraph != null) {
-            InliningUtil.inline(invoke, replacementGraph, false);
+            InliningUtil.inline(invoke, replacementGraph, nullCheck);
         }
     }