From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 5 Feb 2004 05:22:21 +0000 (+0000)
Subject: re PR c++/13932 (duplicate warning message for conversion)
X-Git-Tag: releases/gcc-4.0.0~10368
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=f583e45212b6c2960801fc74c34104bb9064fc95;p=gcc.git

re PR c++/13932 (duplicate warning message for conversion)

	PR c++/13932
	* call.c (convert_like_real): Use "converting" rather than
	"argument" as the descriptive keyword to
	dubious_conversion_warnings.
	* typeck.c (convert_for_assignment): Do not call
	dubious_conversion_warnings.

	PR c++/13932
	* g++.dg/warn/conv2.C: New test.

From-SVN: r77297
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 083bebe540d4..be3315eef966 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-04  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13932
+	* call.c (convert_like_real): Use "converting" rather than
+	"argument" as the descriptive keyword to
+	dubious_conversion_warnings.
+	* typeck.c (convert_for_assignment): Do not call
+	dubious_conversion_warnings.
+
 2004-02-04  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/13086
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 0aa19f126432..e6eded59addb 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3900,7 +3900,7 @@ convert_like_real (tree convs, tree expr, tree fn, int argnum, int inner,
   
   if (issue_conversion_warnings)
     expr = dubious_conversion_warnings
-             (totype, expr, "argument", fn, argnum);
+             (totype, expr, "converting", fn, argnum);
   switch (TREE_CODE (convs))
     {
     case USER_CONV:
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4f635cc7b556..c6d273a6170a 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5642,8 +5642,6 @@ convert_for_assignment (tree type, tree rhs,
   if (TREE_CODE (rhs) == TREE_LIST && TREE_VALUE (rhs) == error_mark_node)
     return error_mark_node;
 
-  rhs = dubious_conversion_warnings (type, rhs, errtype, fndecl, parmnum);
-
   /* The RHS of an assignment cannot have void type.  */
   if (coder == VOID_TYPE)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6c3db3e87af4..df3236f6f4c7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-04  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13932
+	* g++.dg/warn/conv2.C: New test.
+
 2004-02-04  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/13086
diff --git a/gcc/testsuite/g++.dg/warn/conv2.C b/gcc/testsuite/g++.dg/warn/conv2.C
new file mode 100644
index 000000000000..e3466002218e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/conv2.C
@@ -0,0 +1,3 @@
+// PR c++/13932
+
+int i = 1.; // { dg-warning "converting" }