hg: valhalla/valhalla: Merge

[mandy.chung at oracle.com]

Changeset: b2325720e6e2
Author:    mchung
Date:      2020-01-17 12:03 -0800
URL:       https://hg.openjdk.java.net/valhalla/valhalla/rev/b2325720e6e2

Merge

! make/data/jdwp/jdwp.spec
- make/launcher/Launcher-jdk.pack.gmk
- make/lib/Lib-jdk.pack.gmk
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
! src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
! src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
! src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
! src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.hpp
! src/hotspot/share/aot/aotCodeHeap.cpp
! src/hotspot/share/ci/ciField.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoader.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionaryShared.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/include/jvm.h
- src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
! src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
! src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/heapInspection.hpp
! src/hotspot/share/memory/metaspace.cpp
! src/hotspot/share/memory/metaspace.hpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/arrayKlass.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/oops/klassVtable.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/opto/c2compiler.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiExport.cpp
! src/hotspot/share/prims/methodHandles.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- 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/lang/Class.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/java.base/share/classes/java/util/jar/Pack200.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
- src/java.base/share/classes/sun/net/idn/Punycode.java
- src/java.base/share/classes/sun/net/idn/StringPrep.java
- src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
- src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
- src/java.base/share/classes/sun/net/idn/UCharacterEnums.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/classes/sun/text/bidi/BidiBase.java
- src/java.base/share/classes/sun/text/bidi/BidiLine.java
- src/java.base/share/classes/sun/text/bidi/BidiRun.java
- src/java.base/share/classes/sun/text/bidi/BidiWriter.java
- src/java.base/share/classes/sun/text/normalizer/BMPSet.java
- src/java.base/share/classes/sun/text/normalizer/CharTrie.java
- src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
- src/java.base/share/classes/sun/text/normalizer/CodePointMap.java
- src/java.base/share/classes/sun/text/normalizer/CodePointTrie.java
- src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java
- src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
- src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
- src/java.base/share/classes/sun/text/normalizer/Normalizer2.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
- src/java.base/share/classes/sun/text/normalizer/OutputInt.java
- src/java.base/share/classes/sun/text/normalizer/Replaceable.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/Trie.java
- src/java.base/share/classes/sun/text/normalizer/Trie2.java
- src/java.base/share/classes/sun/text/normalizer/Trie2_16.java
- src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
- src/java.base/share/classes/sun/text/normalizer/UCharacter.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
- src/java.base/share/classes/sun/text/normalizer/UTF16.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java
- src/java.base/share/classes/sun/text/normalizer/Utility.java
- src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
- src/java.base/share/classes/sun/text/resources/nfc.nrm
- src/java.base/share/classes/sun/text/resources/nfkc.nrm
- src/java.base/share/classes/sun/text/resources/ubidi.icu
- src/java.base/share/classes/sun/text/resources/uprops.icu
! src/java.base/share/native/libjava/Class.c
! src/java.base/share/native/libjava/Reflection.c
- src/java.base/share/native/libjava/jdk_util.c
! src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
- 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/ProblemList.txt
- test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java
! test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
- test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java
- test/hotspot/jtreg/runtime/records/TEST.properties
! test/jdk/ProblemList.txt
- test/jdk/java/io/Serializable/records/TEST.properties
! test/jdk/java/lang/instrument/RedefineNestmateAttr/TestNestmateAttr.java
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/java/net/NetworkInterface/NoSetNetworkInterface.java
- test/jdk/java/util/jar/Pack200/SecurityTest.java
- test/jdk/javax/net/ssl/compatibility/JdkRelease.java
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.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/sun/security/krb5/auto/SaslGSS.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