diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
commit | 288d4ef1509160b21134e3ddacca5ee8311919ba (patch) | |
tree | b7b335b7f26bf6dbcda43d024c554eb06cbd97f1 /test/files/jvm | |
parent | da46355a90442636ee7634c31a69eae8e8b9cd42 (diff) | |
parent | 333187a7c020b7d51d68c5435852305e70d89d41 (diff) | |
download | scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.gz scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.bz2 scala-288d4ef1509160b21134e3ddacca5ee8311919ba.zip |
Merge remote-tracking branch 'origin/2.12.x' into merge/2.11.x-to-2.12.x-20160203
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/t6941.check | 1 | ||||
-rw-r--r-- | test/files/jvm/t6941.flags | 1 | ||||
-rw-r--r-- | test/files/jvm/t6941/Analyzed_1.flags | 1 | ||||
-rw-r--r-- | test/files/jvm/t6941/Analyzed_1.scala | 11 | ||||
-rw-r--r-- | test/files/jvm/t6941/test.scala | 15 |
5 files changed, 0 insertions, 29 deletions
diff --git a/test/files/jvm/t6941.check b/test/files/jvm/t6941.check deleted file mode 100644 index 43f53aba12..0000000000 --- a/test/files/jvm/t6941.check +++ /dev/null @@ -1 +0,0 @@ -bytecode identical diff --git a/test/files/jvm/t6941.flags b/test/files/jvm/t6941.flags deleted file mode 100644 index 49d036a887..0000000000 --- a/test/files/jvm/t6941.flags +++ /dev/null @@ -1 +0,0 @@ --optimize diff --git a/test/files/jvm/t6941/Analyzed_1.flags b/test/files/jvm/t6941/Analyzed_1.flags deleted file mode 100644 index ad51758c39..0000000000 --- a/test/files/jvm/t6941/Analyzed_1.flags +++ /dev/null @@ -1 +0,0 @@ --nowarn diff --git a/test/files/jvm/t6941/Analyzed_1.scala b/test/files/jvm/t6941/Analyzed_1.scala deleted file mode 100644 index b6951f71ee..0000000000 --- a/test/files/jvm/t6941/Analyzed_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -// this class's bytecode, compiled under -optimize is analyzed by the test -// method a's bytecode should be identical to method b's bytecode -class SameBytecode { - def a(xs: List[Int]) = xs match { - case x :: _ => x - } - - def b(xs: List[Int]) = xs match { - case xs: ::[Int] => xs.head - } -}
\ No newline at end of file diff --git a/test/files/jvm/t6941/test.scala b/test/files/jvm/t6941/test.scala deleted file mode 100644 index fceb54487f..0000000000 --- a/test/files/jvm/t6941/test.scala +++ /dev/null @@ -1,15 +0,0 @@ -import scala.tools.partest.{BytecodeTest, ASMConverters} - -import scala.tools.nsc.util.JavaClassPath -import java.io.InputStream -import scala.tools.asm -import asm.ClassReader -import asm.tree.{ClassNode, InsnList} -import scala.collection.JavaConverters._ - -object Test extends BytecodeTest { - def show: Unit = { - val classNode = loadClassNode("SameBytecode") - similarBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"), ASMConverters.equivalentBytecode(_, _)) - } -} |