[RFR] jdk9.0.4+12 + functionality

Tue Apr 10 08:48:14 UTC 2018

Perhaps I am doing it wrong.

I am doing (from jdk9/hotspot)

hg import ../../jdk9u-updates/hotspot.changeset

and I get

applying ../../jdk9u-updates/hotspot.changeset
patching file .hgtags
committing files:
.hgtags
committing manifest
committing changelog
created 8ee6424c1f82
warning: import the patch as a normal revision
(use --exact to import the patch as a merge)
patching file .hgtags
committing files:
.hgtags
committing manifest
committing changelog
created 23e571cd5f5a
patching file .hgtags
committing files:
.hgtags
committing manifest
committing changelog
created f63eef9ecae1
patching file src/cpu/aarch64/vm/templateTable_aarch64.cpp
committing files:
src/cpu/aarch64/vm/templateTable_aarch64.cpp
committing manifest
committing changelog
created de0d569365b1
patching file src/share/vm/opto/library_call.cpp
patching file
test/compiler/intrinsics/string/TestStringConstruction.java
adding test/compiler/intrinsics/string/TestStringConstruction.java
committing files:
src/share/vm/opto/library_call.cpp
test/compiler/intrinsics/string/TestStringConstruction.java
committing manifest
committing changelog
created 92e88c3da499
patching file src/share/vm/c1/c1_LIRAssembler.cpp
patching file src/share/vm/c1/c1_Runtime1.cpp
committing files:
src/share/vm/c1/c1_LIRAssembler.cpp
src/share/vm/c1/c1_Runtime1.cpp
committing manifest
committing changelog
created b9548fdcc87f
patching file src/share/vm/code/debugInfoRec.cpp
committing files:
src/share/vm/code/debugInfoRec.cpp
committing manifest
committing changelog
created 6716cb928233
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Compilati
onResult.java
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Infopoint
Reason.java
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Hot
SpotCompiledCode.java
patching file src/share/vm/jvmci/jvmciCodeInstaller.cpp
patching file src/share/vm/jvmci/jvmciCodeInstaller.hpp
patching file src/share/vm/jvmci/jvmciJavaClasses.hpp
committing files:
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Compilati
onResult.java
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Infopoint
Reason.java
src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Hot
SpotCompiledCode.java
src/share/vm/jvmci/jvmciCodeInstaller.cpp
src/share/vm/jvmci/jvmciCodeInstaller.hpp
src/share/vm/jvmci/jvmciJavaClasses.hpp
committing manifest
committing changelog
created f4fb2c58c022
patching file src/share/vm/opto/c2_globals.hpp
Hunk #1 succeeded at 745 (offset 1 lines).
patching file src/share/vm/opto/compile.cpp
patching file src/share/vm/opto/node.cpp
patching file src/share/vm/opto/node.hpp
patching file src/share/vm/opto/phase.cpp
patching file src/share/vm/opto/phase.hpp
patching file src/share/vm/opto/phaseX.cpp
patching file src/share/vm/opto/phaseX.hpp
committing files:
src/share/vm/opto/c2_globals.hpp
src/share/vm/opto/compile.cpp
src/share/vm/opto/node.cpp
src/share/vm/opto/node.hpp
src/share/vm/opto/phase.cpp
src/share/vm/opto/phase.hpp
src/share/vm/opto/phaseX.cpp
src/share/vm/opto/phaseX.hpp
committing manifest
committing changelog
created 1f0577cfe549
warning: import the patch as a normal revision
(use --exact to import the patch as a merge)
patching file src/cpu/aarch64/vm/templateTable_aarch64.cpp
Hunk #1 FAILED at 385
Hunk #2 FAILED at 3315
Hunk #3 FAILED at 3459
Hunk #4 FAILED at 3513
4 out of 4 hunks FAILED -- saving rejects to file
src/cpu/aarch64/vm/templateTable_aarch64.cpp.rej
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Compilati
onResult.java
Hunk #1 FAILED at 869
1 out of 1 hunks FAILED -- saving rejects to file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Compilati
onResult.java.rej
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Infopoint
Reason.java
Hunk #1 FAILED at 25
1 out of 1 hunks FAILED -- saving rejects to file
src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Infopoint
Reason.java.rej
patching file
src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Hot
SpotCompiledCode.java
Hunk #1 FAILED at 23
Hunk #2 FAILED at 40
Hunk #3 FAILED at 154
Hunk #4 FAILED at 175
4 out of 4 hunks FAILED -- saving rejects to file
src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Hot
SpotCompiledCode.java.rej
patching file src/share/vm/c1/c1_LIRAssembler.cpp
Hunk #1 FAILED at 35
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/c1/c1_LIRAssembler.cpp.rej
patching file src/share/vm/c1/c1_Runtime1.cpp
Hunk #1 FAILED at 1162
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/c1/c1_Runtime1.cpp.rej
patching file src/share/vm/code/debugInfoRec.cpp
Hunk #1 FAILED at 32
Hunk #2 succeeded at 46 with fuzz 2 (offset 3 lines).
Hunk #3 FAILED at 286
Hunk #4 FAILED at 298
Hunk #5 FAILED at 313
4 out of 5 hunks FAILED -- saving rejects to file
src/share/vm/code/debugInfoRec.cpp.rej
patching file src/share/vm/jvmci/jvmciCodeInstaller.cpp
Hunk #1 FAILED at 726
Hunk #2 FAILED at 867
Hunk #3 FAILED at 989
Hunk #4 FAILED at 999
Hunk #5 FAILED at 1027
5 out of 5 hunks FAILED -- saving rejects to file
src/share/vm/jvmci/jvmciCodeInstaller.cpp.rej
patching file src/share/vm/jvmci/jvmciCodeInstaller.hpp
Hunk #1 FAILED at 218
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/jvmci/jvmciCodeInstaller.hpp.rej
patching file src/share/vm/jvmci/jvmciJavaClasses.hpp
Hunk #1 FAILED at 147
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/jvmci/jvmciJavaClasses.hpp.rej
patching file src/share/vm/opto/c2_globals.hpp
Hunk #1 FAILED at 743
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/opto/c2_globals.hpp.rej
patching file src/share/vm/opto/compile.cpp
Hunk #1 succeeded at 2172 with fuzz 2 (offset 14 lines).
patching file src/share/vm/opto/library_call.cpp
Hunk #1 FAILED at 151
Hunk #2 FAILED at 203
Hunk #3 succeeded at 940 with fuzz 2 (offset 41 lines).
Hunk #4 FAILED at 1040
Hunk #5 FAILED at 1048
Hunk #6 FAILED at 1148
Hunk #7 FAILED at 1242
Hunk #8 FAILED at 1280
Hunk #9 succeeded at 1358 with fuzz 2 (offset 53 lines).
Hunk #10 FAILED at 1360
Hunk #11 FAILED at 1378
Hunk #12 FAILED at 1388
Hunk #13 FAILED at 1443
Hunk #14 FAILED at 1459
12 out of 14 hunks FAILED -- saving rejects to file
src/share/vm/opto/library_call.cpp.rej
patching file src/share/vm/opto/node.cpp
Hunk #1 FAILED at 315
Hunk #2 FAILED at 334
Hunk #3 FAILED at 346
Hunk #4 FAILED at 360
Hunk #5 FAILED at 376
Hunk #6 FAILED at 394
Hunk #7 FAILED at 415
Hunk #8 FAILED at 438
8 out of 8 hunks FAILED -- saving rejects to file
src/share/vm/opto/node.cpp.rej
patching file src/share/vm/opto/node.hpp
Hunk #1 FAILED at 292
1 out of 1 hunks FAILED -- saving rejects to file
src/share/vm/opto/node.hpp.rej
patching file src/share/vm/opto/phase.cpp
Hunk #1 FAILED at 76
Hunk #2 FAILED at 87
2 out of 2 hunks FAILED -- saving rejects to file
src/share/vm/opto/phase.cpp.rej
patching file src/share/vm/opto/phase.hpp
Hunk #1 FAILED at 41
Hunk #2 FAILED at 72
2 out of 2 hunks FAILED -- saving rejects to file
src/share/vm/opto/phase.hpp.rej
patching file src/share/vm/opto/phaseX.cpp
Hunk #1 FAILED at 405
Hunk #2 succeeded at 520 with fuzz 1 (offset 76 lines).
1 out of 2 hunks FAILED -- saving rejects to file
src/share/vm/opto/phaseX.cpp.rej
patching file src/share/vm/opto/phaseX.hpp
Hunk #1 FAILED at 147
Hunk #2 FAILED at 161
Hunk #3 FAILED at 186
3 out of 3 hunks FAILED -- saving rejects to file
src/share/vm/opto/phaseX.hpp.rej
patching file
test/compiler/intrinsics/string/TestStringConstruction.java
file test/compiler/intrinsics/string/TestStringConstruction.java
already exists
1 out of 1 hunks FAILED -- saving rejects to file
test/compiler/intrinsics/string/TestStringConstruction.java.rej
transaction abort!
rollback completed
abort: patch failed to apply

