asfgit closed pull request #852: GROOVY-8954: VerifyError due to incorrect
bytecode produced when a tr…
URL: https://github.com/apache/groovy/pull/852
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
b/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
index 899d5cb47f..3287481ffc 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
@@ -151,10 +151,10 @@ protected boolean writeDirectMethodCall(MethodNode
target, boolean implicitThis,
int opcode = INVOKEVIRTUAL;
if (target.isStatic()) {
opcode = INVOKESTATIC;
- } else if (target.isPrivate() || ((receiver instanceof
VariableExpression && ((VariableExpression) receiver).isSuperExpression()))) {
- opcode = INVOKESPECIAL;
} else if (declaringClass.isInterface()) {
opcode = INVOKEINTERFACE;
+ } else if (target.isPrivate() || ((receiver instanceof
VariableExpression && ((VariableExpression) receiver).isSuperExpression()))) {
+ opcode = INVOKESPECIAL;
}
// handle receiver
diff --git
a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
index 27ecd8d0c4..d4c27b3203 100644
---
a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
+++
b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
@@ -2668,4 +2668,24 @@ assert c.b() == 2
assert Counter.count == 11
'''
}
+
+ //GROOVY-8954
+ void testTraitWithPropertyAlsoFromInterfaceSC() {
+ assertScript '''
+ interface DomainProp {
+ boolean isNullable()
+ }
+
+ abstract class OrderedProp implements DomainProp { }
+
+ trait Nullable {
+ boolean nullable = true
+ }
+
+ @groovy.transform.CompileStatic
+ abstract class CustomProp extends OrderedProp implements Nullable
{ }
+
+ assert new CustomProp() {}
+ '''
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
