*** empty log message ***

From-SVN: r9801

diff --git a/gcc/c-common.c b/gcc/c-common.c
index fc368c8a53d91b2bdb8fcb7476e7eac884e90392..acd66d0abaebd9d47b122eacee460c3e74d282f6 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -2019,6 +2019,7 @@ truthvalue_conversion (expr)
     case TRUTH_AND_EXPR:
     case TRUTH_OR_EXPR:
     case TRUTH_XOR_EXPR:
+    case TRUTH_NOT_EXPR:
       TREE_TYPE (expr) = boolean_type_node;
       return expr;
 

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index e3470b335812d67951c5d9377ee7320976616d89..e95a2c8ef579f74f4116b32e0404f671717d4a2f 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -4201,7 +4201,11 @@ fold (expr)
         and its values must be 0 or 1.
         ("true" is a fixed value perhaps depending on the language,
         but we don't handle values other than 1 correctly yet.)  */
-      return invert_truthvalue (arg0);
+      tem = invert_truthvalue (arg0);
+      /* Avoid infinite recursion.  */
+      if (TREE_CODE (tem) == TRUTH_NOT_EXPR)
+       return t;
+      return convert (type, tem);
 
     case TRUTH_ANDIF_EXPR:
       /* Note that the operands of this must be ints