# HG changeset patch # User Christian Wimmer # Date 1431645039 25200 # Node ID 010d3e1099c39b349927e455fb23654c94eb2600 # Parent cb7bc65fdc0bdba40ad769c8f3e7d2f324bab5a0 Allow snippets that do not have a return value diff -r cb7bc65fdc0b -r 010d3e1099c3 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu May 14 16:10:20 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu May 14 16:10:39 2015 -0700 @@ -1098,11 +1098,12 @@ // rewire outgoing memory edges replaceMemoryUsages(replacee, new MemoryOutputMap(replacee, duplicates)); - ReturnNode ret = (ReturnNode) duplicates.get(returnNode); - MemoryMapNode memoryMap = ret.getMemoryMap(); - ret.setMemoryMap(null); - memoryMap.safeDelete(); - + if (returnNode != null) { + ReturnNode ret = (ReturnNode) duplicates.get(returnNode); + MemoryMapNode memoryMap = ret.getMemoryMap(); + ret.setMemoryMap(null); + memoryMap.safeDelete(); + } if (memoryAnchor != null) { // rewire incoming memory edges MemoryAnchorNode memoryDuplicate = (MemoryAnchorNode) duplicates.get(memoryAnchor);