Unexpected operand at stack top for unboxed primitive with guarded (#…

…2922)

pattern in switch - issue #2914

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/GuardedPattern.java

@@ -54,6 +54,7 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
  @Override
  public void generateCode(BlockScope currentScope, CodeStream codeStream, BranchLabel patternMatchLabel, BranchLabel matchFailLabel) {
  BranchLabel guardCheckLabel = new BranchLabel(codeStream);
+ this.primaryPattern.setOuterExpressionType(this.outerExpressionType);
  this.primaryPattern.generateCode(currentScope, codeStream, guardCheckLabel, matchFailLabel);
  guardCheckLabel.place();
  this.condition.generateOptimizedBoolean(currentScope, codeStream, null, matchFailLabel, true);
@@ -100,6 +101,7 @@ public TypeBinding resolveType(BlockScope scope) {
  if (this.resolvedType != null || this.primaryPattern == null)
  return this.resolvedType;
  this.resolvedType = this.primaryPattern.resolveType(scope);
+
  try {
  scope.resolvingGuardExpression = true; // as guards cannot nest in the same scope, no save & restore called for
  this.condition.resolveTypeExpectingWithBindings(this.primaryPattern.bindingsWhenTrue(), scope, TypeBinding.BOOLEAN);

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/PrimitiveInPatternsTest.java

@@ -6802,7 +6802,30 @@ public static void main(String argv[]) {
  """
  },
  "true");
+ }
+ public void testGuardedPattern_001() {
+ runConformTest(new String[] {
+ "X.java",
+ """
+ public class X {
+ public static int foo(Integer myInt) {
+ return switch (myInt) {
+ case int i when i > 10 -> i;
+ default -> 0;
+ };
+ }
+
+ public static void main(String argv[]) {
+ Integer i = 100;
+ System.out.println(X.foo(i) == i);
+ }
+ }
+ """
+ },
+ "true");
  } // test from spec
+
+ // test from spec
  public void _testSpec001() {
  runConformTest(new String[] {
  "X.java",