changeset 48736:47ea1a11205e condy-folding

renaming after the change of TrackableConstant to Foldable
author vromero
date Fri, 12 Jan 2018 11:08:16 -0500
parents 27785de496e3
children c890e3f259d8
files src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constables.java
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Fri Jan 12 13:16:24 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Fri Jan 12 11:08:16 2018 -0500
@@ -174,7 +174,7 @@
     public final Type dynamicConstantRefType;
     public final Type intrinsicsType;
     public final Type methodTypeType;
-    public final Type trackableConstantType;
+    public final Type foldableType;
     public final Type nativeHeaderType;
     public final Type throwableType;
     public final Type errorType;
@@ -501,7 +501,7 @@
         dynamicConstantRefType = enterClass("java.lang.sym.DynamicConstantRef");
         intrinsicsType = enterClass("java.lang.invoke.Intrinsics");
         methodTypeType = enterClass("java.lang.invoke.MethodType");
-        trackableConstantType = enterClass("java.lang.annotation.Foldable");
+        foldableType = enterClass("java.lang.annotation.Foldable");
         errorType = enterClass("java.lang.Error");
         illegalArgumentExceptionType = enterClass("java.lang.IllegalArgumentException");
         interruptedExceptionType = enterClass("java.lang.InterruptedException");
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constables.java	Fri Jan 12 13:16:24 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constables.java	Fri Jan 12 11:08:16 2018 -0500
@@ -481,7 +481,7 @@
      */
     public Object foldTrackableField(final JCTree tree, final Env<AttrContext> env) {
         Symbol sym = TreeInfo.symbol(tree);
-        boolean trackableConstant = sym.attribute(syms.trackableConstantType.tsym) != null &&
+        boolean trackableConstant = sym.attribute(syms.foldableType.tsym) != null &&
                 sym.packge().modle == syms.java_base;
         if (trackableConstant) {
             String className = sym.owner.type.tsym.flatName().toString();
@@ -531,7 +531,7 @@
     public Object foldMethodInvocation(final JCMethodInvocation tree, final Env<AttrContext> env) {
         Symbol msym = TreeInfo.symbol(tree.meth);
         Object constant = null;
-        boolean trackableConstant = msym.attribute(syms.trackableConstantType.tsym) != null &&
+        boolean trackableConstant = msym.attribute(syms.foldableType.tsym) != null &&
                 msym.packge().modle == syms.java_base;
         boolean isLDC = msym.owner.type.tsym == syms.intrinsicsType.tsym && msym.name == names.ldc;
         if (trackableConstant || isLDC) {