PR c/22311

	* c-typeck.c (build_binary_op): Use common_type wrapper on
	shortened types.
	(common_type): Update comment.

testsuite:
	* gcc.dg/pr22311-1.c : New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102615 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f20a528..d010f6b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-01  Joseph S. Myers  <joseph@codesourcery.com>
+
+       PR c/22311
+       * c-typeck.c (build_binary_op): Use common_type wrapper on
+       shortened types.
+       (common_type): Update comment.
+
 2005-07-31  Steven Bosscher  <stevenb@suse.de>
 
        PR target/23095

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index eb7909e..c049895 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -637,7 +637,8 @@ c_common_type (tree t1, tree t2)
     return t2;
 }
 \f
-/* Wrapper around c_common_type that is used by c-common.c.  ENUMERAL_TYPEs
+/* Wrapper around c_common_type that is used by c-common.c and other
+   front end optimizations that remove promotions.  ENUMERAL_TYPEs
    are allowed here and are converted to their compatible integer types.
    BOOLEAN_TYPEs are allowed here and return either boolean_type_node or
    preferably a non-Boolean type as the common type.  */
@@ -7948,7 +7949,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
              && (unsigned0 || !uns))
            result_type
              = c_common_signed_or_unsigned_type
-             (unsigned0, c_common_type (TREE_TYPE (arg0), TREE_TYPE (arg1)));
+             (unsigned0, common_type (TREE_TYPE (arg0), TREE_TYPE (arg1)));
          else if (TREE_CODE (arg0) == INTEGER_CST
                   && (unsigned1 || !uns)
                   && (TYPE_PRECISION (TREE_TYPE (arg1))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 968118f..29b67a9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-01  Joseph S. Myers  <joseph@codesourcery.com>
+
+       PR c/22311
+       * gcc.dg/pr22311-1.c : New test.
+
 2005-07-31  Steven Bosscher  <stevenb@suse.de>
 
        PR target/23095

diff --git a/gcc/testsuite/gcc.dg/pr22311-1.c b/gcc/testsuite/gcc.dg/pr22311-1.c
new file mode 100644 (file)
index 0000000..4eec5ce
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr22311-1.c
@@ -0,0 +1,6 @@
+/* Bug 22311: ICE with -fshort-enums on shortened operations.  */
+/* { dg-do compile } */
+/* { dg-options "-fshort-enums" } */
+
+typedef enum { A = 1 } E;
+void f(E e, unsigned char c) { c |= e; }