From 5a59b39e8a98c07d4e6a7a77bf35f8ab93b2e560 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 26 Mar 2009 20:27:17 +0100 Subject: [PATCH] re PR c++/39554 (-Wdisallowed-function-list fails when #including ) PR c++/39554 * opts.c (warn_if_disallowed_function_p): Don't assume get_callee_fndecl must return non-NULL. * gcc.dg/wdisallowed-functions-3.c: New test. * g++.dg/warn/Wdisallowed-functions-3.C: New test. From-SVN: r145094 --- gcc/ChangeLog | 6 ++++++ gcc/opts.c | 14 +++++++++++--- gcc/testsuite/ChangeLog | 6 ++++++ .../g++.dg/warn/Wdisallowed-functions-3.C | 10 ++++++++++ gcc/testsuite/gcc.dg/wdisallowed-functions-3.c | 10 ++++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wdisallowed-functions-3.C create mode 100644 gcc/testsuite/gcc.dg/wdisallowed-functions-3.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 947f34f30a28..14fdabfaff88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-03-26 Jakub Jelinek + + PR c++/39554 + * opts.c (warn_if_disallowed_function_p): Don't assume + get_callee_fndecl must return non-NULL. + 2009-03-26 Vladimir Makarov PR rtl-optimization/39522 diff --git a/gcc/opts.c b/gcc/opts.c index 631977097ec0..2d5184fcb0e3 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -745,13 +745,21 @@ flag_instrument_functions_exclude_p (tree fndecl) void warn_if_disallowed_function_p (const_tree exp) { - if (TREE_CODE(exp) == CALL_EXPR + if (TREE_CODE (exp) == CALL_EXPR && VEC_length (char_p, warning_disallowed_functions) > 0) { int i; char *s; - const char *fnname = - IDENTIFIER_POINTER (DECL_NAME (get_callee_fndecl (exp))); + tree fndecl = get_callee_fndecl (exp); + const char *fnname; + + if (fndecl == NULL) + return; + + fnname = get_name (fndecl); + if (fnname == NULL) + return; + for (i = 0; VEC_iterate (char_p, warning_disallowed_functions, i, s); ++i) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0bc39a28ab30..e3e6ab4932d3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-03-26 Jakub Jelinek + + PR c++/39554 + * gcc.dg/wdisallowed-functions-3.c: New test. + * g++.dg/warn/Wdisallowed-functions-3.C: New test. + 2009-03-26 Kaveh R. Ghazi * gcc.dg/inline-33.c: Fix when pic. diff --git a/gcc/testsuite/g++.dg/warn/Wdisallowed-functions-3.C b/gcc/testsuite/g++.dg/warn/Wdisallowed-functions-3.C new file mode 100644 index 000000000000..3ecfb0c2264b --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wdisallowed-functions-3.C @@ -0,0 +1,10 @@ +// PR c++/39554 +// { dg-do compile } +// { dg-options "-Wdisallowed-function-list=bar" } + +void +foo (void (*p) (), void (*bar) ()) +{ + p (); + bar (); +} diff --git a/gcc/testsuite/gcc.dg/wdisallowed-functions-3.c b/gcc/testsuite/gcc.dg/wdisallowed-functions-3.c new file mode 100644 index 000000000000..5b8b31bdfc91 --- /dev/null +++ b/gcc/testsuite/gcc.dg/wdisallowed-functions-3.c @@ -0,0 +1,10 @@ +/* PR c++/39554 */ +/* { dg-do compile } */ +/* { dg-options "-Wdisallowed-function-list=bar" } */ + +void +foo (void (*p) (void), void (*bar) (void)) +{ + p (); + bar (); +} -- 2.47.3