From 4af9f1566dde56adecdba2690df71e39552e32fe Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Mon, 25 Jan 2016 21:38:28 +0100 Subject: Re-write and Re-enable optimizer tests Rewrite tests for new optimizer - SI-6941 - SI-2171 - t3430 - t3252 - t4840 - t2171 - t3430 - t3252 - t6157 - t6547 - t8062 - t8306 - t8359 - t9123 - trait-force-info - private-inline test cases for bugs fixed in the new optimizer - SI-9160, the unnecessary boxing mentioned in the ticket is optimzied since push-pop elimination (#4858). - SI-8796 - SI-8524 - SI-7807 fix flags file for t3420 remove an empty flags file remove unnecessary partest filters explicit inliner warnings in test t7582 Restore the lisp test. Removing the flags file - our build runs with the (new) optimizer enabled anyway. The test spent the past few years as an optimizer test in pos/ see https://issues.scala-lang.org/browse/SI-4512. The attempt may fail, but why not give it a try. $ git lg -S"lisp" ... | * | | | f785785 - SI-4579 Yoke the power of lisp.scala as a stress for the optimizer. (3 years, 8 months ago) ... * | | | | | | 622cc99 - Revert the lisp test. (3 years, 10 months ago) ... * | | | | | | 97f0324 - Revived the lisp test. (3 years, 10 months ago) ... * | 1e0f7dc - Imprison the lisp test, no review. (4 years, 4 months ago) ... * | 6b09630 - "Freed the lisp test." Tweaked partest defaults... (4 years, 6 months ago) ... * | fec42c1 - Lisp test wins again, no review. (4 years, 8 months ago) ... * | 1c2d44d - Restored the lisp.scala test. (4 years, 8 months ago) ... * | 15ed892 - Temporarily sending lisp.scala to be interprete... (4 years, 8 months ago) ... --- test/files/jvm/t6941/Analyzed_1.flags | 1 - test/files/jvm/t6941/Analyzed_1.scala | 11 ----------- test/files/jvm/t6941/test.scala | 15 --------------- 3 files changed, 27 deletions(-) delete mode 100644 test/files/jvm/t6941/Analyzed_1.flags delete mode 100644 test/files/jvm/t6941/Analyzed_1.scala delete mode 100644 test/files/jvm/t6941/test.scala (limited to 'test/files/jvm/t6941') 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(_, _)) - } -} -- cgit v1.2.3