[groovy] branch GROOVY-8686 created (now a279d34)

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a change to branch GROOVY-8686
in repository https://gitbox.apache.org/repos/asf/groovy.git.


      at a279d34  GROOVY-8686: restrict instanceof flow type to enclosing statement

This branch includes the following new commits:

     new a279d34  GROOVY-8686: restrict instanceof flow type to enclosing statement

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[groovy] 01/01: GROOVY-8686: restrict instanceof flow type to enclosing statement

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY-8686
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit a279d34aff252bcf26ed8c0f9a6173b06a903c37
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sun Nov 17 19:26:42 2019 -0600

    GROOVY-8686: restrict instanceof flow type to enclosing statement
---
 .../transform/stc/StaticTypeCheckingVisitor.java   |  8 ++++
 src/test/groovy/bugs/Groovy8686.groovy             | 52 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index acdd3d9..79132b3 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -85,6 +85,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement;
 import org.codehaus.groovy.ast.stmt.CaseStatement;
 import org.codehaus.groovy.ast.stmt.CatchStatement;
 import org.codehaus.groovy.ast.stmt.EmptyStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
 import org.codehaus.groovy.ast.stmt.ForStatement;
 import org.codehaus.groovy.ast.stmt.IfStatement;
 import org.codehaus.groovy.ast.stmt.ReturnStatement;
@@ -2142,6 +2143,13 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
     }
 
     @Override
+    public void visitExpressionStatement(final ExpressionStatement statement) {
+        typeCheckingContext.pushTemporaryTypeInfo();
+        super.visitExpressionStatement(statement);
+        typeCheckingContext.popTemporaryTypeInfo();
+    }
+
+    @Override
     public void visitReturnStatement(final ReturnStatement statement) {
         super.visitReturnStatement(statement);
         returnListener.returnStatementAdded(statement);
diff --git a/src/test/groovy/bugs/Groovy8686.groovy b/src/test/groovy/bugs/Groovy8686.groovy
new file mode 100644
index 0000000..1977c35
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy8686.groovy
@@ -0,0 +1,52 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package groovy.bugs
+
+import groovy.transform.CompileStatic
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.shouldFail
+
+@CompileStatic
+final class Groovy8686 {
+
+    @Test
+    void testInstanceOfScope1() {
+        def err = shouldFail '''
+            @groovy.transform.TypeChecked
+            def m(obj) {
+                boolean isA = (obj instanceof String && obj.equalsIgnoreCase('a'))
+                obj.toLowerCase() // typeof(obj) should be Object, not String
+            }
+        '''
+        assert err =~ /Cannot find matching method java.lang.Object#toLowerCase/
+    }
+
+    @Test
+    void testInstanceOfScope2() {
+        def err = shouldFail '''
+            @groovy.transform.CompileStatic
+            def m(obj) {
+                boolean isA = (obj instanceof String && obj.equalsIgnoreCase('a'))
+                obj.toLowerCase() // typeof(obj) should be Object, not String
+            }
+        '''
+        assert err =~ /Cannot find matching method java.lang.Object#toLowerCase/
+    }
+}