--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Tue Nov 20 19:06:34 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Mon Nov 19 09:57:41 2018 -0800
@@ -172,7 +172,7 @@
                             if (previous == null || previous == OverloadKind.ERROR) {
                                 t.setOverloadKind(overloadKind);
                             } else {
-                                Assert.check(previous == overloadKind);
+                                Assert.check(previous == overloadKind || overloadKind == OverloadKind.ERROR);
                             }
                         }