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 /test | |
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 'test')
-rw-r--r-- | test/files/run/t6955.check | 1 | ||||
-rw-r--r-- | test/files/run/t6955.scala | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/test/files/run/t6955.check b/test/files/run/t6955.check new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/test/files/run/t6955.check @@ -0,0 +1 @@ +2 diff --git a/test/files/run/t6955.scala b/test/files/run/t6955.scala new file mode 100644 index 0000000000..980aa420cc --- /dev/null +++ b/test/files/run/t6955.scala @@ -0,0 +1,28 @@ +import scala.tools.partest.IcodeTest + +// this class should compile to code that uses switches (twice) +class Switches { + type Tag = Byte + + def switchBad(i: Tag): Int = i match { // notice type of i is Tag = Byte + case 1 => 1 + case 2 => 2 + case 3 => 3 + case _ => 0 + } + + // this worked before, should keep working + def switchOkay(i: Byte): Int = i match { + case 1 => 1 + case 2 => 2 + case 3 => 3 + case _ => 0 + } +} + +object Test extends IcodeTest { + // ensure we get two switches out of this -- ignore the rest of the output for robustness + // exclude the constant we emit for the "SWITCH ..." string below (we get the icode for all the code you see in this file) + override def show() = println(collectIcode("").filter(x => x.indexOf("SWITCH ...") >= 0 && x.indexOf("CONSTANT(") == -1).size) +} + |