- Removed flag STATIC

3 files changed, 4 insertions, 15 deletions

diff --git a/sources/scalac/symtab/Modifiers.java b/sources/scalac/symtab/Modifiers.java
index 0e835610e3..1348adf16b 100644
--- a/sources/scalac/symtab/Modifiers.java
+++ b/sources/scalac/symtab/Modifiers.java
@@ -40,7 +40,6 @@ public interface Modifiers {
 
     int PACKAGE       = 0x00100000;   // symbol is a java package.
     int LABEL         = 0x00200000;   // symbol is a label symbol
-    int STATIC        = 0x00400000;   // "static" inner classes (i.e. after class norm.)
     int STABLE        = 0x00800000;   // functions that are assumed to be stable
                                     // (typically, access methods for valdefs)
 
@@ -66,7 +65,7 @@ public interface Modifiers {
     int SOURCEFLAGS   = 0x00000077 | DEF | REPEATED | MODUL | MUTABLE | PACKAGE | PARAM | TRAIT | COVARIANT | CONTRAVARIANT;  // these modifiers can be set in source programs.
     int ACCESSFLAGS   = PRIVATE | PROTECTED;
     int VARIANCES     = COVARIANT | CONTRAVARIANT;
-    int CONSTRFLAGS   = CASE | JAVA | STATIC;
+    int CONSTRFLAGS   = CASE | JAVA;
 
     public static class Helper {
 
@@ -116,10 +115,6 @@ public interface Modifiers {
             return (flags & MODUL)  != 0;
         }
 
-        public static boolean isStatic(int flags) {
-            return (flags & STATIC)  != 0;
-        }
-
         public static boolean isJava(int flags) {
             return (flags & JAVA)  != 0;
         }
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index b37cb278bc..470a566a56 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -482,11 +482,6 @@ public abstract class Symbol implements Modifiers, Kinds {
         return (flags & SYNTHETIC) != 0;
     }
 
-    /** Does this symbol denote a static member? */
-    public final boolean isStatic() {
-        return (flags & STATIC) != 0;
-    }
-
     /** Does this symbol denote an accessor? */
     public final boolean isAccessor() {
         return (flags & ACCESSOR) != 0;
@@ -1279,7 +1274,7 @@ public abstract class Symbol implements Modifiers, Kinds {
      */
     public boolean overrides(Symbol that) {
         return
-            ((this.flags | that.flags) & (PRIVATE | STATIC)) == 0 &&
+            ((this.flags | that.flags) & PRIVATE) == 0 &&
             this.name == that.name &&
             owner.thisType().memberType(this).derefDef().isSubType(
                 owner.thisType().memberType(that).derefDef());
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java
index d21cbba3ba..f0041be728 100644
--- a/sources/scalac/symtab/Type.java
+++ b/sources/scalac/symtab/Type.java
@@ -847,7 +847,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
      */
     public Symbol lookup(Symbol sym, Type pre, Relation relation) {
         assert !sym.isOverloaded(): Debug.show(sym);
-        if (sym.isPrivate() || sym.isStatic() || sym.isInitializer())
+        if (sym.isPrivate() || sym.isInitializer())
             return symbol().isSubClass(sym.owner()) ? sym : Symbol.NONE;
         Type symtype = pre.memberType(sym).derefDef();
         Symbol[] classes = classes();
@@ -882,8 +882,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
         boolean warn)
     {
         if (sym == sym1) return true;
-        if (sym1.isPrivate() || sym1.isStatic() || sym1.isInitializer())
-            return false;
+        if (sym1.isPrivate() || sym1.isInitializer()) return false;
 //         System.out.println("Is 'sym1' " + relation + " 'sym' in 'pre' ?"
 //             + "\n  sym      : " + Debug.show(sym)
 //             + "\n  sym1     : " + Debug.show(sym1)