Requested changes #5

JimLaskey · JimLaskey · commit 7f3d65261814 · 2022-11-03T13:02:38.000-03:00
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1113,30 +1113,37 @@ public static MethodHandle makeConcatWithTemplate(
             }
 
             Class<?> ttype = ttypes[pos];
+            // (long,byte[],ttype) -> long
             MethodHandle prepender = prepender(lastFragment.isEmpty() ? null : fragment, ttype);
             initialLengthCoder = JLA.stringConcatMix(initialLengthCoder, fragment);
+            // (byte[],long,ttypes...) -> String (unchanged)
             mh = MethodHandles.filterArgumentsWithCombiner(mh, 1, prepender,1, 0, 2 + pos);
 
             pos++;
         }
 
         MethodHandle newArrayCombinator = lastFragment.isEmpty() ? newArray() :
                 newArrayWithSuffix(lastFragment);
+        // (long,ttypes...) -> String
         mh = MethodHandles.foldArgumentsWithCombiner(mh, 0, newArrayCombinator,
                 1 // index
         );
 
         pos = 0;
         for (Class<?> ttype : ttypes) {
+            // (long,ttype) -> long
             MethodHandle mix = mixer(ttypes[pos]);
             boolean lastPType = pos == ttypes.length - 1;
 
             if (lastPType) {
+                // (ttype) -> long
                 mix = MethodHandles.insertArguments(mix, 0, initialLengthCoder);
+                // (ttypes...) -> String
                 mh = MethodHandles.foldArgumentsWithCombiner(mh, 0, mix,
                         1 + pos // selected argument
                 );
             } else {
+                // (long,ttypes...) -> String
                 mh = MethodHandles.filterArgumentsWithCombiner(mh, 0, mix,
                         0, // old-index
                         1 + pos // selected argument
diff --git a/src/java.base/share/classes/java/lang/template/StringTemplate.java b/src/java.base/share/classes/java/lang/template/StringTemplate.java
@@ -100,7 +100,7 @@
  * List<Object> values = st.values();
  * // check or manipulate the fragments and/or values
  * ...
- * String result = StringTemplate.interpolate(fragments, values);;
+ * String result = StringTemplate.interpolate(fragments, values);
  * }
  *
  * @implSpec An instance of {@link StringTemplate} is immutatble. Also, the
@@ -185,33 +185,6 @@ default String interpolate() {
         return processor.process(this);
     }
 
-    /**
-     * Return the types of this {@link StringTemplate StringTemplate's} values.
-     *
-     * @return list of value types
-     *
-     * @implNote The default method determines if the {@link StringTemplate}
-     * was synthesized by the compiler, then the types are precisely those of the
-     * embedded expressions, otherwise this method returns the values list types.
-     */
-    default List<Class<?>> valueTypes() {
-        return TemplateRuntime.valueTypes(this);
-    }
-
-    /**
-     * Return {@link MethodHandle MethodHandles} to access this
-     * {@link StringTemplate StringTemplate's} values.
-     *
-     * @return list of value types
-     *
-     * @implNote The default method determines if the {@link java.lang.template.StringTemplate}
-     * was synthesized by the compiler, then the MethodHandles are precisely those of the
-     * embedded expressions fields, otherwise this method returns getters for the values list.
-     */
-    default List<MethodHandle> valueAccessors() {
-        return TemplateRuntime.valueAccessors(this);
-    }
-
     /**
      * Produces a diagnostic string representing the supplied
      * {@link StringTemplate}.
@@ -245,8 +218,7 @@ public static String toString(StringTemplate stringTemplate) {
      */
     public static int hashCode(StringTemplate stringTemplate) {
         Objects.requireNonNull(stringTemplate, "stringTemplate should not be null");
-        return Objects.hashCode(stringTemplate.fragments()) ^
-               Objects.hashCode(stringTemplate.values());
+        return Objects.hash(stringTemplate.fragments(), stringTemplate.values());
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/template/TemplateRuntime.java b/src/java.base/share/classes/java/lang/template/TemplateRuntime.java
@@ -53,25 +53,6 @@
 @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
 final class TemplateRuntime {
 
-    /**
-     * {@link MethodHandle} to {@link TemplateRuntime#getValue(int, StringTemplate)}.
-     */
-    private static final MethodHandle GET_VALUE_MH;
-
-    /**
-     * Initialize {@link MethodHandle MethodHandles}.
-     */
-    static {
-        try {
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-            MethodType mt = MethodType.methodType(Object.class, int.class, StringTemplate.class);
-            GET_VALUE_MH = lookup.findStatic(TemplateRuntime.class, "getValue", mt);
-        } catch (ReflectiveOperationException | SecurityException ex) {
-            throw new AssertionError("template runtime init fail", ex);
-        }
-    }
-
     /**
      * Private constructor.
      */
@@ -81,8 +62,6 @@ private TemplateRuntime() {
 
     private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 
-    private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
-
     private static final JavaUtilCollectionAccess JUCA = SharedSecrets.getJavaUtilCollectionAccess();
 
     /**
@@ -100,101 +79,6 @@ static <E> List<E> toList(E... elements) {
         return JUCA.listFromTrustedArrayNullsAllowed(elements);
     }
 
-    /**
-     * Return the types of a {@link StringTemplate StringTemplate's} values.
-     *
-     * @param st  StringTemplate to examine
-     *
-     * @return list of value types
-     *
-     * @throws NullPointerException if st is null
-     *
-     * @implNote The default method determines if the {@link StringTemplate}
-     * was synthesized by the compiler, then the types are precisely those of the
-     * embedded expressions, otherwise this method returns a list of
-     * {@code Object.class}.
-     */
-    static List<Class<?>> valueTypes(StringTemplate st) {
-        Objects.requireNonNull(st, "st must not be null");
-        Class<?> tsClass = st.getClass();
-        if (tsClass.isSynthetic()) {
-            List<Class<?>> result = new ArrayList<>();
-            try {
-                for (int i = 0; ; i++) {
-                    Field field = tsClass.getDeclaredField("x" + i);
-                    result.add(field.getType());
-                }
-            } catch (NoSuchFieldException ex) {
-                // End of fields
-            } catch (SecurityException ex) {
-                throw new InternalError(ex);
-            }
-            return result;
-        }
-        int size = st.values().size();
-        Class<?>[] types = new Class<?>[size];
-        Arrays.fill(types, Object.class);
-        return List.of(types);
-    }
-
-    /**
-     * Return {@link MethodHandle MethodHandles} to access a
-     * {@link StringTemplate StringTemplate's} values.
-     *
-     * @param st  StringTemplate to examine
-     *
-     * @return list of {@link MethodHandle MethodHandles}
-     *
-     * @throws NullPointerException if st is null
-     *
-     * @implNote The default method determines if the {@link StringTemplate}
-     * was synthesized by the compiler, then the MethodHandles are precisely those of the
-     * embedded expressions fields, otherwise this method returns getters for the values list.
-     */
-    static List<MethodHandle> valueAccessors(StringTemplate st) {
-        Objects.requireNonNull(st, "st must not be null");
-        List<MethodHandle> result = new ArrayList<>();
-        Class<?> tsClass = st.getClass();
-        if (tsClass.isSynthetic()) {
-            try {
-                for (int i = 0; ; i++) {
-                    Field field = tsClass.getDeclaredField("x" + i);
-                    MethodHandle mh = JLIA.unreflectField(field, false);
-                    mh = mh.asType(mh.type().changeParameterType(0, StringTemplate.class));
-                    result.add(mh);
-                }
-            } catch (NoSuchFieldException ex) {
-                // End of fields
-            } catch (ReflectiveOperationException | SecurityException ex) {
-                throw new InternalError(ex);
-            }
-
-            return result;
-        }
-        try {
-            int size = st.values().size();
-            for (int index = 0; index < size; index++) {
-                result.add(MethodHandles.insertArguments(GET_VALUE_MH, 0, index));
-            }
-            return result;
-        } catch (SecurityException ex) {
-            throw new InternalError(ex);
-        }
-    }
-
-    /**
-     * Private method used by {@link TemplateRuntime#valueAccessors(StringTemplate)}
-     * to access values.
-     *
-     * @param index values index
-     * @param st    the {@link StringTemplate}
-     *
-     * @return value at index
-     */
-    private static Object getValue(int index, StringTemplate st) {
-        return st.values().get(index);
-    }
-
     /**
      * Generic StringTemplate.
      *
diff --git a/src/java.base/share/classes/jdk/internal/template/TemplateSupport.java b/src/java.base/share/classes/jdk/internal/template/TemplateSupport.java
@@ -73,7 +73,7 @@ public final class TemplateSupport {
     private final List<String> fragments;
 
     /**
-     * Static final processor that triggered the BSM generation.
+     * The static final processor that triggered the BSM generation.
      */
     private final ValidatingProcessor<?, ?> processor;
 
@@ -138,9 +138,7 @@ public static CallSite stringTemplateBSM(
         Objects.requireNonNull(processorGetter, "processorGetter is null");
         Objects.requireNonNull(fragments, "fragments is null");
 
-        MethodType processorGetterType = MethodType.methodType(ValidatingProcessor.class);
-        ValidatingProcessor<?, ?> processor =
-                (ValidatingProcessor<?, ?>)processorGetter.asType(processorGetterType).invokeExact();
+        ValidatingProcessor<?, ?> processor = (ValidatingProcessor<?, ?>)processorGetter.invoke();
         TemplateSupport support = new TemplateSupport(lookup, name, type, List.of(fragments), processor);
 
         return support.processWithProcessor();
@@ -182,10 +180,7 @@ private static Object defaultProcess(List<String> fragments,
      */
     private MethodHandle defaultProcessMethodHandle() {
         MethodHandle mh = MethodHandles.insertArguments(DEFAULT_PROCESS_MH, 0, fragments, processor);
-        mh = mh.withVarargs(true);
-        mh = mh.asType(type);
-
-        return mh;
+        return mh.asCollector(Object[].class, type.parameterCount()).asType(type);
     }
 
     /**
diff --git a/test/jdk/java/lang/template/Basic.java b/test/jdk/java/lang/template/Basic.java
@@ -424,17 +424,6 @@ static void stringTemplateCoverage() {
         ASSERT(tsValues.interpolate(), x + " + " + y + " = " + (x + y));
         ASSERT(StringTemplate.combine(src, src).interpolate(),
                 RAW."\{x} + \{y} = \{x + y}\{x} + \{y} = \{x + y}".interpolate());
-        ASSERT(src.valueTypes().get(0), int.class);
-        ASSERT(src.valueTypes().get(1), int.class);
-        ASSERT(src.valueTypes().get(2), int.class);
-
-        try {
-            ASSERT(src.valueAccessors().get(0).invoke(src), 10);
-            ASSERT(src.valueAccessors().get(1).invoke(src), 20);
-            ASSERT(src.valueAccessors().get(2).invoke(src), 30);
-        } catch (Throwable ex) {
-            throw new RuntimeException(ex);
-        }
     }
 
     /*
