- Fixed ATree generator and Tree checker for ne...

- Fixed ATree generator and Tree checker for new use of Idents with
static syms

1 files changed, 4 insertions, 3 deletions

diff --git a/sources/scalac/checkers/TreeChecker.java b/sources/scalac/checkers/TreeChecker.java
index b409775629..3c1368552c 100644
--- a/sources/scalac/checkers/TreeChecker.java
+++ b/sources/scalac/checkers/TreeChecker.java
@@ -268,7 +268,8 @@ public class TreeChecker {
             Tree fun = TreeInfo.methPart(bases[0]);
             assert fun instanceof Tree.Ident: show(tree);
             Symbol symbol = fun.symbol();
-            assert symbol != null && symbol.isInitializer(): show(tree);
+            assert symbol != null && !symbol.isLabel(): show(tree);
+            assert symbol.isInitializer(): show(tree);
             return expression(bases[0], definitions.UNIT_TYPE());
 
         case Apply(Tree vfun, Tree[] vargs):
@@ -342,8 +343,8 @@ public class TreeChecker {
             return selection(tree);
 
         case Ident(_):
-            if (symbol.owner().isStaticOwner()) return true;
-            if (symbol.isInitializer()) return true;
+            if (!symbol.isLabel() && symbol.isInitializer()) return true;
+            if (!symbol.isLabel() && symbol.isStatic()) return true;
             assert labels.contains(symbol): show(tree);
             assert symbol.owner() == currentMember(): show(tree);
             return true;