Skip to content

Merge 2.12.x to 2.13.x [ci: last-only]#8242

Merged
lrytz merged 27 commits intoscala:2.13.xfrom
retronym:merge/2.12.x-to-2.13.x-20190718
Jul 18, 2019
Merged

Merge 2.12.x to 2.13.x [ci: last-only]#8242
lrytz merged 27 commits intoscala:2.13.xfrom
retronym:merge/2.12.x-to-2.13.x-20190718

Conversation

@retronym
Copy link
Member

SKIP    *   3397d4791f (origin/2.12.x, 2.12.x) [backport] List.filter optimizations from 2.13.x (#8226)
S       |\
S       | * 1a842d15b9 [backport] List.filter optimizations from 2.13.x
S       *   1a4bd65c24 [backport] Optimize some hot callers of Symbol.name to use rawn… (#8238)
S       |\
S       | * 6c6706586a [backport] Optimize some hot callers of Symbol.name to use rawname
S       * |   74875d680c Merge pull request #8233 from retronym/ticket/sd638
        |\ \
        | |/
        |/|
PICK    | * 146a1a4915 Fix regression in -d out.jar on Windows
P       * |   b5029ab94d Merge pull request #7879 from retronym/classtag-cache
P       |\ \
P       | * | 9f7866cc3d Optimise ClassTag lookup
P       | |/
P       * |   c50ca9ab9f Merge pull request #8232 from retronym/topic/implicit-pt-normalize
P       |\ \
P       | * | acec8d3dd7 Optimise implicit search
        |  /
SKIP    * |   516c971916 Merge pull request #8234 from lrytz/optOpt
S       |\ \
S       | |/
S       |/|
S       | * e17cb66a83 [nomerge] use 'in Compile' for new scalacOptions
        |/
PICK    *   f4059d3ce7 Hoist creation of SubstSymMap out of hot loop in deriveSymbols (#8230)
P       |\
P       | * 97a43ff29f Hoist creation of SubstSymMap out of hot loop in deriveSymbols
P       * |   6306dd6b06 Optimize macro plugin infrastructure to reduce allocations (#8228)
P       |\ \
P       | * | baaab62616 Optimize macro plugin infrastructure to reduce allocations
P       | |/
P       * |   4ab773f0bf Reduce allocations for virtual compilation units (#8229)
P       |\ \
P       | * | 5329b9ef4c Reduce allocations for virtual compilation units
P       | |/
P        * |   2c51aeeb06 Optimize check for by-name expressions (#8231)
P       |\ \
P       | |/
P       |/|
P       | * 57b8204c0d Optimize check for by-name expressions
SKIP    * f9f64a76f3 Merge pull request #8212 from takayahilton/remove-unused-import
S       * cdfc33132f [nomerge] remove unused import.

takayahilton and others added 27 commits July 12, 2019 08:06
Rule out some cases by the type of tree of flags before
looking at the symbol's info.
Binary compatibilty constraints won't let us actually do this
as an override in `List` (we tried that originally but reverted.)

But we are free to type-case List in the inherited implementation.
Reduce the number of substituting type maps that underlie
`Type.dealias` by using `Type.normalize` which internally
caches its result.
Optimize check for by-name expressions
Reduce allocations for virtual compilation units
Optimize macro plugin infrastructure to reduce allocations
…#8230)

Hoist creation of SubstSymMap out of hot loop in deriveSymbols
Otherwise, the `enableOptimizer` settings that are enabled by
`setupPublishCore` and friends doesn't have the desired effect.
[nomerge] use 'in Compile' for new scalacOptions
  - Optimize ClassTag.apply to avoid testing for primitive classes one-by-one.
  - Share instance of ClassTag in a ClassValue based cache and rely on
    this in the compiler where we had previously hoisted hot instances.
Share instance of ClassTag in a ClassValue based cache
My refactoring to use nio.file.Path to represent relative paths
was wrong-headed -- it is too easy to call .toString and get the
system default file separator in places where we actually really
want a '/'.

Also fix regression in t5717 test on Windows
Fixes for windows regressions in classfile writing
…la#8238)

[backport] Optimize some hot callers of Symbol.name to use rawname
[backport] List.filter optimizations from 2.13.x
Skipping 2.12.x specific regression fix in backport
@scala-jenkins scala-jenkins added this to the 2.13.1 milestone Jul 17, 2019
@retronym retronym requested a review from lrytz July 17, 2019 21:58
@lrytz lrytz merged commit d14d421 into scala:2.13.x Jul 18, 2019
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.

5 participants