+2012-09-14 Joseph Myers <joseph@codesourcery.com>
+
+ PR c/54103
+ * c-typeck.c (build_unary_op): Pass original argument of
+ TRUTH_NOT_EXPR to c_objc_common_truthvalue_conversion, then remove
+ any C_MAYBE_CONST_EXPR, if it has integer operands.
+ (build_binary_op): Pass original arguments of TRUTH_ANDIF_EXPR,
+ TRUTH_ORIF_EXPR, TRUTH_AND_EXPR, TRUTH_OR_EXPR and TRUTH_XOR_EXPR
+ to c_objc_common_truthvalue_conversion, then remove any
+ C_MAYBE_CONST_EXPR, if they have integer operands. Use
+ c_objc_common_truthvalue_conversion not
+ c_common_truthvalue_conversion.
+ (c_objc_common_truthvalue_conversion): Build NE_EXPR directly and
+ call note_integer_operands for arguments with integer operands
+ that are not integer constants.
+
2012-09-13 Jakub Jelinek <jakub@redhat.com>
PR c/54559
"wrong type argument to unary exclamation mark");
return error_mark_node;
}
- arg = c_objc_common_truthvalue_conversion (location, arg);
+ if (int_operands)
+ {
+ arg = c_objc_common_truthvalue_conversion (location, xarg);
+ arg = remove_c_maybe_const_expr (arg);
+ }
+ else
+ arg = c_objc_common_truthvalue_conversion (location, arg);
ret = invert_truthvalue_loc (location, arg);
/* If the TRUTH_NOT_EXPR has been folded, reset the location. */
if (EXPR_P (ret) && EXPR_HAS_LOCATION (ret))
but that does not mean the operands should be
converted to ints! */
result_type = integer_type_node;
- op0 = c_common_truthvalue_conversion (location, op0);
- op1 = c_common_truthvalue_conversion (location, op1);
+ if (op0_int_operands)
+ {
+ op0 = c_objc_common_truthvalue_conversion (location, orig_op0);
+ op0 = remove_c_maybe_const_expr (op0);
+ }
+ else
+ op0 = c_objc_common_truthvalue_conversion (location, op0);
+ if (op1_int_operands)
+ {
+ op1 = c_objc_common_truthvalue_conversion (location, orig_op1);
+ op1 = remove_c_maybe_const_expr (op1);
+ }
+ else
+ op1 = c_objc_common_truthvalue_conversion (location, op1);
converted = 1;
boolean_op = true;
}
int_const = (TREE_CODE (expr) == INTEGER_CST && !TREE_OVERFLOW (expr));
int_operands = EXPR_INT_CONST_OPERANDS (expr);
- if (int_operands)
- expr = remove_c_maybe_const_expr (expr);
-
- /* ??? Should we also give an error for vectors rather than leaving
- those to give errors later? */
- expr = c_common_truthvalue_conversion (location, expr);
+ if (int_operands && TREE_CODE (expr) != INTEGER_CST)
+ {
+ expr = remove_c_maybe_const_expr (expr);
+ expr = build2 (NE_EXPR, integer_type_node, expr,
+ convert (TREE_TYPE (expr), integer_zero_node));
+ expr = note_integer_operands (expr);
+ }
+ else
+ /* ??? Should we also give an error for vectors rather than leaving
+ those to give errors later? */
+ expr = c_common_truthvalue_conversion (location, expr);
if (TREE_CODE (expr) == INTEGER_CST && int_operands && !int_const)
{
+2012-09-14 Joseph Myers <joseph@codesourcery.com>
+
+ PR c/54103
+ * gcc.c-torture/compile/pr54103-1.c,
+ gcc.c-torture/compile/pr54103-2.c,
+ gcc.c-torture/compile/pr54103-3.c,
+ gcc.c-torture/compile/pr54103-4.c,
+ gcc.c-torture/compile/pr54103-5.c,
+ gcc.c-torture/compile/pr54103-6.c: New tests.
+ * gcc.dg/c90-const-expr-8.c: Update expected column number.
+
2012-09-14 Eric Botcazou <ebotcazou@adacore.com>
* gcc.dg/pr44194-1.c: Check that there are no memory accesses left.