hg: amber/amber: Clean up canonicalization mechanism; undo some refactorings that caused bootstrap errors

[brian.goetz at oracle.com]

Changeset: be1ff3649a9c
Author:    briangoetz
Date:      2018-04-20 16:45 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/be1ff3649a9c

Clean up canonicalization mechanism; undo some refactorings that caused bootstrap errors

! src/java.base/share/classes/java/lang/invoke/constant/ConstantClassDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/ConstantDescs.java
! src/java.base/share/classes/java/lang/invoke/constant/ConstantMethodHandleDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/ConstantMethodTypeDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/DynamicCallSiteDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/DynamicConstantDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/EnumDesc.java
! test/jdk/java/lang/invoke/constant/ClassRefTest.java
! test/jdk/java/lang/invoke/constant/MethodHandleRefTest.java