Preliminary & experimental support for... [ci: last-only] #7218

adriaanm · 2018-09-14T14:36:10Z

... JPMS module access checks :-)

This will only be available in nightly builds (produced on jdk11), under -Yjpms. This also shows a path for future jdk11-specific features and how we might ship them before we bump our required Java version.

The PR is in rough shape, but it works for simple stuff. Putting this out there to facilitate discussion.

@retronym did most of the work, I just refactored until my paranoia of not affecting normal compiler operation was satisfied.

We wanted to have the basics in place before RC1, but we won't have time to refine or develop new functionality until later in the 2.13.x series.

do jpms lazily per unit, rather than forcing all units

Will only be available in the jdk11 preview nightly builds of the compiler, unlock with -Yjpms. ``` class C { sun.misc.Unsafe.getUnsafe } ``` ``` $ scalac -Yjpms --module-path . /Users/adriaan/Library/Preferences/IdeaIC2018.2/scratches/scratch_49.scala /Users/adriaan/Library/Preferences/IdeaIC2018.2/scratches/scratch_49.scala:2: error: class Unsafe in package misc cannot be accessed in package sun.misc sun.misc.Unsafe.getUnsafe ^ one error found ```

adriaanm · 2018-09-14T16:48:19Z

Test Result (8 failures / +3)
scala.lang.stringinterpol.StringContextTest.initializationError
scala.tools.nsc.symtab.FreshNameExtractorTest.initializationError
scala.tools.testing.AssertThrowsTest.initializationError
test.files.run_.global-showdef.scala
test.files.run_.t6240-universe-code-gen.scala
test.files.run_.t6502.scala
test.files.run_.t8015-ffc.scala
test.macro-annot.run_.repl

smarter · 2018-09-15T01:39:22Z

How come all of scala.reflect.internal.jpms is written in Java and not Scala ?

retronym · 2018-09-15T21:40:06Z

I wanted to make it possible to host that code in an external build, built with Java (9) only like Scala-asm, and then incorporate it into Scala-compiler.jar

xuwei-k · 2018-09-23T13:29:55Z

src/library/scala/collection/StringOps.scala

    linesWithSeparators map (_.stripLineEnd)

+  @deprecated("Use linesIterator. JDK 11 introduces its own lines method on String", "2.13.0-M5")


2.13.0-RC1 or 2.13.0 ?

Yes, should be RC1 now :-) I'll move these commits to their own PR.

we normally just put "2.13.0" so we don't have to keep changing it

retronym · 2018-10-23T00:02:15Z

src/compiler-jdk11/scala/tools/nsc/jpms/JpmsClassPath.scala

+
+  private val fileManager = impl.getFileManager
+  private def locationAsPaths(location: StandardLocation): IndexedSeq[Path] = getLocationAsPaths(fileManager, location).asScala.toVector
+  private val packageIndex = mutable.AnyRefMap[String, PackageEntryImpl]()


retronym · 2018-10-23T00:10:12Z

src/compiler-jdk11/scala/tools/nsc/jpms/JpmsClassPath.scala

+            }
+          }
+        }
+      }


We need an else branch for JARs on the module path, for which path is the .jar file.

I think the right approach is to index the package structure of the JARs eagerly, then use that index here.

WIP: https://github.com/retronym/scala/tree/review/jdk11

The indexing in that branch could be improved to be hierarchical.

To test:

$ cat sandbox/test.scala class Test { println(org.apache.commons.io.IOUtils.EOF) } $ ./build/quick/bin/scala -nobootcp -Yjpms -modulepath $(coursier fetch -q -p commons-io:commons-io:2.6) -addmodules:org.apache.commons.io -addreads:org.apache.commons.io=ALL-UNNAMED

retronym · 2018-10-23T00:39:44Z

We should make it possible for tools like Zinc to see inside PlainNioFile to get at the underlying nio.file.Path. We should also implement PlainNioFile.underlyingSource to get to the underlying JAR file.

Sketch:

scala> def pathOfNioPath(f: scala.reflect.io.AbstractFile) = { val fld = f.getClass.getDeclaredField("nioPath"); fld.setAccessible(true); fld.get(f).asInstanceOf[java.nio.file.Path] }
pathOfNioPath: (f: scala.reflect.io.AbstractFile)java.nio.file.Path
scala> val assocFile = rootMirror.getRequiredClass("org.apache.commons.io.IOUtils").initialize.associatedFile
assocFile: scala.reflect.io.AbstractFile = /org/apache/commons/io/IOUtils.class
scala> val assocNioPath = pathOfNioPath(assocFile)
assocNioPath: java.nio.file.Path = /org/apache/commons/io/IOUtils.class
scala> assocNioPath.getFileSystem.provider.getScheme
res74: String = jar
scala> assocNioPath.getFileSystem.getFileStores.iterator.next.name
res83: String = /Users/jz/.coursier/cache/v1/https/repo1.maven.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.jar/

