Fixed TreeUnpickler not being at the end of a length-annotated type after reading it.

gsps · gsps · commit 8394d1934c46 · 2018-04-21T13:22:04.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -278,7 +278,10 @@ class TreeUnpickler(reader: TastyReader,
                     // Eta expansion of the latter puts readType() out of the expression.
                 }
               }
-              typeAtAddr.getOrElse(start, readRefined)
+              typeAtAddr.get(start) match {
+                case None => readRefined
+                case Some(tp) => goto(end); tp
+              }
             case APPLIEDtype =>
               readType().appliedTo(until(end)(readType()))
             case APPLIEDTERMREF =>

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,10 @@ class TreeUnpickler(reader: TastyReader,`
`278`	`278`	`// Eta expansion of the latter puts readType() out of the expression.`
`279`	`279`	`}`
`280`	`280`	`}`
`281`		`- typeAtAddr.getOrElse(start, readRefined)`
	`281`	`+ typeAtAddr.get(start) match {`
	`282`	`+ case None => readRefined`
	`283`	`+ case Some(tp) => goto(end); tp`
	`284`	`+ }`
`282`	`285`	`case APPLIEDtype =>`
`283`	`286`	`readType().appliedTo(until(end)(readType()))`
`284`	`287`	`case APPLIEDTERMREF =>`