Address review

biboudis · Apr 4, 2024 · 8564251 · 8564251
1 parent 95e153b
commit 8564251
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -495,14 +495,13 @@ private void handleSwitch(JCTree tree,
                          .toArray(s -> new LoadableConstant[s]);
 
             boolean enumSelector = seltype.tsym.isEnum();
-            boolean primitiveSelector = seltype.isPrimitive();
             Name bootstrapName = enumSelector ? names.enumSwitch : names.typeSwitch;
             MethodSymbol bsm = rs.resolveInternalMethod(tree.pos(), env, syms.switchBootstrapsType,
                     bootstrapName, staticArgTypes, List.nil());
 
-            Type resolvedSelectorType = syms.objectType;
-            if (target.releaseAfterJEP455())
-                resolvedSelectorType = seltype;
+            Type resolvedSelectorType = seltype;
+            if (target.usesReferenceOnlySelectorTypes())
+                resolvedSelectorType = syms.objectType;
 
             MethodType indyType = new MethodType(
                     List.of(resolvedSelectorType, syms.intType),

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
@@ -229,7 +229,7 @@ public boolean optimizeOuterThis() {
 
     /** Releases prior to JDK 23 expect a less precise SwitchBootstraps.typeSwitch signature on the selectorType
      */
-    public boolean releaseAfterJEP455() {
-        return compareTo(Target.JDK1_23) >= 0;
+    public boolean usesReferenceOnlySelectorTypes() {
+        return compareTo(Target.JDK1_23) < 0;
     }
 }