Tasty: Fix unpickling of a TEMPLATE with a SHARED parent

smarter · smarter · commit a6394e9ec72f · 2018-01-14T03:27:07.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -760,7 +760,7 @@ class TreeUnpickler(reader: TastyReader,
       val tparams = readIndexedParams[TypeDef](TYPEPARAM)
       val vparams = readIndexedParams[ValDef](PARAM)
       val parents = collectWhile(nextByte != SELFDEF && nextByte != DEFDEF) {
-        nextByte match {
+        nextUnsharedTag match {
           case APPLY | TYPEAPPLY => readTerm()(parentCtx)
           case _ => readTpt()(parentCtx)
         }
diff --git a/compiler/test/dotty/tools/dotc/FromTastyTests.scala b/compiler/test/dotty/tools/dotc/FromTastyTests.scala
@@ -33,7 +33,6 @@ class FromTastyTests extends ParallelTesting {
         "i2345.scala",
         "i2888.scala",
         "i2944.scala",
-        "i2980.scala",
         "i3000.scala",
         "i536.scala",
         "i974.scala",

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ class TreeUnpickler(reader: TastyReader,`
`760`	`760`	`val tparams = readIndexedParams[TypeDef](TYPEPARAM)`
`761`	`761`	`val vparams = readIndexedParams[ValDef](PARAM)`
`762`	`762`	`val parents = collectWhile(nextByte != SELFDEF && nextByte != DEFDEF) {`
`763`		`- nextByte match {`
	`763`	`+ nextUnsharedTag match {`
`764`	`764`	`case APPLY \| TYPEAPPLY => readTerm()(parentCtx)`
`765`	`765`	`case _ => readTpt()(parentCtx)`
`766`	`766`	`}`