Skip to content

Commit

Permalink
Avoided relying on class symbols of primitive value types during unpi…
Browse files Browse the repository at this point in the history
…ckling. They might not be initialized yet (as seen during bootstrapped tests).
  • Loading branch information
gsps committed Jan 23, 2018
1 parent ee2b4c8 commit 4d1ced0
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4d1ced0

Please sign in to comment.