From 44b5c261a8e585c5747380895aa06c84f9d63f6c Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Mon, 25 Aug 2014 23:13:05 +0200 Subject: JUnit tests for dead code elimination. JUnit tests may use tools from partest-extras (ASMConverters) --- test/files/jvm/t6941/test.scala | 4 ++-- test/files/jvm/t7253/test.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test/files/jvm') diff --git a/test/files/jvm/t6941/test.scala b/test/files/jvm/t6941/test.scala index 248617f71f..fceb54487f 100644 --- a/test/files/jvm/t6941/test.scala +++ b/test/files/jvm/t6941/test.scala @@ -1,4 +1,4 @@ -import scala.tools.partest.BytecodeTest +import scala.tools.partest.{BytecodeTest, ASMConverters} import scala.tools.nsc.util.JavaClassPath import java.io.InputStream @@ -10,6 +10,6 @@ import scala.collection.JavaConverters._ object Test extends BytecodeTest { def show: Unit = { val classNode = loadClassNode("SameBytecode") - similarBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"), equalsModuloVar) + similarBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"), ASMConverters.equivalentBytecode(_, _)) } } diff --git a/test/files/jvm/t7253/test.scala b/test/files/jvm/t7253/test.scala index 7fe08e8813..a3f1e86e65 100644 --- a/test/files/jvm/t7253/test.scala +++ b/test/files/jvm/t7253/test.scala @@ -1,4 +1,4 @@ -import scala.tools.partest.BytecodeTest +import scala.tools.partest.{BytecodeTest, ASMConverters} import scala.tools.nsc.util.JavaClassPath import java.io.InputStream @@ -8,10 +8,10 @@ import asm.tree.{ClassNode, InsnList} import scala.collection.JavaConverters._ object Test extends BytecodeTest { - import instructions._ + import ASMConverters._ def show: Unit = { - val instrBaseSeqs = Seq("ScalaClient_1", "JavaClient_1") map (name => instructions.fromMethod(getMethod(loadClassNode(name), "foo"))) + val instrBaseSeqs = Seq("ScalaClient_1", "JavaClient_1") map (name => instructionsFromMethod(getMethod(loadClassNode(name), "foo"))) val instrSeqs = instrBaseSeqs map (_ filter isInvoke) cmpInstructions(instrSeqs(0), instrSeqs(1)) } -- cgit v1.2.3 From 01f5435318551ce12787b120440572f169c71463 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Fri, 29 Aug 2014 13:44:36 +0200 Subject: SI-8568 unreachable test now passes in GenBCode --- test/files/jvm/unreachable.flags | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test/files/jvm/unreachable.flags (limited to 'test/files/jvm') diff --git a/test/files/jvm/unreachable.flags b/test/files/jvm/unreachable.flags deleted file mode 100644 index 49f2d2c4c8..0000000000 --- a/test/files/jvm/unreachable.flags +++ /dev/null @@ -1 +0,0 @@ --Ybackend:GenASM -- cgit v1.2.3