diff options
author | Martin Odersky <odersky@gmail.com> | 2016-07-21 14:51:16 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-07-21 17:42:53 +0200 |
commit | c37185d3307e2b02e25e888fd44d5e8bba95aa1d (patch) | |
tree | b0ec5f8198a559abb1cf83f68a8bed3ad318a4a4 /src/dotty/tools/dotc/typer/Namer.scala | |
parent | eaffc785be1e42c3a44ce149dfb8cabb6681d7c6 (diff) | |
download | dotty-c37185d3307e2b02e25e888fd44d5e8bba95aa1d.tar.gz dotty-c37185d3307e2b02e25e888fd44d5e8bba95aa1d.tar.bz2 dotty-c37185d3307e2b02e25e888fd44d5e8bba95aa1d.zip |
Fix #1401: Make sure all refs are forwarded
Faced with recursive dependencies through self types, we might have
to apply `normalizeToClassRefs` to a class P with a parent that is not
yet initialized (witnessed by P's parents being Nil). In that case
we should still execute forwardRefs on P, but we have to
wait in a suspension until P is initialized.
This avoids the problem raised in #1401. I am still not quite sure
why forwardRefs is needed, but it seems that asSeenFrom alone is not
enough to track the dependencies in this case.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Namer.scala')
-rw-r--r-- | src/dotty/tools/dotc/typer/Namer.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala index 3b193d2db..20cf09846 100644 --- a/src/dotty/tools/dotc/typer/Namer.scala +++ b/src/dotty/tools/dotc/typer/Namer.scala @@ -688,7 +688,8 @@ class Namer { typer: Typer => else createSymbol(self) // pre-set info, so that parent types can refer to type params - denot.info = ClassInfo(cls.owner.thisType, cls, Nil, decls, selfInfo) + val tempClassInfo = new TempClassInfo(cls.owner.thisType, cls, decls, selfInfo) + denot.info = tempClassInfo // Ensure constructor is completed so that any parameter accessors // which have type trees deriving from its parameters can be @@ -705,6 +706,8 @@ class Namer { typer: Typer => index(rest)(inClassContext(selfInfo)) denot.info = ClassInfo(cls.owner.thisType, cls, parentRefs, decls, selfInfo) + tempClassInfo.suspensions.foreach(_()) + Checking.checkWellFormed(cls) if (isDerivedValueClass(cls)) cls.setFlag(Final) cls.setApplicableFlags( |