Skip to content

Fix the build so setupPublishCore enables the optimizer again#6997

Merged
dwijnand merged 1 commit intoscala:2.13.xfrom
retronym:topic/scalac-options
Aug 2, 2018
Merged

Fix the build so setupPublishCore enables the optimizer again#6997
dwijnand merged 1 commit intoscala:2.13.xfrom
retronym:topic/scalac-options

Conversation

@retronym
Copy link
Member

@retronym retronym commented Aug 2, 2018

Regressed in #6964

Before:

$ sbt setupPublishCore 'show library/scalacOptions' 'show reflect/scalacOptions' 'show compiler/test:scalacOptions' 'show test/scalacOptions'
[info] Loading global plugins from /Users/jz/.sbt/0.13/plugins
[info] Loading project definition from /Users/jz/code/scala/project/project
[info] Loading project definition from /Users/jz/code/scala/project
[info] Resolving key references (11393 settings) ...
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] *
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM

After:

$ sbt setupPublishCore 'show library/scalacOptions' 'show reflect/scalacOptions' 'show compiler/test:scalacOptions' 'show test/scalacOptions'
[info] Loading global plugins from /Users/jz/.sbt/0.13/plugins
[info] Loading project definition from /Users/jz/code/scala/project/project
[info] Loading project definition from /Users/jz/code/scala/project
[info] Resolving key references (11393 settings) ...
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[info] * -sourcepath
[info] * /Users/jz/code/scala/src/library
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM

Regressed in scala#6964

Before:

```
$ sbt setupPublishCore 'show library/scalacOptions' 'show reflect/scalacOptions' 'show compiler/test:scalacOptions' 'show test/scalacOptions'
[info] Loading global plugins from /Users/jz/.sbt/0.13/plugins
[info] Loading project definition from /Users/jz/code/scala/project/project
[info] Loading project definition from /Users/jz/code/scala/project
[info] Resolving key references (11393 settings) ...
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
[info] *
[success] Total time: 0 s, completed 02/08/2018 12:33:38 PM
```

After:

```
$ sbt setupPublishCore 'show library/scalacOptions' 'show reflect/scalacOptions' 'show compiler/test:scalacOptions' 'show test/scalacOptions'
[info] Loading global plugins from /Users/jz/.sbt/0.13/plugins
[info] Loading project definition from /Users/jz/code/scala/project/project
[info] Loading project definition from /Users/jz/code/scala/project
[info] Resolving key references (11393 settings) ...
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] *** Welcome to the sbt build definition for Scala! ***
[info] Check README.md for more information.
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[info] * -sourcepath
[info] * /Users/jz/code/scala/src/library
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[info] * -Xlint:-nullary-override,-inaccessible,_
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
[info] * -opt:l:inline
[info] * -opt-inline-from:scala/**
[success] Total time: 0 s, completed 02/08/2018 12:31:18 PM
```
@scala-jenkins scala-jenkins added this to the 2.13.0-M5 milestone Aug 2, 2018
@retronym retronym requested a review from som-snytt August 2, 2018 02:34
@retronym retronym mentioned this pull request Aug 2, 2018
@retronym retronym changed the title Fix the build so setupPublishCore enabled the optimizer Fix the build so setupPublishCore enables the optimizer again Aug 2, 2018
Copy link
Member

@dwijnand dwijnand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I'm not sure if this disables it for the junit source code (depends if they're compile:compiled or test:compiled). But either way the regression fix trumps this.

@dwijnand dwijnand merged commit be5ba05 into scala:2.13.x Aug 2, 2018
Copy link
Contributor

@som-snytt som-snytt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Adding to my list of things learned the hard way.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants