From 4af9f1566dde56adecdba2690df71e39552e32fe Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
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) <Jason Zaugg>
...
* | | | | | | 622cc99 - Revert the lisp test. (3 years, 10 months ago) <Paul Phillips>
...
* | | | | | | 97f0324 - Revived the lisp test. (3 years, 10 months ago) <Paul Phillips>
...
* | 1e0f7dc - Imprison the lisp test, no review. (4 years, 4 months ago) <Paul Phillips>
...
* | 6b09630 - "Freed the lisp test." Tweaked partest defaults... (4 years, 6 months ago) <Paul Phillips>
...
* | fec42c1 - Lisp test wins again, no review. (4 years, 8 months ago) <Paul Phillips>
...
* | 1c2d44d - Restored the lisp.scala test. (4 years, 8 months ago) <Paul Phillips>
...
* | 15ed892 - Temporarily sending lisp.scala to be interprete... (4 years, 8 months ago) <Paul Phillips>
...
---
 test/pending/run/private-inline.check | 13 ---------
 test/pending/run/private-inline.flags |  1 -
 test/pending/run/private-inline.scala | 52 -----------------------------------
 3 files changed, 66 deletions(-)
 delete mode 100644 test/pending/run/private-inline.check
 delete mode 100644 test/pending/run/private-inline.flags
 delete mode 100644 test/pending/run/private-inline.scala

(limited to 'test/pending')

diff --git a/test/pending/run/private-inline.check b/test/pending/run/private-inline.check
deleted file mode 100644
index e71aec2fcf..0000000000
--- a/test/pending/run/private-inline.check
+++ /dev/null
@@ -1,13 +0,0 @@
-private-inline.scala:24: warning: Could not inline required method wrapper1 because callee contains exception handlers / finally clause, and is invoked with non-empty operand stack.
-  def f1b() = identity(wrapper1(5))
-                               ^
-private-inline.scala:24: warning: At the end of the day, could not inline @inline-marked method wrapper1
-  def f1b() = identity(wrapper1(5))
-                               ^
-private-inline.scala:29: warning: Could not inline required method wrapper2 because callee contains exception handlers / finally clause, and is invoked with non-empty operand stack.
-  def f2b() = identity(wrapper2(5))
-                               ^
-private-inline.scala:29: warning: At the end of the day, could not inline @inline-marked method wrapper2
-  def f2b() = identity(wrapper2(5))
-                               ^
-20
diff --git a/test/pending/run/private-inline.flags b/test/pending/run/private-inline.flags
deleted file mode 100644
index c550fdce16..0000000000
--- a/test/pending/run/private-inline.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise -Yinline-warnings -Ybackend:GenASM
diff --git a/test/pending/run/private-inline.scala b/test/pending/run/private-inline.scala
deleted file mode 100644
index 60fef9efca..0000000000
--- a/test/pending/run/private-inline.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-
-final class A {
-  private var x1 = false
-  var x2 = false
-
-  // manipulates private var
-  @inline private def wrapper1[T](body: => T): T = {
-    val saved = x1
-    x1 = true
-    try body
-    finally x1 = saved
-  }
-  // manipulates public var
-  @inline private def wrapper2[T](body: => T): T = {
-    val saved = x2
-    x2 = true
-    try body
-    finally x2 = saved
-  }
-
-  // not inlined
-  def f1a() = wrapper1(5)
-  // inlined!
-  def f1b() = identity(wrapper1(5))
-
-  // not inlined
-  def f2a() = wrapper2(5)
-  // inlined!
-  def f2b() = identity(wrapper2(5))
-}
-
-object Test {
-  def methodClasses = List("f1a", "f2a") map ("A$$anonfun$" + _ + "$1")
-
-  def main(args: Array[String]): Unit = {
-    val a = new A
-    import a._
-    println(f1a() + f1b() + f2a() + f2b())
-
-    // Don't know how else to test this: all these should have been
-    // inlined, so all should fail.
-    methodClasses foreach { clazz =>
-
-      val foundClass = (
-        try   Class.forName(clazz)
-        catch { case _: Throwable => null }
-      )
-
-      assert(foundClass == null, foundClass)
-    }
-  }
-}
-- 
cgit v1.2.3