GROOVY-11457: STC: try/catch/finally conditional assignments

apache · Sep 4, 2024 · 6e6f304 · 6e6f304
1 parent 35478b7
commit 6e6f304
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4532,18 +4532,25 @@ private static boolean isEmptyMap(final Expression expr) {
 
     @Override
     public void visitTryCatchFinally(final TryCatchStatement statement) {
-        List<CatchStatement> catchStatements = statement.getCatchStatements();
-        for (CatchStatement catchStatement : catchStatements) {
-            ClassNode exceptionType = catchStatement.getExceptionType();
-            typeCheckingContext.controlStructureVariables.put(catchStatement.getVariable(), exceptionType);
-        }
+        Map<Parameter, ClassNode> vars = typeCheckingContext.controlStructureVariables;
+        Map<VariableExpression, List<ClassNode>> oldTracker = pushAssignmentTracking();
         try {
-            super.visitTryCatchFinally(statement);
-        } finally {
-            for (CatchStatement catchStatement : catchStatements) {
-                typeCheckingContext.controlStructureVariables.remove(catchStatement.getVariable());
+            visitStatement(statement);
+            statement.getResourceStatements().forEach(rsrc -> rsrc.visit(this));
+            statement.getTryStatement().visit(this);
+            for (CatchStatement catchStatement : statement.getCatchStatements()) {
+                vars.put(catchStatement.getVariable(), catchStatement.getExceptionType());
+                try {
+                    restoreTypeBeforeConditional();
+                    catchStatement.visit(this);
+                } finally {
+                    vars.remove(catchStatement.getVariable());
+                }
             }
+        } finally {
+            popAssignmentTracking(oldTracker);
         }
+        statement.getFinallyStatement().visit(this);
     }
 
     protected void storeType(final Expression exp, ClassNode cn) {

diff --git a/src/test/groovy/transform/stc/STCAssignmentTest.groovy b/src/test/groovy/transform/stc/STCAssignmentTest.groovy
@@ -602,7 +602,7 @@ class STCAssignmentTest extends StaticTypeCheckingTestCase {
         'Cannot find matching method java.io.Serializable#toInteger()'
     }
 
-    void testTernaryInitWithAssignment() {
+    void testTernaryWithNestedAssignment() {
         shouldFailWithMessages '''
             def x = '123'
             def y = (false ? (x = new HashSet()) : 42)
@@ -611,6 +611,35 @@ class STCAssignmentTest extends StaticTypeCheckingTestCase {
         'Cannot find matching method java.io.Serializable#toInteger()'
     }
 
+    // GROOVY-11457
+    void testTryCatchFinallyWithAssignment() {
+        assertScript '''
+            def x = (Appendable) null
+            if (true)  {
+                x = 1
+            }
+            try {
+                ;
+            } finally {
+                x = (Appendable) null
+            }
+            Appendable y = x
+        '''
+        shouldFailWithMessages '''
+            def x = (Appendable) null
+            if (true)  {
+                x = 1
+            }
+            try {
+                ;
+            } catch (e) {
+                x = (Appendable) null
+            }
+            Appendable y = x // Cannot cast object '1' with class 'Integer' to class 'Appendable'
+        ''',
+        'Cannot assign value of type java.lang.Object to variable of type java.lang.Appendable'
+    }
+
     void testFloatSub() {
         assertScript '''
             float x = 1.0f