src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java

*** 46,13 ***
  import jdk.internal.access.SharedSecrets;
  import java.lang.classfile.ClassFile;
  import java.lang.classfile.Label;
  import java.lang.classfile.instruction.SwitchCase;
  
- import jdk.internal.constant.ConstantUtils;
  import jdk.internal.constant.MethodTypeDescImpl;
  import jdk.internal.constant.ReferenceClassDescImpl;
  import jdk.internal.misc.PreviewFeatures;
  import jdk.internal.vm.annotation.Stable;
  
  import static java.lang.constant.ConstantDescs.*;
  import static java.lang.invoke.MethodHandles.Lookup.ClassOption.NESTMATE;
--- 46,13 ---
  import jdk.internal.access.SharedSecrets;
  import java.lang.classfile.ClassFile;
  import java.lang.classfile.Label;
  import java.lang.classfile.instruction.SwitchCase;
  
  import jdk.internal.constant.MethodTypeDescImpl;
  import jdk.internal.constant.ReferenceClassDescImpl;
+ import jdk.internal.constant.ConstantUtils;
  import jdk.internal.misc.PreviewFeatures;
  import jdk.internal.vm.annotation.Stable;
  
  import static java.lang.constant.ConstantDescs.*;
  import static java.lang.invoke.MethodHandles.Lookup.ClassOption.NESTMATE;

*** 702,11 ***
          List<EnumDesc<?>> enumDescs = addExtraInfo ? new ArrayList<>() : null;
          List<Class<?>> extraClassLabels = addExtraInfo ? new ArrayList<>() : null;
  
          byte[] classBytes = ClassFile.of().build(ConstantUtils.binaryNameToDesc(typeSwitchClassName(caller.lookupClass())),
                  clb -> {
!                     clb.withFlags(AccessFlag.FINAL, AccessFlag.SUPER, AccessFlag.SYNTHETIC)
                         .withMethodBody("typeSwitch",
                                         addExtraInfo ? MTD_TYPE_SWITCH_EXTRA : MTD_TYPE_SWITCH,
                                         ClassFile.ACC_FINAL | ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC,
                                         generateTypeSwitchSkeleton(selectorType, labelConstants, enumDescs, extraClassLabels));
          });
--- 702,11 ---
          List<EnumDesc<?>> enumDescs = addExtraInfo ? new ArrayList<>() : null;
          List<Class<?>> extraClassLabels = addExtraInfo ? new ArrayList<>() : null;
  
          byte[] classBytes = ClassFile.of().build(ConstantUtils.binaryNameToDesc(typeSwitchClassName(caller.lookupClass())),
                  clb -> {
!                     clb.withFlags(AccessFlag.FINAL, (PreviewFeatures.isEnabled())  ? AccessFlag.IDENTITY : AccessFlag.SUPER, AccessFlag.SYNTHETIC)
                         .withMethodBody("typeSwitch",
                                         addExtraInfo ? MTD_TYPE_SWITCH_EXTRA : MTD_TYPE_SWITCH,
                                         ClassFile.ACC_FINAL | ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC,
                                         generateTypeSwitchSkeleton(selectorType, labelConstants, enumDescs, extraClassLabels));
          });