From da5fb46991c2b6af4cb7271841429d26a8d7d78a Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 19 May 2011 13:16:20 +0200 Subject: [PATCH] tree-cfg.c (verify_gimple_assign_binary): Barf on TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR. 2011-05-19 Kai Tietz * tree-cfg.c (verify_gimple_assign_binary): Barf on TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR. (gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form. From-SVN: r173903 --- gcc/ChangeLog | 6 ++++++ gcc/gimplify.c | 18 +++++++++++++++++- gcc/tree-cfg.c | 20 +------------------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b9a9c866d99..3da31e700b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-19 Kai Tietz + + * tree-cfg.c (verify_gimple_assign_binary): Barf on + TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR. + (gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form. + 2011-05-19 Anatoly Sokolov Rainer Orth diff --git a/gcc/gimplify.c b/gcc/gimplify.c index d776692d715..5fd22c011c2 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7210,7 +7210,23 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, break; } } - + + /* With two-valued operand types binary truth expressions are + semantically equivalent to bitwise binary expressions. Canonicalize + them to the bitwise variant. */ switch (TREE_CODE (*expr_p)) + { + case TRUTH_AND_EXPR: + TREE_SET_CODE (*expr_p, BIT_AND_EXPR); + break; + case TRUTH_OR_EXPR: + TREE_SET_CODE (*expr_p, BIT_IOR_EXPR); + break; + case TRUTH_XOR_EXPR: + TREE_SET_CODE (*expr_p, BIT_XOR_EXPR); + break; + default: + break; + } /* Classified as tcc_expression. */ goto expr_2; diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 957f1f1238c..f6b171024bd 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -3555,29 +3555,11 @@ do_pointer_plus_expr_check: case TRUTH_ANDIF_EXPR: case TRUTH_ORIF_EXPR: - gcc_unreachable (); - case TRUTH_AND_EXPR: case TRUTH_OR_EXPR: case TRUTH_XOR_EXPR: - { - /* We require two-valued operand types. */ - if (!(TREE_CODE (rhs1_type) == BOOLEAN_TYPE - || (INTEGRAL_TYPE_P (rhs1_type) - && TYPE_PRECISION (rhs1_type) == 1)) - || !(TREE_CODE (rhs2_type) == BOOLEAN_TYPE - || (INTEGRAL_TYPE_P (rhs2_type) - && TYPE_PRECISION (rhs2_type) == 1))) - { - error ("type mismatch in binary truth expression"); - debug_generic_expr (lhs_type); - debug_generic_expr (rhs1_type); - debug_generic_expr (rhs2_type); - return true; - } - break; - } + gcc_unreachable (); case LT_EXPR: case LE_EXPR: -- 2.30.2