hg: panama/dev: Automatic merge with foreign

[maurizio.cimadamore at oracle.com]

Changeset: d5ba258b5854
Author:    mcimadamore
Date:      2019-09-11 22:10 +0000
URL:       https://hg.openjdk.java.net/panama/dev/rev/d5ba258b5854

Automatic merge with foreign

! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/sparc/sharedRuntime_sparc.cpp
! src/hotspot/cpu/x86/frame_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zArguments_linux_aarch64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zBackingFile_linux_aarch64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zBackingFile_linux_aarch64.hpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zBackingPath_linux_aarch64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zBackingPath_linux_aarch64.hpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zGlobals_linux_aarch64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zGlobals_linux_aarch64.hpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zPhysicalMemoryBacking_linux_aarch64.cpp
- src/hotspot/os_cpu/linux_aarch64/gc/z/zPhysicalMemoryBacking_linux_aarch64.hpp
- src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
- src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
- src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
- src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciObjectFactory.cpp
! src/hotspot/share/classfile/javaClasses.cpp
- src/hotspot/share/classfile/sharedPathsMiscInfo.cpp
- src/hotspot/share/classfile/sharedPathsMiscInfo.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeBlob.cpp
- src/hotspot/share/gc/g1/g1HeapSizingPolicy_ext.cpp
- src/hotspot/share/gc/parallel/gcTaskManager.cpp
- src/hotspot/share/gc/parallel/gcTaskManager.hpp
- src/hotspot/share/gc/parallel/gcTaskThread.cpp
- src/hotspot/share/gc/parallel/gcTaskThread.hpp
- src/hotspot/share/gc/parallel/pcTasks.cpp
- src/hotspot/share/gc/parallel/pcTasks.hpp
- src/hotspot/share/gc/parallel/psTasks.cpp
- src/hotspot/share/gc/parallel/psTasks.hpp
! src/hotspot/share/logging/logTag.hpp
- src/hotspot/share/logging/logTag_ext.hpp
- src/hotspot/share/oops/markOop.cpp
- src/hotspot/share/oops/markOop.hpp
- src/hotspot/share/oops/markOop.inline.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/callnode.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/runtime.hpp
! src/hotspot/share/prims/nativeLookup.cpp
! src/hotspot/share/prims/unsafe.cpp
- src/hotspot/share/runtime/arguments_ext.cpp
- src/hotspot/share/runtime/globals_ext.hpp
- src/hotspot/share/runtime/os_ext.hpp
! src/hotspot/share/runtime/sharedRuntime.cpp
! src/hotspot/share/runtime/sharedRuntime.hpp
! src/hotspot/share/runtime/stubRoutines.cpp
! src/hotspot/share/runtime/stubRoutines.hpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
! src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
! src/java.base/share/classes/jdk/internal/misc/Unsafe.java
- src/jdk.hotspot.agent/share/classes/META-INF/services/com.sun.jdi.connect.Connector
- test/hotspot/jtreg/serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java
- test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeArray.java
- test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeStringArray.java
- test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java
- test/jdk/java/lang/invoke/findclass.security.policy
- test/jdk/java/net/Socket/reset/Test.java
- test/jdk/java/nio/charset/coders/SJISMappingPropTest.java
- test/jdk/java/nio/charset/coders/SJISPropTest.java
- test/jdk/java/nio/charset/coders/ref.windows-31j
- test/jdk/java/security/testlibrary/CertUtils.java
- test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
- test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java