GROOVY-9857

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/builder/BuildAccessRulesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,10 +89,10 @@ public void testAccessForImport() {
     @Test
     public void testAccessForExtends() {
         String source = "import java.beans.*\n" +
-            "class Foo extends BeanDescriptor {\n" +
+            "class Foo extends SimpleBeanInfo {\n" +
             "}";
 
-        assertAccessRestriction(source, "BeanDescriptor");
+        assertAccessRestriction(source, "SimpleBeanInfo");
     }
 
     @Test

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GenericsTests.java

@@ -454,6 +454,9 @@ public void testCallingGenericConstructors() {
             "p/B.groovy",
             "package p\n" +
             "class B extends A {\n" +
+            "  B() {\n" +
+            "    super(42)\n" +
+            "  }\n" +
             "  void m() {\n" +
             "    new A(42)\n" +
             "  }\n" +

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java

@@ -5558,6 +5558,27 @@ public void testGroovy9391() {
             "----------\n");
     }
 
+    @Test // https://issues.apache.org/jira/browse/GROOVY-9857
+    public void testGroovy9857() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "abstract class A {\n" +
+            "  A(boolean b) { }\n" +
+            "}\n" +
+            "class C extends A {}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 4)\n" +
+            "\tclass C extends A {}\n" +
+            "\t      ^\n" +
+            "Groovy:Implicit super constructor A() is undefined for generated constructor. Must define an explicit constructor.\n" +
+            "----------\n");
+    }
+
     @Test // https://issues.apache.org/jira/browse/GROOVY-9906
     public void testGroovy9906() {
         //@formatter:off

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/RecordTypeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2021 the original author or authors.
+ * Copyright 2009-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.eclipse.jdt.groovy.core.tests.xform;
 
 import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isAtLeastGroovy;
+import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
 import static org.junit.Assume.assumeTrue;
 
 import org.eclipse.jdt.groovy.core.tests.basic.GroovyCompilerTestSuite;
@@ -40,7 +41,8 @@ public void testRecordType1() {
             "import static java.lang.reflect.Modifier.isFinal\n" +
             "assert isFinal(Simple.class.modifiers)\n" +
             "def obj = new Simple(1,'x')\n" +
-            "print obj.n\n" +
+            "print obj.n()\n" +
+            "print obj.s\n" +
             "print obj\n",
 
             "Simple.groovy",
@@ -52,6 +54,29 @@ public void testRecordType1() {
         };
         //@formatter:on
 
-        runConformTest(sources, "1Simple[n=1, s=x]");
+        runConformTest(sources, "1xSimple[n=1, s=x]");
+    }
+
+    @Test
+    public void testRecordType2() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "import static java.lang.reflect.Modifier.isFinal\n" +
+            "assert isFinal(Simple.class.modifiers)\n" +
+            "def obj = new Simple(1,'x')\n" +
+            "print obj.n()\n" +
+            "print obj.s\n" +
+            "print obj\n",
+
+            "Simple.groovy",
+            "record Simple(Integer n, String s) {\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "1xSimple[n=1, s=x]");
     }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -494,14 +494,23 @@ private void visitStdMethod(MethodNode node, boolean isConstructor, Parameter[]
                 }
             }
             if (!hasCallToSuper) {
-                // GRECLIPSE add -- GROOVY-9373
+                // GRECLIPSE add -- GROOVY-9373, GROOVY-9857
                 if (code != null) {
                     int line = code.getLineNumber();
                     if (line > 0) {
                         mv.visitLineNumber(line, l0);
                         controller.setLineNumber(line);
                     }
                 }
+                if (controller.getClassNode().getSuperClass().getDeclaredConstructor(Parameter.EMPTY_ARRAY) == null) { ASTNode where = node;
+                    String error = "Implicit super constructor " + controller.getClassNode().getSuperClass().getNameWithoutPackage() + "() is undefined";
+                    if (node.getLineNumber() > 0) error += ". Must explicitly invoke another constructor.";
+                    else {
+                        error += " for generated constructor. Must define an explicit constructor.";
+                        where = controller.getClassNode();
+                    }
+                    addError(error, where);
+                }
                 // GRECLIPSE end
                 // add call to "super()"
                 mv.visitVarInsn(ALOAD, 0);

base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -453,14 +453,23 @@ private void visitStdMethod(final MethodNode node, final boolean isConstructor,
                 }
             }
             if (!hasCallToSuper) {
-                // GRECLIPSE add -- GROOVY-9373
+                // GRECLIPSE add -- GROOVY-9373, GROOVY-9857
                 if (code != null) {
                     int line = code.getLineNumber();
                     if (line > 0) {
                         mv.visitLineNumber(line, l0);
                         controller.setLineNumber(line);
                     }
                 }
+                if (controller.getClassNode().getSuperClass().getDeclaredConstructor(Parameter.EMPTY_ARRAY) == null) { ASTNode where = node;
+                    String error = "Implicit super constructor " + controller.getClassNode().getSuperClass().getNameWithoutPackage() + "() is undefined";
+                    if (node.getLineNumber() > 0) error += ". Must explicitly invoke another constructor.";
+                    else {
+                        error += " for generated constructor. Must define an explicit constructor.";
+                        where = controller.getClassNode();
+                    }
+                    addError(error, where);
+                }
                 // GRECLIPSE end
                 // add call to "super()"
                 mv.visitVarInsn(ALOAD, 0);

base/org.codehaus.groovy40/.checkstyle

@@ -35,6 +35,7 @@
         <file-match-pattern match-pattern="groovy/ast/expr/(Static)?MethodCallExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/tools/(Expression|Generics)Utils.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum)Visitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Extended)?Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/GeneratorContext.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/WriterController.java" include-pattern="false" />