- Removed Name.ERROR

5 files changed, 4 insertions, 6 deletions

diff --git a/sources/meta/scalac/ast/MetaTree.java b/sources/meta/scalac/ast/MetaTree.java
index 3ae0c9970d..31b98d1d4b 100644
--- a/sources/meta/scalac/ast/MetaTree.java
+++ b/sources/meta/scalac/ast/MetaTree.java
@@ -117,7 +117,7 @@ public class MetaTree extends AbstractTreeExpander {
             writer.indent().print("return ");
             switch (kind) {
             case TreeKind.Type:
-                writer.print("name.isTypeName() && (symbol() == null || !symbol().isConstructor()) || name == Name.ERROR");
+                writer.print("name.isTypeName() && (symbol() == null || !symbol().isConstructor()) || name == Names.ERROR");
                 break;
             case TreeKind.Term:
                 writer.print("name.isTermName() || (symbol() != null && symbol().isConstructor())");
diff --git a/sources/scalac/ast/Tree.java.tmpl b/sources/scalac/ast/Tree.java.tmpl
index e1dbed177f..6c61e2e254 100644
--- a/sources/scalac/ast/Tree.java.tmpl
+++ b/sources/scalac/ast/Tree.java.tmpl
@@ -18,6 +18,7 @@ import scalac.checkers.CheckTreeNodes;
 import scalac.symtab.Symbol;
 import scalac.symtab.Type;
 import scalac.util.Debug;
+import scalac.util.Names;
 {#Imports#}
 
 public class Tree {
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index 2f5cad351a..8940370fb2 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -1918,7 +1918,7 @@ final class ErrorSymbol extends Symbol {
 
     /** Constructor */
     public ErrorSymbol() {
-        super(Kinds.ERROR, Position.NOPOS, Name.ERROR, null, 0, 0);
+        super(Kinds.ERROR, Position.NOPOS, Names.ERROR, null, 0, 0);
         super.setInfo(Type.ErrorType);
     }
 
diff --git a/sources/scalac/util/Name.java b/sources/scalac/util/Name.java
index e4af414657..82b1fc5055 100644
--- a/sources/scalac/util/Name.java
+++ b/sources/scalac/util/Name.java
@@ -126,7 +126,4 @@ public final class Name {
             this != Names.false_;
     }
 
-    public static final Name ERROR = Name.fromString("<error>");
-    static { ERROR.type = ERROR; }
-
 }
diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java
index 4c7098af3e..da461290c9 100644
--- a/sources/scalac/util/Names.java
+++ b/sources/scalac/util/Names.java
@@ -63,7 +63,7 @@ public class Names {
         return Name.fromString(TYPE_PREFIX + sym.name);
     }
 
-    public static final Name ERROR = Name.ERROR;
+    public static final Name ERROR = Name.fromString("<error>");
     public static final Name NOSYMBOL = Name.fromString("<none>");
     public static final Name EMPTY = Name.fromString("");
     public static final Name IMPORT_WILDCARD = Name.fromString("_");