groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [groovy] branch GROOVY_3_0_X updated: GROOVY-9120: check for local variable references within AIC
Date Sat, 04 Jan 2020 13:11:42 GMT
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 3ff9a86  GROOVY-9120: check for local variable references within AIC
3ff9a86 is described below

commit 3ff9a8605b16b6668fc23e350df7642c2f279167
Author: Eric Milles <eric.milles@thomsonreuters.com>
AuthorDate: Wed Jan 1 17:27:50 2020 -0600

    GROOVY-9120: check for local variable references within AIC
    
    (cherry picked from commit f1f57dc75366a9b24160dc9c301a7446a9b8950c)
---
 .../groovy/classgen/VariableScopeVisitor.java      |  4 +-
 src/test/groovy/bugs/Groovy9120.groovy             | 60 ++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/VariableScopeVisitor.java b/src/main/java/org/codehaus/groovy/classgen/VariableScopeVisitor.java
index 76664b3..3da0856 100644
--- a/src/main/java/org/codehaus/groovy/classgen/VariableScopeVisitor.java
+++ b/src/main/java/org/codehaus/groovy/classgen/VariableScopeVisitor.java
@@ -244,10 +244,12 @@ public class VariableScopeVisitor extends ClassCodeVisitorSupport {
             variable = new DynamicVariable(name, crossingStaticContext);
         }
 
+        boolean isClassVariable = (scope.isClassScope() && !scope.isReferencedLocalVariable(name))
+            || (scope.isReferencedClassVariable(name) && scope.getDeclaredVariable(name)
== null);
         VariableScope end = scope;
         scope = currentScope;
         while (scope != end) {
-            if (end.isClassScope() || (end.isReferencedClassVariable(name) && end.getDeclaredVariable(name)
== null)) {
+            if (isClassVariable) {
                 scope.putReferencedClassVariable(variable);
             } else {
                 scope.putReferencedLocalVariable(variable);
diff --git a/src/test/groovy/bugs/Groovy9120.groovy b/src/test/groovy/bugs/Groovy9120.groovy
new file mode 100644
index 0000000..429826a
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9120.groovy
@@ -0,0 +1,60 @@
+/*
+ *  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.assertScript
+
+@CompileStatic
+final class Groovy9120 {
+
+    @Test
+    void testLocalVariableReferencesFromAIC() {
+        assertScript '''
+            import java.util.concurrent.Callable
+
+            interface Face9120 {
+                Runnable runnable()
+                Callable<Long> callable()
+            }
+
+            static Face9120 make() {
+                final long number = 42
+                return new Face9120() {
+                    @Override
+                    Runnable runnable() {
+                        return { ->
+                            assert "number is ${number}" == 'number is 42'
+                        }
+                    }
+                    @Override
+                    Callable<Long> callable() {
+                        return { -> number }
+                    }
+                }
+            }
+
+            def face = make()
+            face.runnable().run()
+            assert "number is ${face.callable().call()}" == 'number is 42'
+        '''
+    }
+}


Mime
View raw message