src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java

rev 17627 : 8186500: StringConcatFactory.makeConcatWithConstants throws AssertionError when recipe contains non-String constants
Reviewed-by: TBD

*** 23,45 ****
   * questions.
   */
  
  package java.lang.invoke;
  
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.Label;
  import jdk.internal.org.objectweb.asm.MethodVisitor;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.internal.vm.annotation.ForceInline;
! import jdk.internal.misc.Unsafe;
  
  import java.lang.invoke.MethodHandles.Lookup;
! import java.util.*;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  import java.util.function.Function;
- import sun.security.action.GetPropertyAction;
  
  import static jdk.internal.org.objectweb.asm.Opcodes.*;
  
  /**
   * <p>Methods to facilitate the creation of String concatenation methods, that
--- 23,50 ----
   * questions.
   */
  
  package java.lang.invoke;
  
+ import jdk.internal.misc.Unsafe;
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.Label;
  import jdk.internal.org.objectweb.asm.MethodVisitor;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.internal.vm.annotation.ForceInline;
! import sun.invoke.util.Wrapper;
! import sun.security.action.GetPropertyAction;
  
  import java.lang.invoke.MethodHandles.Lookup;
! import java.util.ArrayList;
! import java.util.Arrays;
! import java.util.List;
! import java.util.Objects;
! import java.util.Properties;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  import java.util.function.Function;
  
  import static jdk.internal.org.objectweb.asm.Opcodes.*;
  
  /**
   * <p>Methods to facilitate the creation of String concatenation methods, that
*** 1619,1645 ****
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> PREPEND = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "prepend", int.class, int.class, byte[].class, byte.class, c);
              }
          };
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> CODER_MIX = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "mixCoder", byte.class, byte.class, c);
              }
          };
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> LENGTH_MIX = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "mixLen", int.class, int.class, c);
              }
          };
  
          private static final MethodHandle NEW_STRING;
          private static final MethodHandle NEW_ARRAY;
--- 1624,1653 ----
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> PREPEND = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "prepend", int.class, int.class, byte[].class, byte.class,
!                         Wrapper.asPrimitiveType(c));
              }
          };
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> CODER_MIX = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "mixCoder", byte.class, byte.class,
!                         Wrapper.asPrimitiveType(c));
              }
          };
  
          // This one is deliberately non-lambdified to optimize startup time:
          private static final Function<Class<?>, MethodHandle> LENGTH_MIX = new Function<Class<?>, MethodHandle>() {
              @Override
              public MethodHandle apply(Class<?> c) {
!                 return lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "mixLen", int.class, int.class,
!                         Wrapper.asPrimitiveType(c));
              }
          };
  
          private static final MethodHandle NEW_STRING;
          private static final MethodHandle NEW_ARRAY;