diff options
author | Paul Phillips <paulp@improving.org> | 2009-05-12 18:50:11 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-05-12 18:50:11 +0000 |
commit | 764e5d6db8565ee8adfd4bfc639c3d84c318ee89 (patch) | |
tree | a6ada1c0b7640865ea625edd068b5037f1978bfb | |
parent | e2690f9e0c98085f57d68f9c443942d34050e9c1 (diff) | |
download | scala-764e5d6db8565ee8adfd4bfc639c3d84c318ee89.tar.gz scala-764e5d6db8565ee8adfd4bfc639c3d84c318ee89.tar.bz2 scala-764e5d6db8565ee8adfd4bfc639c3d84c318ee89.zip |
Reverted overconfident patch for #715 while I f...
Reverted overconfident patch for #715 while I finish it for real.
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index b96fbe827c..2b37a28853 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -498,11 +498,8 @@ abstract class Pickler extends SubComponent { } else { writeRef(sym.name); EXTref } - if (!sym.owner.isRoot && sym.owner != NoSymbol) - writeRef(sym.owner) - - if (sym.owner == NoSymbol) NONEsym - else tag + if (!sym.owner.isRoot) writeRef(sym.owner) + tag case sym: ClassSymbol => val posOffset = writeSymInfo(sym) if (sym.thisSym.tpe != sym.tpe) writeRef(sym.typeOfThis) |