diff options
Diffstat (limited to 'sources/scalac/symtab')
-rw-r--r-- | sources/scalac/symtab/Definitions.java | 2 | ||||
-rw-r--r-- | sources/scalac/symtab/Symbol.java | 2 | ||||
-rw-r--r-- | sources/scalac/symtab/Type.java | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java index f5b61ad79a..505c6b14f2 100644 --- a/sources/scalac/symtab/Definitions.java +++ b/sources/scalac/symtab/Definitions.java @@ -464,8 +464,6 @@ public class Definitions { public Definitions(Global global) { // make definitions accessible earlier to other components global.definitions = this; - // force initialization of class Type - Type.localThisType.symbol(); // create attributed tree typer atyper = new ATreeTyper(global, this); diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index 9d6bf4cf0a..86152ca1b4 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -1003,7 +1003,7 @@ public abstract class Symbol implements Modifiers, Kinds { /** Get this.type corresponding to this symbol */ public Type thisType() { - return Type.localThisType; + return Type.NoPrefix; } /** Get type of `this' in current class. diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java index fed9d8055e..6e89ef88d8 100644 --- a/sources/scalac/symtab/Type.java +++ b/sources/scalac/symtab/Type.java @@ -135,10 +135,6 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { // Creators --------------------------------------------------------------------- - /** An owner-less ThisType - */ - public static Type localThisType = NoPrefix; - /** An empty Type array */ public static final Type[] EMPTY_ARRAY = new Type[0]; @@ -3089,11 +3085,11 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { if (sym == definitions.JAVA_OBJECT_CLASS || sym == definitions.ALL_CLASS || sym == definitions.ALLREF_CLASS) - return Type.typeRef(localThisType, definitions.ANY_CLASS, EMPTY_ARRAY); + return Type.typeRef(NoPrefix, definitions.ANY_CLASS, EMPTY_ARRAY); else { Type this1 = unbox(); if (this1 != this) return this1; - else return Type.typeRef(localThisType, sym, EMPTY_ARRAY); + else return Type.typeRef(NoPrefix, sym, EMPTY_ARRAY); } default: throw new ApplicationError(sym + " has wrong kind: " + sym.kind); |