diff options
author | David Malcolm <dmalcolm@redhat.com> | 2020-01-17 09:50:33 -0500 |
---|---|---|
committer | David Malcolm <dmalcolm@redhat.com> | 2020-01-22 14:18:31 -0500 |
commit | 75038aa6aa5b562e6358108619d66ef2ccab9a53 (patch) | |
tree | b1fe8edd2080d5fea96ef7347ce1fd7f93983cfa /gcc/analyzer/sm-file.cc | |
parent | 68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604 (diff) | |
download | gcc-75038aa6aa5b562e6358108619d66ef2ccab9a53.zip gcc-75038aa6aa5b562e6358108619d66ef2ccab9a53.tar.gz gcc-75038aa6aa5b562e6358108619d66ef2ccab9a53.tar.bz2 |
analyzer: introduce namespace to avoid ODR clashes (PR 93307)
PR analyzer/93307 reports that in an LTO bootstrap, there are ODR
violations between:
- the "region" type:
gcc/analyzer/region-model.h:792
vs:
gcc/sched-int.h:1443
- the "constraint" type:
gcc/analyzer/constraint-manager.h:121
vs:
gcc/tree-ssa-structalias.c:533
This patches solves this clash by putting all of the analyzer names
within a namespace. I chose "ana" as it is short (to save typing).
The analyzer selftests are moved from namespace "selftest" to
"ana::selftest".
There are various places where the namespace has to be closed
and reopened, to allow e.g. for specializations of templates
in the global namespace.
gcc/analyzer/ChangeLog:
PR analyzer/93307
* analysis-plan.h: Wrap everything namespace "ana".
* analyzer-logging.cc: Likewise.
* analyzer-logging.h: Likewise.
* analyzer-pass.cc (pass_analyzer::execute): Update for "ana"
namespace.
* analyzer-selftests.cc: Wrap everything namespace "ana".
* analyzer-selftests.h: Likewise.
* analyzer.h: Likewise for forward decls of types.
* call-string.h: Likewise.
* checker-path.cc: Likewise.
* checker-path.h: Likewise.
* constraint-manager.cc: Likewise.
* constraint-manager.h: Likewise.
* diagnostic-manager.cc: Likewise.
* diagnostic-manager.h: Likewise.
* engine.cc: Likewise.
* engine.h: Likewise.
* exploded-graph.h: Likewise.
* function-set.cc: Likewise.
* function-set.h: Likewise.
* pending-diagnostic.cc: Likewise.
* pending-diagnostic.h: Likewise.
* program-point.cc: Likewise.
* program-point.h: Likewise.
* program-state.cc: Likewise.
* program-state.h: Likewise.
* region-model.cc: Likewise.
* region-model.h: Likewise.
* sm-file.cc: Likewise.
* sm-malloc.cc: Likewise.
* sm-pattern-test.cc: Likewise.
* sm-sensitive.cc: Likewise.
* sm-signal.cc: Likewise.
* sm-taint.cc: Likewise.
* sm.cc: Likewise.
* sm.h: Likewise.
* state-purge.h: Likewise.
* supergraph.cc: Likewise.
* supergraph.h: Likewise.
gcc/ChangeLog:
PR analyzer/93307
* gdbinit.in (break-on-saved-diagnostic): Update for move of
diagnostic_manager into "ana" namespace.
* selftest-run-tests.c (selftest::run_tests): Update for move of
selftest::run_analyzer_selftests to
ana::selftest::run_analyzer_selftests.
Diffstat (limited to 'gcc/analyzer/sm-file.cc')
-rw-r--r-- | gcc/analyzer/sm-file.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc index f731981..1144492 100644 --- a/gcc/analyzer/sm-file.cc +++ b/gcc/analyzer/sm-file.cc @@ -39,6 +39,8 @@ along with GCC; see the file COPYING3. If not see #if ENABLE_ANALYZER +namespace ana { + namespace { /* A state machine for detecting misuses of <stdio.h>'s FILE * API. */ @@ -434,4 +436,6 @@ analyzer_sm_file_cc_tests () #endif /* CHECKING_P */ +} // namespace ana + #endif /* #if ENABLE_ANALYZER */ |