Fix several tests under GenBCode

lrytz · lrytz · commit 1f5c3f8ba84a · 2015-05-26T14:47:39.000+02:00
- private-inline, t8601-closure-elim, inline-in-constructors - test closure inlining / elimination, which is not yet implemented in GenBCode. noted in https://github.com/scala-opt/scala/issues/14. - constant-optimization, t7006 - no constant folding in GenBCode yet. noted in https://github.com/scala-opt/scala/issues/29. - patmat_opt_ignore_underscore, patmat_opt_no_nullcheck, patmat_opt_primitive_typetest - not all optimizations in GenBCode yet. noted in https://github.com/scala-opt/scala/issues/30. - t3234 - tests a warning of trait inlining - trait inlining works in GenBCode - synchronized - ignore inliner warnings (they changed a bit) - t6102 - account for the changed outputo of -Ydebug has under GenBCode
diff --git a/test/files/instrumented/inline-in-constructors.flags b/test/files/instrumented/inline-in-constructors.flags
@@ -1 +1 @@
--optimise -Ydelambdafy:inline
+-optimise -Ydelambdafy:inline -Ybackend:GenASM
diff --git a/test/files/jvm/constant-optimization/Foo_1.flags b/test/files/jvm/constant-optimization/Foo_1.flags
@@ -1 +1 @@
--Ynooptimise -Yconst-opt
+-Ynooptimise -Yconst-opt -Ybackend:GenASM
diff --git a/test/files/jvm/patmat_opt_ignore_underscore.flags b/test/files/jvm/patmat_opt_ignore_underscore.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/jvm/patmat_opt_no_nullcheck.flags b/test/files/jvm/patmat_opt_no_nullcheck.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/jvm/patmat_opt_primitive_typetest.flags b/test/files/jvm/patmat_opt_primitive_typetest.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/jvm/t7006/Foo_1.flags b/test/files/jvm/t7006/Foo_1.flags
@@ -1 +1 @@
--optimise -Ydebug -Xfatal-warnings
+-optimise -Ydebug -Xfatal-warnings -Ybackend:GenASM
diff --git a/test/files/neg/t3234.flags b/test/files/neg/t3234.flags
@@ -1 +1 @@
--Yinline -Yinline-warnings -Xfatal-warnings
+-Yinline -Yinline-warnings -Xfatal-warnings -Ybackend:GenASM
diff --git a/test/files/run/private-inline.flags b/test/files/run/private-inline.flags
@@ -1 +1 @@
--optimise -Yinline-warnings
+-optimise -Yinline-warnings -Ybackend:GenASM
diff --git a/test/files/run/synchronized.check b/test/files/run/synchronized.check
@@ -1,8 +1,3 @@
-#partest !-Ybackend:GenBCode
-warning: there were 14 inliner warnings; re-run with -Yinline-warnings for details
-#partest -Ybackend:GenBCode
-warning: there were 14 inliner warnings; re-run with -Yopt-warnings for details
-#partest
     .|.               c1.f1:     OK
     .|.               c1.fi:     OK
     .|...             c1.fv:     OK
diff --git a/test/files/run/synchronized.scala b/test/files/run/synchronized.scala
@@ -1,3 +1,6 @@
+/*
+ * filter: inliner warnings; re-run with
+ */
 import java.lang.Thread.holdsLock
 import scala.collection.mutable.StringBuilder
 
diff --git a/test/files/run/t6102.check b/test/files/run/t6102.check
@@ -28,5 +28,10 @@
 [running phase constopt on t6102.scala]
 #partest
 [running phase dce on t6102.scala]
+#partest !-Ybackend:GenBCode
 [running phase jvm on icode]
+#partest -Ybackend:GenBCode
+[running phase jvm on t6102.scala]
+[running phase jvm on t6102.scala]
+#partest
 hello
diff --git a/test/files/run/t8601-closure-elim.flags b/test/files/run/t8601-closure-elim.flags
@@ -1 +1 @@
--optimize -Ydelambdafy:inline
+-optimize -Ydelambdafy:inline -Ybackend:GenASM

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimise -Ydelambdafy:inline`
	`1`	`+-optimise -Ydelambdafy:inline -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--Ynooptimise -Yconst-opt`
	`1`	`+-Ynooptimise -Yconst-opt -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimize`
	`1`	`+-optimize -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimise -Ydebug -Xfatal-warnings`
	`1`	`+-optimise -Ydebug -Xfatal-warnings -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--Yinline -Yinline-warnings -Xfatal-warnings`
	`1`	`+-Yinline -Yinline-warnings -Xfatal-warnings -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimise -Yinline-warnings`
	`1`	`+-optimise -Yinline-warnings -Ybackend:GenASM`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimize -Ydelambdafy:inline`
	`1`	`+-optimize -Ydelambdafy:inline -Ybackend:GenASM`