diff options
Diffstat (limited to 'gcc/analyzer/bounds-checking.cc')
| -rw-r--r-- | gcc/analyzer/bounds-checking.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gcc/analyzer/bounds-checking.cc b/gcc/analyzer/bounds-checking.cc index d2e2b34..921ad16 100644 --- a/gcc/analyzer/bounds-checking.cc +++ b/gcc/analyzer/bounds-checking.cc @@ -20,8 +20,8 @@ along with GCC; see the file COPYING3. If not see #include "analyzer/common.h" #include "intl.h" -#include "diagnostic-diagram.h" -#include "diagnostic-format-sarif.h" +#include "diagnostics/diagram.h" +#include "diagnostics/sarif-sink.h" #include "analyzer/analyzer-logging.h" #include "analyzer/region-model.h" @@ -51,7 +51,7 @@ public: } void prepare_for_emission (checker_path *path, pending_diagnostic *pd, - diagnostic_event_id_t emission_id) override + diagnostics::paths::event_id_t emission_id) override { region_creation_event_capacity::prepare_for_emission (path, pd, @@ -101,10 +101,11 @@ public: *this)); } - void maybe_add_sarif_properties (sarif_object &result_obj) + void + maybe_add_sarif_properties (diagnostics::sarif_object &result_obj) const override { - sarif_property_bag &props = result_obj.get_or_create_properties (); + auto &props = result_obj.get_or_create_properties (); #define PROPERTY_PREFIX "gcc/analyzer/out_of_bounds/" props.set_string (PROPERTY_PREFIX "dir", get_dir () == access_direction::read ? "read" : "write"); @@ -181,7 +182,7 @@ protected: a problem. Give up if that's happened. */ return; } - diagnostic_diagram diagram + diagnostics::diagram diagram (canvas, /* Alt text. */ _("Diagram visualizing the predicted out-of-bounds access")); @@ -203,7 +204,7 @@ protected: const region *m_reg; tree m_diag_arg; const svalue *m_sval_hint; - diagnostic_event_id_t m_region_creation_event_id; + diagnostics::paths::event_id_t m_region_creation_event_id; }; /* Abstract base class for all out-of-bounds warnings where the @@ -228,11 +229,11 @@ public: && m_out_of_bounds_bits == other.m_out_of_bounds_bits); } - void maybe_add_sarif_properties (sarif_object &result_obj) + void maybe_add_sarif_properties (diagnostics::sarif_object &result_obj) const override { out_of_bounds::maybe_add_sarif_properties (result_obj); - sarif_property_bag &props = result_obj.get_or_create_properties (); + auto &props = result_obj.get_or_create_properties (); #define PROPERTY_PREFIX "gcc/analyzer/concrete_out_of_bounds/" props.set (PROPERTY_PREFIX "out_of_bounds_bits", m_out_of_bounds_bits.to_json ()); @@ -294,11 +295,11 @@ public: *this)); } - void maybe_add_sarif_properties (sarif_object &result_obj) + void maybe_add_sarif_properties (diagnostics::sarif_object &result_obj) const final override { concrete_out_of_bounds::maybe_add_sarif_properties (result_obj); - sarif_property_bag &props = result_obj.get_or_create_properties (); + auto &props = result_obj.get_or_create_properties (); #define PROPERTY_PREFIX "gcc/analyzer/concrete_past_the_end/" props.set (PROPERTY_PREFIX "bit_bound", tree_to_json (m_bit_bound)); @@ -966,11 +967,12 @@ public: && pending_diagnostic::same_tree_p (m_capacity, other.m_capacity)); } - void maybe_add_sarif_properties (sarif_object &result_obj) + void + maybe_add_sarif_properties (diagnostics::sarif_object &result_obj) const final override { out_of_bounds::maybe_add_sarif_properties (result_obj); - sarif_property_bag &props = result_obj.get_or_create_properties (); + auto &props = result_obj.get_or_create_properties (); #define PROPERTY_PREFIX "gcc/analyzer/symbolic_past_the_end/" props.set (PROPERTY_PREFIX "offset", tree_to_json (m_offset)); props.set (PROPERTY_PREFIX "num_bytes", tree_to_json (m_num_bytes)); |