GROOVY-11907: SC: trait static field helper generates invalid bytecode when method-level DYNAMIC_RESOLUTION is present (GROOVY-11817 regression)

Author: paulk-asert

src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -220,7 +220,7 @@ private Expression transformBinaryExpression(final BinaryExpression exp, final C
     private Expression transformFieldReference(final Expression exp, final FieldNode fn, final boolean isStatic) {
         Expression receiver = createFieldHelperReceiver();
         if (isStatic) {
-            receiver = asClass(receiver);
+            receiver = asClass(receiver, fn); // GROOVY-11907
         }
 
         MethodCallExpression mce = callX(receiver, Traits.helperGetterName(fn));
@@ -352,7 +352,17 @@ private Expression createFieldHelperReceiver() {
     }
 
     private Expression asClass(final Expression e) {
+        return asClass(e, null);
+    }
+
+    private Expression asClass(final Expression e, final FieldNode fn) {
         ClassNode rawClass = ClassHelper.CLASS_Type.getPlainNodeReference();
-        return ternaryX(isInstanceOfX(e, rawClass), e, callX(e, "getClass"));
+        MethodCallExpression getClassCall = callX(e, "getClass");
+        if (fn != null && fn.isStatic()) {
+            // GROOVY-11907: mark sub-expression for dynamic dispatch so that
+            // GROOVY-11817's per-expression DYNAMIC_RESOLUTION check handles it
+            getClassCall.putNodeMetaData(org.codehaus.groovy.transform.stc.StaticTypesMarker.DYNAMIC_RESOLUTION, rawClass);
+        }
+        return ternaryX(isInstanceOfX(e, rawClass), e, getClassCall);
     }
 }

src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy

@@ -4053,4 +4053,37 @@ final class TraitASTTransformationTest {
             new C().test()
         '''
     }
+
+    // GROOVY-11907
+    @Test
+    void testTraitStaticFieldWithCompileStaticAndConfigScript() {
+        def config = shell.getClass().getDeclaredField('config')
+                .tap { accessible = true }.get(shell) as org.codehaus.groovy.control.CompilerConfiguration
+        groovy.ui.GroovyMain.processConfigScriptText('''
+            withConfig(configuration) {
+                inline(phase: 'CONVERSION') { source, context, classNode ->
+                    classNode.putNodeMetaData('test', 'true')
+                }
+            }
+        ''', config)
+
+        try {
+            assertScript shell, '''
+                @CompileStatic
+                trait MyTrait {
+                    static String myField
+                }
+
+                @CompileStatic
+                class MyClass implements MyTrait {
+                }
+
+                MyClass.myField = 'test'
+                assert MyClass.myField == 'test'
+            '''
+        } finally {
+            // clean up: remove the customizer we added
+            config.compilationCustomizers.removeIf { it.class.simpleName == 'InlinedASTCustomizer' }
+        }
+    }
 }