Merge branch 'vampire/mixin-spec-internals' into 'vampire/flexible-version-check'

Vampire · Vampire · commit 8478ba182dab · 2025-10-20T19:02:56.000+02:00
diff --git a/spock-core/src/main/java/org/spockframework/compiler/AstNodeCache.java b/spock-core/src/main/java/org/spockframework/compiler/AstNodeCache.java
@@ -42,6 +42,7 @@ public class AstNodeCache {
   public final ClassNode ErrorRethrower = ClassHelper.makeWithoutCaching(ErrorRethrower.class);
   public final ClassNode Specification = ClassHelper.makeWithoutCaching(Specification.class);
   public final ClassNode SpecInternals = ClassHelper.makeWithoutCaching(SpecInternals.class);
+  public final ClassNode SpecialMethodCallTarget = ClassHelper.makeWithoutCaching(SpecialMethodCallTarget.class);
   public final ClassNode MockController = ClassHelper.makeWithoutCaching(MockController.class);
   public final ClassNode SpecificationContext = ClassHelper.makeWithoutCaching(SpecificationContext.class);
   public final ClassNode DataVariableMultiplication = ClassHelper.makeWithoutCaching(DataVariableMultiplication.class);
diff --git a/spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java b/spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java
@@ -289,6 +289,7 @@ private boolean handleOldCall(MethodCallExpression expr) {
       return true;
     }
 
+    expr.setObjectExpression(new ClassExpression(resources.getAstNodeCache().SpecialMethodCallTarget));
     expr.setMethod(new ConstantExpression(expr.getMethodAsString() + "Impl"));
     List<Expression> args = AstUtil.getArgumentList(expr);
     if (args.size() != 1) {
diff --git a/spock-core/src/main/java/org/spockframework/compiler/SpecialMethodCall.java b/spock-core/src/main/java/org/spockframework/compiler/SpecialMethodCall.java
@@ -45,17 +45,19 @@ public class SpecialMethodCall implements ISpecialMethodCall {
   @Nullable
   private final ClosureExpression closureExpr;
   private final boolean conditionBlock;
+  private final AstNodeCache nodeCache;
 
   public SpecialMethodCall(String methodName, Expression inferredName, Expression inferredType,
       MethodCallExpression methodCallExpr, @Nullable BinaryExpression binaryExpr,
-      @Nullable ClosureExpression closureExpr, boolean conditionBlock) {
+      @Nullable ClosureExpression closureExpr, boolean conditionBlock, AstNodeCache nodeCache) {
     this.methodName = methodName;
     this.inferredName = inferredName;
     this.inferredType = inferredType;
     this.binaryExpr = binaryExpr;
     this.methodCallExpr = methodCallExpr;
     this.closureExpr = closureExpr;
     this.conditionBlock = conditionBlock;
+    this.nodeCache = nodeCache;
   }
 
   @Override
@@ -168,13 +170,15 @@ public ClosureExpression getClosureExpr() {
   @Override
   public void expand() {
     List<Expression> args = new ArrayList<>();
+    args.add(VariableExpression.THIS_EXPRESSION);
     args.add(inferredName);
     args.add(inferredType);
     args.addAll(AstUtil.getArgumentList(methodCallExpr));
 
     ArgumentListExpression argsExpr = new ArgumentListExpression(args);
     AstUtil.copySourcePosition(methodCallExpr.getArguments(), argsExpr);
     methodCallExpr.setArguments(argsExpr);
+    methodCallExpr.setObjectExpression(new ClassExpression(nodeCache.SpecialMethodCallTarget));
     methodCallExpr.setMethod(new ConstantExpression(methodName + "Impl"));
   }
 
@@ -208,7 +212,7 @@ public static SpecialMethodCall parse(MethodCallExpression methodCallExpr, @Null
     }
     wrapCastedConstructorArgs(arguments, nodeCache);
 
-    return new SpecialMethodCall(methodName, inferredName, inferredType, methodCallExpr, binaryExpr, closureExpr, conditionBlock);
+    return new SpecialMethodCall(methodName, inferredName, inferredType, methodCallExpr, binaryExpr, closureExpr, conditionBlock, nodeCache);
   }
 
   private static void wrapCastedConstructorArgs(List<Expression> arguments, AstNodeCache nodeCache) {
diff --git a/spock-core/src/main/java/org/spockframework/lang/SpecInternals.java b/spock-core/src/main/java/org/spockframework/lang/SpecInternals.java
diff --git a/spock-core/src/main/java/org/spockframework/runtime/SpecialMethodCallTarget.java b/spock-core/src/main/java/org/spockframework/runtime/SpecialMethodCallTarget.java
diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/StackTraceFiltering.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/StackTraceFiltering.groovy
@@ -302,8 +302,6 @@ thrown(RuntimeException)
     WrongExceptionThrownError e = thrown()
 
     stackTraceLooksLike e, """
-org.spockframework.lang.SpecInternals|checkExceptionThrown|-
-org.spockframework.lang.SpecInternals|thrownImpl|-
 apackage.ASpec|a feature|5
     """
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation-groovy4.txt b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation-groovy4.txt
@@ -173,16 +173,17 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     POP
    L17
     LINENUMBER 8 L17
+    LDC Lorg/spockframework/runtime/SpecialMethodCallTarget;.class
     ALOAD 0
     ACONST_NULL
     ACONST_NULL
     LDC Ljava/lang/RuntimeException;.class
-    INVOKEDYNAMIC invoke(Lapackage/TestSpec;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object; [
+    INVOKEDYNAMIC invoke(Ljava/lang/Class;Lapackage/TestSpec;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object; [
       // handle kind 0x6 : INVOKESTATIC
       org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
       // arguments:
       "thrownImpl", 
-      2
+      0
     ]
     POP
     ALOAD 0
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation.txt b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation.txt
@@ -160,11 +160,12 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ALOAD 1
     LDC 2
     AALOAD
+    LDC Lorg/spockframework/runtime/SpecialMethodCallTarget;.class
     ALOAD 0
     ACONST_NULL
     ACONST_NULL
     LDC Ljava/lang/RuntimeException;.class
-    INVOKEINTERFACE org/codehaus/groovy/runtime/callsite/CallSite.callCurrent (Lgroovy/lang/GroovyObject;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; (itf)
+    INVOKEINTERFACE org/codehaus/groovy/runtime/callsite/CallSite.call (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; (itf)
     POP
     ALOAD 0
     ICONST_2
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy
@@ -21,7 +21,7 @@ public void $spock_feature_0_0() {
     }
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
-    this.thrownImpl(null, null, java.lang.IllegalStateException)
+    org.spockframework.runtime.SpecialMethodCallTarget.thrownImpl(this, null, null, java.lang.IllegalStateException)
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
@@ -21,7 +21,7 @@ public void $spock_feature_0_0() {
     }
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
-    this.thrownImpl(null, null, java.lang.IllegalStateException)
+    org.spockframework.runtime.SpecialMethodCallTarget.thrownImpl(this, null, null, java.lang.IllegalStateException)
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy
@@ -7,7 +7,7 @@ class ASpec extends Specification {
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = []), @org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.WHEN, texts = []), @org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.THEN, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
     org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
-    java.util.List list = this.MockImpl('list', java.util.List)
+    java.util.List list = org.spockframework.runtime.SpecialMethodCallTarget.MockImpl(this, 'list', java.util.List)
     this.getSpecificationContext().getMockController().enterScope()
     this.getSpecificationContext().getMockController().addInteraction(new org.spockframework.mock.runtime.InteractionBuilder(8, 5, '1 * list.add(1)').setFixedCount(1).addEqualTarget(list).addEqualMethodName('add').setArgListKind(true, false).addEqualArg(1).build())
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ private boolean handleOldCall(MethodCallExpression expr) {`
`289`	`289`	`return true;`
`290`	`290`	`}`
`291`	`291`
	`292`	`+ expr.setObjectExpression(new ClassExpression(resources.getAstNodeCache().SpecialMethodCallTarget));`
`292`	`293`	`expr.setMethod(new ConstantExpression(expr.getMethodAsString() + "Impl"));`
`293`	`294`	`List<Expression> args = AstUtil.getArgumentList(expr);`
`294`	`295`	`if (args.size() != 1) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public void $spock_feature_0_0() {`
`21`	`21`	`}`
`22`	`22`	`org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)`
`23`	`23`	`org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)`
`24`		`- this.thrownImpl(null, null, java.lang.IllegalStateException)`
	`24`	`+ org.spockframework.runtime.SpecialMethodCallTarget.thrownImpl(this, null, null, java.lang.IllegalStateException)`
`25`	`25`	`org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)`
`26`	`26`	`this.getSpecificationContext().getMockController().leaveScope()`
`27`	`27`	`}`