hg: amber/amber: merge with default

[vicente.romero at oracle.com]

Changeset: bec646ff7f36
Author:    vromero
Date:      2018-04-05 12:07 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/bec646ff7f36

merge with default

! make/CompileJavaModules.gmk
! make/Docs.gmk
! make/Images.gmk
! make/InitSupport.gmk
! make/Main.gmk
! make/RunTests.gmk
! make/autoconf/basics.m4
! make/autoconf/boot-jdk.m4
! make/autoconf/flags.m4
! make/autoconf/help.m4
! make/autoconf/spec.gmk.in
! make/autoconf/toolchain.m4
! make/common/MakeBase.gmk
! make/common/NativeCompilation.gmk
- make/data/x11wrappergen/functions.txt
- make/data/x11wrappergen/sizes.32
- make/data/x11wrappergen/sizes.64
- make/data/x11wrappergen/sizes.64-solaris-i386
! make/devkit/Makefile
! make/devkit/Tools.gmk
- make/devkit/createSolarisDevkit.sh
- make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c
- make/lib/LibosxLibraries.gmk
- make/lib/NetworkingLibraries.gmk
- make/lib/NioLibraries.gmk
- make/lib/PlatformLibraries.gmk
- make/lib/SecurityLibraries.gmk
! 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/ci/ciEnv.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/parallel/cardTableExtension.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.hpp
- src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp
! src/hotspot/share/interpreter/bytecode.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
- src/hotspot/share/logging/logTagLevelExpression.cpp
- src/hotspot/share/logging/logTagLevelExpression.hpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.hpp
- src/hotspot/share/memory/universe_ext.cpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/oops/generateOopMap.cpp
! src/hotspot/share/prims/jvm.cpp
! 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/vmStructs.cpp
- src/hotspot/share/services/allocationContextService.hpp
! src/hotspot/share/utilities/exceptions.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/lang/Integer.java
! src/java.base/share/classes/java/lang/Long.java
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
! src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.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/javax/security/auth/Policy.java
- src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
- src/java.base/unix/classes/java/io/FileDescriptor.java
- src/java.base/windows/classes/java/io/FileDescriptor.java
- src/java.management/share/classes/sun/management/TypeVersionMapper.java
- src/java.sql/share/classes/javax/transaction/xa/XAException.java
- src/java.sql/share/classes/javax/transaction/xa/XAResource.java
- src/java.sql/share/classes/javax/transaction/xa/Xid.java
- src/java.sql/share/classes/javax/transaction/xa/package.html
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
- test/hotspot/gtest/logging/test_logTagLevelExpression.cpp
- test/jdk/com/sun/jdi/JDIScaffold.java
- test/jdk/java/lang/System/ExitFinalizersAndJIT.java
- test/jdk/java/lang/System/finalization/FinExit.java
- test/jdk/java/lang/System/finalization/FinExit.sh
! test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
! test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
! test/jdk/java/lang/invoke/condy/CondyWrongType.java
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so
- test/jdk/javax/transaction/testng/Driver.java
- test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java
- test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java
- test/jdk/sanity/releaseFile/NegativeSOURCETest.java
- test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java
- test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java
- test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java
- test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java
- test/jdk/sun/java2d/OpenGL/GradientPaints.java
- test/jdk/sun/java2d/OpenGL/bug7181438.java