diff options
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 2dd60522d1..9ecb18b581 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -257,7 +257,6 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { */ void validate(Symbol sym) { checkNoConflict(sym, DEFERRED, PRIVATE); - checkNoConflict(sym, FINAL, PRIVATE); checkNoConflict(sym, FINAL, SEALED); checkNoConflict(sym, PRIVATE, PROTECTED); checkNoConflict(sym, PRIVATE, OVERRIDE); @@ -2174,7 +2173,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { tree, adapt(qual1, qualmode, Type.AnyType), name); case Ident(Name name): - if (((mode & PATTERNmode) != 0) && name.isVariable()) { + if (((mode & (PATTERNmode | FUNmode)) == PATTERNmode) && name.isVariable()) { //System.out.println("pat var " + name + ":" + pt);//DEBUG Symbol vble, vble2 = null; |