You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2024/04/23 20:21:05 UTC
(groovy) branch GROOVY_4_0_X updated: GROOVY-11352: `this` or `super` ctor call: outer static method arguments
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 43412ee815 GROOVY-11352: `this` or `super` ctor call: outer static method arguments
43412ee815 is described below
commit 43412ee81523c886cee90ae272aac93cce181996
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Apr 23 13:02:46 2024 -0500
GROOVY-11352: `this` or `super` ctor call: outer static method arguments
---
.../java/org/codehaus/groovy/classgen/Verifier.java | 15 ++++++++++-----
src/test/gls/innerClass/InnerClassTest.groovy | 20 ++++++++++++++++++++
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/Verifier.java b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
index 6c496f7d62..248bec3c98 100644
--- a/src/main/java/org/codehaus/groovy/classgen/Verifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
@@ -672,12 +672,17 @@ public class Verifier implements GroovyClassVisitor, Opcodes {
@Override
public void visitMethodCallExpression(final MethodCallExpression mce) {
if (inSpecialConstructorCall && isThisObjectExpression(mce)) {
- MethodNode methodTarget = mce.getMethodTarget();
- if (methodTarget == null || !(methodTarget.isStatic() || classNode.getOuterClasses().contains(methodTarget.getDeclaringClass()))) {
- if (!mce.isImplicitThis()) {
- throw newVariableError(mce.getObjectExpression().getText(), mce.getObjectExpression());
- } else {
+ boolean outerOrStaticMember = false;
+ if (mce.getMethodTarget() != null) {
+ outerOrStaticMember = mce.getMethodTarget().isStatic() || classNode.getOuterClasses().contains(mce.getMethodTarget().getDeclaringClass());
+ } else if (mce.isImplicitThis()) { // GROOVY-11352
+ outerOrStaticMember = classNode.getOuterClasses().stream().anyMatch(oc -> oc.hasPossibleStaticMethod(mce.getMethodAsString(), mce.getArguments()));
+ }
+ if (!outerOrStaticMember) {
+ if (mce.isImplicitThis()) {
throw newVariableError(mce.getMethodAsString(), mce.getMethod());
+ } else {
+ throw newVariableError(mce.getObjectExpression().getText(), mce.getObjectExpression());
}
}
mce.getMethod().visit(this);
diff --git a/src/test/gls/innerClass/InnerClassTest.groovy b/src/test/gls/innerClass/InnerClassTest.groovy
index 102f148469..c23b9bbe6e 100644
--- a/src/test/gls/innerClass/InnerClassTest.groovy
+++ b/src/test/gls/innerClass/InnerClassTest.groovy
@@ -1083,6 +1083,26 @@ final class InnerClassTest {
'''
}
+ @Test // GROOVY-11352
+ void testUsageOfOuterMethod7() {
+ assertScript '''
+ class Super {
+ protected final String s
+ Super(String s) { this.s = s }
+ }
+ class Outer {
+ static String initValue() { 'ok' }
+ static class Inner extends Super {
+ Inner() {
+ super(initValue()) // here
+ }
+ }
+ String test() { new Inner().s }
+ }
+ assert new Outer().test() == 'ok'
+ '''
+ }
+
@Test
void testUsageOfOuterMethodOverridden() {
assertScript '''