GROOVY-11641: roll back

Author: eric-milles

src/main/java/groovy/lang/MetaClassImpl.java

@@ -110,7 +110,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.BiConsumer;
-import java.util.regex.Pattern;
 
 import static groovy.lang.Tuple.tuple;
 import static java.lang.Character.isUpperCase;
@@ -145,11 +144,6 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
     private static final MetaMethod AMBIGUOUS_LISTENER_METHOD = new DummyMetaMethod();
     private static final Comparator<CachedClass> CACHED_CLASS_NAME_COMPARATOR = Comparator.comparing(CachedClass::getName);
     private static final boolean PERMISSIVE_PROPERTY_ACCESS = SystemUtil.getBooleanSafe("groovy.permissive.property.access");
-    private static final Pattern TRAIT_FIELD;
-    static {
-        final var identifier = "[\\p{javaJavaIdentifierStart}&&[^_$]][\\p{javaJavaIdentifierPart}&&[^_$]]*"; // _ and $ are special
-        TRAIT_FIELD = Pattern.compile("(?:" + identifier + "_)*" + identifier + "(?:\\$" + identifier + ")*__(" + identifier + ")");
-    }
     private static final VMPlugin VM_PLUGIN = VMPluginFactory.getPlugin();
 
     protected final Class theClass;
@@ -2366,12 +2360,6 @@ private void fillStaticPropertyIndex() {
             }
             if (prop != null) {
                 staticPropertyIndex.put(name, prop);
-                if (!name.startsWith("$") && name.contains("__")) {
-                    var matcher = TRAIT_FIELD.matcher(name);
-                    if (matcher.matches()) { // GROOVY-11641
-                        staticPropertyIndex.putIfAbsent(matcher.group(1), prop);
-                    }
-                }
             }
         };
 

src/main/java/org/codehaus/groovy/transform/sc/transformers/PropertyExpressionTransformer.java

@@ -40,10 +40,6 @@ class PropertyExpressionTransformer {
     }
 
     Expression transformPropertyExpression(final PropertyExpression pe) {
-        if (pe.getNodeMetaData(StaticTypesMarker.DYNAMIC_RESOLUTION) != null) {
-            return pe.transformExpression(scTransformer); // GROOVY-11641, etc.
-        }
-
         MethodNode dmct = pe.getNodeMetaData(StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
         // NOTE: BinaryExpressionTransformer handles the setter
         if (dmct != null && dmct.getParameters().length == 0) {

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

@@ -55,7 +55,6 @@
 import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.ternaryX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
-import static org.codehaus.groovy.transform.stc.StaticTypesMarker.DYNAMIC_RESOLUTION;
 
 /**
  * This expression transformer is used internally by the {@link org.codehaus.groovy.transform.trait.TraitASTTransformation
@@ -124,7 +123,6 @@ public Expression transform(final Expression exp) {
                 }
             } else if (accessedVariable instanceof DynamicVariable && !inClosure) { // GROOVY-8049, GROOVY-9386
                 PropertyExpression propertyExpression = propX(varX(weaved), vexp.getName());
-                propertyExpression.putNodeMetaData(DYNAMIC_RESOLUTION, Boolean.TRUE);
                 propertyExpression.getProperty().setSourcePosition(exp);
                 return propertyExpression;
             }

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

@@ -24,6 +24,7 @@ import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.expr.ClassExpression
 import org.codehaus.groovy.ast.expr.ListExpression
 import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.RepeatedTest
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
@@ -431,21 +432,19 @@ final class TraitASTTransformationTest {
         '''
     }
 
-    @Test
+    @RepeatedTest(10)
     void testSimpleTraitInheritanceWithTraitOverridingMethodFromParent() {
-        10.times {
-            assertScript shell, '''
-                trait Top { String methodFromA() { 'A' } }
-                trait Bottom extends Top {
-                    String methodFromA() { 'B' }
-                    String methodFromB() { 'B' }
-                }
-                class Foo implements Bottom {}
-                def f = new Foo()
-                assert f.methodFromA() == 'B'
-                assert f.methodFromB() == 'B'
-            '''
-        }
+        assertScript shell, '''
+            trait Top { String methodFromA() { 'A' } }
+            trait Bottom extends Top {
+                String methodFromA() { 'B' }
+                String methodFromB() { 'B' }
+            }
+            class Foo implements Bottom {}
+            def f = new Foo()
+            assert f.methodFromA() == 'B'
+            assert f.methodFromB() == 'B'
+        '''
     }
 
     @Test
@@ -3714,15 +3713,15 @@ final class TraitASTTransformationTest {
     // GROOVY-11641
     @CompileModesTest
     void testTraitAccessToInheritedStaticMethods4(String mode) {
-        assertScript shell, """
+        shouldFail shell, """
             $mode
             trait Foo {
                 public static final String BANG = '!'
             }
             $mode
             trait Bar extends Foo {
                 static staticMethod(String string) {
-                    string + BANG
+                    string + BANG // requires qualifier
                 }
             }
             $mode