hg: amber/amber: manual merge with branch jep-334

[vicente.romero at oracle.com]

Changeset: 80c69f5cd21a
Author:    vromero
Date:      2018-05-31 06:15 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/80c69f5cd21a

manual merge with branch jep-334

- make/BuildNashorn.gmk
! make/CompileJavaModules.gmk
+ make/CompileJavaModulesNashorn.gmk
! make/Docs.gmk
! make/Main.gmk
- make/UnpackSecurity.gmk
! make/autoconf/basics.m4
! make/test/JtregNativeHotspot.gmk
- src/hotspot/os/aix/jvm_aix.cpp
- src/hotspot/os/bsd/jvm_bsd.cpp
- src/hotspot/os/linux/jvm_linux.cpp
- src/hotspot/os/solaris/jvm_solaris.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
- src/hotspot/share/jfr/metadata/GenerateJfrFiles.java
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/exceptions.cpp
! 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/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java
- test/jdk/java/lang/Character/Blocks.txt
- test/jdk/java/lang/Character/CheckBlocks.java
- test/jdk/java/lang/Character/TestISOControls.java
! test/langtools/tools/javac/diags/examples.not-yet.txt