hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Jan 23 20:11:35 UTC 2019
Changeset: daf1ee5cff52
Author: mcimadamore
Date: 2019-01-23 21:11 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/daf1ee5cff52
Automatic merge with default
! .hgtags
! make/autoconf/flags-cflags.m4
! make/conf/jib-profiles.js
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
! src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
! src/hotspot/cpu/arm/nativeInst_arm_32.hpp
! src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
! src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
! src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
! src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
! src/hotspot/cpu/s390/codeBuffer_s390.hpp
! src/hotspot/cpu/sparc/nativeInst_sparc.hpp
! src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
! src/hotspot/cpu/x86/nativeInst_x86.hpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/os/aix/os_aix.inline.hpp
! src/hotspot/os/bsd/os_bsd.cpp
! src/hotspot/os/bsd/os_bsd.inline.hpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/linux/os_linux.hpp
! src/hotspot/os/linux/os_linux.inline.hpp
! src/hotspot/os/windows/os_windows.cpp
! src/hotspot/os/windows/os_windows.hpp
! src/hotspot/os/windows/os_windows.inline.hpp
! src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp
! src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
! src/hotspot/share/adlc/arena.hpp
! src/hotspot/share/c1/c1_LIR.hpp
! src/hotspot/share/ci/bcEscapeAnalyzer.cpp
! src/hotspot/share/ci/ciEnv.hpp
! src/hotspot/share/ci/ciMethodData.cpp
! src/hotspot/share/ci/ciMethodData.hpp
! src/hotspot/share/ci/ciObjectFactory.hpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/dictionary.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/javaClasses.inline.hpp
! src/hotspot/share/classfile/packageEntry.hpp
! src/hotspot/share/classfile/symbolTable.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeHeapState.cpp
! src/hotspot/share/code/compiledMethod.hpp
! src/hotspot/share/code/location.hpp
! src/hotspot/share/code/nmethod.hpp
! src/hotspot/share/code/relocInfo.hpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/compiler/compileTask.hpp
! src/hotspot/share/compiler/compilerOracle.hpp
! src/hotspot/share/compiler/methodLiveness.cpp
! src/hotspot/share/compiler/methodLiveness.hpp
! src/hotspot/share/gc/cms/cmsOopClosures.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/g1/dirtyCardQueue.hpp
- src/hotspot/share/gc/g1/evacuationInfo.hpp
! src/hotspot/share/gc/g1/g1Allocator.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.inline.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/blockOffsetTable.hpp
! src/hotspot/share/gc/shared/collectedHeap.cpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/gc/shared/collectedHeap.inline.hpp
! src/hotspot/share/gc/shared/gcPolicyCounters.hpp
! src/hotspot/share/gc/shared/gcTrace.hpp
! src/hotspot/share/gc/shared/parallelCleaning.hpp
! src/hotspot/share/gc/shared/ptrQueue.hpp
! src/hotspot/share/gc/shared/workerManager.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
! src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
! src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
! src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
! 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/shenandoah/shenandoahStrDedupQueue.cpp
! src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
! src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
! src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
! src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
! src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
! src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
! src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
! src/hotspot/share/interpreter/bytecodeTracer.hpp
! src/hotspot/share/interpreter/invocationCounter.hpp
! src/hotspot/share/interpreter/oopMapCache.hpp
! src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
! src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
! src/hotspot/share/jvmci/jvmciCompiler.cpp
! src/hotspot/share/jvmci/jvmciEnv.cpp
! src/hotspot/share/jvmci/jvmciEnv.hpp
! src/hotspot/share/logging/logDecorators.hpp
! src/hotspot/share/logging/logFileOutput.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/memory/allocation.hpp
! src/hotspot/share/memory/padded.hpp
! src/hotspot/share/memory/virtualspace.hpp
! src/hotspot/share/oops/arrayKlass.hpp
! 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/metadata.hpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/methodData.hpp
! src/hotspot/share/oops/objArrayKlass.hpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/oopsHierarchy.hpp
! src/hotspot/share/oops/symbol.hpp
! src/hotspot/share/oops/typeArrayKlass.hpp
! src/hotspot/share/opto/callnode.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/compile.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopPredicate.cpp
! src/hotspot/share/opto/loopTransform.cpp
! src/hotspot/share/opto/loopnode.hpp
! src/hotspot/share/opto/loopopts.cpp
! src/hotspot/share/opto/mulnode.hpp
! src/hotspot/share/opto/regmask.cpp
! src/hotspot/share/opto/regmask.hpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/compilationPolicy.cpp
! src/hotspot/share/runtime/compilationPolicy.hpp
! src/hotspot/share/runtime/deoptimization.hpp
! src/hotspot/share/runtime/flags/jvmFlag.hpp
! src/hotspot/share/runtime/frame.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/globals_extension.hpp
! src/hotspot/share/runtime/java.cpp
! src/hotspot/share/runtime/jniHandles.hpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/os.hpp
! src/hotspot/share/runtime/os.inline.hpp
! src/hotspot/share/runtime/osThread.hpp
! src/hotspot/share/runtime/stackValue.hpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/thread.inline.hpp
! src/hotspot/share/runtime/tieredThresholdPolicy.cpp
! src/hotspot/share/utilities/concurrentHashTable.hpp
! src/hotspot/share/utilities/concurrentHashTable.inline.hpp
! src/hotspot/share/utilities/constantTag.hpp
! src/hotspot/share/utilities/exceptions.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/io/PrintStream.java
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Long.java
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/constant/ClassDesc.java
! src/java.base/share/classes/java/lang/constant/ConstantUtils.java
! src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
! src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
! src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
! src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
! src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
! src/java.base/share/classes/java/math/BigDecimal.java
! src/java.base/share/classes/sun/nio/ch/Net.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/java.base/share/classes/sun/security/tools/keytool/Main.java
! src/java.base/share/conf/security/java.security
! src/java.base/share/lib/security/default.policy
! src/java.base/unix/native/libnet/net_util_md.c
! src/java.base/unix/native/libnio/ch/Net.c
- src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/SocketDispatcher.c
! src/java.base/windows/native/libnio/ch/Net.c
- src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
! src/java.compiler/share/classes/javax/lang/model/util/Elements.java
! src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
! src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
- src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java
- src/java.desktop/share/classes/sun/awt/TracedEventQueue.java
- src/java.desktop/share/classes/sun/awt/image/BadDepthException.java
! src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
! src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
! src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
! src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.cpp
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
! src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
! src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKeyStore.java
! src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
! 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.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
! test/hotspot/gtest/utilities/test_globalDefinitions.cpp
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/TestDriver.java
! test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/TestDriver.java
! test/hotspot/jtreg/vmTestbase/nsk/share/test/StressOptions.java
! test/jdk/ProblemList.txt
- test/jdk/java/lang/String/AlignIndent.java
! test/jdk/java/lang/constant/ClassDescTest.java
! test/jdk/java/lang/constant/CondyDescTest.java
! test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
! test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
- test/jdk/javax/net/ssl/compatibility/Parameter.java
- test/jdk/sun/security/util/Resources/NewNamesFormat.java
- test/jdk/sun/security/util/Resources/NewResourcesNames.java
! test/jdk/tools/launcher/ExecutionEnvironment.java
! test/jdk/tools/launcher/Test7029048.java
- test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLankmarkRegions.java
- test/langtools/tools/javac/RawStringLiteralLang.java
- test/langtools/tools/javac/RawStringLiteralLangAPI.java
- test/langtools/tools/javac/diags/examples/RawStringLiteral.java
More information about the amber-dev
mailing list