[Truffle] Guard against potential dead nodes appearing in if/else cla…

…uses.
jruby · Feb 9, 2015 · 1fd8e8a · 1fd8e8a
1 parent c4185ef
commit 1fd8e8a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -1448,13 +1448,13 @@ public RubyNode visitIfNode(org.jruby.ast.IfNode node) {
 
         org.jruby.ast.Node thenBody = node.getThenBody();
 
-        if (thenBody == null) {
+        if (thenBody == null || thenBody.isNil()) {
             thenBody = new org.jruby.ast.NilNode(node.getPosition());
         }
 
         org.jruby.ast.Node elseBody = node.getElseBody();
 
-        if (elseBody == null) {
+        if (elseBody == null || elseBody.isNil()) {
             elseBody = new org.jruby.ast.NilNode(node.getPosition());
         }