(groovy) branch GROOVY_4_0_X updated: GROOVY-11600: no implicit outer class argument on inner record ctor call

[emilles]

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

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


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new 73c993ed6c GROOVY-11600: no implicit outer class argument on inner 
record ctor call
73c993ed6c is described below

commit 73c993ed6cd046a56674312fc2caeeee063ec2ce
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Fri Apr 4 20:44:03 2025 -0500

    GROOVY-11600: no implicit outer class argument on inner record ctor call
---
 .../groovy/classgen/InnerClassVisitorHelper.java         |  5 +++--
 src/test/groovy/transform/stc/ConstructorsSTCTest.groovy | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java 
b/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
index 8d0202becb..b3a03352c8 100644
--- a/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
@@ -110,7 +110,8 @@ public abstract class InnerClassVisitorHelper extends 
ClassCodeVisitorSupport {
     }
 
     protected static boolean shouldHandleImplicitThisForInnerClass(final 
ClassNode cn) {
-        final int explicitOrImplicitStatic = Opcodes.ACC_STATIC | 
Opcodes.ACC_INTERFACE | Opcodes.ACC_ENUM;
-        return (cn.getModifiers() & explicitOrImplicitStatic) == 0 && (cn 
instanceof InnerClassNode && !((InnerClassNode) cn).isAnonymous());
+        final int explicitOrImplicitStatic = Opcodes.ACC_ENUM | 
Opcodes.ACC_INTERFACE | Opcodes.ACC_RECORD | Opcodes.ACC_STATIC;
+        return (cn.getModifiers() & explicitOrImplicitStatic) == 0 && (cn 
instanceof InnerClassNode && !((InnerClassNode) cn).isAnonymous())
+                && cn.getAnnotations().stream().noneMatch(aNode -> 
"groovy.transform.RecordType".equals(aNode.getClassNode().getName())); // 
GROOVY-11600
     }
 }
diff --git a/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy 
b/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
index 2e79c75995..391442074d 100644
--- a/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
@@ -590,4 +590,20 @@ class ConstructorsSTCTest extends 
StaticTypeCheckingTestCase {
             assert new A().test() == ['value']
         '''
     }
+
+    // GROOVY-11600
+    void testInnerRecordConstructorCall() {
+        assertScript '''
+            class C {
+                record R(int i, Number n) {
+                }
+                void test() {
+                    def r = new C.R(1,2)
+                    assert r.i() == 1
+                    assert r.n() == 2
+                }
+            }
+            new C().test()
+        '''
+    }
 }