diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-10-12 11:11:10 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-10-12 11:11:10 +0200 |
| commit | db354748e387f664db4eae2aa61e1a17037548e8 (patch) | |
| tree | 57cfede406897109e53e251a48e7799c733b9a34 /src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala | |
| parent | a5db9c71ce9be1bbfb745f5da088324c9510350c (diff) | |
| download | dotty-db354748e387f664db4eae2aa61e1a17037548e8.tar.gz dotty-db354748e387f664db4eae2aa61e1a17037548e8.tar.bz2 dotty-db354748e387f664db4eae2aa61e1a17037548e8.zip | |
Address reviewer comments #811.
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala b/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala index 0f5d4bb91..17fef3852 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala @@ -221,7 +221,7 @@ object PickleBuffer { FINAL_PKL -> Final, METHOD_PKL -> Method, INTERFACE_PKL -> NoInitsInterface, - MODULE_PKL -> Module, + MODULE_PKL -> (Module | Lazy, Module), IMPLICIT_PKL -> Implicit, SEALED_PKL -> Sealed, CASE_PKL -> Case, @@ -287,7 +287,7 @@ object PickleBuffer { val shift = ChunkBits val mask = ChunkSize - 1 assert(6 * ChunkBits == ScalaFlagEnd) - val t = FlagSet( + FlagSet( map(0)((sflags >>> (shift * 0)).toInt & mask) | map(1)((sflags >>> (shift * 1)).toInt & mask) | map(2)((sflags >>> (shift * 2)).toInt & mask) | @@ -295,8 +295,5 @@ object PickleBuffer { map(4)((sflags >>> (shift * 4)).toInt & mask) | map(5)((sflags >>> (shift * 5)).toInt & mask) ) - if (!isType && t.is(Module, Lazy)) - t | Lazy // scala2 modules do not always set lazy flag. Dotty modules do - else t } } |