diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-11 23:38:39 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-11 23:38:39 -0700 |
| commit | a0ba7c4a3feae7f9421d55e3e7c0691b02d82be3 (patch) | |
| tree | c3cefc9e72eaaf103fbcc562b94804697298ea02 /src/compiler | |
| parent | 25e2bb072caf37677f8b04a01c28f190f17494ef (diff) | |
| parent | 3e2c31fbebfd723e8a9afd28cbd0a62659466069 (diff) | |
| download | scala-a0ba7c4a3feae7f9421d55e3e7c0691b02d82be3.tar.gz scala-a0ba7c4a3feae7f9421d55e3e7c0691b02d82be3.tar.bz2 scala-a0ba7c4a3feae7f9421d55e3e7c0691b02d82be3.zip | |
Merge pull request #887 from paulp/topic/pickledflags
major fixes to how flags are pickled
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index 192cc94b90..cc5ed0f129 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -503,7 +503,7 @@ abstract class Pickler extends SubComponent { private def writeSymInfo(sym: Symbol) { writeRef(sym.name) writeRef(localizedOwner(sym)) - writeLongNat((rawFlagsToPickled(sym.flags & PickledFlags))) + writeLongNat((rawToPickledFlags(sym.flags & PickledFlags))) if (sym.hasAccessBoundary) writeRef(sym.privateWithin) writeRef(sym.info) } @@ -966,7 +966,7 @@ abstract class Pickler extends SubComponent { TREE case Modifiers(flags, privateWithin, _) => - val pflags = rawFlagsToPickled(flags) + val pflags = rawToPickledFlags(flags) writeNat((pflags >> 32).toInt) writeNat((pflags & 0xFFFFFFFF).toInt) writeRef(privateWithin) |