[aarch64-port-dev ] [RFR] [8u] 8u242-b02 & 8u242-b04 Upstream Sync

Roman Kennke rkennke at redhat.com
Wed Dec 18 14:23:29 UTC 2019


Hi Andrew,

> Webrevs: https://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/
> 
> This includes both the b02 and b04 merges. I'm not aware of an easy way
> to split them using webrev. Merge changesets for each are below.
> 
> b03 was empty, so can be ignored.
> 
> Merge changesets for b02:
> 
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/corba/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jaxp/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jaxws/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jdk/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/hotspot/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/langtools/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/nashorn/merge-b02.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/root/merge-b02.changeset
> 
> Merge changesets for b04:
> 
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/corba/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jaxp/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jaxws/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/jdk/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/hotspot/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/langtools/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/nashorn/merge-b04.changeset
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b04/root/merge-b04.changeset
> 
> Changes in aarch64-shenandoah-jdk8u242-b02:
>   - S8057986: freetype code to get glyph outline does not handle initial
> control point properly
>   - S8068736: Avoid synchronization on Executable/Field.declaredAnnotations
>   - S8073347: javadoc of Formattable messed up by JDK-8019857
>   - S8206173: MallocSiteTable::initialize() doesn't take function
> descriptors into account
>   - S8213568: Typo in java/awt/GraphicsEnvironment/LoadLock/GE_init5.java
>   - S8218558: NMT stack traces in output should show mt component for
> virtual memory allocations
>   - S8225101: Crash at sun.awt.X11.XlibWrapper.XkbGetUpdatedMap when
> change keybord map
>   - S8228888: C2 compilation fails with assert "m has strange control"
>   - S8229020: Failure on CPUs allowing loads reordering:
> assert(_tasks[t] == 1) failed: What else?
>   - S8229169: False failure of GenericTaskQueue::pop_local on
> architectures with weak memory model
>   - S8230363: C2: Let ConnectionGraph::not_global_escape(Node* n) return
> false if n is not in the CG
>   - S8231887: ComodoCA.java fails because certificate was revoked
>   - S8233839: aarch64: missing memory barrier in NewObjectArrayStub and
> NewTypeArrayStub
> 
> Changes in aarch64-shenandoah-jdk8u242-b04:
>   - S8048556: Unnecessary GCLocker-initiated young GCs
>   - S8073108: Use x86 and SPARC CPU instructions for GHASH acceleration
>   - S8130341: GHASH 32bit intrinsics has AEADBadTagException
>   - S8139178: Wrong fontMetrics when printing in Landscape (OpenJDK)
>   - S8146238: [macosx] Java2D Queue Flusher crash on OSX after switching
> between user accounts
>   - S8196681: Java Access Bridge logging and debug flags dynamically
> controlled
>   - S8204288: Matching the end of a string followed by an empty greedy
> regex and a word boundary fails
>   - S8204290: Add check to limit number of capture groups
>   - S8219914: Change the environment variable for Java Access Bridge
> logging to have a directory.
>   - S8225505: ctrl-F1 does not show the tooltip of a menu item (JMenuItems)
> 
> Main issues of note:
>   - 8233839 is already upstream:
> https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/rev/09d4b646f756
>   - There is an AArch64 part of JDK-8073108 which had to be omitted
> upstream. Martin Balao will post this for inclusion here once this is
> pushed.
> 
> diffstats for b02:
> 
> diffstat for root (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for corba (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for jaxp (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for jaxws (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for langtools (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for nashorn (b02)
>  b/.hgtags |    1 +
>  1 file changed, 1 insertion(+)
> 
> diffstat for jdk (b02)
>  b/.hgtags
>                 |    1
>  b/src/share/classes/java/lang/reflect/Executable.java
>                 |   35
>  b/src/share/classes/java/lang/reflect/Field.java
>                 |   33
>  b/src/share/classes/java/util/Formattable.java
>                 |   10
>  b/src/share/native/sun/font/freetypeScaler.c
>                 |  130 +-
>  b/src/solaris/classes/sun/awt/X11/XToolkit.java
>                 |   18
>  b/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java
>                 |    4
>  b/test/java/awt/font/GlyphVector/GlyphVectorOutline.java
>                 |   91 +
>  b/test/security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java |  504 +++++-----
>  9 files changed, 488 insertions(+), 338 deletions(-)
> 
> diffstat for hotspot (b02)
>  b/.hgtags                                        |    1
>  b/src/share/vm/opto/escape.cpp                   |    3 +
>  b/src/share/vm/opto/loopopts.cpp                 |    2
>  b/src/share/vm/services/allocationSite.hpp       |    5 +-
>  b/src/share/vm/services/mallocSiteTable.cpp      |   16 +++++--
>  b/src/share/vm/services/mallocSiteTable.hpp      |    8 ---
>  b/src/share/vm/services/memBaseline.cpp          |    6 +-
>  b/src/share/vm/services/memReporter.cpp          |   29 ++++++++-----
>  b/src/share/vm/services/memReporter.hpp          |    2
>  b/src/share/vm/services/virtualMemoryTracker.hpp |    4 -
>  b/src/share/vm/utilities/macros.hpp              |    8 +++
>  b/src/share/vm/utilities/taskqueue.hpp           |    5 ++
>  b/src/share/vm/utilities/workgroup.cpp           |    1
>  b/test/compiler/loopopts/StrangeControl.jasm     |   48
> ++++++++++++++++++++++
>  b/test/compiler/loopopts/TestStrangeControl.java |   49
> +++++++++++++++++++++++
>  15 files changed, 157 insertions(+), 30 deletions(-)
> 
> diffstats for b04:
> 
> diffstat for root (b04)
>  b/.hgtags |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diffstat for corba (b04)
>  b/.hgtags |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diffstat for jaxp (b04)
>  b/.hgtags |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diffstat for jaxws (b04)
>  b/.hgtags |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diffstat for langtools (b04)
>  b/.hgtags |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diffstat for nashorn (b04)
>  b/.hgtags
>      |    2
>  b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
>      |    2
>  b/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
>      |    1
>  b/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
>      |    3
>  b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java |    1
>  b/test/script/basic/JDK-8204288.js
>      |   35 ++++++++
>  b/test/script/basic/JDK-8204290.js
>      |   40 ++++++++++
>  7 files changed, 82 insertions(+), 2 deletions(-)
> 
> diffstat for jdk (b04)
>  b/.hgtags
>                                 |    2
>  b/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
>                                 |   11
>  b/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m
>                                 |   41
>  b/src/share/classes/com/sun/crypto/provider/GHASH.java
>                                 |  103 -
>  b/src/share/classes/javax/swing/ToolTipManager.java
>                                 |   49
>  b/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
>                                 |    9
>  b/src/share/native/sun/font/freetypeScaler.c
>                                 |   18
>  b/src/share/native/sun/java2d/opengl/OGLSurfaceData.c
>                                 |   12
>  b/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
>                                 |    6
>  b/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java
>                                 |    5
>  b/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
>                                 |   54
>  b/src/windows/classes/com/sun/java/accessibility/AccessBridge.java
>                                 |  405 ++--
>  b/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
>                                 |    6
>  b/src/windows/native/sun/bridge/AccessBridgeATInstance.cpp
>                                 |   26
>  b/src/windows/native/sun/bridge/AccessBridgeDebug.cpp
>                                 |   93 -
>  b/src/windows/native/sun/bridge/AccessBridgeDebug.h
>                                 |    4
>  b/src/windows/native/sun/bridge/AccessBridgeEventHandler.cpp
>                                 |   36
>  b/src/windows/native/sun/bridge/AccessBridgeJavaEntryPoints.cpp
>                                 |  896 ++++------
>  b/src/windows/native/sun/bridge/AccessBridgeJavaVMInstance.cpp
>                                 |   10
>  b/src/windows/native/sun/bridge/AccessBridgeMessageQueue.cpp
>                                 |   20
>  b/src/windows/native/sun/bridge/JavaAccessBridge.cpp
>                                 |  743 ++++----
>  b/src/windows/native/sun/bridge/WinAccessBridge.cpp
>                                 |  542 +++---
>  b/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
>                                 |   52
>  b/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java
>                                 |   92 -
>  b/test/java/awt/font/Rotate/RotatedFontMetricsTest.java
>                                 |   79
>  b/test/javax/swing/ToolTipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java |  144 +
>  26 files changed, 1919 insertions(+), 1539 deletions(-)
> 
> diffstat for hotspot (b04)
>  b/.hgtags
>     |    2
>  b/src/cpu/ppc/vm/vm_version_ppc.cpp
>     |    5
>  b/src/cpu/sparc/vm/assembler_sparc.hpp
>     |    8
>  b/src/cpu/sparc/vm/stubGenerator_sparc.cpp
>     |  128 ++++
>  b/src/cpu/sparc/vm/vm_version_sparc.cpp
>     |   11
>  b/src/cpu/x86/vm/assembler_x86.cpp
>     |    9
>  b/src/cpu/x86/vm/assembler_x86.hpp
>     |    2
>  b/src/cpu/x86/vm/stubGenerator_x86_32.cpp
>     |  170 +++++
>  b/src/cpu/x86/vm/stubGenerator_x86_64.cpp
>     |  176 ++++++
>  b/src/cpu/x86/vm/stubRoutines_x86.cpp
>     |    4
>  b/src/cpu/x86/vm/stubRoutines_x86.hpp
>     |    7
>  b/src/cpu/x86/vm/vm_version_x86.cpp
>     |   11
>  b/src/share/vm/classfile/vmSymbols.hpp
>     |    6
>  b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
>     |    6
>  b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp |    4
>  b/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
>     |   10
>  b/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
>     |   13
>  b/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
>     |    4
>  b/src/share/vm/memory/gcLocker.cpp
>     |   14
>  b/src/share/vm/memory/gcLocker.hpp
>     |    8
>  b/src/share/vm/memory/genCollectedHeap.cpp
>     |   24
>  b/src/share/vm/opto/escape.cpp
>     |    1
>  b/src/share/vm/opto/library_call.cpp
>     |   37 +
>  b/src/share/vm/opto/runtime.cpp
>     |   18
>  b/src/share/vm/opto/runtime.hpp
>     |    2
>  b/src/share/vm/runtime/globals.hpp
>     |    3
>  b/src/share/vm/runtime/stubRoutines.cpp
>     |    1
>  b/src/share/vm/runtime/stubRoutines.hpp
>     |    2
>  b/src/share/vm/runtime/vmStructs.cpp
>     |    1
>  b/test/compiler/7184394/TestAESBase.java
>     |   45 +
>  b/test/compiler/7184394/TestAESDecode.java
>     |    6
>  b/test/compiler/7184394/TestAESEncode.java
>     |    8
>  b/test/compiler/7184394/TestAESMain.java
>     |    7
>  b/test/gc/stress/gclocker/TestExcessGCLockerCollections.java
>     |  285 ++++++++++
>  34 files changed, 1006 insertions(+), 32 deletions(-)
> 
> Both merges were successfully built on x86, x86_64, s390, s390x, ppc,
> ppc64, ppc64le & aarch64.
> 
> Ok to push?

Looks good! Thanks!
Roman




More information about the aarch64-port-dev mailing list