diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Mirrors.scala | 3 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Trees.scala | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/internal/Mirrors.scala b/src/reflect/scala/reflect/internal/Mirrors.scala index 2e2e63a4b4..bde7f7ac51 100644 --- a/src/reflect/scala/reflect/internal/Mirrors.scala +++ b/src/reflect/scala/reflect/internal/Mirrors.scala @@ -247,7 +247,7 @@ trait Mirrors extends api.Mirrors { // is very beneficial for a handful of bootstrap symbols to have // first class identities sealed trait WellKnownSymbol extends Symbol { - this initFlags TopLevelCreationFlags + this initFlags (TopLevelCreationFlags | STATIC) } // Features common to RootClass and RootPackage, the roots of all // type and term symbols respectively. @@ -276,7 +276,6 @@ trait Mirrors extends api.Mirrors { override def isRoot = true override def isEffectiveRoot = true - override def isStatic = true override def isNestedClass = false } // The empty package, which holds all top level types without given packages. diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala index 220869e4d2..94d51b7455 100644 --- a/src/reflect/scala/reflect/internal/Trees.scala +++ b/src/reflect/scala/reflect/internal/Trees.scala @@ -160,7 +160,7 @@ trait Trees extends api.Trees { self: SymbolTable => new ThisSubstituter(clazz, to) transform this def hasSymbolWhich(f: Symbol => Boolean) = - hasSymbol && symbol != null && f(symbol) + (symbol ne null) && (symbol ne NoSymbol) && f(symbol) def isErroneous = (tpe ne null) && tpe.isErroneous def isTyped = (tpe ne null) && !tpe.isErroneous |