In light of https://bugs.openjdk.java.net/browse/JDK-8177845, I think it's fine to apply this webrev as is (wrt JVMCI/Graal changes anyway). I'll then adopt the changes into Graal and will rebase my 8177845 on them.
-Doug > On 7 Apr 2017, at 00:40, Igor Veresov <igor.vere...@oracle.com> wrote: > > Hi Alan, > > The changes to jdk.internal.vm.compiler will need to go to > https://github.com/graalvm/graal-core as well. For jdk10 we’re not doing > two-way merges when we pull a fresh version of graal. For jdk9 it’s ok > because we’re not going to refresh Graal there. Please coordinate with the > Labs. > > CCing Doug Simon. > > igor > > >> On Apr 4, 2017, at 9:28 AM, Alan Bateman <alan.bate...@oracle.com> wrote: >> >> As I mentioned on jigsaw-dev yesterday, we have accumulated a number of >> changes in the jake forest and would like to bring the changes into jdk9/dev >> for jdk-9+165. >> >> Most of the changes in this update are the move of Module and friends from >> java.lang.reflect to java.lang. This is mostly a mechanical update. >> >> We also have the update to the derivation of automatic modules to no longer >> ignore trailing digits in modules names, this is to align JDK 9 with the >> updated proposal for issue #VersionsInModuleNames [1]. >> >> There are a number of smaller changes, summarized in JDK-8177530 [2]. >> >> The webrev with the changes is here: >> http://cr.openjdk.java.net/~alanb/8177530/1 >> >> The changes are currently based on jdk-9+163 and will be rebased before >> pushing to jdk9/dev. >> >> The corresponding update to jtreg is already in the code-tools/jtreg repo >> and will be tagged (I assume as jtreg4.2-b07) before this integration. Once >> it is tagged then we'll rev'ing the requiredVersion in each TEST.ROOT. >> >> -Alan >> >> [1] >> http://openjdk.java.net/projects/jigsaw/spec/issues/#VersionsInModuleNames >> [2] https://bugs.openjdk.java.net/browse/JDK-8177530 >> >> >> >