Also perform uninitialized check on temp locals.

headius · headius · commit fe0157dc201d · 2016-10-31T11:00:04.000-05:00
Fixes #4251.
diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/DefinedVariableNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/DefinedVariableNode.java
@@ -7,6 +7,8 @@
 import org.jruby.ir.instructions.ResultInstr;
 import org.jruby.ir.operands.LocalVariable;
 import org.jruby.ir.operands.Operand;
+import org.jruby.ir.operands.TemporaryLocalVariable;
+import org.jruby.ir.operands.TemporaryVariable;
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.operands.WrappedIRClosure;
 import org.jruby.ir.IRClosure;
@@ -79,7 +81,11 @@ public void applyTransferFunction(Instr i) {
         // Variables that belong to outer scopes should always
         // be considered defined.
         for (Variable v: i.getUsedVariables()) {
-            if (v instanceof LocalVariable && ((LocalVariable)v).getScopeDepth() > 0) {
+            if (v instanceof LocalVariable) {
+                if (((LocalVariable)v).getScopeDepth() > 0) {
+                    tmp.set(problem.getDFVar(v));
+                }
+            } else if (v instanceof TemporaryLocalVariable) {
                 tmp.set(problem.getDFVar(v));
             }
         }
@@ -116,17 +122,22 @@ public void identifyInits(Set<Variable> undefinedVars) {
         initSolution();
         for (Instr i: basicBlock.getInstrs()) {
             for (Variable v: i.getUsedVariables()) {
-                LocalVariable lv;
                 if (!v.isSelf()) {
                     if (v instanceof LocalVariable) {
-                        lv = (LocalVariable)v;
+                        LocalVariable lv = (LocalVariable) v;
                         // Variables that belong to outer scopes
                         // are considered already defined.
                         if (lv.getScopeDepth() < parentScopeDepth && !tmp.get(problem.getDFVar(v))) {
                             // We want lv suitable for initializing in this scope
                             undefinedVars.add(lv.getScopeDepth() == 0 ? lv : lv.cloneForDepth(0));
                         }
                         tmp.set(problem.getDFVar(lv));
+                    } else if (v instanceof TemporaryLocalVariable) {
+                        TemporaryLocalVariable tlv = (TemporaryLocalVariable) v;
+                        if (!tmp.get(problem.getDFVar(v))) {
+                            undefinedVars.add(tlv);
+                        }
+                        tmp.set(problem.getDFVar(tlv));
                     }
                 }
             }