On Tue, 2018-04-10 at 07:42 +0000, Andrey Petushkov wrote:
> Hi Ed,
> 
> That was http://hg.openjdk.java.net/aarch32-port/jdk9/
> Indeed you're right but I have no idea why that has happened, I just
> pulled from http://hg.openjdk.java.net/jdk-updates/jdk9u/ and merged.
> Both went flawlessly. I'll redo the operation and check if the
> problem persists. (And sorry, I just don't want to run webrev again,
> it took about 2 days to complete!)
> 
> Thanks,
> Andrey
> 
> On Mon, Apr 9, 2018 at 11:42 PM Edward Nevill <edward.nevill at gmail.co
> m> wrote:
> > Hi Andrey,
> > 
> > What repo are these changesets based on?
> > 
> > I have tried
> > 
> > http://hg.openjdk.java.net/aarch32-port/jdk9/
> > 
> > and
> > 
> > http://hg.openjdk.java.net/aarch32-port/jdk9-arm3264/
> > 
> > But the changesets don't seem to apply cleanly.
> > 
> > All the best,
> > Ed.
> > 
> > On Mon, 2018-04-09 at 17:42 +0300, Andrey Petushkov wrote:
> > > Dear All,
> > >
> > > There are the following changes proposed for review and commit
> > into
> > > aarch32-jdk9 repo set:
> > > - update to the latest jdk9u state:
> > > http://cr.openjdk.java.net/~apetushkov/aarch32jdk9.0.4%2b12/
> > <http://
> > > cr.openjdk.java.net/~apetushkov/aarch32jdk9.0.4+12/>
> > > (2Gbyte webrev, not something you really want to look into)
> > > - bring all functionality developed by Azul in course of jdk8
> > > projects
> > > http://cr.openjdk.java.net/~apetushkov/aarch32jdk9-azul/ <http://
> > cr.o
> > > penjdk.java.net/~apetushkov/aarch32jdk9-azul/>
> > > almost everything is already part of aarch32-jdk8u repo, although
> > > we’ve been lagging behind with a few features (primarily c2 and
> > > crypto intrinsics). We’re apologising for that. And, again, sorry
> > for
> > > brining this in a typical manner of 10K line patch. The reason is
> > > that we were not following regular jdk9 development and only
> > recently
> > > brought out code in line with java 9. So there was no set of
> > > meaningful changes even internally to Azul but rather something
> > close
> > > to what you can see at the link above
> > >