From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 18 Feb 2025 21:54:52 +0000 (-0500)
Subject: sarif output: fix alphabetization in sarif_scheme_handler::make_sink
X-Git-Tag: basepoints/gcc-16~1943
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196e8dbddc509cd6f42f879b72934dfbdb470aa1;p=thirdparty%2Fgcc.git

sarif output: fix alphabetization in sarif_scheme_handler::make_sink

No functional change intended.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

gcc/ChangeLog:
	* opts-diagnostic.cc (sarif_scheme_handler::make_sink): Put
	properties in alphabetical order.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>
---

diff --git a/gcc/opts-diagnostic.cc b/gcc/opts-diagnostic.cc
index 6516e5aec7e..cab7925aa34 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;