Skip to content

Commit

Permalink
[Switch][Primitive type patterns] Unexpected operand error with switc…
Browse files Browse the repository at this point in the history 
…h pattern and widening unboxing conversion (#3158)

fix direction of conversion

extend existing test to loop over numerical types

Fixes #3113
  • Loading branch information
@stephan-herrmann
stephan-herrmann authored Oct 24, 2024
1 parent 55f53bd commit 185d23b
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ...clipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/TypePattern.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void generateTestingConversion(BlockScope scope, CodeStream codeStream) {
case WIDENING_REFERENCE_AND_UNBOXING_COVERSION_AND_WIDENING_PRIMITIVE_CONVERSION:
int rhsUnboxed = TypeIds.box2primitive(provided.superclass().id);
codeStream.generateUnboxingConversion(rhsUnboxed);
this.computeConversion(scope, TypeBinding.wellKnownBaseType(rhsUnboxed), expected);
this.computeConversion(scope, expected, TypeBinding.wellKnownBaseType(rhsUnboxed));
codeStream.generateImplicitConversion(this.implicitConversion);
break;
case NARROWING_AND_UNBOXING_CONVERSION:
Expand Down
123 changes: 105 additions & 18 deletions ...ompiler/src/org/eclipse/jdt/core/tests/compiler/regression/PrimitiveInPatternsTestSH.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1510,29 +1510,93 @@ public static void main(String... args) {
},
"12");
}
public void testInstanceof_widenUnbox() {
runConformTest(new String[] {
"X.java",
"""
void testInstanceof_widenUnbox(String fromBox, int idx, String expectedOuts) {
// for all numerical types challenge route WIDENING_REFERENCE_AND_UNBOXING_COVERSION_AND_WIDENING_PRIMITIVE_CONVERSION
//
// example (from="Integer", idx=4, ...):
// class X {
// // alternating for type variable (m1*) and wildcard (m2*):
// static <T extends Integer> long m1long(T in) {
// if (in instanceof long v) return v;
// return -1L;
// }
// static long m2Long(Optional<? extends Integer> in) {
// if (in.get() instanceof long v) return v;
// return -1L;
// }
// static <T extends Integer> float m1float(T in) {
// if (in instanceof float v) return v;
// return -1.0f;
// }
// ...
// public static void main(String... args) {
// Integer v = Integer.valueOf((int) 49);
// System.out.print(m1long(v));
// System.out.print('+');
// System.out.print(Optional.of(m2long(v));
// System.out.print('|');
// System.out.print(m1float(v));
// System.out.print('|');
// ...
// }
// }
String m1 = """
static <T extends FROM> PRIM m1PRIM(T in) {
if (in instanceof PRIM v) return v;
return NEGVAL;
}
""".replace("FROM", fromBox);
String m2 = """
static PRIM m2PRIM(Optional<? extends FROM> in) {
if (in.get() instanceof PRIM v) return v;
return NEGVAL;
}
""".replace("FROM", fromBox);
StringBuilder clazz = new StringBuilder();
clazz.append("""
import java.util.Optional;
public class X {
static <T extends Integer> int mInteger(T in) {
if (in instanceof int v) return v;
return -1;
}
static int mShort(Optional<? extends Short> in) {
if (in.get() instanceof int v) return v;
return -1;
}
public static void main(String... args) {
System.out.print(mInteger(Integer.valueOf(1)));
System.out.print(mShort(Optional.of(Short.valueOf((short) 2))));
""");
StringBuilder main = new StringBuilder();
main.append("public static void main(String... args) {\n");
main.append("\tFROM v = FROM.valueOf((CAST) VAL);\n"
.replace("FROM", fromBox)
.replace("CAST", PRIMITIVES[idx])
.replace("VAL", GOODVALUES[idx]));
String call1Tmpl = "\tSystem.out.print(m1PRIM(v));\n".replace("FROM", fromBox);
String call2Tmpl = "\tSystem.out.print(m2PRIM(Optional.of(v)));\n".replace("FROM", fromBox);
for (int i=idx+1; i<8; i++) {
if (!IS_NUMERICAL[i]) continue;
clazz.append(fillIn(m1, i));
clazz.append(fillIn(m2, i));
main.append(fillIn(call1Tmpl, i));
main.append("\tSystem.out.print('+');\n");
main.append(fillIn(call2Tmpl, i));
main.append("\tSystem.out.print('|');\n");
}
clazz.append(main);
clazz.append("""
}
}
"""
},
"12");
""");
runConformTest(new String[] {"X.java", clazz.toString()}, expectedOuts);
}
public void testInstanceof_widenUnbox_Byte() {
testInstanceof_widenUnbox("Byte", 1, "49+49|49+49|49+49|49.0+49.0|49.0+49.0|");
}
public void testInstanceof_widenUnbox_Short() {
testInstanceof_widenUnbox("Short", 3, "49+49|49+49|49.0+49.0|49.0+49.0|");
}
public void testInstanceof_widenUnbox_Integer() {
testInstanceof_widenUnbox("Integer", 4, "49+49|49.0+49.0|49.0+49.0|");
}
public void testInstanceof_widenUnbox_Long() {
testInstanceof_widenUnbox("Long", 5, "49.0+49.0|49.0+49.0|");
}
public void testInstanceof_widenUnbox_Float() {
testInstanceof_widenUnbox("Float", 6, "49.0+49.0|");
}

public void testInstanceof_genericExpression() { // regression test for a checkCast which we failed to generate earlier
runConformTest(new String[] {
"X.java",
Expand Down Expand Up @@ -2324,6 +2388,29 @@ void foo() {
""");
}

// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3113
// [Switch][Record patterns] Unexpected operand error with switch pattern and widening unboxing conversion
public void testGH3113_ok() {
runConformTest(new String[] {
"X.java",
"""
record Record<T extends Integer>(T t) {}
public class X {
public static <T extends Integer> double convert(Record<T> r) {
return switch (r) {
case Record(double d) -> d;
default -> 2;
};
}
public static void main(String[] args) {
System.out.print(convert(new Record(2)));
}
}
"""
},
"2.0");
}

// test from spec
public void _testSpec001() {
runConformTest(new String[] {
Expand Down

0 comments on commit 185d23b

Please sign in to comment.