diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-22 16:05:08 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-22 16:08:12 -0800 |
| commit | a983f2b30c352f3d62f0ac615044dcd45b1b1618 (patch) | |
| tree | f8d7c602c1983452a448260973f19a42a9987215 /test/files/run/elidable.check | |
| parent | d6ed9e20fea676345f17b477f484becc9c48069a (diff) | |
| download | scala-a983f2b30c352f3d62f0ac615044dcd45b1b1618.tar.gz scala-a983f2b30c352f3d62f0ac615044dcd45b1b1618.tar.bz2 scala-a983f2b30c352f3d62f0ac615044dcd45b1b1618.zip | |
Revert recent elidable commits.
On epfl jenkins, elidable.scala fails with:
[partest] java.lang.VerifyError: (class: Test$, method: main signature: ([Ljava/lang/String;)V) Unable to pop operand off an empty stack
[partest]
[partest] at Test.main(elidable.scala)
Strangely it is fine for me on OSX with either apple's jvm or openjdk.
Since tests were not running for a while I don't know which of the recent
elidable commits is responsible, so given present time demands all I
can do is revert them all.
Revert "Fix for SI-5215: scalac crash when @elidable used in trait"
This reverts commit 5e52ce9a13f12ef159e25ac80c6be2803ec48950.
Revert "Fix for SI-5215 part 2: generate return value when eliding method calls"
This reverts commit 61c9b4f01d99a81e15391b270bd1b5a895f65ffd.
Revert "Eliminating duplication in zero creation."
This reverts commit fbb7865e137e83660257fdc79d19d29ff39c775b.
Revert "Disallow eliding when Nothing is expected"
This reverts commit f26a47c4e8bda2f6c689b4e9b0bb5c64ccf4c699.
Diffstat (limited to 'test/files/run/elidable.check')
| -rw-r--r-- | test/files/run/elidable.check | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/test/files/run/elidable.check b/test/files/run/elidable.check index 88cf98e0d1..4ce04f0040 100644 --- a/test/files/run/elidable.check +++ b/test/files/run/elidable.check @@ -1,14 +1 @@ -Good for me, I was not elided. Test.f3 -Good for me, I was not elided. O.f3 -Good for me, I was not elided. C.f1 -Good for me, I was not elided. C.f2 -() -false -0 -0 -0 -0 -0 -0.0 -0.0 -null +Good for me, I was not elided. |