diff options
author | Martin Odersky <odersky@gmail.com> | 2016-07-22 16:12:16 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-07-22 16:12:16 +0200 |
commit | 1a3aeb147dff4875d8bf6701571babdaca9d869c (patch) | |
tree | 5463a6047564040ad40e588215d754d1c090a132 /src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | |
parent | c37185d3307e2b02e25e888fd44d5e8bba95aa1d (diff) | |
download | dotty-1a3aeb147dff4875d8bf6701571babdaca9d869c.tar.gz dotty-1a3aeb147dff4875d8bf6701571babdaca9d869c.tar.bz2 dotty-1a3aeb147dff4875d8bf6701571babdaca9d869c.zip |
Resume suspensions also when reading from classfiles
Make treatment in Scala2Unpickler and Namer the same and factor
out common functionality.
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index 14747619a..8ea4cecde 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -106,7 +106,8 @@ object Scala2Unpickler { // `denot.sourceModule.exists` provision i859.scala crashes in the backend. denot.owner.thisType select denot.sourceModule else selfInfo - denot.info = new TempClassInfo(denot.owner.thisType, denot.classSymbol, decls, ost) // first rough info to avoid CyclicReferences + val tempInfo = new TempClassInfo(denot.owner.thisType, denot.classSymbol, decls, ost) + denot.info = tempInfo // first rough info to avoid CyclicReferences var parentRefs = ctx.normalizeToClassRefs(parents, cls, decls) if (parentRefs.isEmpty) parentRefs = defn.ObjectType :: Nil for (tparam <- tparams) { @@ -132,8 +133,7 @@ object Scala2Unpickler { registerCompanionPair(scalacCompanion, denot.classSymbol) } - denot.info = ClassInfo( // final info, except possibly for typeparams ordering - denot.owner.thisType, denot.classSymbol, parentRefs, decls, ost) + tempInfo.finalize(denot, parentRefs) // install final info, except possibly for typeparams ordering denot.ensureTypeParamsInCorrectOrder() } } |