diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-15 07:24:55 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-15 07:24:55 -0800 |
| commit | efefa461b9921e775978de62a230e3cd8f9d581e (patch) | |
| tree | 5f18c3611e70f255499d243f2155ea3c370abafa /src | |
| parent | 86f86264729811873e80573f3b8921d5486ece65 (diff) | |
| parent | 38958f458cec09dacece690b2376d96fc7758972 (diff) | |
| download | scala-efefa461b9921e775978de62a230e3cd8f9d581e.tar.gz scala-efefa461b9921e775978de62a230e3cd8f9d581e.tar.bz2 scala-efefa461b9921e775978de62a230e3cd8f9d581e.zip | |
Merge pull request #1881 from adriaanm/rebase-1879-master
SI-6955 switch emission no longer foiled by type alias
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index 49eca828a9..5f70da6a63 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -3520,7 +3520,7 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL override def emitSwitch(scrut: Tree, scrutSym: Symbol, cases: List[List[TreeMaker]], pt: Type, matchFailGenOverride: Option[Tree => Tree], unchecked: Boolean): Option[Tree] = { import CODE._ val regularSwitchMaker = new RegularSwitchMaker(scrutSym, matchFailGenOverride, unchecked) // TODO: if patterns allow switch but the type of the scrutinee doesn't, cast (type-test) the scrutinee to the corresponding switchable type and switch on the result - if (regularSwitchMaker.switchableTpe(scrutSym.tpe)) { + if (regularSwitchMaker.switchableTpe(scrutSym.tpe.dealiasWiden)) { val caseDefsWithDefault = regularSwitchMaker(cases map {c => (scrutSym, c)}, pt) if (caseDefsWithDefault isEmpty) None // not worth emitting a switch. else { |