hg: panama/dev: manual merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Jul 5 10:54:08 UTC 2018


Changeset: 382460a0cd85
Author:    mcimadamore
Date:      2018-07-05 11:53 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/382460a0cd85

manual merge with default

! make/CompileJavaModules.gmk
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/opto/c2compiler.cpp
! src/hotspot/share/opto/escape.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
- test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTest.java
- test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTestAgent.java
- test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
- test/hotspot/jtreg/serviceability/sa/ClhsdbSymbolTable.java
- test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/java.base/java/util/ServiceConfigurationError.java
- test/jdk/sun/tools/jhsdb/AlternateHashingTest.java
- test/jdk/sun/tools/jhsdb/LingeredAppWithAltHashing.java



More information about the panama-dev mailing list