hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: ed420ea71310
Author:    mcimadamore
Date:      2017-09-25 16:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/ed420ea71310

Automatic merge with default

! make/Bundles.gmk
! make/CopyImportModules.gmk
! make/CreateBuildJdkCopy.gmk
! make/CreateJmods.gmk
! make/Docs.gmk
! make/GenerateLinkOptData.gmk
! make/Images.gmk
! make/Init.gmk
! make/InitSupport.gmk
! make/Jprt.gmk
! make/MacBundles.gmk
! make/Main.gmk
! make/MainSupport.gmk
! make/ReleaseFile.gmk
! make/RunTests.gmk
! make/autoconf/Makefile.in
! make/autoconf/basics.m4
! make/autoconf/basics_windows.m4
! make/autoconf/boot-jdk.m4
! make/autoconf/bootcycle-spec.gmk.in
! make/autoconf/buildjdk-spec.gmk.in
! make/autoconf/compare.sh.in
! make/autoconf/flags.m4
! make/autoconf/generated-configure.sh
! make/autoconf/help.m4
! make/autoconf/jdk-options.m4
! make/autoconf/source-dirs.m4
! make/autoconf/spec.gmk.in
! make/autoconf/toolchain.m4
! make/common/JarArchive.gmk
! make/common/MakeBase.gmk
! make/common/NativeCompilation.gmk
! make/common/ZipArchive.gmk
! make/copy/Copy-java.base.gmk
! make/devkit/Makefile
! make/devkit/Tools.gmk
! make/gensrc/Gensrc-jdk.charsets.gmk
! make/gensrc/GensrcIcons.gmk
! make/hotspot/ide/CreateVSProject.gmk
! make/langtools/intellij/langtools.iml
! make/scripts/compare.sh
! make/test/JtregNativeHotspot.gmk
! make/test/JtregNativeJdk.gmk
! 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/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciReplay.cpp
! src/hotspot/share/ci/ciStreams.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/interpreter/bytecode.cpp
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/interpreter/bytecodeTracer.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/interpreter/linkResolver.hpp
! src/hotspot/share/interpreter/rewriter.cpp
! src/hotspot/share/interpreter/templateTable.cpp
! src/hotspot/share/interpreter/templateTable.hpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/oops/generateOopMap.cpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/prims/jvm.h
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/signature.cpp
! src/hotspot/share/runtime/signature.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/constantTag.cpp
! src/hotspot/share/utilities/constantTag.hpp
! src/hotspot/share/utilities/exceptions.cpp
! src/hotspot/share/utilities/exceptions.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/lang/invoke/CallSite.java
! src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/package-info.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
! src/java.base/share/native/libjli/java.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java
! src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
! src/sample/nashorn/java_completion.js
! test/jdk/java/lang/invoke/CallSiteTest.java
! test/jdk/java/lang/invoke/CallStaticInitOrder.java
! test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java
! test/jdk/java/lang/invoke/MethodHandleConstants.java