hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Jan 18 21:07:27 UTC 2018


Changeset: 92dbb3eba42e
Author:    mcimadamore
Date:      2018-01-18 22:04 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/92dbb3eba42e

Automatic merge with default

! make/autoconf/generated-configure.sh
! make/autoconf/spec.gmk.in
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/java.compiler/share/classes/javax/lang/model/overview.html
- src/java.compiler/share/classes/javax/tools/FileManagerUtils.java
- src/java.compiler/share/classes/javax/tools/overview.html
- src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
- src/jdk.jdeps/share/classes/com/sun/tools/javap/overview.html
- src/jdk.unsupported/share/classes/sun/reflect/Reflection.java
- test/jdk/jdk/internal/reflect/Reflection/GetCallerClassWithDepth.java
- test/jdk/sun/reflect/Reflection/GetCallerClassWithDepth.java
- test/langtools/tools/javac/T8192885/AddGotoAfterForLoopToLNTTest.java



More information about the amber-dev mailing list