Fix for issue #344: instanceof ternary expression flow typing

groovy · Oct 2, 2017 · 7c83c58 · 7c83c58
1 parent 8e82239
commit 7c83c58
Show file tree

Hide file tree

Showing 6 changed files with 4,083 additions and 5 deletions.
diff --git a/...rg.codehaus.groovy20/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy20/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -2193,6 +2193,9 @@ public void visitTernaryExpression(final TernaryExpression expression) {
         Expression trueExpression = expression.getTrueExpression();
         Expression falseExpression = expression.getFalseExpression();
         trueExpression.visit(this);
+        // GRECLIPSE add
+        final ClassNode typeOfTrue = findCurrentInstanceOfClass(trueExpression, getType(trueExpression));
+        // GRECLIPSE end
         // pop if-then-else temporary type info
         temporaryIfBranchTypeInformation.pop();
         falseExpression.visit(this);
@@ -2209,7 +2212,9 @@ public void visitTernaryExpression(final TernaryExpression expression) {
             }
         } else {
             // store type information
-            final ClassNode typeOfTrue = getType(trueExpression);
+            // GRECLIPSE edit
+            //final ClassNode typeOfTrue = getType(trueExpression);
+            // GRECLIPSE end
             final ClassNode typeOfFalse = getType(falseExpression);
             resultType = lowestUpperBound(typeOfTrue, typeOfFalse);
         }