Merge pull request #4358 from dotty-staging/fix/java-tparams-cycle

Fix #4357: Avoid cyclic reference when parsing Java classfile
scala · Apr 22, 2018 · 8feb596 · 8feb596
2 parents f2bb231 + ae2d13a
commit 8feb596
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -990,7 +990,7 @@ object SymDenotations {
      */
     private def companionNamed(name: TypeName)(implicit ctx: Context): Symbol =
       if (owner.isClass)
-        owner.info.decl(name).suchThat(_.isCoDefinedWith(symbol)).symbol
+        owner.unforcedDecls.lookup(name).suchThat(_.isCoDefinedWith(symbol)).symbol
       else if (!owner.exists || ctx.compilationUnit == null)
         NoSymbol
       else if (!ctx.compilationUnit.tpdTree.isEmpty)

diff --git a/tests/pos-java-interop/i4357/B_1.java b/tests/pos-java-interop/i4357/B_1.java
@@ -0,0 +1,4 @@
+public class B_1 extends A<B_1.C> {
+  public static class C {};
+}
+class A<T> {}
diff --git a/tests/pos-java-interop/i4357/Test_2.scala b/tests/pos-java-interop/i4357/Test_2.scala
@@ -0,0 +1,3 @@
+object Test {
+  val b: B_1 = new B_1()
+}