diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-21 00:50:15 -0800 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-21 00:50:15 -0800 |
| commit | 26387cacaa8f78105419044fc33acc8fd8343662 (patch) | |
| tree | 15fe66051230bb183786d945c65270cb49049cd6 /src/compiler/scala/tools/nsc/symtab | |
| parent | af89c3d258c98351868e5ed5acee97e5b2268452 (diff) | |
| parent | 07ff3a99b75174c4e4a4e52348b34aa0b68f51b1 (diff) | |
| download | scala-26387cacaa8f78105419044fc33acc8fd8343662.tar.gz scala-26387cacaa8f78105419044fc33acc8fd8343662.tar.bz2 scala-26387cacaa8f78105419044fc33acc8fd8343662.zip | |
Merge pull request #3368 from retronym/ticket/8151
SI-8151 Remove -Yself-in-annots and associated implementation
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index ce3e7b1bb5..90c15bca61 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -238,9 +238,8 @@ abstract class Pickler extends SubComponent { case ExistentialType(tparams, restpe) => putType(restpe) putSymbols(tparams) - case AnnotatedType(_, underlying, selfsym) => + case AnnotatedType(_, underlying) => putType(underlying) - if (settings.selfInAnnots) putSymbol(selfsym) tp.staticAnnotations foreach putAnnotation case _ => throw new FatalError("bad type: " + tp + "(" + tp.getClass + ")") @@ -450,7 +449,7 @@ abstract class Pickler extends SubComponent { case PolyType(tparams, restpe) => writeRef(restpe); writeRefs(tparams) case ExistentialType(tparams, restpe) => writeRef(restpe); writeRefs(tparams) case StaticallyAnnotatedType(annots, tp) => writeRef(tp) ; writeRefs(annots) - case AnnotatedType(_, tp, _) => writeTypeBody(tp) // write the underlying type if there are no static annotations + case AnnotatedType(_, tp) => writeTypeBody(tp) // write the underlying type if there are no static annotations case CompoundType(parents, _, clazz) => writeRef(clazz); writeRefs(parents) } |