From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id A7BE93858006; Wed, 5 Oct 2022 17:54:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7BE93858006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664992482; bh=Yn1t8EIM73ewEPxI1Oox7/UHz7wNYhHmwqv2kuMKSo8=; h=From:To:Subject:Date:From; b=fru0XrzmsOkC//N7xwJ4zn0osZ8OKVBxBXUvQtEu3wJxZJY41+cvSpkGT+2RRpqcE X6PFoLK2DQwXk7rxQ1OuscadZ8VvL1wIlAkfEaReOwp8SCi49GuR5zaVSHQYC6IghM U65U/XMNcYMvn15XHIigpShRNd23hrDfsdxDoDJE= 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-3095] analyzer: simplify some includes X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: 6832c95c0e1a58ba4d342ec002000f9d9d7db5ca X-Git-Newrev: 2eff4fe383a59de94267352e25f77b29d8e6bb42 Message-Id: <20221005175442.A7BE93858006@sourceware.org> Date: Wed, 5 Oct 2022 17:54:42 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2eff4fe383a59de94267352e25f77b29d8e6bb42 commit r13-3095-g2eff4fe383a59de94267352e25f77b29d8e6bb42 Author: David Malcolm Date: Wed Oct 5 13:52:59 2022 -0400 analyzer: simplify some includes gcc/analyzer/ChangeLog: * analysis-plan.cc: Simplify includes. * analyzer-pass.cc: Likewise. * analyzer-selftests.cc: Likewise. * analyzer.cc: Likewise. * analyzer.h: Add includes of "json.h" and "tristate.h". * call-info.cc: Simplify includes. * call-string.cc: Likewise. * call-summary.cc: Likewise. * checker-path.cc: Likewise. * complexity.cc: Likewise. * constraint-manager.cc: Likewise. * diagnostic-manager.cc: Likewise. * engine.cc: Likewise. * feasible-graph.cc: Likewise. * known-function-manager.cc: Likewise. * pending-diagnostic.cc: Likewise. * program-point.cc: Likewise. * program-state.cc: Likewise. * region-model-asm.cc: Likewise. * region-model-impl-calls.cc: Likewise. * region-model-manager.cc: Likewise. * region-model-reachability.cc: Likewise. * region-model.cc: Likewise. * region-model.h: Include "selftest.h". * region.cc: Simplify includes. * sm-fd.cc: 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. * state-purge.cc: Likewise. * store.cc: Likewise. * store.h: Likewise. * supergraph.cc: Likewise. * svalue.cc: Likewise. * svalue.h: Likewise. * trimmed-graph.cc: Likewise. * varargs.cc: Likewise. Signed-off-by: David Malcolm Diff: --- gcc/analyzer/analysis-plan.cc | 2 -- gcc/analyzer/analyzer-pass.cc | 1 - gcc/analyzer/analyzer-selftests.cc | 1 - gcc/analyzer/analyzer.cc | 1 - gcc/analyzer/analyzer.h | 2 ++ gcc/analyzer/call-info.cc | 7 ------- gcc/analyzer/call-string.cc | 1 - gcc/analyzer/call-summary.cc | 1 - gcc/analyzer/checker-path.cc | 8 -------- gcc/analyzer/complexity.cc | 4 ---- gcc/analyzer/constraint-manager.cc | 3 --- gcc/analyzer/diagnostic-manager.cc | 7 ------- gcc/analyzer/engine.cc | 6 ------ gcc/analyzer/feasible-graph.cc | 7 ------- gcc/analyzer/known-function-manager.cc | 1 - gcc/analyzer/pending-diagnostic.cc | 8 -------- gcc/analyzer/program-point.cc | 4 ---- gcc/analyzer/program-state.cc | 6 ------ gcc/analyzer/region-model-asm.cc | 3 --- gcc/analyzer/region-model-impl-calls.cc | 7 ------- gcc/analyzer/region-model-manager.cc | 7 ------- gcc/analyzer/region-model-reachability.cc | 9 ++------- gcc/analyzer/region-model.cc | 4 ---- gcc/analyzer/region-model.h | 1 + gcc/analyzer/region.cc | 4 ---- gcc/analyzer/sm-fd.cc | 4 ---- gcc/analyzer/sm-file.cc | 3 --- gcc/analyzer/sm-malloc.cc | 4 ---- gcc/analyzer/sm-pattern-test.cc | 4 ---- gcc/analyzer/sm-sensitive.cc | 3 --- gcc/analyzer/sm-signal.cc | 6 ------ gcc/analyzer/sm-taint.cc | 4 ---- gcc/analyzer/sm.cc | 2 -- gcc/analyzer/state-purge.cc | 10 +--------- gcc/analyzer/store.cc | 5 ----- gcc/analyzer/store.h | 2 -- gcc/analyzer/supergraph.cc | 1 - gcc/analyzer/svalue.cc | 10 ++-------- gcc/analyzer/svalue.h | 1 - gcc/analyzer/trimmed-graph.cc | 13 ------------- gcc/analyzer/varargs.cc | 11 ----------- 41 files changed, 8 insertions(+), 180 deletions(-) diff --git a/gcc/analyzer/analysis-plan.cc b/gcc/analyzer/analysis-plan.cc index c488f372ea7..a4a42c5cd3d 100644 --- a/gcc/analyzer/analysis-plan.cc +++ b/gcc/analyzer/analysis-plan.cc @@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "ipa-utils.h" #include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-core.h" #include "analyzer/analyzer-logging.h" @@ -35,7 +34,6 @@ along with GCC; see the file COPYING3. If not see #include "ordered-hash-map.h" #include "options.h" #include "cgraph.h" -#include "function.h" #include "cfg.h" #include "basic-block.h" #include "gimple.h" diff --git a/gcc/analyzer/analyzer-pass.cc b/gcc/analyzer/analyzer-pass.cc index f6cef58bc7c..fc7098ddccb 100644 --- a/gcc/analyzer/analyzer-pass.cc +++ b/gcc/analyzer/analyzer-pass.cc @@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic.h" #include "options.h" #include "tree.h" -#include "function.h" #include "analyzer/analyzer.h" #include "analyzer/engine.h" diff --git a/gcc/analyzer/analyzer-selftests.cc b/gcc/analyzer/analyzer-selftests.cc index 3765e70e4c3..278c245f415 100644 --- a/gcc/analyzer/analyzer-selftests.cc +++ b/gcc/analyzer/analyzer-selftests.cc @@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tree.h" #include "stringpool.h" -#include "function.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-selftests.h" diff --git a/gcc/analyzer/analyzer.cc b/gcc/analyzer/analyzer.cc index c85dbf331d5..8a2a7734f24 100644 --- a/gcc/analyzer/analyzer.cc +++ b/gcc/analyzer/analyzer.cc @@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple.h" #include "diagnostic.h" #include "intl.h" -#include "function.h" #include "analyzer/analyzer.h" #if ENABLE_ANALYZER diff --git a/gcc/analyzer/analyzer.h b/gcc/analyzer/analyzer.h index 49c19af7fc0..a2d79e4a59f 100644 --- a/gcc/analyzer/analyzer.h +++ b/gcc/analyzer/analyzer.h @@ -22,6 +22,8 @@ along with GCC; see the file COPYING3. If not see #define GCC_ANALYZER_ANALYZER_H #include "function.h" +#include "json.h" +#include "tristate.h" class graphviz_out; diff --git a/gcc/analyzer/call-info.cc b/gcc/analyzer/call-info.cc index d9a261fe217..56059ac5cf4 100644 --- a/gcc/analyzer/call-info.cc +++ b/gcc/analyzer/call-info.cc @@ -30,11 +30,7 @@ along with GCC; see the file COPYING3. If not see #include "options.h" #include "cgraph.h" #include "tree-pretty-print.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" @@ -56,9 +52,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-path.h" #include "analyzer/checker-path.h" #include "analyzer/diagnostic-manager.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" #include "analyzer/exploded-graph.h" #include "analyzer/call-info.h" diff --git a/gcc/analyzer/call-string.cc b/gcc/analyzer/call-string.cc index a09f569d9d1..f0a30d9b2b6 100644 --- a/gcc/analyzer/call-string.cc +++ b/gcc/analyzer/call-string.cc @@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see #include "pretty-print.h" #include "tree.h" #include "options.h" -#include "json.h" #include "ordered-hash-map.h" #include "options.h" #include "cgraph.h" diff --git a/gcc/analyzer/call-summary.cc b/gcc/analyzer/call-summary.cc index 33916547e1e..bc50562b5ec 100644 --- a/gcc/analyzer/call-summary.cc +++ b/gcc/analyzer/call-summary.cc @@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-dfa.h" #include "diagnostic.h" #include "tree-diagnostic.h" -#include "selftest.h" #include "analyzer/analyzer.h" #include "analyzer/region-model.h" #include "analyzer/call-summary.h" diff --git a/gcc/analyzer/checker-path.cc b/gcc/analyzer/checker-path.cc index 22bae2f34b1..371111b288d 100644 --- a/gcc/analyzer/checker-path.cc +++ b/gcc/analyzer/checker-path.cc @@ -28,26 +28,18 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "gimple-pretty-print.h" #include "fold-const.h" -#include "function.h" #include "diagnostic-path.h" #include "options.h" #include "cgraph.h" -#include "function.h" #include "cfg.h" #include "digraph.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" #include "diagnostic-event-id.h" -#include "shortest-paths.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" #include "ordered-hash-map.h" -#include "selftest.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" diff --git a/gcc/analyzer/complexity.cc b/gcc/analyzer/complexity.cc index 40ae8f7bcfc..39fbbc133f4 100644 --- a/gcc/analyzer/complexity.cc +++ b/gcc/analyzer/complexity.cc @@ -38,11 +38,7 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "fold-const.h" #include "tree-pretty-print.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "options.h" diff --git a/gcc/analyzer/constraint-manager.cc b/gcc/analyzer/constraint-manager.cc index 6685e2e801c..96ae0738419 100644 --- a/gcc/analyzer/constraint-manager.cc +++ b/gcc/analyzer/constraint-manager.cc @@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see #include "selftest.h" #include "diagnostic-core.h" #include "graphviz.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "ordered-hash-map.h" #include "options.h" @@ -41,7 +39,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/supergraph.h" #include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" #include "analyzer/analyzer-logging.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc index 2d185a1f3e6..695bde5bee1 100644 --- a/gcc/analyzer/diagnostic-manager.cc +++ b/gcc/analyzer/diagnostic-manager.cc @@ -29,15 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "diagnostic-event-id.h" #include "diagnostic-path.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" -#include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" -#include "selftest.h" #include "ordered-hash-map.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index faef0bd15b0..46bcaeda837 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -25,9 +25,6 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "fold-const.h" #include "gcc-rich-location.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" #include "diagnostic-core.h" #include "diagnostic-event-id.h" #include "diagnostic-path.h" @@ -35,10 +32,7 @@ along with GCC; see the file COPYING3. If not see #include "pretty-print.h" #include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" #include "ordered-hash-map.h" -#include "selftest.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/feasible-graph.cc b/gcc/analyzer/feasible-graph.cc index fe7e79fe902..a946e4c5a35 100644 --- a/gcc/analyzer/feasible-graph.cc +++ b/gcc/analyzer/feasible-graph.cc @@ -29,15 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "diagnostic-event-id.h" #include "diagnostic-path.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" -#include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" -#include "selftest.h" #include "ordered-hash-map.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" diff --git a/gcc/analyzer/known-function-manager.cc b/gcc/analyzer/known-function-manager.cc index f0fd4fc5271..48fb005e37e 100644 --- a/gcc/analyzer/known-function-manager.cc +++ b/gcc/analyzer/known-function-manager.cc @@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tree.h" -#include "function.h" #include "analyzer/analyzer.h" #include "diagnostic-core.h" #include "analyzer/analyzer-logging.h" diff --git a/gcc/analyzer/pending-diagnostic.cc b/gcc/analyzer/pending-diagnostic.cc index eff050f6757..50a8afc6afd 100644 --- a/gcc/analyzer/pending-diagnostic.cc +++ b/gcc/analyzer/pending-diagnostic.cc @@ -24,8 +24,6 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "intl.h" #include "diagnostic.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" @@ -34,8 +32,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/sm.h" #include "analyzer/pending-diagnostic.h" #include "analyzer/diagnostic-manager.h" -#include "selftest.h" -#include "tristate.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" @@ -50,10 +46,6 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "analyzer/supergraph.h" #include "analyzer/program-state.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" -#include "sbitmap.h" #include "analyzer/exploded-graph.h" #include "diagnostic-path.h" #include "analyzer/checker-path.h" diff --git a/gcc/analyzer/program-point.cc b/gcc/analyzer/program-point.cc index 6c296d5ddc8..cfa4dda14df 100644 --- a/gcc/analyzer/program-point.cc +++ b/gcc/analyzer/program-point.cc @@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "gimple-pretty-print.h" #include "gcc-rich-location.h" -#include "json.h" #include "ordered-hash-map.h" #include "options.h" #include "cgraph.h" @@ -41,14 +40,11 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/program-point.h" #include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" #include "selftest.h" #include "analyzer/store.h" #include "analyzer/region-model.h" #include "analyzer/sm.h" #include "analyzer/program-state.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" #include "diagnostic-event-id.h" #include "analyzer/pending-diagnostic.h" #include "analyzer/diagnostic-manager.h" diff --git a/gcc/analyzer/program-state.cc b/gcc/analyzer/program-state.cc index b54bdcee854..7537dc03e41 100644 --- a/gcc/analyzer/program-state.cc +++ b/gcc/analyzer/program-state.cc @@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "diagnostic-core.h" #include "diagnostic.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" #include "ordered-hash-map.h" #include "selftest.h" #include "analyzer/call-string.h" @@ -40,9 +37,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/region-model.h" #include "analyzer/program-state.h" #include "analyzer/constraint-manager.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" #include "diagnostic-event-id.h" #include "analyzer/pending-diagnostic.h" #include "analyzer/diagnostic-manager.h" diff --git a/gcc/analyzer/region-model-asm.cc b/gcc/analyzer/region-model-asm.cc index bb73e6eed60..b4c1f9195ec 100644 --- a/gcc/analyzer/region-model-asm.cc +++ b/gcc/analyzer/region-model-asm.cc @@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-iterator.h" #include "diagnostic-core.h" #include "pretty-print.h" -#include "tristate.h" -#include "selftest.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "options.h" diff --git a/gcc/analyzer/region-model-impl-calls.cc b/gcc/analyzer/region-model-impl-calls.cc index 5cc590716b4..8f4940a4d55 100644 --- a/gcc/analyzer/region-model-impl-calls.cc +++ b/gcc/analyzer/region-model-impl-calls.cc @@ -38,18 +38,11 @@ along with GCC; see the file COPYING3. If not see #include "tree-pretty-print.h" #include "diagnostic-color.h" #include "diagnostic-metadata.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" #include "options.h" -#include "cgraph.h" -#include "cfg.h" -#include "digraph.h" #include "analyzer/supergraph.h" #include "sbitmap.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index 9a2ee08df78..f5999e64d01 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -38,18 +38,11 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "fold-const.h" #include "tree-pretty-print.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" #include "options.h" -#include "cgraph.h" -#include "cfg.h" -#include "digraph.h" #include "analyzer/supergraph.h" #include "sbitmap.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/region-model-reachability.cc b/gcc/analyzer/region-model-reachability.cc index 12d09c3e500..be1372c9e80 100644 --- a/gcc/analyzer/region-model-reachability.cc +++ b/gcc/analyzer/region-model-reachability.cc @@ -36,23 +36,18 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "fold-const.h" #include "tree-pretty-print.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" #include "options.h" -#include "cgraph.h" -#include "cfg.h" -#include "digraph.h" -#include "json.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" #include "analyzer/region-model.h" #include "analyzer/region-model-reachability.h" +#include "diagnostic.h" +#include "tree-diagnostic.h" #if ENABLE_ANALYZER diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index aa3d2054131..c50f5c6fb96 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -39,18 +39,14 @@ along with GCC; see the file COPYING3. If not see #include "tree-pretty-print.h" #include "diagnostic-color.h" #include "diagnostic-metadata.h" -#include "tristate.h" #include "bitmap.h" #include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" #include "options.h" #include "cgraph.h" #include "cfg.h" -#include "digraph.h" #include "analyzer/supergraph.h" #include "sbitmap.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/region-model.h b/gcc/analyzer/region-model.h index e81595e8bc4..635a0c27330 100644 --- a/gcc/analyzer/region-model.h +++ b/gcc/analyzer/region-model.h @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see (Zhongxing Xu, Ted Kremenek, and Jian Zhang) http://lcs.ios.ac.cn/~xuzb/canalyze/memmodel.pdf */ +#include "selftest.h" #include "analyzer/svalue.h" #include "analyzer/region.h" #include "analyzer/known-function-manager.h" diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc index 09646bfc98a..da5a13ec0be 100644 --- a/gcc/analyzer/region.cc +++ b/gcc/analyzer/region.cc @@ -40,11 +40,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-pretty-print.h" #include "diagnostic-color.h" #include "diagnostic-metadata.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" diff --git a/gcc/analyzer/sm-fd.cc b/gcc/analyzer/sm-fd.cc index 505d598f3f0..c4ad91cfeb2 100644 --- a/gcc/analyzer/sm-fd.cc +++ b/gcc/analyzer/sm-fd.cc @@ -28,8 +28,6 @@ along with GCC; see the file COPYING3. If not see #include "options.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" @@ -37,8 +35,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/pending-diagnostic.h" #include "analyzer/function-set.h" #include "analyzer/analyzer-selftests.h" -#include "tristate.h" -#include "selftest.h" #include "stringpool.h" #include "attribs.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc index f6cb29c7806..13f2507f7c7 100644 --- a/gcc/analyzer/sm-file.cc +++ b/gcc/analyzer/sm-file.cc @@ -28,8 +28,6 @@ along with GCC; see the file COPYING3. If not see #include "options.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" @@ -37,7 +35,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/pending-diagnostic.h" #include "analyzer/function-set.h" #include "analyzer/analyzer-selftests.h" -#include "tristate.h" #include "selftest.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" diff --git a/gcc/analyzer/sm-malloc.cc b/gcc/analyzer/sm-malloc.cc index 73c549fa081..fef6e63e1d7 100644 --- a/gcc/analyzer/sm-malloc.cc +++ b/gcc/analyzer/sm-malloc.cc @@ -29,15 +29,11 @@ along with GCC; see the file COPYING3. If not see #include "bitmap.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "analyzer/pending-diagnostic.h" -#include "tristate.h" -#include "selftest.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" diff --git a/gcc/analyzer/sm-pattern-test.cc b/gcc/analyzer/sm-pattern-test.cc index 9b2ad68e26a..3208132882e 100644 --- a/gcc/analyzer/sm-pattern-test.cc +++ b/gcc/analyzer/sm-pattern-test.cc @@ -30,15 +30,11 @@ along with GCC; see the file COPYING3. If not see #include "tree-pretty-print.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "analyzer/pending-diagnostic.h" -#include "tristate.h" -#include "selftest.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" diff --git a/gcc/analyzer/sm-sensitive.cc b/gcc/analyzer/sm-sensitive.cc index 83c19068be6..cb5f8595b1f 100644 --- a/gcc/analyzer/sm-sensitive.cc +++ b/gcc/analyzer/sm-sensitive.cc @@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tree.h" #include "function.h" -#include "function.h" #include "basic-block.h" #include "gimple.h" #include "options.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" diff --git a/gcc/analyzer/sm-signal.cc b/gcc/analyzer/sm-signal.cc index b601f450513..e3b08c38b30 100644 --- a/gcc/analyzer/sm-signal.cc +++ b/gcc/analyzer/sm-signal.cc @@ -31,15 +31,12 @@ along with GCC; see the file COPYING3. If not see #include "bitmap.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "diagnostic-event-id.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "analyzer/pending-diagnostic.h" #include "sbitmap.h" -#include "tristate.h" #include "ordered-hash-map.h" #include "selftest.h" #include "analyzer/call-string.h" @@ -48,13 +45,10 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/region-model.h" #include "analyzer/program-state.h" #include "analyzer/checker-path.h" -#include "digraph.h" #include "cfg.h" #include "gimple-iterator.h" #include "cgraph.h" #include "analyzer/supergraph.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" #include "analyzer/diagnostic-manager.h" #include "shortest-paths.h" #include "analyzer/exploded-graph.h" diff --git a/gcc/analyzer/sm-taint.cc b/gcc/analyzer/sm-taint.cc index f5c0cc13a2f..bc27533256f 100644 --- a/gcc/analyzer/sm-taint.cc +++ b/gcc/analyzer/sm-taint.cc @@ -30,13 +30,9 @@ along with GCC; see the file COPYING3. If not see #include "options.h" #include "diagnostic-path.h" #include "diagnostic-metadata.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "gimple-iterator.h" -#include "tristate.h" -#include "selftest.h" #include "ordered-hash-map.h" #include "cgraph.h" #include "cfg.h" diff --git a/gcc/analyzer/sm.cc b/gcc/analyzer/sm.cc index d17d5c765b4..1ab4c21fa1d 100644 --- a/gcc/analyzer/sm.cc +++ b/gcc/analyzer/sm.cc @@ -31,11 +31,9 @@ along with GCC; see the file COPYING3. If not see #include "pretty-print.h" #include "diagnostic.h" #include "tree-diagnostic.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" -#include "tristate.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" diff --git a/gcc/analyzer/state-purge.cc b/gcc/analyzer/state-purge.cc index 7a061a19480..d3f516a671c 100644 --- a/gcc/analyzer/state-purge.cc +++ b/gcc/analyzer/state-purge.cc @@ -36,24 +36,16 @@ along with GCC; see the file COPYING3. If not see #include "ssa-iterators.h" #include "diagnostic-core.h" #include "gimple-pretty-print.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/call-string.h" -#include "digraph.h" -#include "ordered-hash-map.h" -#include "cfg.h" -#include "gimple-iterator.h" -#include "cgraph.h" #include "analyzer/supergraph.h" #include "analyzer/program-point.h" #include "analyzer/analyzer-logging.h" #include "analyzer/state-purge.h" -#include "tristate.h" -#include "selftest.h" #include "analyzer/store.h" #include "analyzer/region-model.h" #include "gimple-walk.h" +#include "cgraph.h" #if ENABLE_ANALYZER diff --git a/gcc/analyzer/store.cc b/gcc/analyzer/store.cc index 1ca12142e47..d2279b53249 100644 --- a/gcc/analyzer/store.cc +++ b/gcc/analyzer/store.cc @@ -38,18 +38,13 @@ along with GCC; see the file COPYING3. If not see #include "tree-pretty-print.h" #include "diagnostic-color.h" #include "diagnostic-metadata.h" -#include "tristate.h" #include "bitmap.h" #include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "ordered-hash-map.h" #include "options.h" -#include "cgraph.h" #include "cfg.h" -#include "digraph.h" #include "analyzer/supergraph.h" #include "sbitmap.h" #include "analyzer/call-string.h" diff --git a/gcc/analyzer/store.h b/gcc/analyzer/store.h index 0b5cbd69e51..1087782a326 100644 --- a/gcc/analyzer/store.h +++ b/gcc/analyzer/store.h @@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_ANALYZER_STORE_H #define GCC_ANALYZER_STORE_H -#include "tristate.h" - /* Implementation of the region-based ternary model described in: "A Memory Model for Static Analysis of C Programs" (Zhongxing Xu, Ted Kremenek, and Jian Zhang) diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc index a4a495aeaa2..0e9a32500cb 100644 --- a/gcc/analyzer/supergraph.cc +++ b/gcc/analyzer/supergraph.cc @@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see #include "bitmap.h" #include "cfganal.h" #include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "ordered-hash-map.h" #include "options.h" diff --git a/gcc/analyzer/svalue.cc b/gcc/analyzer/svalue.cc index d8d419a1032..9ec46d626da 100644 --- a/gcc/analyzer/svalue.cc +++ b/gcc/analyzer/svalue.cc @@ -38,22 +38,16 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "fold-const.h" #include "tree-pretty-print.h" -#include "tristate.h" #include "bitmap.h" -#include "selftest.h" -#include "function.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" -#include "options.h" -#include "cgraph.h" -#include "cfg.h" -#include "digraph.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" #include "analyzer/svalue.h" #include "analyzer/region-model.h" +#include "diagnostic.h" +#include "tree-diagnostic.h" #if ENABLE_ANALYZER diff --git a/gcc/analyzer/svalue.h b/gcc/analyzer/svalue.h index 9d0f04d7502..382b083d76a 100644 --- a/gcc/analyzer/svalue.h +++ b/gcc/analyzer/svalue.h @@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_ANALYZER_SVALUE_H #define GCC_ANALYZER_SVALUE_H -#include "json.h" #include "analyzer/complexity.h" #include "analyzer/store.h" #include "analyzer/program-point.h" diff --git a/gcc/analyzer/trimmed-graph.cc b/gcc/analyzer/trimmed-graph.cc index 6c85910c5f2..9fdb4a9e240 100644 --- a/gcc/analyzer/trimmed-graph.cc +++ b/gcc/analyzer/trimmed-graph.cc @@ -29,15 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "diagnostic-event-id.h" #include "diagnostic-path.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" -#include "sbitmap.h" #include "bitmap.h" -#include "tristate.h" -#include "selftest.h" #include "ordered-hash-map.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" @@ -48,12 +41,6 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/store.h" #include "analyzer/region-model.h" #include "analyzer/constraint-manager.h" -#include "cfg.h" -#include "basic-block.h" -#include "gimple.h" -#include "gimple-iterator.h" -#include "cgraph.h" -#include "digraph.h" #include "analyzer/supergraph.h" #include "analyzer/program-state.h" #include "analyzer/exploded-graph.h" diff --git a/gcc/analyzer/varargs.cc b/gcc/analyzer/varargs.cc index 9400086b10e..b2e6cd53c06 100644 --- a/gcc/analyzer/varargs.cc +++ b/gcc/analyzer/varargs.cc @@ -26,28 +26,17 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "gimple.h" #include "diagnostic-path.h" -#include "json.h" #include "analyzer/analyzer.h" #include "analyzer/analyzer-logging.h" #include "analyzer/sm.h" #include "analyzer/pending-diagnostic.h" -#include "tristate.h" -#include "selftest.h" #include "analyzer/call-string.h" #include "analyzer/program-point.h" #include "analyzer/store.h" #include "analyzer/region-model.h" #include "analyzer/program-state.h" #include "analyzer/checker-path.h" -#include "digraph.h" -#include "ordered-hash-map.h" -#include "cfg.h" -#include "gimple-iterator.h" #include "analyzer/supergraph.h" -#include "alloc-pool.h" -#include "fibonacci_heap.h" -#include "shortest-paths.h" -#include "sbitmap.h" #include "analyzer/diagnostic-manager.h" #include "analyzer/exploded-graph.h" #include "diagnostic-metadata.h"