From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id A8DD9385842D; Tue, 22 Nov 2022 22:32:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8DD9385842D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669156376; bh=GrtKKgPTrpVRdSJS+04frpqCcM4wDByAff37NmYLgjg=; h=From:To:Subject:Date:From; b=JVH4EM6Zc3CY9IOoqhOmkGHVVH0MJ/T4tkEg85xFIVCHFXkUWrCeGnJJwNYxykwqc QBnUuj2qW+DBJQsPa9piqo0ME+cF3f7FGEy6Rf3g9xjdyGKB2IrmLYTEOghRmrZ+9S 1xzCmHkkmvFW/Z/jo8mkcgHwq+AA2gLxyPNQROFk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4249] analyzer: only look for named functions in root ns [PR107788] X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: 64fb291c5839e1a82afb62743172b4eab1267399 X-Git-Newrev: ec7c796de020cb5cd955aa5b26c92b1da49d6076 Message-Id: <20221122223256.A8DD9385842D@sourceware.org> Date: Tue, 22 Nov 2022 22:32:56 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ec7c796de020cb5cd955aa5b26c92b1da49d6076 commit r13-4249-gec7c796de020cb5cd955aa5b26c92b1da49d6076 Author: David Malcolm Date: Tue Nov 22 17:29:21 2022 -0500 analyzer: only look for named functions in root ns [PR107788] gcc/analyzer/ChangeLog: PR analyzer/107788 * known-function-manager.cc (known_function_manager::get_match): Don't look up fndecls by name when they're not in the root namespace. gcc/testsuite/ChangeLog: PR analyzer/107788 * g++.dg/analyzer/named-functions.C: New test. Signed-off-by: David Malcolm Diff: --- gcc/analyzer/known-function-manager.cc | 15 ++++++++++++--- gcc/testsuite/g++.dg/analyzer/named-functions.C | 12 ++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gcc/analyzer/known-function-manager.cc b/gcc/analyzer/known-function-manager.cc index e17350da5ec..c1074bcb6e5 100644 --- a/gcc/analyzer/known-function-manager.cc +++ b/gcc/analyzer/known-function-manager.cc @@ -91,6 +91,7 @@ known_function_manager::add (enum internal_fn ifn, const known_function * known_function_manager::get_match (tree fndecl, const call_details &cd) const { + /* Look for a matching built-in. */ if (fndecl_built_in_p (fndecl, BUILT_IN_NORMAL)) { if (const known_function *candidate @@ -99,10 +100,18 @@ known_function_manager::get_match (tree fndecl, const call_details &cd) const fndecl)) return candidate; } + + /* Look for a match by name. */ + + /* Reject fndecls that aren't in the root namespace. */ + if (DECL_CONTEXT (fndecl) + && TREE_CODE (DECL_CONTEXT (fndecl)) != TRANSLATION_UNIT_DECL) + return NULL; if (tree identifier = DECL_NAME (fndecl)) - if (const known_function *candidate = get_by_identifier (identifier)) - if (candidate->matches_call_types_p (cd)) - return candidate; + if (const known_function *candidate = get_by_identifier (identifier)) + if (candidate->matches_call_types_p (cd)) + return candidate; + return NULL; } diff --git a/gcc/testsuite/g++.dg/analyzer/named-functions.C b/gcc/testsuite/g++.dg/analyzer/named-functions.C new file mode 100644 index 00000000000..661a9307b81 --- /dev/null +++ b/gcc/testsuite/g++.dg/analyzer/named-functions.C @@ -0,0 +1,12 @@ +#define NULL ((void *)0) + +namespace my +{ + int socket (int, int, int); +}; + +void test_my_socket () +{ + /* This shouldn't match the known function "::socket". */ + my::socket (0, 0, 0); /* { dg-bogus "leak" } */ +}