@@ -290,6 +290,10 @@ fanalyzer-transitivity
Common Var(flag_analyzer_transitivity) Init(0)
Enable transitivity of constraints during analysis.
+fanalyzer-show-events-in-system-headers
+Common Var(flag_analyzer_show_events_in_system_headers) Init(0)
+Show events within system headers in analyzer execution paths.
+
fanalyzer-call-summaries
Common Var(flag_analyzer_call_summaries) Init(0)
Approximate the effect of function calls to simplify analysis.
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
+#include "input.h"
#include "pretty-print.h"
#include "gcc-rich-location.h"
#include "gimple-pretty-print.h"
@@ -2281,6 +2282,8 @@ diagnostic_manager::prune_path (checker_path *path,
path->maybe_log (get_logger (), "path");
prune_for_sm_diagnostic (path, sm, sval, state);
prune_interproc_events (path);
+ if (! flag_analyzer_show_events_in_system_headers)
+ prune_system_headers (path);
consolidate_conditions (path);
finish_pruning (path);
path->maybe_log (get_logger (), "pruned");
@@ -2667,6 +2670,99 @@ diagnostic_manager::prune_interproc_events (checker_path *path) const
while (changed);
}
+/* Remove everything within [call point, IDX]. For consistency,
+ IDX should represent the return event of the frame to delete,
+ or if there is none it should be the last event of the frame.
+ After this function, IDX designates the event prior to calling
+ this frame. */
+
+static void
+prune_frame (checker_path *path, int &idx)
+{
+ gcc_assert (idx >= 0);
+ int nesting = 1;
+ if (path->get_checker_event (idx)->is_return_p ())
+ nesting = 0;
+ do
+ {
+ if (path->get_checker_event (idx)->is_call_p ())
+ nesting--;
+ else if (path->get_checker_event (idx)->is_return_p ())
+ nesting++;
+
+ path->delete_event (idx--);
+ } while (idx >= 0 && nesting != 0);
+}
+
+/* This function is called when fanalyzer-show-events-in-system-headers
+ is disabled and will prune the diagnostic of all events within a
+ system header, only keeping the entry and exit events to the header.
+ This should be called after diagnostic_manager::prune_interproc_events
+ so that sucessive events [system header call, system header return]
+ are preserved thereafter.
+
+ Given a diagnostics path diving into a system header in the form
+ [
+ prefix events...,
+ system header call,
+ system header entry,
+ events within system headers...,
+ system header return,
+ suffix events...
+ ]
+
+ then transforms it into
+ [
+ prefix events...,
+ system header call,
+ system header return,
+ suffix events...
+ ]. */
+
+void
+diagnostic_manager::prune_system_headers (checker_path *path) const
+{
+ int idx = (signed)path->num_events () - 1;
+ while (idx >= 0)
+ {
+ const checker_event *event = path->get_checker_event (idx);
+ /* Prune everything between
+ [..., system entry, (...), system return, ...]. */
+ if (event->is_return_p ()
+ && in_system_header_at (event->get_location ()))
+ {
+ int ret_idx = idx;
+ prune_frame (path, idx);
+
+ if (get_logger ())
+ {
+ log ("filtering system headers events %i-%i:",
+ idx, ret_idx);
+ }
+ // Delete function entry within system headers.
+ if (idx >= 0)
+ {
+ event = path->get_checker_event (idx);
+ if (event->is_function_entry_p ()
+ && in_system_header_at (event->get_location ()))
+ {
+ if (get_logger ())
+ {
+ label_text desc (event->get_desc (false));
+ log ("filtering event %i:"
+ "system header entry event: %s",
+ idx, desc.get ());
+ }
+
+ path->delete_event (idx);
+ }
+ }
+ }
+
+ idx--;
+ }
+}
+
/* Return true iff event IDX within PATH is on the same line as REF_EXP_LOC. */
static bool
@@ -180,6 +180,7 @@ private:
state_machine::state_t state) const;
void update_for_unsuitable_sm_exprs (tree *expr) const;
void prune_interproc_events (checker_path *path) const;
+ void prune_system_headers (checker_path *path) const;
void consolidate_conditions (checker_path *path) const;
void finish_pruning (checker_path *path) const;
@@ -430,6 +430,7 @@ Objective-C and Objective-C++ Dialects}.
-fanalyzer-checker=@var{name}
-fno-analyzer-feasibility
-fanalyzer-fine-grained
+-fanalyzer-show-events-in-system-headers
-fno-analyzer-state-merge
-fno-analyzer-state-purge
-fno-analyzer-suppress-followups
@@ -11203,6 +11204,14 @@ have been detected as being duplicates of each other, it emits a note when
reporting the best diagnostic, giving the number of additional diagnostics
that were suppressed by the deduplication logic.
+@opindex fanalyzer-show-events-in-system-headers
+@opindex fno-analyzer-show-events-in-system-headers
+@item -fanalyzer-show-events-in-system-headers
+By default the analyzer emits simplified diagnostics paths by hiding
+events fully located within a system header.
+With @option{-fanalyzer-show-events-in-system-headers} such
+events are no longer suppressed.
+
@opindex fanalyzer-state-merge
@opindex fno-analyzer-state-merge
@item -fno-analyzer-state-merge
new file mode 100644
@@ -0,0 +1,18 @@
+/* { dg-skip-if "no shared_ptr in C++98" { c++98_only } } */
+
+#include <memory>
+
+struct A {int x; int y;};
+
+int main () {
+ std::shared_ptr<A> a; /* { dg-line declare_a } */
+ a->x = 4; /* { dg-line deref_a } */
+ /* { dg-warning "dereference of NULL" "" { target *-*-* } deref_a } */
+
+ return 0;
+}
+
+/* { dg-note "\\(1\\) 'a\\.std::.+::_M_ptr' is NULL" "" { target c++14_down } declare_a } */
+/* { dg-note "dereference of NULL 'a\\.std::.+::operator->\\(\\)'" "" { target *-*-* } deref_a } */
+/* { dg-note "calling 'std::.+::operator->' from 'main'" "" { target *-*-* } deref_a } */
+/* { dg-note "returning to 'main' from 'std::.+::operator->'" "" { target *-*-* } deref_a } */
new file mode 100644
@@ -0,0 +1,19 @@
+/* { dg-additional-options "-fno-analyzer-show-events-in-system-headers" } */
+/* { dg-skip-if "no shared_ptr in C++98" { c++98_only } } */
+
+#include <memory>
+
+struct A {int x; int y;};
+
+int main () {
+ std::shared_ptr<A> a; /* { dg-line declare_a } */
+ a->x = 4; /* { dg-line deref_a } */
+ /* { dg-warning "dereference of NULL" "" { target *-*-* } deref_a } */
+
+ return 0;
+}
+
+/* { dg-note "\\(1\\) 'a\\.std::.+::_M_ptr' is NULL" "" { target c++14_down } declare_a } */
+/* { dg-note "dereference of NULL 'a\\.std::.+::operator->\\(\\)'" "" { target *-*-* } deref_a } */
+/* { dg-note "calling 'std::.+::operator->' from 'main'" "" { target *-*-* } deref_a } */
+/* { dg-note "returning to 'main' from 'std::.+::operator->'" "" { target *-*-* } deref_a } */
new file mode 100644
@@ -0,0 +1,14 @@
+/* { dg-additional-options "-fanalyzer-show-events-in-system-headers" } */
+/* { dg-skip-if "no shared_ptr in C++98" { c++98_only } } */
+
+#include <memory>
+
+struct A {int x; int y;};
+
+int main () { /* { dg-message "\\(1\\) entry to 'main'" "telltale event that we are going within a deeper frame than 'main'" } */
+ std::shared_ptr<A> a; /* { dg-line declare_a } */
+ a->x = 4; /* { dg-line deref_a } */
+ /* { dg-warning "dereference of NULL" "" { target *-*-* } deref_a } */
+
+ return 0;
+}