hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Tue Mar 26 19:40:42 UTC 2019


Changeset: 158efa324ed9
Author:    vromero
Date:      2019-03-26 15:40 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/158efa324ed9

manual merge with default

! .hgtags
! make/CompileJavaModules.gmk
! make/conf/jib-profiles.js
- make/devkit/createMacosxDevkit6.sh
- make/devkit/createMacosxDevkit9.sh
- make/devkit/createWindowsDevkit2013.sh
- make/devkit/createWindowsDevkit2015.sh
! make/test/JtregGraalUnit.gmk
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/os/bsd/os_bsd.cpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/linux/os_linux.hpp
! src/hotspot/os/windows/os_windows.cpp
- src/hotspot/os_cpu/linux_aarch64/linux_aarch64.ad
- src/hotspot/os_cpu/linux_sparc/linux_sparc.ad
! src/hotspot/share/ci/bcEscapeAnalyzer.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/dictionary.hpp
- src/hotspot/share/classfile/dictionary.inline.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/javaClasses.inline.hpp
! src/hotspot/share/code/compiledMethod.hpp
! src/hotspot/share/code/nmethod.hpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/compiler/compileTask.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
! src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp
! src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp
! src/hotspot/share/gc/shared/barrierSet.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/gc/shared/gcPolicyCounters.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
! src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
- src/hotspot/share/gc/z/zAddressRangeMap.hpp
- src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/symbol.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopTransform.cpp
! src/hotspot/share/opto/regmask.cpp
! src/hotspot/share/opto/regmask.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/compilationPolicy.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/os.hpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/tieredThresholdPolicy.cpp
- src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java
- src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManager.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
- src/java.base/share/classes/com/sun/net/ssl/SSLContext.java
- src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java
- src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java
- src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
- src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java
- src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
- src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
- src/java.base/share/classes/com/sun/net/ssl/package-info.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/BaseStructure.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Marshaller.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XmlWriter.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XmlWriterToTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMaths.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/IntegerExactOpSpeculation.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c
! test/jdk/ProblemList.txt
- test/jdk/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ProviderTest.java
- test/jdk/com/sun/net/ssl/SSLSecurity/TruncateArray.java
- test/jdk/javax/net/ssl/FixingJavadocs/ComURLNulls.java
- test/jdk/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java
- test/jdk/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
- test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
- test/jdk/sun/security/ssl/X509TrustManagerImpl/ClientServer.java
! test/jdk/tools/launcher/Test7029048.java
- test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java
- test/langtools/jdk/javadoc/tool/removeOldDoclet/OldDoclet.jasm
- test/langtools/tools/javac/doclint/ImplicitHeadersTest.java



More information about the amber-dev mailing list