adriaanm · 2020-10-06T07:30:42Z

Itsy-bitsy will rise again.

retronym and others added 8 commits September 14, 2018 16:24

tweaks unrelated to jpms?

d2503a6

Use linesIterator so that we compile on jdk11

4cceb24

deprecate StringOps:lines (already in PR queue?)

38da832

jpms basics

bcd269b

tighten access, optimize imports

aa4b857

Parse jpms module-info.java

0e06e57

do jpms lazily per unit, rather than forcing all units

toJava

e14723c

basics

82882d9

adriaanm added the WIP label Sep 14, 2018

scala-jenkins added this to the 2.13.0-RC1 milestone Sep 14, 2018

adriaanm force-pushed the topic/jpms branch from 00d9681 to fc3708b Compare September 14, 2018 15:01

xuwei-k reviewed Sep 23, 2018

View reviewed changes

FibreFoX mentioned this pull request Oct 2, 2018

Does not compile using JDK 10 or above Yubico/java-webauthn-server#4

Closed

retronym reviewed Oct 23, 2018

View reviewed changes

retronym mentioned this pull request Oct 24, 2018

Keep track of java dependencies in JDK versions > 8 sbt/zinc#609

Open

adriaanm modified the milestones: 2.13.0-RC1, 2.13.1 Jan 24, 2019

retronym mentioned this pull request Feb 22, 2019

Publicise PlainNioFile and implement underlyingSource #7782

Merged

eed3si9n modified the milestones: 2.13.1, 2.13.2 Aug 13, 2019

lrytz modified the milestones: 2.13.2, 2.13.3 Jan 31, 2020

SethTisue marked this pull request as draft May 8, 2020 02:16

SethTisue removed the WIP label May 8, 2020

SethTisue modified the milestones: 2.13.3, 2.13.4 May 12, 2020

adriaanm closed this Oct 6, 2020

SethTisue removed this from the 2.13.4 milestone Oct 6, 2020

GedMarc mentioned this pull request Feb 26, 2022

add Automatic-Module-Name FasterXML/jackson-module-scala#569

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Preliminary & experimental support for... [ci: last-only] #7218

Preliminary & experimental support for... [ci: last-only] #7218

Uh oh!

adriaanm commented Sep 14, 2018

Uh oh!

adriaanm commented Sep 14, 2018

Uh oh!

smarter commented Sep 15, 2018

Uh oh!

retronym commented Sep 15, 2018 via email

Uh oh!

xuwei-k Sep 23, 2018

Uh oh!

adriaanm Sep 23, 2018

Uh oh!

SethTisue Sep 25, 2018

Uh oh!

retronym Oct 23, 2018

Uh oh!

retronym Oct 23, 2018 •

edited

Loading

Uh oh!

retronym commented Oct 23, 2018

Uh oh!

adriaanm commented Oct 6, 2020

Uh oh!

Uh oh!

		linesWithSeparators map (_.stripLineEnd)

		@deprecated("Use linesIterator. JDK 11 introduces its own lines method on String", "2.13.0-M5")

Preliminary & experimental support for... [ci: last-only] #7218

Preliminary & experimental support for... [ci: last-only] #7218

Uh oh!

Conversation

adriaanm commented Sep 14, 2018

Uh oh!

adriaanm commented Sep 14, 2018

Uh oh!

smarter commented Sep 15, 2018

Uh oh!

retronym commented Sep 15, 2018 via email

Uh oh!

xuwei-k Sep 23, 2018

Choose a reason for hiding this comment

Uh oh!

adriaanm Sep 23, 2018

Choose a reason for hiding this comment

Uh oh!

SethTisue Sep 25, 2018

Choose a reason for hiding this comment

Uh oh!

retronym Oct 23, 2018

Choose a reason for hiding this comment

Uh oh!

retronym Oct 23, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

retronym commented Oct 23, 2018

Uh oh!

adriaanm commented Oct 6, 2020

Uh oh!

Uh oh!

retronym Oct 23, 2018 •

edited

Loading