8238213: Method resolution should stop on static error

Vicente Romero · Vicente Romero · commit bb3d226a4eed · 2021-06-09T15:56:55.000Z
Reviewed-by: jlahoda
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -3417,7 +3417,7 @@ abstract class LookupHelper {
          */
         final boolean shouldStop(Symbol sym, MethodResolutionPhase phase) {
             return phase.ordinal() > maxPhase.ordinal() ||
-                !sym.kind.isResolutionError() || sym.kind == AMBIGUOUS;
+                 !sym.kind.isResolutionError() || sym.kind == AMBIGUOUS || sym.kind == STATICERR;
         }
 
         /**
diff --git a/test/langtools/tools/javac/static_error/ShouldStopOnStaticError.java b/test/langtools/tools/javac/static_error/ShouldStopOnStaticError.java
@@ -0,0 +1,19 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 8238213
+ * @summary Method resolution should stop on static error
+ * @compile/fail/ref=ShouldStopOnStaticError.out -XDrawDiagnostics ShouldStopOnStaticError.java
+ */
+
+public class ShouldStopOnStaticError {
+    static void foo() {
+        test1(5.0);
+        test2((Double)5.0);
+    }
+
+    void test1(double d) {}
+    void test1(Double d) {}
+
+    void test2(Number n) {}
+    static void test2(Double... d) {}
+}
diff --git a/test/langtools/tools/javac/static_error/ShouldStopOnStaticError.out b/test/langtools/tools/javac/static_error/ShouldStopOnStaticError.out
@@ -0,0 +1,3 @@
+ShouldStopOnStaticError.java:10:9: compiler.err.non-static.cant.be.ref: kindname.method, test1(double)
+ShouldStopOnStaticError.java:11:9: compiler.err.non-static.cant.be.ref: kindname.method, test2(java.lang.Number)
+2 errors

Original file line number	Diff line number	Diff line change
`@@ -3417,7 +3417,7 @@ abstract class LookupHelper {`
`3417`	`3417`	`*/`
`3418`	`3418`	`final boolean shouldStop(Symbol sym, MethodResolutionPhase phase) {`
`3419`	`3419`	`return phase.ordinal() > maxPhase.ordinal() \|\|`
`3420`		`- !sym.kind.isResolutionError() \|\| sym.kind == AMBIGUOUS;`
	`3420`	`+ !sym.kind.isResolutionError() \|\| sym.kind == AMBIGUOUS \|\| sym.kind == STATICERR;`
`3421`	`3421`	`}`
`3422`	`3422`
`3423`	`3423`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ShouldStopOnStaticError.java:10:9: compiler.err.non-static.cant.be.ref: kindname.method, test1(double)`
	`2`	`+ShouldStopOnStaticError.java:11:9: compiler.err.non-static.cant.be.ref: kindname.method, test2(java.lang.Number)`
	`3`	`+2 errors`