@@ -6636,16 +6636,24 @@ conversion_null_warnings (tree totype, tree expr, tree fn, int argnum)
if (null_node_p (expr) && TREE_CODE (totype) != BOOLEAN_TYPE
&& ARITHMETIC_TYPE_P (totype))
{
- source_location loc =
- expansion_point_location_if_in_system_header (input_location);
-
if (fn)
- warning_at (loc, OPT_Wconversion_null,
- "passing NULL to non-pointer argument %P of %qD",
- argnum, fn);
+ {
+ source_location loc = EXPR_LOC_OR_LOC (expr, input_location);
+ loc = expansion_point_location_if_in_system_header (loc);
+ auto_diagnostic_group d;
+ if (warning_at (loc, OPT_Wconversion_null,
+ "passing NULL to non-pointer argument %P of %qD",
+ argnum, fn))
+ inform (get_fndecl_argument_location (fn, argnum),
+ " declared here");
+ }
else
- warning_at (loc, OPT_Wconversion_null,
- "converting to non-pointer type %qT from NULL", totype);
+ {
+ source_location loc
+ = expansion_point_location_if_in_system_header (input_location);
+ warning_at (loc, OPT_Wconversion_null,
+ "converting to non-pointer type %qT from NULL", totype);
+ }
}
/* Issue warnings if "false" is converted to a NULL pointer */
@@ -6653,9 +6661,15 @@ conversion_null_warnings (tree totype, tree expr, tree fn, int argnum)
&& TYPE_PTR_P (totype))
{
if (fn)
- warning_at (input_location, OPT_Wconversion_null,
- "converting %<false%> to pointer type for argument %P "
- "of %qD", argnum, fn);
+ {
+ source_location loc = EXPR_LOC_OR_LOC (expr, input_location);
+ auto_diagnostic_group d;
+ if (warning_at (loc, OPT_Wconversion_null,
+ "converting %<false%> to pointer type for argument "
+ "%P of %qD", argnum, fn))
+ inform (get_fndecl_argument_location (fn, argnum),
+ " declared here");
+ }
else
warning_at (input_location, OPT_Wconversion_null,
"converting %<false%> to pointer type %qT", totype);
@@ -6695,6 +6709,10 @@ maybe_print_user_conv_context (conversion *convs)
location_t
get_fndecl_argument_location (tree fndecl, int argnum)
{
+ /* Gracefully fail for e.g. TEMPLATE_DECL. */
+ if (TREE_CODE (fndecl) != FUNCTION_DECL)
+ return DECL_SOURCE_LOCATION (fndecl);
+
int i;
tree param;
@@ -6712,6 +6730,18 @@ get_fndecl_argument_location (tree fndecl, int argnum)
return DECL_SOURCE_LOCATION (param);
}
+/* If FNDECL is non-NULL, issue a note highlighting ARGNUM
+ within its declaration (or the fndecl itself if something went
+ wrong). */
+
+void
+maybe_inform_about_fndecl_for_bogus_argument_init (tree fn, int argnum)
+{
+ if (fn)
+ inform (get_fndecl_argument_location (fn, argnum),
+ " initializing 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
indicates the `this' argument of a method. INNER is nonzero when
@@ -6789,9 +6819,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
complain);
else
expr = cp_convert (totype, expr, complain);
- if (complained && fn)
- inform (DECL_SOURCE_LOCATION (fn),
- " initializing argument %P of %qD", argnum, fn);
+ if (complained)
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
return expr;
}
else if (t->kind == ck_user || !t->bad_p)
@@ -6818,9 +6847,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
"invalid conversion from %qH to %qI",
TREE_TYPE (expr), totype);
}
- if (complained && fn)
- inform (get_fndecl_argument_location (fn, argnum),
- " initializing argument %P of %qD", argnum, fn);
+ if (complained)
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
return cp_convert (totype, expr, complain);
}
@@ -6942,9 +6970,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
? LOOKUP_IMPLICIT : LOOKUP_NORMAL);
build_user_type_conversion (totype, convs->u.expr, flags, complain);
gcc_assert (seen_error ());
- if (fn)
- inform (DECL_SOURCE_LOCATION (fn),
- " initializing argument %P of %qD", argnum, fn);
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
}
return error_mark_node;
@@ -7038,9 +7064,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
{
auto_diagnostic_group d;
maybe_print_user_conv_context (convs);
- if (fn)
- inform (DECL_SOURCE_LOCATION (fn),
- " initializing argument %P of %qD", argnum, fn);
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
}
return error_mark_node;
}
@@ -7091,9 +7115,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
{
auto_diagnostic_group d;
maybe_print_user_conv_context (convs);
- if (fn)
- inform (DECL_SOURCE_LOCATION (fn),
- " initializing argument %P of %qD", argnum, fn);
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
}
return build_cplus_new (totype, expr, complain);
@@ -7120,9 +7142,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
else
gcc_unreachable ();
maybe_print_user_conv_context (convs);
- if (fn)
- inform (DECL_SOURCE_LOCATION (fn),
- " initializing argument %P of %qD", argnum, fn);
+ maybe_inform_about_fndecl_for_bogus_argument_init (fn, argnum);
+
return error_mark_node;
}
@@ -9254,8 +9275,8 @@ complain_about_bad_argument (location_t arg_loc,
error_at (&richloc,
"cannot convert %qH to %qI",
from_type, to_type);
- inform (get_fndecl_argument_location (fndecl, parmnum),
- " initializing argument %P of %qD", parmnum, fndecl);
+ maybe_inform_about_fndecl_for_bogus_argument_init (fndecl,
+ parmnum);
}
/* Subroutine of build_new_method_call_1, for where there are no viable
@@ -6128,6 +6128,7 @@ extern location_t get_fndecl_argument_location (tree, int);
extern void complain_about_bad_argument (location_t arg_loc,
tree from_type, tree to_type,
tree fndecl, int parmnum);
+extern void maybe_inform_about_fndecl_for_bogus_argument_init (tree, int);
/* A class for recording information about access failures (e.g. private
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "c-family/c-ada-spec.h"
#include "asan.h"
+#include "gcc-rich-location.h"
/* Id for dumping the raw trees. */
int raw_dump_id;
@@ -5121,14 +5122,25 @@ check_default_args (tree x)
{
tree arg = TYPE_ARG_TYPES (TREE_TYPE (x));
bool saw_def = false;
+ location_t loc_of_first_default_arg = UNKNOWN_LOCATION;
int i = 0 - (TREE_CODE (TREE_TYPE (x)) == METHOD_TYPE);
for (; arg && arg != void_list_node; arg = TREE_CHAIN (arg), ++i)
{
if (TREE_PURPOSE (arg))
- saw_def = true;
+ {
+ saw_def = true;
+ location_t loc = get_fndecl_argument_location (x, i);
+ if (loc != DECL_SOURCE_LOCATION (x))
+ loc_of_first_default_arg = loc;
+ }
else if (saw_def && !PACK_EXPANSION_P (TREE_VALUE (arg)))
{
- error ("default argument missing for parameter %P of %q+#D", i, x);
+ location_t loc = get_fndecl_argument_location (x, i);
+ gcc_rich_location richloc (loc);
+ if (loc_of_first_default_arg != UNKNOWN_LOCATION)
+ richloc.add_range (loc_of_first_default_arg);
+ error_at (&richloc,
+ "default argument missing for parameter %P of %q#D", i, x);
TREE_PURPOSE (arg) = error_mark_node;
}
}
@@ -4014,11 +4014,19 @@ convert_arguments (tree typelist, vec<tree, va_gc> **values, tree fndecl,
{
if (complain & tf_error)
{
+ location_t loc = EXPR_LOC_OR_LOC (val, input_location);
if (fndecl)
- error ("parameter %P of %qD has incomplete type %qT",
- i, fndecl, type);
+ {
+ auto_diagnostic_group d;
+ error_at (loc,
+ "parameter %P of %qD has incomplete type %qT",
+ i, fndecl, type);
+ inform (get_fndecl_argument_location (fndecl, i),
+ " declared here");
+ }
else
- error ("parameter %P has incomplete type %qT", i, type);
+ error_at (loc, "parameter %P has incomplete type %qT", i,
+ type);
}
parmval = error_mark_node;
}
@@ -8801,6 +8809,7 @@ convert_for_assignment (tree type, tree rhs,
{
tree rhstype;
enum tree_code coder;
+ location_t rhs_loc = EXPR_LOC_OR_LOC (rhs, input_location);
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */
if (TREE_CODE (rhs) == NON_LVALUE_EXPR)
@@ -9075,6 +9084,7 @@ convert_for_initialization (tree exp, tree type, tree rhs, int flags,
if (codel == REFERENCE_TYPE)
{
+ auto_diagnostic_group d;
/* This should eventually happen in convert_arguments. */
int savew = 0, savee = 0;
@@ -9084,9 +9094,8 @@ convert_for_initialization (tree exp, tree type, tree rhs, int flags,
if (fndecl
&& (warningcount + werrorcount > savew || errorcount > savee))
- inform (DECL_SOURCE_LOCATION (fndecl),
+ inform (get_fndecl_argument_location (fndecl, parmnum),
"in passing argument %P of %qD", parmnum, fndecl);
-
return rhs;
}
new file mode 100644
@@ -0,0 +1,53 @@
+// { dg-options "-fdiagnostics-show-caret" }
+
+/* Function. */
+
+void test_1 (int a, int b = 42, int c, int d); // { dg-line test_1 }
+
+// { dg-error "default argument missing for parameter 3 of " "" { target *-*-* } test_1 }
+/* { dg-begin-multiline-output "" }
+ void test_1 (int a, int b = 42, int c, int d);
+ ~~~~~~~~~~ ~~~~^
+ { dg-end-multiline-output "" } */
+
+// { dg-error "default argument missing for parameter 4 of " "" { target *-*-* } test_1 }
+/* { dg-begin-multiline-output "" }
+ void test_1 (int a, int b = 42, int c, int d);
+ ~~~~~~~~~~ ~~~~^
+ { dg-end-multiline-output "" } */
+
+
+/* Non-static member fn. */
+
+struct test_2
+{
+ void member_2 (int a, int b = 42, int c); // { dg-error "default argument missing for parameter 3 of " }
+};
+
+
+/* { dg-begin-multiline-output "" }
+ void member_2 (int a, int b = 42, int c);
+ ~~~~~~~~~~ ~~~~^
+ { dg-end-multiline-output "" } */
+
+
+/* Static member fn. */
+
+struct test_3
+{
+ static void member_3 (int a, int b = 42, int c); // { dg-error "default argument missing for parameter 3 of " }
+};
+/* { dg-begin-multiline-output "" }
+ static void member_3 (int a, int b = 42, int c);
+ ~~~~~~~~~~ ~~~~^
+ { dg-end-multiline-output "" } */
+
+
+/* Template. */
+
+template <typename Type>
+void test_4 (int a, int b = 42, int c); // { dg-error "default argument missing for parameter 3 of " }
+/* { dg-begin-multiline-output "" }
+ void test_4 (int a, int b = 42, int c);
+ ~~~~~~~~~~ ~~~~^
+ { dg-end-multiline-output "" } */
new file mode 100644
@@ -0,0 +1,26 @@
+// { dg-do compile { target c++14 } }
+// { dg-options "-fdiagnostics-show-caret" }
+
+void f2(int, char (*)(int), int) { } // { dg-line f2 }
+
+void test_1 ()
+{
+ auto glambda = [](auto a) { return a; }; // { dg-line candidate }
+ int (*fp)(int) = glambda;
+ f2(1, glambda, 3); // { dg-error "invalid user-defined conversion" }
+ /* { dg-begin-multiline-output "" }
+ f2(1, glambda, 3);
+ ^~~~~~~
+ { dg-end-multiline-output "" } */
+ // { dg-message "candidate is: " "" { target *-*-* } candidate }
+ /* { dg-begin-multiline-output "" }
+ auto glambda = [](auto a) { return a; };
+ ^
+ { dg-end-multiline-output "" } */
+ // { dg-message "no known conversion from " "" { target *-*-* } candidate }
+ // { dg-message "initializing argument 2 of " "" { target *-*-* } f2 }
+ /* { dg-begin-multiline-output "" }
+ void f2(int, char (*)(int), int) { }
+ ^~~~~~~~~~~~~
+ { dg-end-multiline-output "" } */
+}
@@ -226,4 +226,45 @@ int test_11 (int first, int second, float third)
{ dg-end-multiline-output "" } */
}
+/* Bad reference. */
+
+struct s12;
+
+extern int callee_12 (int one, s12 &second, float three); // { dg-line callee_12 }
+
+int test_12 (int first, int second, float third)
+{
+ return callee_12 (first, second, third); // { dg-error "invalid initialization of reference of " }
+ /* { dg-begin-multiline-output "" }
+ return callee_12 (first, second, third);
+ ^~~~~~
+ { dg-end-multiline-output "" } */
+ // { dg-message "in passing argument 2 of " "" { target *-*-* } callee_12 }
+ /* { dg-begin-multiline-output "" }
+ extern int callee_12 (int one, s12 &second, float three);
+ ~~~~~^~~~~~
+ { dg-end-multiline-output "" } */
+}
+
+/* Incomplete type. */
+
+struct s13;
+
+extern int callee_13 (int one, s13 second, float three); // { dg-line callee_13 }
+
+int test_13 (int first, int second, float third)
+{
+ return callee_13 (first, second, third); // { dg-error "has incomplete type" }
+ /* { dg-begin-multiline-output "" }
+ return callee_13 (first, second, third);
+ ^~~~~~
+ { dg-end-multiline-output "" } */
+ // { dg-message "declared here" "" { target *-*-* } callee_13 }
+ /* { dg-begin-multiline-output "" }
+ extern int callee_13 (int one, s13 second, float three);
+ ~~~~^~~~~~
+ { dg-end-multiline-output "" } */
+}
+
+
// TODO: template callsite
new file mode 100644
@@ -0,0 +1,37 @@
+// { dg-do compile }
+// { dg-options "-Wconversion-null -fdiagnostics-show-caret" }
+
+#include <stddef.h>
+
+void callee_1 (int, int, int) {} // { dg-message "declared here" }
+
+void caller_1 (void)
+{
+ callee_1 (0, NULL, 2); // { dg-warning "passing NULL to non-pointer argument 2 of" }
+ /* { dg-begin-multiline-output "" }
+ callee_1 (0, NULL, 2);
+ ^~~~
+ { dg-end-multiline-output "" } */
+ /* { dg-begin-multiline-output "" }
+ void callee_1 (int, int, int) {}
+ ^~~
+ { dg-end-multiline-output "" } */
+}
+
+void callee_2 (int, void *, int) {} // { dg-message "declared here" "" { target { ! c++11 } } }
+// { dg-message "initializing argument 2 of " "" { target c++11 } .-1 }
+
+void caller_2 (void)
+{
+ callee_2 (0, false, 2); // { dg-warning "converting 'false' to pointer type for argument 2 of " "" { target { ! c++11 } } }
+ // { dg-error "cannot convert" "" { target c++11 } .-1 }
+
+ /* { dg-begin-multiline-output "" }
+ callee_2 (0, false, 2);
+ ^~~~~
+ { dg-end-multiline-output "" } */
+ /* { dg-begin-multiline-output "" }
+ void callee_2 (int, void *, int) {}
+ ^~~~~~
+ { dg-end-multiline-output "" } */
+}