diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/call.c | 60 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wconversion2.C | 4 |
4 files changed, 52 insertions, 24 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1409d2b..2142ac4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2007-03-15 Dirk Mueller <dmueller@suse.de> + + PR c++/30860 + * call.c (convert_conversion_warnings): New.. + (convert_like_real): .. factored out from here. + (convert_conversion_warnings): Add warning about + false being converted to NULL in argument passing. + 2007-03-14 Dirk Mueller <dmueller@suse.de> * cp/semantics.c (c_finish_if_stmt): Call empty_if_body_warning. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 00e0c06..53129bb 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4245,6 +4245,41 @@ build_temp (tree expr, tree type, int flags, return expr; } +/* Perform warnings about conversion of EXPR to type TOTYPE. + FN and ARGNUM are used for diagnostics. */ + +static void +convert_conversion_warnings (tree totype, tree expr, tree fn, int argnum) +{ + tree t = non_reference (totype); + + /* Issue warnings about peculiar, but valid, uses of NULL. */ + if (expr == null_node && TREE_CODE (t) != BOOLEAN_TYPE && ARITHMETIC_TYPE_P (t)) + { + if (fn) + warning (OPT_Wconversion, "passing NULL to non-pointer argument %P of %qD", + argnum, fn); + else + warning (OPT_Wconversion, "converting to non-pointer type %qT from NULL", t); + } + + /* Warn about assigning a floating-point type to an integer type. */ + if (TREE_CODE (TREE_TYPE (expr)) == REAL_TYPE + && TREE_CODE (t) == INTEGER_TYPE) + { + if (fn) + warning (OPT_Wconversion, "passing %qT for argument %P to %qD", + TREE_TYPE (expr), argnum, fn); + else + warning (OPT_Wconversion, "converting to %qT from %qT", t, TREE_TYPE (expr)); + } + + /* Issue warnings if "false" is converted to a NULL pointer */ + if (expr == boolean_false_node && fn && POINTER_TYPE_P (t)) + warning (OPT_Wconversion, + "converting %<false%> to pointer type for argument %P of %qD", + argnum, fn); +} /* Perform the conversions in CONVS on the expression EXPR. FN and ARGNUM are used for diagnostics. ARGNUM is zero based, -1 @@ -4293,30 +4328,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum, } if (issue_conversion_warnings) - { - tree t = non_reference (totype); - - /* Issue warnings about peculiar, but valid, uses of NULL. */ - if (expr == null_node && TREE_CODE (t) != BOOLEAN_TYPE && ARITHMETIC_TYPE_P (t)) - { - if (fn) - warning (OPT_Wconversion, "passing NULL to non-pointer argument %P of %qD", - argnum, fn); - else - warning (OPT_Wconversion, "converting to non-pointer type %qT from NULL", t); - } - - /* Warn about assigning a floating-point type to an integer type. */ - if (TREE_CODE (TREE_TYPE (expr)) == REAL_TYPE - && TREE_CODE (t) == INTEGER_TYPE) - { - if (fn) - warning (OPT_Wconversion, "passing %qT for argument %P to %qD", - TREE_TYPE (expr), argnum, fn); - else - warning (OPT_Wconversion, "converting to %qT from %qT", t, TREE_TYPE (expr)); - } - } + convert_conversion_warnings (totype, expr, fn, argnum); switch (convs->kind) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0f36b87..27974a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-03-15 Dirk Mueller <dmueller@suse.de> + + * g++.dg/warn/Wconversion2.C: New. + 2007-03-14 Eric Christopher <echristo@apple.com> * gcc.dg/ssp-1.c: New. diff --git a/gcc/testsuite/g++.dg/warn/Wconversion2.C b/gcc/testsuite/g++.dg/warn/Wconversion2.C new file mode 100644 index 0000000..d77407a --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wconversion2.C @@ -0,0 +1,4 @@ +// { dg-options "-Wconversion" } + +void foo(const char *); +void bar() { foo(false); } // { dg-warning "pointer type argument" } |