hg: amber/amber: manual merge with jep-334
vicente.romero at oracle.com
vicente.romero at oracle.com
Thu Oct 11 21:45:02 UTC 2018
Changeset: 74ee15ed51dc
Author: vromero
Date: 2018-10-11 14:29 -0700
URL: http://hg.openjdk.java.net/amber/amber/rev/74ee15ed51dc
manual merge with jep-334
! make/Images.gmk
- make/Jprt.gmk
! make/Main.gmk
! make/autoconf/jdk-options.m4
! make/autoconf/spec.gmk.in
! make/common/JavaCompilation.gmk
! make/common/NativeCompilation.gmk
- make/jprt.properties
! make/scripts/compare.sh
! src/hotspot/cpu/x86/interp_masm_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.hpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/signature.cpp
! src/hotspot/share/runtime/signature.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Enum.java
! src/java.base/share/classes/java/lang/constant/AsTypeMethodHandleDesc.java
! src/java.base/share/classes/java/lang/constant/ClassDesc.java
! src/java.base/share/classes/java/lang/constant/ConstantDescs.java
! src/java.base/share/classes/java/lang/constant/ConstantUtils.java
! src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.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/MethodHandleDesc.java
! src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
! src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
! src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java
! src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/hotspot/jtreg/ProblemList-cds-mode.txt
- test/hotspot/jtreg/jprt.config
- test/jaxp/javax/xml/jaxp/libs/jaxp/library/JarUtils.java
- test/jdk/com/sun/jdi/CatchPatternTest.sh
- test/jdk/com/sun/jdi/ImmutableResourceTest.sh
- test/jdk/com/sun/jdi/JITDebug.sh
- test/jdk/com/sun/jdi/PrivateTransportTest.sh
- test/jdk/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
- test/jdk/com/sun/jdi/redefine/RedefineSetUp.sh
- test/jdk/com/sun/jdi/redefineMethod/RedefineSetUp.sh
! test/jdk/java/lang/constant/SymbolicDescTest.java
! test/jdk/java/lang/constant/TypeDescriptorTest.java
- test/jdk/jprt.config
- test/jdk/lib/testlibrary/JarUtils.java
- test/jdk/sun/security/tools/keytool/autotest.sh
- test/jdk/sun/security/tools/keytool/standard.sh
More information about the amber-dev
mailing list