https://gcc.gnu.org/g:196e8dbddc509cd6f42f879b72934dfbdb470aa1

commit r15-7610-g196e8dbddc509cd6f42f879b72934dfbdb470aa1
Author: David Malcolm <dmalc...@redhat.com>
Date:   Tue Feb 18 16:54:52 2025 -0500

    sarif output: fix alphabetization in sarif_scheme_handler::make_sink
    
    No functional change intended.
    
    Signed-off-by: David Malcolm <dmalc...@redhat.com>
    
    gcc/ChangeLog:
            * opts-diagnostic.cc (sarif_scheme_handler::make_sink): Put
            properties in alphabetical order.
    
    Signed-off-by: David Malcolm <dmalc...@redhat.com>

Diff:
---
 gcc/opts-diagnostic.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/opts-diagnostic.cc b/gcc/opts-diagnostic.cc
index 6516e5aec7eb..cab7925aa342 100644
--- a/gcc/opts-diagnostic.cc
+++ b/gcc/opts-diagnostic.cc
@@ -434,12 +434,17 @@ sarif_scheme_handler::make_sink (const context &ctxt,
                                 const char *unparsed_arg,
                                 const scheme_name_and_params &parsed_arg) const
 {
-  enum sarif_version version = sarif_version::v2_1_0;
   label_text filename;
+  enum sarif_version version = sarif_version::v2_1_0;
   for (auto& iter : parsed_arg.m_kvs)
     {
       const std::string &key = iter.first;
       const std::string &value = iter.second;
+      if (key == "file")
+       {
+         filename = label_text::take (xstrdup (value.c_str ()));
+         continue;
+       }
       if (key == "version")
        {
          static const std::array<std::pair<const char *, enum sarif_version>,
@@ -454,11 +459,6 @@ sarif_scheme_handler::make_sink (const context &ctxt,
            return nullptr;
          continue;
        }
-      if (key == "file")
-       {
-         filename = label_text::take (xstrdup (value.c_str ()));
-         continue;
-       }
 
       /* Key not found.  */
       auto_vec<const char *> known_keys;

Reply via email to