https://gcc.gnu.org/g:8c07814f46ca617ccc5f9fbf2b220dc41ae228c2
commit r15-2288-g8c07814f46ca617ccc5f9fbf2b220dc41ae228c2
Author: David Malcolm <dmalc...@redhat.com>
Date: Wed Jul 24 18:07:55 2024 -0400
diagnostics: SARIF output: add "workingDirectory" property (§3.20.19)
gcc/ChangeLog:
* diagnostic-format-sarif.cc
(sarif_builder::make_artifact_location_object): Make public.
(sarif_invocation::sarif_invocation): Add param "builder".
Use it to potentially populate the "workingDirectory" property
with the result of pwd (§3.20.19).
(sarif_builder::sarif_builder): Pass *this to m_invocation_obj's
ctor.
gcc/testsuite/ChangeLog:
* c-c++-common/diagnostic-format-sarif-file-1.c: Verify that we have
a "workingDirectory" property.
Signed-off-by: David Malcolm <dmalc...@redhat.com>
Diff:
---
gcc/diagnostic-format-sarif.cc | 15 ++++++++++-----
.../c-c++-common/diagnostic-format-sarif-file-1.c | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc
index 847e1eb9bdfc..9be84fb268a5 100644
--- a/gcc/diagnostic-format-sarif.cc
+++ b/gcc/diagnostic-format-sarif.cc
@@ -125,7 +125,7 @@ class sarif_tool_component : public sarif_object {};
class sarif_invocation : public sarif_object
{
public:
- sarif_invocation ();
+ sarif_invocation (sarif_builder &builder);
void add_notification_for_ice (diagnostic_context &context,
const diagnostic_info &diagnostic,
@@ -378,6 +378,9 @@ public:
std::unique_ptr<sarif_artifact_content>
maybe_make_artifact_content_object (const char *filename) const;
+ std::unique_ptr<sarif_artifact_location>
+ make_artifact_location_object (const char *filename);
+
private:
std::unique_ptr<sarif_result>
make_result_object (diagnostic_context &context,
@@ -404,8 +407,6 @@ private:
std::unique_ptr<sarif_artifact_location>
make_artifact_location_object (location_t loc);
std::unique_ptr<sarif_artifact_location>
- make_artifact_location_object (const char *filename);
- std::unique_ptr<sarif_artifact_location>
make_artifact_location_object_for_pwd () const;
std::unique_ptr<sarif_region>
maybe_make_region_object (location_t loc,
@@ -512,10 +513,14 @@ sarif_object::get_or_create_properties ()
/* class sarif_invocation : public sarif_object. */
-sarif_invocation::sarif_invocation ()
+sarif_invocation::sarif_invocation (sarif_builder &builder)
: m_notifications_arr (::make_unique<json::array> ()),
m_success (true)
{
+ // "workingDirectory" property (SARIF v2.1.0 section 3.20.19)
+ if (const char *pwd = getpwd ())
+ set<sarif_artifact_location> ("workingDirectory",
+ builder.make_artifact_location_object (pwd));
}
/* Handle an internal compiler error DIAGNOSTIC occurring on CONTEXT.
@@ -747,7 +752,7 @@ sarif_builder::sarif_builder (diagnostic_context &context,
const char *main_input_filename_,
bool formatted)
: m_context (context),
- m_invocation_obj (::make_unique<sarif_invocation> ()),
+ m_invocation_obj (::make_unique<sarif_invocation> (*this)),
m_results_array (new json::array ()),
m_cur_group_result (nullptr),
m_seen_any_relative_paths (false),
diff --git a/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c
b/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c
index 50375465483d..0a3778323792 100644
--- a/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c
+++ b/gcc/testsuite/c-c++-common/diagnostic-format-sarif-file-1.c
@@ -32,6 +32,7 @@
{ dg-final { scan-sarif-file "\"informationUri\": \"" } }
{ dg-final { scan-sarif-file "\"invocations\": \\\[" } }
+ { dg-final { scan-sarif-file {"workingDirectory": } } }
{ dg-final { scan-sarif-file "\"toolExecutionNotifications\": \\\[\\\]"
} }
{ dg-final { scan-sarif-file "\"executionSuccessful\": true" } }
