diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 08:42:59 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 08:42:59 -0700 |
| commit | ca9831e4f42abf24cc5c14a972fe40a08c4fc569 (patch) | |
| tree | 7706e9774bab4356a3a39c67d64452a34a1cecbe | |
| parent | 327618831b73f65d4c91f125fe9cf03fecab3d2b (diff) | |
| parent | 383fd5c13741791c3311e83b1701e3535ed0aeb8 (diff) | |
| download | scala-ca9831e4f42abf24cc5c14a972fe40a08c4fc569.tar.gz scala-ca9831e4f42abf24cc5c14a972fe40a08c4fc569.tar.bz2 scala-ca9831e4f42abf24cc5c14a972fe40a08c4fc569.zip | |
Merge pull request #1073 from adriaanm/ticket-6183
SI-6183 don't crash on type error in outer test
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index 4776c3b45f..8599db2121 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -1043,8 +1043,9 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL def outerTest(testedBinder: Symbol, expectedTp: Type): Tree = { val expectedOuter = expectedTp.prefix match { - case ThisType(clazz) => THIS(clazz) - case pre => REF(pre.prefix, pre.termSymbol) + case ThisType(clazz) => THIS(clazz) + case pre if pre != NoType => REF(pre.prefix, pre.termSymbol) + case _ => TRUE_typed // fallback for SI-6183 } // ExplicitOuter replaces `Select(q, outerSym) OBJ_EQ expectedPrefix` by `Select(q, outerAccessor(outerSym.owner)) OBJ_EQ expectedPrefix` |