hg: panama/dev: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Dec 12 21:03:55 UTC 2018
Changeset: 4925a094dffc
Author: mcimadamore
Date: 2018-12-12 22:09 +0100
URL: http://hg.openjdk.java.net/panama/dev/rev/4925a094dffc
Automatic merge with default
! make/CompileJavaModules.gmk
- make/scripts/pandoc-manpage-filter.js
- make/scripts/pandoc-manpage-filter.sh.template
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeCache.hpp
- src/hotspot/share/gc/cms/vmCMSOperations.cpp
- src/hotspot/share/gc/cms/vmCMSOperations.hpp
- src/hotspot/share/gc/g1/vm_operations_g1.cpp
- src/hotspot/share/gc/g1/vm_operations_g1.hpp
- src/hotspot/share/gc/parallel/vmPSOperations.cpp
- src/hotspot/share/gc/parallel/vmPSOperations.hpp
- src/hotspot/share/gc/shared/vmGCOperations.cpp
- src/hotspot/share/gc/shared/vmGCOperations.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/opto/type.hpp
! src/hotspot/share/prims/unsafe.cpp
- src/hotspot/share/runtime/vm_operations.cpp
- src/hotspot/share/runtime/vm_operations.hpp
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/DefaultTerminal2.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/OSvTerminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal2.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/WCWidth.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AnsiStringsCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/extra/AnsiInterpretingOutputStream.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Ansi.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Curses.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InfoCmp.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java
- src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java
- src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/test/ea/AtomicVirtualizationTests.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/PrintStreamOptionKey.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ComputeObjectAddressNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GetObjectAddressNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyCallNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyWithSlowPathNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/alloc/trace/TraceGlobalMoveResolutionMappingTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/DefaultTraceRegisterAllocationPolicy.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessAnalysisPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessInfo.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/ShadowedRegisterValue.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAllocationPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAssertions.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceBuilderPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolver.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPolicy.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceUtil.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TrivialTraceAllocator.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/bu/BottomUpAllocator.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedInterval.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedRange.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/IntervalHint.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/RegisterVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceInterval.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAllocationPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAssignLocationsPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanEliminateSpillMovePhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanLifetimeAnalysisPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanRegisterAllocationPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanResolveDataFlowPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanWalker.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/ControlFlowGraphState.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceBuilderBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceLSRAIntervalBuildingBench.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyBailoutUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyCallerSensitiveMethods.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyDebugUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyGetOptionsUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyGraphAddUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyInstanceOfUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUpdateUsages.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUsageWithEquals.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyVirtualizableUsage.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9_11.test/src/org/graalvm/compiler/replacements/jdk9_11/test/UnsafeObjectReplacementsTest.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png
- test/hotspot/jtreg/compiler/graalunit/Replacements9_11Test.java
- test/hotspot/jtreg/gc/epsilon/CriticalNativeArgs.java
- test/hotspot/jtreg/gc/epsilon/CriticalNativeStress.java
- test/hotspot/jtreg/gc/epsilon/libCriticalNative.c
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/TEST.properties
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network001.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network002.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network003.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network004.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network005.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network006.java
- test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh
- test/jdk/jdk/internal/jline/console/StripAnsiTest.java
- test/jdk/jdk/internal/jline/extra/AnsiInterpretingOutputStreamTest.java
- test/jdk/jdk/internal/jline/extra/HistoryTest.java
- test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz
- test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256
- test/jdk/sun/text/IntHashtable/Bug4170614Test.sh
- test/jdk/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java
More information about the panama-dev
mailing list