From 4d1ced0a8e03774ae8597b33964c1928cdc8e039 Mon Sep 17 00:00:00 2001 From: Georg Schmid Date: Tue, 23 Jan 2018 19:52:27 +0100 Subject: [PATCH] Avoided relying on class symbols of primitive value types during unpickling. They might not be initialized yet (as seen during bootstrapped tests). --- .../dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index d4e27db50bfd..08b9f0c48b17 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -420,8 +420,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas // TODO(gsps): This is a hack to mark certain primitive methods as stable. // In the future such primitive methods should be pickled with the Stable flag set. def markPrimitiveStable(owner: Symbol, name: Name, flags: FlagSet): FlagSet = - if (defn.ScalaValueClasses().contains(owner)) flags | Stable - else flags + if (tpnme.ScalaValueNames.contains(defn.scalaClassName(owner))) flags | Stable else flags tag match { case NONEsym => return NoSymbol