Merge 2.12 to 2.13 feb 4 [ci: last-only] #8694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Repair broken test, command options changed. The javap tool can be run a few ways from Javap. For JDK 8, add tools.jar to the class loader and load the internal Task reflectively. Otherwise, if we seem to be loaded by the App loader, so that we can access platform classes, also just load the internal Task. There is no tools.jar. Another strategy is to use the ToolProvider interface, which has the drawback that the REPL output directory must be a real directory on the class path. If we are loaded by the bootstrap loader, trying to load the platform classes will fail. Since the REPL class loader is a child of the platform loader, we could use its compiler to compile the task class that can run the internal tool non-reflectively. Remove that adapter option that compiled an adapter class on the REPL class path. Instead, recommend running `-nobootcp` or `-Yrepl-outdir d -toolcp d`. The first option makes javap visible to REPL; the second option makes REPL output visible to the ToolProvider-provided tool.
The invalid end of the range position crashes recent versions of Zinc. Manually tested with: https://github.com/retronym/sbt-scaladoc-aioooe
Fix end of range position of Scaladoc use case
Using `linkedClassOfClass` here doesn't work properly if the owner is a
module without a companion, since the mirror class gets generated during
jvm.
I tried to handle all of the cases I could think of:
- public class Foo { public static void test() {} }:
- sym.isStaticMember: true
- sym.owner.internalName: Foo
- ownerInternalName: Foo
- class Foo; object Foo { def test() { } }
- sym.isStaticMember: false
- sym.owner.internalName: Foo$
- ownerInternalName: Foo
- object Foo { def test() { } }
- sym.isStaticMember: false
- sym.owner.internalName: Foo$
- ownerInternalName: Foo (even though this doesn't exist yet!)
- object Foo { <static> def test() { } }
- sym.isStaticMember: true
- sym.owner.internalName: Foo$
- ownerInternalName: Foo$ (!)
Any `TraversableForwarder` method with the danger of returning `underlying` itself needs to go through `toList` (which marks the underlying list as needing to be copied on the next mutation). Notice that `toStream` is also affected since `List#toStream` builds the result lazily. Fixes scala/bug#11869
Thread the needle of static handle ownership
[2.12] Fix some tests on JDK 11
Update ASM to 7.3.1
REPL javap under JDK9+
Update ScalaCheck to 1.14.3
Export underlying on non-copying conversion
…Tupling remove tupling for foreach in keySet/values of immutable HashMap and TreeMap
dwijnand
approved these changes
Feb 5, 2020
|
Yeah, that's our tradition at least :-) The last one I did: #8650. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
motivation: get the ASM 7.3.1 upgrade (#8676) onto 2.13.x for testing in the community build
this was straightforward
with the exception of #8400 which I did not attempt to merge myself; I have asked Som to submit a forward-portEDIT: oh, it was already forward ported (#8486)