Skip to content

Commit a179845

Browse files
committed
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
1 parent 80295ff commit a179845

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

build-ant-macros.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<attribute name="name"/>
77
<sequential>
88
<antcall target="@{name}">
9-
<param name="scalac.args.optimise" value="-optimise"/>
9+
<param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
1010
</antcall>
1111
</sequential>
1212
</macrodef>

build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ant $antArgs $scalacArgs $targets
1919
2020
antArgs tend to be:
2121
-Darchives.skipxz=true
22-
-Dscalac.args.optimise=-optimise
22+
-Dscalac.args.optimise=-Yopt:l:classpath
2323
2424
scalacArgs examples:
2525
"-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\""
@@ -79,13 +79,13 @@ TODO:
7979
<target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/swing).">
8080
<antcall target="publish">
8181
<param name="docs.skip" value="1"/>
82-
<param name="scalac.args.optimise" value="-optimise"/>
82+
<param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
8383
</antcall>
8484
</target>
8585
<target name="publish-core-opt-nodocs" description="Builds an untested, undocumented optimised core (library/reflect/compiler) and publishes to maven.">
8686
<antcall target="publish-core">
8787
<param name="docs.skip" value="1"/>
88-
<param name="scalac.args.optimise" value="-optimise"/>
88+
<param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
8989
</antcall>
9090
</target>
9191
<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:
10421042
<antcall target="publish-core-local">
10431043
<param name="maven.version.suffix" value="-STARR-${git.commit.sha}-SNAPSHOT"/>
10441044
<param name="docs.skip" value="1"/>
1045-
<param name="scalac.args.optimise" value="-optimise"/>
1045+
<param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
10461046
<param name="update.starr.version" value="alright then"/>
10471047
</antcall>
10481048
</target>

scripts/jobs/integrate/bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ bootstrap() {
493493
-Dremote.snapshot.repository=NOPE\
494494
-Dremote.release.repository=$releaseTempRepoUrl\
495495
-Drepository.credentials.id=$releaseTempRepoCred\
496-
-Dscalac.args.optimise=-optimise\
496+
-Dscalac.args.optimise=-Yopt:l:classpath\
497497
-Ddocs.skip=1\
498498
-Dlocker.skip=1\
499499
$publishLockerPrivateTask >> $baseDir/logs/builds 2>&1
@@ -533,7 +533,7 @@ bootstrap() {
533533
-Dremote.snapshot.repository=NOPE\
534534
-Dremote.release.repository=$releaseTempRepoUrl\
535535
-Drepository.credentials.id=$releaseTempRepoCred\
536-
-Dscalac.args.optimise=-optimise\
536+
-Dscalac.args.optimise=-Yopt:l:classpath\
537537
$antBuildTask $publishPrivateTask
538538

539539
# clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala

scripts/jobs/validate/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ case $prDryRun in
1010
# build quick using STARR built upstream, as specified by scalaVersion
1111
# (in that sense it's locker, since it was built with starr by that upstream job)
1212
ant -Dstarr.version=$scalaVersion \
13-
-Dscalac.args.optimise=-optimise \
13+
-Dscalac.args.optimise=-Yopt:l:classpath \
1414
-Dlocker.skip=1 -Dextra.repo.url=$prRepoUrl \
1515
$testExtraArgs ${testTarget-test.core docs.done}
1616
;;

test/files/presentation/t7678/Runner.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* filter: inliner warnings; re-run with
3+
*/
14
import scala.tools.nsc.interactive.tests._
25
import scala.reflect.internal.util._
36

test/files/run/t8029.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* filter: inliner warning; re-run with
3+
*/
14
import scala.tools.partest._
25
import scala.tools.nsc._
36

0 commit comments

Comments
 (0)