hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Tue Jan 7 11:07:40 UTC 2020 

Changeset: 3d52b59f9738
Author:    mcimadamore
Date:      2020-01-07 11:07 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/3d52b59f9738

Automatic merge with default

- make/launcher/Launcher-jdk.pack.gmk
- make/lib/Lib-jdk.pack.gmk
- src/hotspot/share/gc/g1/survRateGroup.cpp
- src/hotspot/share/gc/g1/survRateGroup.hpp
- src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
- src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties
- src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java
- src/java.base/share/classes/java/time/overview.html
- src/java.base/share/classes/java/util/jar/Pack200.java
! src/java.base/share/classes/module-info.java
- src/java.base/share/classes/sun/security/util/math/intpoly/FieldGen.jsh
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP256.java
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP384.java
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP521.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P256OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P384OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P521OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/header.txt
- src/java.base/share/native/libjava/jdk_util.c
- src/jdk.compiler/share/classes/META-INF/services/com.sun.tools.javac.platform.PlatformProvider
- src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java
- src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
- src/jdk.pack/share/classes/module-info.java
- src/jdk.pack/share/man/pack200.1
- src/jdk.pack/share/man/unpack200.1
- src/jdk.pack/share/native/common-unpack/bands.cpp
- src/jdk.pack/share/native/common-unpack/bands.h
- src/jdk.pack/share/native/common-unpack/bytes.cpp
- src/jdk.pack/share/native/common-unpack/bytes.h
- src/jdk.pack/share/native/common-unpack/coding.cpp
- src/jdk.pack/share/native/common-unpack/coding.h
- src/jdk.pack/share/native/common-unpack/constants.h
- src/jdk.pack/share/native/common-unpack/defines.h
- src/jdk.pack/share/native/common-unpack/unpack.cpp
- src/jdk.pack/share/native/common-unpack/unpack.h
- src/jdk.pack/share/native/common-unpack/utils.cpp
- src/jdk.pack/share/native/common-unpack/utils.h
- src/jdk.pack/share/native/common-unpack/zip.cpp
- src/jdk.pack/share/native/common-unpack/zip.h
- src/jdk.pack/share/native/libunpack/jni.cpp
- src/jdk.pack/share/native/unpack200/main.cpp
- src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest
- test/hotspot/gtest/gc/z/test_zUtils.cpp
- test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java
- test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java
- test/jdk/java/lang/Runtime/Resources.java
- test/jdk/java/lang/Runtime/Version/Basic.java
- test/jdk/java/lang/Runtime/Version/VersionProps.java
- test/jdk/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java
- test/jdk/java/lang/Runtime/exec/BadEnvp.java
- test/jdk/java/lang/Runtime/exec/ConcurrentRead.java
- test/jdk/java/lang/Runtime/exec/Duped.java
- test/jdk/java/lang/Runtime/exec/ExecCommand.java
- test/jdk/java/lang/Runtime/exec/ExecEmptyString.java
- test/jdk/java/lang/Runtime/exec/ExecWithDir.java
- test/jdk/java/lang/Runtime/exec/ExecWithInput.java
- test/jdk/java/lang/Runtime/exec/ExecWithLotsOfArgs.java
- test/jdk/java/lang/Runtime/exec/ExitValue.java
- test/jdk/java/lang/Runtime/exec/LotsOfDestroys.java
- test/jdk/java/lang/Runtime/exec/LotsOfOutput.java
- test/jdk/java/lang/Runtime/exec/SetCwd.java
- test/jdk/java/lang/Runtime/exec/SleepyCat.java
- test/jdk/java/lang/Runtime/exec/Space.java
- test/jdk/java/lang/Runtime/exec/Status.java
- test/jdk/java/lang/Runtime/exec/StreamsSurviveDestroy.java
- test/jdk/java/lang/Runtime/exec/UnixCommands.java
- test/jdk/java/lang/Runtime/exec/WinCommand.java
- test/jdk/java/lang/Runtime/exec/setcwd.sh
- test/jdk/java/lang/Runtime/loadLibrary/LoadLibraryTest.java
- test/jdk/java/lang/Runtime/loadLibrary/src/Target.java
- test/jdk/java/lang/Runtime/loadLibrary/src/Target2.java
- test/jdk/java/lang/Runtime/shutdown/Basic.java
- test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.java
- test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.sh
- test/jdk/java/lang/Runtime/shutdown/ShutdownInterruptedMain.java
- test/jdk/java/util/jar/Pack200/SecurityTest.java
- test/jdk/javax/net/ssl/compatibility/JdkRelease.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
- test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java
- test/jdk/tools/jar/DeprecateOptionN.java
- test/jdk/tools/pack200/AttributeTests.java
- test/jdk/tools/pack200/BandIntegrity.java
- test/jdk/tools/pack200/CommandLineTests.java
- test/jdk/tools/pack200/DeprecatePack200.java
- test/jdk/tools/pack200/InstructionTests.java
- test/jdk/tools/pack200/ModuleAttributes.java
- test/jdk/tools/pack200/MultiRelease.java
- test/jdk/tools/pack200/Pack200Props.java
- test/jdk/tools/pack200/Pack200Test.java
- test/jdk/tools/pack200/PackChecksum.java
- test/jdk/tools/pack200/PackTestZip64.java
- test/jdk/tools/pack200/PackTestZip64Manual.java
- test/jdk/tools/pack200/PackageVersionTest.java
- test/jdk/tools/pack200/RepackTest.java
- test/jdk/tools/pack200/T7007157.java
- test/jdk/tools/pack200/TestExceptions.java
- test/jdk/tools/pack200/TestNormal.java
- test/jdk/tools/pack200/TimeStamp.java
- test/jdk/tools/pack200/UnpackerMemoryTest.java
- test/jdk/tools/pack200/Utils.java
- test/jdk/tools/pack200/badattr.jar
- test/jdk/tools/pack200/pack200-verifier/data/README
- test/jdk/tools/pack200/pack200-verifier/data/golden.jar
- test/jdk/tools/pack200/pack200-verifier/make/build.xml
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java
- test/jdk/tools/pack200/typeannos/Lambda.java
- test/jdk/tools/pack200/typeannos/Readme.txt
- test/jdk/tools/pack200/typeannos/TargetTypes.java
- test/jdk/tools/pack200/typeannos/TestTypeAnnotations.java
- test/jdk/tools/pack200/typeannos/TypeUseTarget.java

More information about the amber-dev mailing list