diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-09-05 01:25:06 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-09-05 02:57:43 +0200 |
| commit | b33f604e4a0864cd88402b2f3e4c75b24beb4435 (patch) | |
| tree | 65b370fac6dc2bc19ac09a15c9e0da87aa6b99e6 /src | |
| parent | dc02760eac04accb9e0d5e34128f4c79cfa8c327 (diff) | |
| download | dotty-b33f604e4a0864cd88402b2f3e4c75b24beb4435.tar.gz dotty-b33f604e4a0864cd88402b2f3e4c75b24beb4435.tar.bz2 dotty-b33f604e4a0864cd88402b2f3e4c75b24beb4435.zip | |
Fix a bug in unpickler
Module roots were mis-characterized, which meant that module symbols were loaded twice.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/UnPickler.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala index b80e2322a..3510462cc 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala @@ -421,7 +421,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: def isClassRoot = (name == classRoot.name) && (owner == classRoot.owner) && !(flags is ModuleClass) def isModuleClassRoot = (name == moduleClassRoot.name) && (owner == moduleClassRoot.owner) && (flags is Module) - def isModuleRoot = (name == moduleClassRoot.name.toTermName) && (owner == moduleClassRoot.owner) && (flags is Module) + def isModuleRoot = (name == moduleClassRoot.name.sourceModuleName) && (owner == moduleClassRoot.owner) && (flags is Module) //if (isClassRoot) println(s"classRoot of $classRoot found at $readIndex, flags = $flags") // !!! DEBUG //if (isModuleRoot) println(s"moduleRoot of $moduleRoot found at $readIndex, flags = $flags") // !!! DEBUG |