diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-07-02 14:06:15 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-07-03 20:17:45 +0200 |
| commit | cd878232b5747e8993bd0bae8c451c5128038130 (patch) | |
| tree | 1390f79ee521d140dd42177db864abd83cf4b9a7 /test/files/neg | |
| parent | c07442d8d2df084e7f22ca1c5102858a6aa15807 (diff) | |
| download | scala-cd878232b5747e8993bd0bae8c451c5128038130.tar.gz scala-cd878232b5747e8993bd0bae8c451c5128038130.tar.bz2 scala-cd878232b5747e8993bd0bae8c451c5128038130.zip | |
Warn when combining settings for the old optimizer with -YGenBCode
Remove some unnecessary flags files
- neg/t4425.flags
- run/blame_eye_triple_eee-double.flags
- run/blame_eye_triple_eee-float.flags
Force tests that use -optimize to GenASM
- neg/sealed-final-neg.flags
- pos/inline-access-levels.flags
- pos/inliner2.flags
- pos/sealed-final.flags
- pos/t3420.flags
- pos/t8410.flags
- run/constant-optimization.flags
- run/dead-code-elimination.flags
- run/elidable-opt.flags
- run/finalvar.flags
- run/icode-reader-dead-code.scala
- run/optimizer-array-load.flags
- run/synchronized.flags
- run/t3509.flags
- run/t3569.flags
- run/t4285.flags
- run/t4935.flags
- run/t5789.scala
- run/t6188.flags
- run/t7459b-optimize.flags
- run/t7582.flags
- run/t7582b.flags
- run/t8601.flags
- run/t8601b.flags
- run/t8601c.flags
- run/t8601d.flags
- run/t8601e.flags
- run/t9003.flags
Move some tests to the new optimizer
- run/classfile-format-51.scala
- run/classfile-format-52.scala
- run/run-bug4840.flags
- run/t2106.flags
- run/t6102.flags
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/incompatibleSettings.check | 6 | ||||
| -rw-r--r-- | test/files/neg/incompatibleSettings.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/incompatibleSettings.scala | 1 | ||||
| -rw-r--r-- | test/files/neg/sealed-final-neg.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/t4425.flags | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/test/files/neg/incompatibleSettings.check b/test/files/neg/incompatibleSettings.check new file mode 100644 index 0000000000..0f28d41825 --- /dev/null +++ b/test/files/neg/incompatibleSettings.check @@ -0,0 +1,6 @@ +warning: Conflicting compiler settings were detected. Some settings will be ignored. +Compiler settings for the 2.11 optimizer (-optimise) are incompatible with -Ybackend:GenBCode (which is the default in 2.12). +The optimizer settings are ignored. See -Yopt:help for enabling the new optimizer in 2.12. +error: No warnings can be incurred under -Xfatal-warnings. +one warning found +one error found diff --git a/test/files/neg/incompatibleSettings.flags b/test/files/neg/incompatibleSettings.flags new file mode 100644 index 0000000000..00dd9c1c24 --- /dev/null +++ b/test/files/neg/incompatibleSettings.flags @@ -0,0 +1 @@ +-optimise -Ybackend:GenBCode -Xfatal-warnings diff --git a/test/files/neg/incompatibleSettings.scala b/test/files/neg/incompatibleSettings.scala new file mode 100644 index 0000000000..826a1a5bc2 --- /dev/null +++ b/test/files/neg/incompatibleSettings.scala @@ -0,0 +1 @@ +class C diff --git a/test/files/neg/sealed-final-neg.flags b/test/files/neg/sealed-final-neg.flags index cfabf7a5b4..3f0fcd2201 100644 --- a/test/files/neg/sealed-final-neg.flags +++ b/test/files/neg/sealed-final-neg.flags @@ -1 +1 @@ --Xfatal-warnings -Yinline-warnings -optimise
\ No newline at end of file +-Xfatal-warnings -Ybackend:GenASM -Yinline-warnings -optimise
\ No newline at end of file diff --git a/test/files/neg/t4425.flags b/test/files/neg/t4425.flags deleted file mode 100644 index 1182725e86..0000000000 --- a/test/files/neg/t4425.flags +++ /dev/null @@ -1 +0,0 @@ --optimize
\ No newline at end of file |