Alternative fix: Make annotation reading lazier

odersky · michelou · commit 7ebf4e257f36 · 2021-04-20T20:25:54.000+02:00
Fixes scala#12109 without causing problems elsewhere.
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -792,7 +792,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
           OrType(args(0), args(1), soft = false)
         }
         else if (args.nonEmpty) tycon.safeAppliedTo(EtaExpandIfHK(sym.typeParams, args.map(translateTempPoly)))
-        //else if (sym.typeParams.nonEmpty) tycon.EtaExpand(sym.typeParams)
+        else if (sym.typeParams.nonEmpty) tycon.EtaExpand(sym.typeParams)
         else tycon
       case TYPEBOUNDStpe =>
         val lo = readTypeRef()

Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas`
`792`	`792`	`OrType(args(0), args(1), soft = false)`
`793`	`793`	`}`
`794`	`794`	`else if (args.nonEmpty) tycon.safeAppliedTo(EtaExpandIfHK(sym.typeParams, args.map(translateTempPoly)))`
`795`		`- //else if (sym.typeParams.nonEmpty) tycon.EtaExpand(sym.typeParams)`
	`795`	`+ else if (sym.typeParams.nonEmpty) tycon.EtaExpand(sym.typeParams)`
`796`	`796`	`else tycon`
`797`	`797`	`case TYPEBOUNDStpe =>`
`798`	`798`	`val lo = readTypeRef()`