From: Manuel López-Ibáñez <manu@gcc.gnu.org>
Date: Wed, 7 Nov 2012 16:58:03 +0000 (+0000)
Subject: re PR c/51294 (spurious warning from -Wconversion in C and C++ in conditional express... 
X-Git-Tag: releases/gcc-4.8.0~2165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f46d6a577819e7db2c77fa369d5364afeaac9b0;p=thirdparty%2Fgcc.git

re PR c/51294 (spurious warning from -Wconversion in C and C++ in conditional expressions)

2012-11-07  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	PR c/51294
c-family/
	* c-common.c (conversion_warning): Handle conditional expressions.
testsuite/
	* c-c++-common/pr51294.c: New.

From-SVN: r193301
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index f7c942216bcb..6f343ef2419a 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-07  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	PR c/51294
+	* c-common.c (conversion_warning): Handle conditional expressions.
+
 2012-10-29  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR c++/54930
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 840bc84c6d24..90c1992129f5 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -2670,22 +2670,14 @@ conversion_warning (tree type, tree expr)
 
     case COND_EXPR:
       {
-	/* In case of COND_EXPR, if both operands are constants or
-	   COND_EXPR, then we do not care about the type of COND_EXPR,
-	   only about the conversion of each operand.  */
-	tree op1 = TREE_OPERAND (expr, 1);
-	tree op2 = TREE_OPERAND (expr, 2);
-
-	if ((TREE_CODE (op1) == REAL_CST || TREE_CODE (op1) == INTEGER_CST
-	     || TREE_CODE (op1) == COND_EXPR)
-	    && (TREE_CODE (op2) == REAL_CST || TREE_CODE (op2) == INTEGER_CST
-		|| TREE_CODE (op2) == COND_EXPR))
-	  {
-	    conversion_warning (type, op1);
-	    conversion_warning (type, op2);
-	    return;
-	  }
-	/* Fall through.  */
+        /* In case of COND_EXPR, we do not care about the type of
+           COND_EXPR, only about the conversion of each operand.  */
+        tree op1 = TREE_OPERAND (expr, 1);
+        tree op2 = TREE_OPERAND (expr, 2);
+        
+        conversion_warning (type, op1);
+        conversion_warning (type, op2);
+        return;
       }
 
     default: /* 'expr' is not a constant.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3fb9de45bb6d..7c2d5dfa39a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-07  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	PR c/51294
+	* c-c++-common/pr51294.c: New.
+
 2012-11-07  Martin Jambor  <mjambor@suse.cz>
 
 	PR tree-optimization/53787
diff --git a/gcc/testsuite/c-c++-common/pr51294.c b/gcc/testsuite/c-c++-common/pr51294.c
new file mode 100644
index 000000000000..395e6b2dfc38
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr51294.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-Wconversion -Wsign-conversion" } */
+
+void foo(int haveBar, char bar_)
+{
+  char zuul = haveBar?bar_:0;
+  char zuul2 = haveBar?bar_:bar_;
+  char zuul3 = haveBar?0:bar_;
+}