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

[vicente.romero at oracle.com]

Changeset: 8bfc38cd76fd
Author:    vromero
Date:      2018-06-14 13:27 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/8bfc38cd76fd

manual merge with jep-334 branch

! src/java.base/share/classes/java/lang/constant/ClassDesc.java
- src/java.base/share/classes/java/lang/constant/ConstantClassDesc.java
! src/java.base/share/classes/java/lang/constant/ConstantDesc.java
! src/java.base/share/classes/java/lang/constant/ConstantDescs.java
- src/java.base/share/classes/java/lang/constant/ConstantMethodTypeDesc.java
! src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java < src/java.base/share/classes/java/lang/constant/ConstantMethodHandleDesc.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/PrimitiveClassDesc.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/constant/package-info.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! test/jdk/java/lang/constant/CondyRefTest.java
! test/jdk/java/lang/constant/ConstantUtilsTest.java
! test/jdk/java/lang/constant/MethodHandleRefTest.java