Correct the type of String + Object (#6941)

typetools · Jan 2, 2025 · 11a39c5 · 11a39c5
1 parent af87b07
commit 11a39c5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/util/JavaExpressionParseUtil.java b/framework/src/main/java/org/checkerframework/framework/util/JavaExpressionParseUtil.java
@@ -952,13 +952,13 @@ public JavaExpression visit(BinaryExpr expr, Void aVoid) {
       TypeMirror rightType = rightJe.getType();
       TypeMirror type;
       // isSubtype() first does the cheaper test isSameType(), so no need to do it here.
-      if (types.isSubtype(leftType, rightType)) {
+      if (expr.getOperator() == BinaryExpr.Operator.PLUS
+          && (TypesUtils.isString(leftType) || TypesUtils.isString(rightType))) {
+        type = stringTypeMirror;
+      } else if (types.isSubtype(leftType, rightType)) {
         type = rightType;
       } else if (types.isSubtype(rightType, leftType)) {
         type = leftType;
-      } else if (expr.getOperator() == BinaryExpr.Operator.PLUS
-          && (TypesUtils.isString(leftType) || TypesUtils.isString(rightType))) {
-        type = stringTypeMirror;
       } else {
         throw new ParseRuntimeException(
             constructJavaExpressionParseError(