diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-07-02 17:04:21 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-07-03 15:23:02 +0200 |
commit | a179845fd5fae45cfab714db667fc140985e3a89 (patch) | |
tree | fa08557deb5c185affcf2e0bfe83e6264546bca4 | |
parent | 80295ffc260d08592937ce6b27a333b9aedcac4c (diff) | |
download | scala-a179845fd5fae45cfab714db667fc140985e3a89.tar.gz scala-a179845fd5fae45cfab714db667fc140985e3a89.tar.bz2 scala-a179845fd5fae45cfab714db667fc140985e3a89.zip |
Enable the new optimizer when building scala
No change in build.sbt, there's no optimizer settings there yet.
Ignore the inliner warning in presentation/t7678 and run/t8029.scala,
noted in https://issues.scala-lang.org/browse/SI-9378
-rw-r--r-- | build-ant-macros.xml | 2 | ||||
-rwxr-xr-x | build.xml | 8 | ||||
-rwxr-xr-x | scripts/jobs/integrate/bootstrap | 4 | ||||
-rwxr-xr-x | scripts/jobs/validate/test | 2 | ||||
-rw-r--r-- | test/files/presentation/t7678/Runner.scala | 3 | ||||
-rw-r--r-- | test/files/run/t8029.scala | 3 |
6 files changed, 14 insertions, 8 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 868fb41cce..cfdb1ce70e 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -6,7 +6,7 @@ <attribute name="name"/> <sequential> <antcall target="@{name}"> - <param name="scalac.args.optimise" value="-optimise"/> + <param name="scalac.args.optimise" value="-Yopt:l:classpath"/> </antcall> </sequential> </macrodef> @@ -19,7 +19,7 @@ ant $antArgs $scalacArgs $targets antArgs tend to be: -Darchives.skipxz=true - -Dscalac.args.optimise=-optimise + -Dscalac.args.optimise=-Yopt:l:classpath scalacArgs examples: "-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\"" @@ -79,13 +79,13 @@ TODO: <target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/swing)."> <antcall target="publish"> <param name="docs.skip" value="1"/> - <param name="scalac.args.optimise" value="-optimise"/> + <param name="scalac.args.optimise" value="-Yopt:l:classpath"/> </antcall> </target> <target name="publish-core-opt-nodocs" description="Builds an untested, undocumented optimised core (library/reflect/compiler) and publishes to maven."> <antcall target="publish-core"> <param name="docs.skip" value="1"/> - <param name="scalac.args.optimise" value="-optimise"/> + <param name="scalac.args.optimise" value="-Yopt:l:classpath"/> </antcall> </target> <target name="publish-core-local-nodocs" description="Builds an untested, undocumented core (library/reflect/compiler) and locally publishes to maven"> @@ -1042,7 +1042,7 @@ TODO: <antcall target="publish-core-local"> <param name="maven.version.suffix" value="-STARR-${git.commit.sha}-SNAPSHOT"/> <param name="docs.skip" value="1"/> - <param name="scalac.args.optimise" value="-optimise"/> + <param name="scalac.args.optimise" value="-Yopt:l:classpath"/> <param name="update.starr.version" value="alright then"/> </antcall> </target> diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index ccc62c0d45..706a20daf4 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -493,7 +493,7 @@ bootstrap() { -Dremote.snapshot.repository=NOPE\ -Dremote.release.repository=$releaseTempRepoUrl\ -Drepository.credentials.id=$releaseTempRepoCred\ - -Dscalac.args.optimise=-optimise\ + -Dscalac.args.optimise=-Yopt:l:classpath\ -Ddocs.skip=1\ -Dlocker.skip=1\ $publishLockerPrivateTask >> $baseDir/logs/builds 2>&1 @@ -533,7 +533,7 @@ bootstrap() { -Dremote.snapshot.repository=NOPE\ -Dremote.release.repository=$releaseTempRepoUrl\ -Drepository.credentials.id=$releaseTempRepoCred\ - -Dscalac.args.optimise=-optimise\ + -Dscalac.args.optimise=-Yopt:l:classpath\ $antBuildTask $publishPrivateTask # clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala diff --git a/scripts/jobs/validate/test b/scripts/jobs/validate/test index bedef2e458..d63d39c65d 100755 --- a/scripts/jobs/validate/test +++ b/scripts/jobs/validate/test @@ -10,7 +10,7 @@ case $prDryRun in # build quick using STARR built upstream, as specified by scalaVersion # (in that sense it's locker, since it was built with starr by that upstream job) ant -Dstarr.version=$scalaVersion \ - -Dscalac.args.optimise=-optimise \ + -Dscalac.args.optimise=-Yopt:l:classpath \ -Dlocker.skip=1 -Dextra.repo.url=$prRepoUrl \ $testExtraArgs ${testTarget-test.core docs.done} ;; diff --git a/test/files/presentation/t7678/Runner.scala b/test/files/presentation/t7678/Runner.scala index 14d6dc2a70..e45f057ff1 100644 --- a/test/files/presentation/t7678/Runner.scala +++ b/test/files/presentation/t7678/Runner.scala @@ -1,3 +1,6 @@ +/* + * filter: inliner warnings; re-run with + */ import scala.tools.nsc.interactive.tests._ import scala.reflect.internal.util._ diff --git a/test/files/run/t8029.scala b/test/files/run/t8029.scala index dbd5c41387..62629d51bc 100644 --- a/test/files/run/t8029.scala +++ b/test/files/run/t8029.scala @@ -1,3 +1,6 @@ +/* + * filter: inliner warning; re-run with + */ import scala.tools.partest._ import scala.tools.nsc._ |