# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1375893259 -7200
# Node ID d91d7d3ae39383800bb3bbcbee84de02a90a1343
# Parent  e428ffc7a0adb7086eed71c5fd0f180c29260ef2
create null check for MacroSubstitution + MethodSubstitution case

diff -r e428ffc7a0ad -r d91d7d3ae393 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java
--- 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);
         }
     }