GROOVY-11485: default constructor: error for super constructor not found

apache · Sep 27, 2024 · a98c525 · a98c525
1 parent cd9377f
commit a98c525
Show file tree

Hide file tree

Showing 4 changed files with 163 additions and 72 deletions.
diff --git a/src/main/java/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java b/src/main/java/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java
@@ -41,6 +41,7 @@
 import org.objectweb.asm.MethodVisitor;
 
 import java.util.List;
+import java.util.StringJoiner;
 import java.util.function.BiConsumer;
 
 import static org.apache.groovy.ast.tools.AnnotatedNodeUtils.hasAnnotation;
@@ -394,6 +395,15 @@ private void addThisReference(ConstructorNode node) {
         addFieldInit(thisZero, thisField, newCode);
         ConstructorCallExpression cce = getFirstIfSpecialConstructorCall(block);
         if (cce == null) {
+            ClassNode superClass = classNode.getSuperClass();
+            Parameter[] implicit = Parameter.EMPTY_ARRAY; // signature of the super class constuctor
+            if (superClass.getOuterClass() != null && (superClass.getModifiers() & ACC_STATIC) == 0)
+                implicit = new Parameter[]{new Parameter(superClass.getOuterClass(), "outerClass")};
+            if (superClass.getDeclaredConstructor(implicit) == null && !superClass.getDeclaredConstructors().isEmpty()) { // GROOVY-11485
+                var joiner = new StringJoiner(", ", superClass.getNameWithoutPackage() + "(", ")");
+                for (var parameter : implicit) joiner.add(parameter.getType().getNameWithoutPackage());
+                addError("An explicit constructor is required because the implicit super constructor " + joiner.toString() + " is undefined", classNode);
+            }
             cce = ctorSuperX(new TupleExpression());
             block.getStatements().add(0, stmt(cce));
         }
@@ -414,17 +424,18 @@ private void addThisReference(ConstructorNode node) {
 
     private boolean shouldImplicitlyPassThisZero(ConstructorCallExpression cce) {
         boolean pass = false;
-        ClassNode superCN = classNode.getSuperClass();
         if (cce.isThisCall()) {
             pass = true;
         } else if (cce.isSuperCall()) {
-            // if the super class is another non-static inner class in the same outer class hierarchy, implicit this
-            // needs to be passed
-            if (!superCN.isEnum() && !superCN.isInterface() && superCN instanceof InnerClassNode) {
-                InnerClassNode superInnerCN = (InnerClassNode) superCN;
-                if (!isStatic(superInnerCN) && classNode.getOuterClass().isDerivedFrom(superCN.getOuterClass())) {
-                    pass = true;
-                }
+            // if the super class is another non-static inner class in the same
+            // outer class hierarchy, implicit this needs to be passed
+            ClassNode superClass = classNode.getSuperClass();
+            if (!superClass.isEnum()
+                    && !superClass.isInterface()
+                    && superClass instanceof InnerClassNode
+                    && !isStatic((InnerClassNode) superClass)
+                    && classNode.getOuterClass().isDerivedFrom(superClass.getOuterClass())) {
+                pass = true;
             }
         }
         return pass;

diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
@@ -96,7 +96,6 @@
 import static org.codehaus.groovy.vmplugin.v8.IndyInterface.CallType;
 import static org.codehaus.groovy.vmplugin.v8.IndyInterface.LOG;
 import static org.codehaus.groovy.vmplugin.v8.IndyInterface.LOG_ENABLED;
-import static org.codehaus.groovy.vmplugin.v8.IndyInterface.LOOKUP;
 import static org.codehaus.groovy.vmplugin.v8.IndyInterface.switchPoint;
 
 public abstract class Selector {
@@ -436,7 +435,7 @@ public void setHandleForMetaMethod() {
                 isVargs = mc.isVargsMethod();
                 Constructor<?> con = mc.getCachedConstrcutor().getCachedConstructor();
                 try {
-                    handle = LOOKUP.unreflectConstructor(con);
+                    handle = this.callSite.getLookup().unreflectConstructor(con);
                     if (LOG_ENABLED) LOG.info("successfully unreflected constructor");
                 } catch (IllegalAccessException e) {
                     throw new GroovyBugError(e);