[clang] [clang-tools-extra] [clang-tidy] Add SARIF output to clang-tidy (PR #219182)

via cfe-commits cfe-commits at lists.llvm.org
Tue Nov 3 01:58:24 PST 2026


https://github.com/matthew-j-code updated https://github.com/llvm/llvm-project/pull/219182

>From 66c0ac42fb7de98a6f244116830917eb22bd875a Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 10 Jul 2026 07:11:06 -0700
Subject: [PATCH 01/28] [clang-tidy] Add SARIF output to clang-tidy

Clang-tidy is a static analysis framework, and
should therefore be able to output results in the
Static Analysis Results Interchange Format
(SARIF). This brings clang-tidy in line with clang
and clang-static-analyzer.
---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    | 130 +++++++++++++-
 clang-tools-extra/clang-tidy/ClangTidy.h      |   3 +-
 .../clang-tidy/tool/ClangTidyMain.cpp         |  21 ++-
 clang-tools-extra/docs/ReleaseNotes.md        |   4 +
 .../export-SARIF-Thread-flows.cpp             | 136 +++++++++++++++
 .../export-SARIF-diagnostics-terminal.cpp     |  98 +++++++++++
 .../export-SARIF-diagnostics.cpp              | 165 ++++++++++++++++++
 .../include/clang/Frontend/SARIFDiagnostic.h  |  16 +-
 clang/lib/Frontend/SARIFDiagnostic.cpp        |  60 ++++---
 9 files changed, 593 insertions(+), 40 deletions(-)
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index d065bb2c4bcfcd..05084b33a92b32 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -24,10 +24,12 @@
 #include "clang/AST/ASTConsumer.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Basic/DiagnosticFrontend.h"
+#include "clang/Basic/Sarif.h"
 #include "clang/Format/Format.h"
 #include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/MultiplexConsumer.h"
+#include "clang/Frontend/SARIFDiagnostic.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/PreprocessorOptions.h"
@@ -36,6 +38,7 @@
 #include "clang/Tooling/DiagnosticsYaml.h" // IWYU pragma: keep
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/Process.h"
 #include <memory>
 #include <utility>
@@ -101,11 +104,18 @@ class AnalyzerDiagnosticConsumer : public ento::PathDiagnosticConsumer {
 class ErrorReporter {
 public:
   ErrorReporter(ClangTidyContext &Context, FixBehaviour ApplyFixes,
-                llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS)
+                llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
+                llvm::raw_ostream *SarifOS = nullptr)
       : Files(FileSystemOptions(), std::move(BaseFS)),
         DiagPrinter(new TextDiagnosticPrinter(llvm::outs(), DiagOpts)),
         Diags(DiagnosticIDs::create(), DiagOpts, DiagPrinter),
-        SourceMgr(Diags, Files), Context(Context), ApplyFixes(ApplyFixes) {
+        SourceMgr(Diags, Files), Context(Context), ApplyFixes(ApplyFixes),
+        SarifOS(SarifOS) {
+    if (SarifOS) {
+      SarifWriter.emplace(SourceMgr);
+      SarifWriter->createRun("clang-tidy", "clang-tidy");
+    }
+
     DiagOpts.setShowColors(Context.getOptions().UseColor.value_or(
                                llvm::sys::Process::StandardOutHasColors())
                                ? ShowColorsKind::On
@@ -195,6 +205,97 @@ class ErrorReporter {
     }
     for (const auto &Note : Error.Notes)
       reportNote(Note);
+
+    if (SarifWriter)
+      exportSarifResult(Error, Loc);
+  }
+
+  SmallVector<ThreadFlow, 8> createThreadFlows(const ClangTidyError &Error) {
+    SmallVector<ThreadFlow, 8> Flows;
+    if (!StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
+      return Flows;
+
+    Flows.reserve(Error.Notes.size());
+    for (const tooling::DiagnosticMessage &Note : Error.Notes) {
+      tooling::FileByteRange FBR;
+      if (Note.Ranges.empty()) {
+        FBR.FilePath = Note.FilePath;
+        FBR.FileOffset = Note.FileOffset;
+        FBR.Length = 1;
+      } else {
+        FBR = Note.Ranges.front();
+      }
+      const CharSourceRange Range = getRange(FBR);
+      Flows.push_back(
+          ThreadFlow::create().setRange(Range).setMessage(Note.Message));
+    }
+    return Flows;
+  }
+
+  static std::string buildClangTidyHelpURI(StringRef Name) {
+    const auto [Module, Check] = Name.starts_with("clang-analyzer-")
+                                     ? Name.rsplit('-')
+                                     : Name.split('-');
+    return llvm::formatv(
+        "https://clang.llvm.org/extra/clang-tidy/checks/{0}/{1}.html",
+        Module, Check);
+  }
+
+  void exportSarifResult(const ClangTidyError &Error,
+                         const SourceLocation Loc) {
+    assert(SarifWriter &&
+           "SarifWriter must be initialized to export SARIF results");
+
+    const std::pair<llvm::StringMap<size_t>::iterator, bool> RuleIndexEntry =
+        SarifRuleIdx.try_emplace(Error.DiagnosticName, 0);
+    llvm::StringMap<size_t>::iterator RuleIndexEntryIt = RuleIndexEntry.first;
+    bool Inserted = RuleIndexEntry.second;
+    size_t &RuleIndex = RuleIndexEntryIt->second;
+
+    const DiagnosticsEngine::Level EffectiveLevel =
+        Error.IsWarningAsError
+            ? DiagnosticsEngine::Error
+            : static_cast<DiagnosticsEngine::Level>(Error.DiagLevel);
+
+    if (Inserted) {
+      const StringRef Name = Error.DiagnosticName;
+      SarifRule Rule =
+          SarifRule::create().setRuleId(Name).setName(Name).setDescription(
+              Error.Message.Message);
+
+      if (!Name.starts_with("clang-diagnostic"))
+        Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
+
+      Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
+      RuleIndex = SarifWriter->createRule(Rule);
+    }
+
+    SarifResult Result =
+        SarifResult::create(RuleIndex)
+            .setDiagnosticMessage(Error.Message.Message)
+            .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel))
+            .setThreadFlows(createThreadFlows(Error))
+            .addLocations(getResultRanges(Error, Loc));
+
+    SarifWriter->appendResult(Result);
+  }
+
+  SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error,
+                                                  SourceLocation Loc) {
+    SmallVector<CharSourceRange, 4> Ranges;
+    Ranges.reserve(Error.Message.Ranges.size());
+    for (const FileByteRange &FBR : Error.Message.Ranges)
+      Ranges.push_back(getRange(FBR));
+
+    if (Ranges.empty() && Loc.isValid()) {
+      // Some Clang-Tidy diagnostics are issued with a single location (not a
+      // range). For these, we create a range of length 1 at the diagnostic
+      // location. As, SARIF results require a character range for each
+      // location.
+      Ranges.push_back(
+          CharSourceRange::getCharRange(Loc, Loc.getLocWithOffset(1)));
+    }
+    return Ranges;
   }
 
   void finish() {
@@ -254,6 +355,8 @@ class ErrorReporter {
       if (OriginalCWD)
         VFS.setCurrentWorkingDirectory(*OriginalCWD);
     }
+    if (SarifWriter)
+      finalizeSarif();
   }
 
   unsigned getWarningsAsErrorsCount() const { return WarningsAsErrors; }
@@ -271,6 +374,14 @@ class ErrorReporter {
     return SourceMgr.getLocForStartOfFile(ID).getLocWithOffset(Offset);
   }
 
+  void finalizeSarif() {
+    assert(SarifWriter &&
+           "SarifWriter must be initialized to export SARIF results");
+    assert(SarifOS && "SarifOS must be initialized to export SARIF results");
+    llvm::json::Value Document = SarifWriter->createDocument();
+    *SarifOS << llvm::formatv("{0:2}", Document);
+  }
+
   void reportFix(const DiagnosticBuilder &Diag,
                  const llvm::StringMap<Replacements> &Fix) {
     for (const auto &FileAndReplacements : Fix) {
@@ -328,6 +439,13 @@ class ErrorReporter {
   unsigned TotalFixes = 0U;
   unsigned AppliedFixes = 0U;
   unsigned WarningsAsErrors = 0U;
+  llvm::raw_ostream *SarifOS = nullptr;
+  // ExportSarifResult is called for each SARIF rule that gets created, while a
+  // SarifWriter run is created once at ErrorReporter construction.
+  std::optional<SarifDocumentWriter> SarifWriter;
+  // SarifRuleIdx is used across multiple calls of exportSarifResult as cache to
+  // avoid creating duplicate SARIF rules.
+  llvm::StringMap<size_t> SarifRuleIdx;
 };
 
 class ClangTidyASTConsumer : public MultiplexConsumer {
@@ -613,7 +731,8 @@ runClangTidy(ClangTidyContext &Context, const CompilationDatabase &Compilations,
   Context.setEnableProfiling(EnableCheckProfile);
   Context.setProfileStoragePrefix(StoreCheckProfile);
 
-  ClangTidyDiagnosticConsumer DiagConsumer(Context, nullptr, true, ApplyAnyFix);
+  ClangTidyDiagnosticConsumer DiagConsumer(Context, nullptr, true, ApplyAnyFix,
+                                           true);
   auto DiagOpts = std::make_unique<DiagnosticOptions>();
   DiagnosticsEngine DE(DiagnosticIDs::create(), *DiagOpts, &DiagConsumer,
                        /*ShouldOwnClient=*/false);
@@ -668,8 +787,9 @@ runClangTidy(ClangTidyContext &Context, const CompilationDatabase &Compilations,
 void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
-                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
-  ErrorReporter Reporter(Context, Fix, std::move(BaseFS));
+                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
+                  llvm::raw_ostream *SarifOS) {
+  ErrorReporter Reporter(Context, Fix, std::move(BaseFS), SarifOS);
   llvm::vfs::FileSystem &FileSystem =
       Reporter.getSourceManager().getFileManager().getVirtualFileSystem();
   auto InitialWorkingDir = FileSystem.getCurrentWorkingDirectory();
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h
index 5fac25bd3bbca3..5069cb3cca6293 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.h
+++ b/clang-tools-extra/clang-tidy/ClangTidy.h
@@ -118,7 +118,8 @@ enum FixBehaviour {
 void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
-                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS);
+                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
+                  llvm::raw_ostream *SarifOS = nullptr);
 
 /// Serializes replacements into YAML and writes them to the specified
 /// output stream.
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 7ee556fa7c51fa..cc39ae2b507bf2 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -21,6 +21,7 @@
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/PluginLoader.h" // IWYU pragma: keep
 #include "llvm/Support/Process.h"
@@ -311,6 +312,12 @@ code with clang-apply-replacements.
                                         cl::value_desc("filename"),
                                         cl::cat(ClangTidyCategory));
 
+static cl::opt<std::string> ExportSarif("export-sarif", desc(R"(
+File in which to store diagnostics in SARIF format.
+)"),
+                                        cl::value_desc("filename"),
+                                        cl::cat(ClangTidyCategory));
+
 static cl::opt<bool> Quiet("quiet", desc(R"(
 Run clang-tidy in quiet mode. This suppresses
 printing statistics about ignored warnings and
@@ -652,6 +659,18 @@ int clangTidyMain(int argc, const char **argv) {
     FileName = PathList.front();
 
   const SmallString<256> FilePath = makeAbsolute(FileName);
+
+  std::unique_ptr<llvm::raw_fd_ostream> SarifOS;
+  if (!ExportSarif.empty()) {
+    std::error_code EC;
+    SarifOS = std::make_unique<llvm::raw_fd_ostream>(ExportSarif, EC,
+                                                     llvm::sys::fs::OF_Text);
+    if (EC) {
+      llvm::errs() << "Error opening output file: " << EC.message() << '\n';
+      return 1;
+    }
+  }
+
   ClangTidyOptions EffectiveOptions = OptionsProvider->getOptions(FilePath);
 
   const std::vector<std::string> EnabledChecks =
@@ -754,7 +773,7 @@ int clangTidyMain(int argc, const char **argv) {
   unsigned WErrorCount = 0;
 
   handleErrors(Errors, Context, DisableFixes ? FB_NoFix : Behaviour,
-               WErrorCount, BaseFS);
+               WErrorCount, BaseFS, SarifOS.get());
 
   if (!ExportFixes.empty() && !Errors.empty()) {
     std::error_code EC;
diff --git a/clang-tools-extra/docs/ReleaseNotes.md b/clang-tools-extra/docs/ReleaseNotes.md
index 93fbe57a583216..4c9f10c4c7153c 100644
--- a/clang-tools-extra/docs/ReleaseNotes.md
+++ b/clang-tools-extra/docs/ReleaseNotes.md
@@ -105,6 +105,10 @@ infrastructure are described first, followed by tool-specific sections.
   piping from {program}`git` to {program}`clang-tidy-diff.py`, where slashes
   will now be automatically normalized.
 
+- Added a new {program}`clang-tidy` command line option `-export-sarif=<file>`
+  in which clang-tidy diagnostics are exported in the `SARIF https://sarifweb.azurewebsites.net/`
+  format.
+  
 #### New checks
 
 - New {doc}`llvm-invalid-regex-pattern
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
new file mode 100644
index 00000000000000..63ff3653cbc3fc
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
@@ -0,0 +1,136 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
+// RUN: clang-tidy %t-input.cpp -checks='-*,clang-analyzer*' -export-sarif=%t.sarif > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
+// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
+void f() {
+  int *ptr = nullptr;
+  *ptr = 1;
+}
+
+//CHECK-MESSAGES: -input.cpp:3:8: warning: Dereference of null pointer (loaded from variable 'ptr') [clang-analyzer-core.NullDereference]
+//CHECK-MESSAGES: -input.cpp:2:3: note: 'ptr' initialized to a null pointer value
+//CHECK-MESSAGES: -input.cpp:3:8: note: Dereference of null pointer (loaded from variable 'ptr')
+
+//CHECK-SARIF: {
+//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-SARIF-NEXT:   "runs": [
+//CHECK-SARIF-NEXT:     {
+//CHECK-SARIF-NEXT:       "artifacts": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
+//CHECK-SARIF-NEXT:           "location": {
+//CHECK-SARIF-NEXT:             "index": 0,
+//CHECK-SARIF-NEXT:             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
+//CHECK-SARIF-NEXT:           "roles": [
+//CHECK-SARIF-NEXT:             "resultFile"
+//CHECK-SARIF-NEXT:           ]
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-SARIF-NEXT:       "results": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "codeFlows": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "threadFlows": [
+//CHECK-SARIF-NEXT:                 {
+//CHECK-SARIF-NEXT:                   "locations": [
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "'ptr' initialized to a null pointer value"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 11,
+//CHECK-SARIF-NEXT:                             "endLine": 2,
+//CHECK-SARIF-NEXT:                             "startColumn": 3,
+//CHECK-SARIF-NEXT:                             "startLine": 2
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     },
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                              "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 7,
+//CHECK-SARIF-NEXT:                             "endLine": 3,
+//CHECK-SARIF-NEXT:                             "startColumn": 4,
+//CHECK-SARIF-NEXT:                             "startLine": 3
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     }                      
+//CHECK-SARIF-NEXT:                   ]        
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               ]
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "level": "warning",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 7,
+//CHECK-SARIF-NEXT:                   "endLine": 3,
+//CHECK-SARIF-NEXT:                   "startColumn": 4,
+//CHECK-SARIF-NEXT:                   "startLine": 3
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-analyzer-core.NullDereference",
+//CHECK-SARIF-NEXT:           "ruleIndex": 0
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "tool": {
+//CHECK-SARIF-NEXT:         "driver": {
+//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/docs/UsersManual.html",
+//CHECK-SARIF-NEXT:           "language": "en-US",
+//CHECK-SARIF-NEXT:           "name": "clang-tidy",
+//CHECK-SARIF-NEXT:           "rules": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "warning",
+//CHECK-SARIF-NEXT:                 "rank": -1
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "helpUri": "https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer/core.NullDereference.html",
+//CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",
+//CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "version": "{{.*}}"
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       }
+//CHECK-SARIF-NEXT:     }
+//CHECK-SARIF-NEXT:   ],
+//CHECK-SARIF-NEXT:   "version": "{{.*}}"
+//CHECK-SARIF-NEXT: }
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
new file mode 100644
index 00000000000000..52fb3fc3a639cd
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -0,0 +1,98 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
+// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -export-sarif - -- -Wmissing-prototypes -Wzero-length-array 2>/dev/null | FileCheck %s
+#define X(n) void n ## n() {}
+X(f)
+int a[-1];
+int b[0];
+
+void test(x);
+struct Foo {
+  member;
+  Foo(int) {}
+};
+
+//CHECK: {{^{$}}
+//CHECK-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-NEXT:   "runs": [
+//CHECK-NEXT:     {
+//CHECK-NEXT:       "artifacts": [
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "length": {{[0-9]+}},
+//CHECK-NEXT:           "location": {
+//CHECK-NEXT:             "index": 0,
+//CHECK-NEXT:             "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "mimeType": "text/plain",
+//CHECK-NEXT:           "roles": [
+//CHECK-NEXT:             "resultFile"
+//CHECK-NEXT:           ]
+//CHECK-NEXT:         }
+//CHECK-NEXT:       ],
+//CHECK-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-NEXT:       "results": [
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "error",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 2,
+//CHECK-NEXT:                   "endLine": 2,
+//CHECK-NEXT:                   "startColumn": 1,
+//CHECK-NEXT:                   "startLine": 2
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "no previous prototype for function 'ff'"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "clang-diagnostic-missing-prototypes",
+//CHECK-NEXT:           "ruleIndex": 0
+//CHECK-NEXT:         },
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "error",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 9,
+//CHECK-NEXT:                   "endLine": 3,
+//CHECK-NEXT:                   "startColumn": 7,
+//CHECK-NEXT:                   "startLine": 3
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "'a' declared as an array with a negative size"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-NEXT:           "ruleIndex": 1
+//CHECK-NEXT:         },
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "warning",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:              {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                    "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 8,
+//CHECK-NEXT:                   "endLine": 4,
+//CHECK-NEXT:                   "startColumn": 7,
+//CHECK-NEXT:                   "startLine": 4
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
new file mode 100644
index 00000000000000..4ba2d3d55a4ed6
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -0,0 +1,165 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
+// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -export-sarif=%t.sarif -- -Wmissing-prototypes -Wzero-length-array > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
+// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
+#define X(n) void n ## n() {}
+X(f)
+int a[-1];
+int b[0];
+
+void test(x);
+struct Foo {
+  member;
+  Foo(int) {}
+};
+
+//CHECK-MESSAGES: -input.cpp:2:1: error: no previous prototype for function 'ff' [clang-diagnostic-missing-prototypes,-warnings-as-errors]
+//CHECK-MESSAGES: -input.cpp:1:19: note: expanded from macro 'X'
+//CHECK-MESSAGES: {{^}}note: expanded from here{{$}}
+//CHECK-MESSAGES: -input.cpp:2:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
+//CHECK-MESSAGES: -input.cpp:1:14: note: expanded from macro 'X'
+//CHECK-MESSAGES: -input.cpp:3:7: error: 'a' declared as an array with a negative size [clang-diagnostic-error]
+//CHECK-MESSAGES: -input.cpp:4:7: warning: zero size arrays are an extension [clang-diagnostic-zero-length-array]
+//CHECK-MESSAGES: -input.cpp:6:11: error: unknown type name 'x' [clang-diagnostic-error]
+//CHECK-MESSAGES: -input.cpp:8:3: error: a type specifier is required for all declarations [clang-diagnostic-error]
+//CHECK-MESSAGES: -input.cpp:9:3: error: single-argument constructors must be marked explicit to avoid unintentional implicit conversions [google-explicit-constructor,-warnings-as-errors]
+
+//CHECK-SARIF: {
+//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-SARIF-NEXT:   "runs": [
+//CHECK-SARIF-NEXT:     {
+//CHECK-SARIF-NEXT:       "artifacts": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
+//CHECK-SARIF-NEXT:           "location": {
+//CHECK-SARIF-NEXT:             "index": 0,
+//CHECK-SARIF-NEXT:             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
+//CHECK-SARIF-NEXT:           "roles": [
+//CHECK-SARIF-NEXT:             "resultFile"
+//CHECK-SARIF-NEXT:           ]
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-SARIF-NEXT:       "results": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 2,
+//CHECK-SARIF-NEXT:                   "endLine": 2,
+//CHECK-SARIF-NEXT:                   "startColumn": 1,
+//CHECK-SARIF-NEXT:                   "startLine": 2
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "no previous prototype for function 'ff'"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-missing-prototypes",
+//CHECK-SARIF-NEXT:           "ruleIndex": 0
+//CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 9,
+//CHECK-SARIF-NEXT:                   "endLine": 3,
+//CHECK-SARIF-NEXT:                   "startColumn": 7,
+//CHECK-SARIF-NEXT:                   "startLine": 3
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "'a' declared as an array with a negative size"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:           "ruleIndex": 1
+//CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "warning",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 8,
+//CHECK-SARIF-NEXT:                   "endLine": 4,
+//CHECK-SARIF-NEXT:                   "startColumn": 7,
+//CHECK-SARIF-NEXT:                   "startLine": 4
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "zero size arrays are an extension"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-zero-length-array",
+//CHECK-SARIF-NEXT:           "ruleIndex": 2
+//CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp" 
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 12,
+//CHECK-SARIF-NEXT:                   "endLine": 6,
+//CHECK-SARIF-NEXT:                   "startColumn": 11,
+//CHECK-SARIF-NEXT:                   "startLine": 6
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "unknown type name 'x'"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:           "ruleIndex": 1
+//CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 4,
+//CHECK-SARIF-NEXT:                   "endLine": 8,
+//CHECK-SARIF-NEXT:                   "startColumn": 3,
+//CHECK-SARIF-NEXT:                   "startLine": 8
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "a type specifier is required for all declarations"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:           "ruleIndex": 1
+//CHECK-SARIF-NEXT:         },
diff --git a/clang/include/clang/Frontend/SARIFDiagnostic.h b/clang/include/clang/Frontend/SARIFDiagnostic.h
index 7a6f27eb3b9fab..cef565db1686a5 100644
--- a/clang/include/clang/Frontend/SARIFDiagnostic.h
+++ b/clang/include/clang/Frontend/SARIFDiagnostic.h
@@ -6,8 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This is a utility class that provides support for constructing a SARIF object
-// containing diagnostics.
+// This file implements SARIF diagnostic emission, including the SARIFDiagnostic
+// renderer and helper utilities for mapping diagnostic levels and annotating
+// SARIF rules.
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,6 +21,14 @@
 
 namespace clang {
 
+// Maps clang DiagnosticsEngine level to SARIF result levels.
+SarifResultLevel getSarifResultLevel(DiagnosticsEngine::Level level);
+
+// Creates configuration for a SARIF rule based on the diagnostic level and sets
+// the rank.
+SarifRule addDiagnosticLevelToRule(SarifRule Rule,
+                                   DiagnosticsEngine::Level Level);
+
 class SARIFDiagnostic : public DiagnosticRenderer {
 public:
   SARIFDiagnostic(raw_ostream &OS, const LangOptions &LangOpts,
@@ -70,9 +79,6 @@ class SARIFDiagnostic : public DiagnosticRenderer {
   getSarifLocation(FullSourceLoc Loc, PresumedLoc PLoc,
                    ArrayRef<CharSourceRange> Ranges);
 
-  SarifRule addDiagnosticLevelToRule(SarifRule Rule,
-                                     DiagnosticsEngine::Level Level);
-
   llvm::StringRef emitFilename(StringRef Filename, const SourceManager &SM);
 
   llvm::SmallVector<std::pair<FullSourceLoc, PresumedLoc>>
diff --git a/clang/lib/Frontend/SARIFDiagnostic.cpp b/clang/lib/Frontend/SARIFDiagnostic.cpp
index 5183462b76f413..b2df1772e4ee5a 100644
--- a/clang/lib/Frontend/SARIFDiagnostic.cpp
+++ b/clang/lib/Frontend/SARIFDiagnostic.cpp
@@ -30,6 +30,38 @@
 
 namespace clang {
 
+SarifResultLevel getSarifResultLevel(DiagnosticsEngine::Level level) {
+  switch (level) {
+  case DiagnosticsEngine::Ignored:
+    llvm_unreachable("Invalid diagnostic type");
+  case DiagnosticsEngine::Note:
+    return SarifResultLevel::Note;
+  case DiagnosticsEngine::Remark:
+    return SarifResultLevel::None;
+  case DiagnosticsEngine::Warning:
+    return SarifResultLevel::Warning;
+  case DiagnosticsEngine::Error:
+  case DiagnosticsEngine::Fatal:
+    return SarifResultLevel::Error;
+  }
+  llvm_unreachable("Potentially un-handled DiagnosticsEngine::Level. "
+                   "Is the switch not fully covered?");
+}
+
+SarifRule addDiagnosticLevelToRule(SarifRule Rule,
+                                   DiagnosticsEngine::Level Level) {
+  SarifReportingConfiguration Config =
+      SarifReportingConfiguration::create().setLevel(
+          getSarifResultLevel(Level));
+
+  if (Level == DiagnosticsEngine::Error)
+    Config = Config.setRank(50);
+  else if (Level == DiagnosticsEngine::Fatal)
+    Config = Config.setRank(100);
+
+  return Rule.setDefaultConfiguration(Config);
+}
+
 SARIFDiagnostic::SARIFDiagnostic(raw_ostream &OS, const LangOptions &LangOpts,
                                  DiagnosticOptions &DiagOpts,
                                  SarifDocumentWriter *Writer)
@@ -164,34 +196,6 @@ SARIFDiagnostic::getSarifLocation(FullSourceLoc Loc, PresumedLoc PLoc,
   return Locations;
 }
 
-SarifRule
-SARIFDiagnostic::addDiagnosticLevelToRule(SarifRule Rule,
-                                          DiagnosticsEngine::Level Level) {
-  auto Config = SarifReportingConfiguration::create();
-
-  switch (Level) {
-  case DiagnosticsEngine::Note:
-    Config = Config.setLevel(SarifResultLevel::Note);
-    break;
-  case DiagnosticsEngine::Remark:
-    Config = Config.setLevel(SarifResultLevel::None);
-    break;
-  case DiagnosticsEngine::Warning:
-    Config = Config.setLevel(SarifResultLevel::Warning);
-    break;
-  case DiagnosticsEngine::Error:
-    Config = Config.setLevel(SarifResultLevel::Error).setRank(50);
-    break;
-  case DiagnosticsEngine::Fatal:
-    Config = Config.setLevel(SarifResultLevel::Error).setRank(100);
-    break;
-  case DiagnosticsEngine::Ignored:
-    assert(false && "Invalid diagnostic type");
-  }
-
-  return Rule.setDefaultConfiguration(Config);
-}
-
 llvm::StringRef SARIFDiagnostic::emitFilename(StringRef Filename,
                                               const SourceManager &SM) {
   if (DiagOpts.AbsolutePath) {

>From 40cefa8d6a8cc71d3a9c702342ddd114404a7d55 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 28 Aug 2026 04:09:07 -0700
Subject: [PATCH 02/28] Fixed unchecked optional access and const-correctness

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 05084b33a92b32..3fce3d42bec8a2 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -237,8 +237,8 @@ class ErrorReporter {
                                      ? Name.rsplit('-')
                                      : Name.split('-');
     return llvm::formatv(
-        "https://clang.llvm.org/extra/clang-tidy/checks/{0}/{1}.html",
-        Module, Check);
+        "https://clang.llvm.org/extra/clang-tidy/checks/{0}/{1}.html", Module,
+        Check);
   }
 
   void exportSarifResult(const ClangTidyError &Error,
@@ -248,8 +248,9 @@ class ErrorReporter {
 
     const std::pair<llvm::StringMap<size_t>::iterator, bool> RuleIndexEntry =
         SarifRuleIdx.try_emplace(Error.DiagnosticName, 0);
-    llvm::StringMap<size_t>::iterator RuleIndexEntryIt = RuleIndexEntry.first;
-    bool Inserted = RuleIndexEntry.second;
+    const llvm::StringMap<size_t>::iterator RuleIndexEntryIt =
+        RuleIndexEntry.first;
+    const bool Inserted = RuleIndexEntry.second;
     size_t &RuleIndex = RuleIndexEntryIt->second;
 
     const DiagnosticsEngine::Level EffectiveLevel =
@@ -267,17 +268,17 @@ class ErrorReporter {
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
 
       Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
-      RuleIndex = SarifWriter->createRule(Rule);
+      RuleIndex = SarifWriter.value().createRule(Rule);
     }
 
-    SarifResult Result =
+    const SarifResult Result =
         SarifResult::create(RuleIndex)
             .setDiagnosticMessage(Error.Message.Message)
             .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel))
             .setThreadFlows(createThreadFlows(Error))
             .addLocations(getResultRanges(Error, Loc));
 
-    SarifWriter->appendResult(Result);
+    SarifWriter.value().appendResult(Result);
   }
 
   SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error,
@@ -378,7 +379,7 @@ class ErrorReporter {
     assert(SarifWriter &&
            "SarifWriter must be initialized to export SARIF results");
     assert(SarifOS && "SarifOS must be initialized to export SARIF results");
-    llvm::json::Value Document = SarifWriter->createDocument();
+    llvm::json::Value Document = SarifWriter.value().createDocument();
     *SarifOS << llvm::formatv("{0:2}", Document);
   }
 

>From e4730344142a8ca6a97306b20b011a299e17e60b Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 28 Aug 2026 06:08:54 -0700
Subject: [PATCH 03/28] Textdiagnosticprinter suppressed for stdout

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    | 36 ++++++++++---------
 clang-tools-extra/clang-tidy/ClangTidy.h      |  3 +-
 .../clang-tidy/tool/ClangTidyMain.cpp         |  3 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 3fce3d42bec8a2..e8cca7831734fd 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -105,9 +105,13 @@ class ErrorReporter {
 public:
   ErrorReporter(ClangTidyContext &Context, FixBehaviour ApplyFixes,
                 llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                llvm::raw_ostream *SarifOS = nullptr)
+                llvm::raw_ostream *SarifOS = nullptr,
+                bool ExportSarifToStdout = false)
       : Files(FileSystemOptions(), std::move(BaseFS)),
-        DiagPrinter(new TextDiagnosticPrinter(llvm::outs(), DiagOpts)),
+        DiagPrinter(
+            ExportSarifToStdout
+                ? static_cast<DiagnosticConsumer *>(new IgnoringDiagConsumer())
+                : new TextDiagnosticPrinter(llvm::outs(), DiagOpts)),
         Diags(DiagnosticIDs::create(), DiagOpts, DiagPrinter),
         SourceMgr(Diags, Files), Context(Context), ApplyFixes(ApplyFixes),
         SarifOS(SarifOS) {
@@ -120,7 +124,8 @@ class ErrorReporter {
                                llvm::sys::Process::StandardOutHasColors())
                                ? ShowColorsKind::On
                                : ShowColorsKind::Off);
-    DiagPrinter->BeginSourceFile(LangOpts);
+    if (DiagPrinter)
+      DiagPrinter->BeginSourceFile(LangOpts);
     if (DiagOpts.showColors(llvm::sys::Process::StandardOutHasColors()) &&
         !llvm::sys::Process::StandardOutIsDisplayed())
       llvm::sys::Process::UseANSIEscapeCodes(true);
@@ -246,11 +251,8 @@ class ErrorReporter {
     assert(SarifWriter &&
            "SarifWriter must be initialized to export SARIF results");
 
-    const std::pair<llvm::StringMap<size_t>::iterator, bool> RuleIndexEntry =
+    const auto [RuleIndexEntryIt, Inserted] =
         SarifRuleIdx.try_emplace(Error.DiagnosticName, 0);
-    const llvm::StringMap<size_t>::iterator RuleIndexEntryIt =
-        RuleIndexEntry.first;
-    const bool Inserted = RuleIndexEntry.second;
     size_t &RuleIndex = RuleIndexEntryIt->second;
 
     const DiagnosticsEngine::Level EffectiveLevel =
@@ -268,7 +270,8 @@ class ErrorReporter {
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
 
       Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
-      RuleIndex = SarifWriter.value().createRule(Rule);
+      if(SarifWriter)
+        RuleIndex = SarifWriter->createRule(Rule);
     }
 
     const SarifResult Result =
@@ -278,7 +281,8 @@ class ErrorReporter {
             .setThreadFlows(createThreadFlows(Error))
             .addLocations(getResultRanges(Error, Loc));
 
-    SarifWriter.value().appendResult(Result);
+    if(SarifWriter)
+      SarifWriter->appendResult(Result);
   }
 
   SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error,
@@ -376,11 +380,10 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
-    assert(SarifWriter &&
-           "SarifWriter must be initialized to export SARIF results");
-    assert(SarifOS && "SarifOS must be initialized to export SARIF results");
-    llvm::json::Value Document = SarifWriter.value().createDocument();
-    *SarifOS << llvm::formatv("{0:2}", Document);
+    if (SarifWriter && SarifOS) {
+      llvm::json::Value Document = SarifWriter->createDocument();
+      *SarifOS << llvm::formatv("{0:2}", Document);
+    }
   }
 
   void reportFix(const DiagnosticBuilder &Diag,
@@ -789,8 +792,9 @@ void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
                   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                  llvm::raw_ostream *SarifOS) {
-  ErrorReporter Reporter(Context, Fix, std::move(BaseFS), SarifOS);
+                  llvm::raw_ostream *SarifOS, bool ExportSarifToStdout) {
+  ErrorReporter Reporter(Context, Fix, std::move(BaseFS), SarifOS,
+                         ExportSarifToStdout);
   llvm::vfs::FileSystem &FileSystem =
       Reporter.getSourceManager().getFileManager().getVirtualFileSystem();
   auto InitialWorkingDir = FileSystem.getCurrentWorkingDirectory();
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h
index 5069cb3cca6293..6df3d7bcc2c3b8 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.h
+++ b/clang-tools-extra/clang-tidy/ClangTidy.h
@@ -119,7 +119,8 @@ void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
                   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                  llvm::raw_ostream *SarifOS = nullptr);
+                  llvm::raw_ostream *SarifOS = nullptr,
+                  bool ExportSarifToStdout = false);
 
 /// Serializes replacements into YAML and writes them to the specified
 /// output stream.
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index cc39ae2b507bf2..442f9bf3f98343 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -773,7 +773,8 @@ int clangTidyMain(int argc, const char **argv) {
   unsigned WErrorCount = 0;
 
   handleErrors(Errors, Context, DisableFixes ? FB_NoFix : Behaviour,
-               WErrorCount, BaseFS, SarifOS.get());
+               WErrorCount, BaseFS, SarifOS.get(),
+               SarifOS && ExportSarif == "-");
 
   if (!ExportFixes.empty() && !Errors.empty()) {
     std::error_code EC;

>From 48ebe8709f7dd89f38410653d77831d961619f1d Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 28 Aug 2026 06:24:22 -0700
Subject: [PATCH 04/28] fixed formatting

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index e8cca7831734fd..a86db0fcd37e9d 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -270,7 +270,7 @@ class ErrorReporter {
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
 
       Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
-      if(SarifWriter)
+      if (SarifWriter)
         RuleIndex = SarifWriter->createRule(Rule);
     }
 
@@ -281,7 +281,7 @@ class ErrorReporter {
             .setThreadFlows(createThreadFlows(Error))
             .addLocations(getResultRanges(Error, Loc));
 
-    if(SarifWriter)
+    if (SarifWriter)
       SarifWriter->appendResult(Result);
   }
 

>From 3a4e100820d275e642226c00345f4f7a6761ce9e Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 1 Sep 2026 06:24:17 -0700
Subject: [PATCH 05/28] fixed invalid informationUri and removed incorrect
 setDescription

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp |  3 +--
 clang/lib/Basic/Sarif.cpp                  | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index a86db0fcd37e9d..d7635346817b27 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -263,8 +263,7 @@ class ErrorReporter {
     if (Inserted) {
       const StringRef Name = Error.DiagnosticName;
       SarifRule Rule =
-          SarifRule::create().setRuleId(Name).setName(Name).setDescription(
-              Error.Message.Message);
+          SarifRule::create().setRuleId(Name).setName(Name);
 
       if (!Name.starts_with("clang-diagnostic"))
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index e829b9bb47ad94..5536e6a02091fe 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -351,14 +351,16 @@ void SarifDocumentWriter::createRun(StringRef ShortToolName,
   // Signify a new run has begun.
   Closed = false;
 
-  json::Object Tool{
-      {"driver",
-       json::Object{{"name", ShortToolName},
-                    {"fullName", LongToolName},
-                    {"language", "en-US"},
-                    {"version", ToolVersion},
-                    {"informationUri",
-                     "https://clang.llvm.org/docs/UsersManual.html"}}}};
+  StringRef InformationUri = "https://clang.llvm.org/docs/UsersManual.html";
+  if (LongToolName == "clang-tidy")
+    InformationUri = "https://clang.llvm.org/extra/clang-tidy/";
+
+  json::Object Tool{{"driver", json::Object{{"name", ShortToolName},
+                                            {"fullName", LongToolName},
+                                            {"language", "en-US"},
+                                            {"version", ToolVersion},
+                                            {"informationUri", InformationUri},
+                                            {"rules", json::Array{}}}}};
   json::Object TheRun{{"tool", std::move(Tool)},
                       {"results", {}},
                       {"artifacts", {}},

>From cb3fa84148417525ee760ff9ec0fcd29f7fadb83 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 1 Sep 2026 08:00:57 -0700
Subject: [PATCH 06/28] fixed broken test

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp                    | 4 +---
 .../clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index d7635346817b27..7fa5cff6ffcfdc 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -262,9 +262,7 @@ class ErrorReporter {
 
     if (Inserted) {
       const StringRef Name = Error.DiagnosticName;
-      SarifRule Rule =
-          SarifRule::create().setRuleId(Name).setName(Name);
-
+      SarifRule Rule = SarifRule::create().setRuleId(Name).setName(Name);
       if (!Name.starts_with("clang-diagnostic"))
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
 
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
index 63ff3653cbc3fc..23f88e7c5bd180 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
@@ -108,7 +108,7 @@ void f() {
 //CHECK-SARIF-NEXT:       "tool": {
 //CHECK-SARIF-NEXT:         "driver": {
 //CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
-//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/docs/UsersManual.html",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
 //CHECK-SARIF-NEXT:           "language": "en-US",
 //CHECK-SARIF-NEXT:           "name": "clang-tidy",
 //CHECK-SARIF-NEXT:           "rules": [
@@ -119,7 +119,7 @@ void f() {
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "fullDescription": {
-//CHECK-SARIF-NEXT:                 "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:                 "text": ""
 //CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "helpUri": "https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer/core.NullDereference.html",
 //CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",

>From 56ef347e28bed003d075d6b7b5d98c5d5ea1d5bb Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 1 Sep 2026 08:35:23 -0700
Subject: [PATCH 07/28] Placeholder for desc

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp                    | 4 +++-
 .../clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 7fa5cff6ffcfdc..29ca88680a7d9b 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -262,7 +262,9 @@ class ErrorReporter {
 
     if (Inserted) {
       const StringRef Name = Error.DiagnosticName;
-      SarifRule Rule = SarifRule::create().setRuleId(Name).setName(Name);
+      SarifRule Rule =
+          SarifRule::create().setRuleId(Name).setName(Name).setDescription(
+              Error.Message.Message);
       if (!Name.starts_with("clang-diagnostic"))
         Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
 
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
index 23f88e7c5bd180..9cd4f0d4aa883b 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
@@ -119,7 +119,7 @@ void f() {
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "fullDescription": {
-//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:                 "text": "Dereference of null pointer (loaded from variable 'ptr')"
 //CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "helpUri": "https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer/core.NullDereference.html",
 //CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",

>From e5d69a0c326489fe0c2ebb4e58e64bcda7f5449d Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Thu, 3 Sep 2026 07:55:56 -0700
Subject: [PATCH 08/28] added more in-depth test cases + for notes, removed
 fullDescription and helpUri

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    |  53 +++--
 .../clang-tidy/tool/ClangTidyMain.cpp         |   8 +-
 .../export-SARIF-Thread-flows.cpp             |  21 +-
 .../export-SARIF-diagnostics-terminal.cpp     | 191 +++++++++++++++++-
 .../export-SARIF-diagnostics.cpp              | 143 ++++++++++++-
 .../export-SARIF-no-location.cpp              |  98 +++++++++
 clang/include/clang/Basic/Sarif.h             |   9 +-
 clang/lib/Basic/Sarif.cpp                     |  16 +-
 8 files changed, 472 insertions(+), 67 deletions(-)
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 29ca88680a7d9b..530c9cfe8d4912 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -215,6 +215,17 @@ class ErrorReporter {
       exportSarifResult(Error, Loc);
   }
 
+  CharSourceRange getNoteRange(const tooling::DiagnosticMessage &Note) {
+    if (!Note.Ranges.empty())
+      return getRange(Note.Ranges.front());
+
+    tooling::FileByteRange FBR;
+    FBR.FilePath = Note.FilePath;
+    FBR.FileOffset = Note.FileOffset;
+    FBR.Length = 1;
+    return getRange(FBR);
+  }
+
   SmallVector<ThreadFlow, 8> createThreadFlows(const ClangTidyError &Error) {
     SmallVector<ThreadFlow, 8> Flows;
     if (!StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
@@ -222,30 +233,13 @@ class ErrorReporter {
 
     Flows.reserve(Error.Notes.size());
     for (const tooling::DiagnosticMessage &Note : Error.Notes) {
-      tooling::FileByteRange FBR;
-      if (Note.Ranges.empty()) {
-        FBR.FilePath = Note.FilePath;
-        FBR.FileOffset = Note.FileOffset;
-        FBR.Length = 1;
-      } else {
-        FBR = Note.Ranges.front();
-      }
-      const CharSourceRange Range = getRange(FBR);
-      Flows.push_back(
-          ThreadFlow::create().setRange(Range).setMessage(Note.Message));
+      Flows.push_back(ThreadFlow::create()
+                          .setRange(getNoteRange(Note))
+                          .setMessage(Note.Message));
     }
     return Flows;
   }
 
-  static std::string buildClangTidyHelpURI(StringRef Name) {
-    const auto [Module, Check] = Name.starts_with("clang-analyzer-")
-                                     ? Name.rsplit('-')
-                                     : Name.split('-');
-    return llvm::formatv(
-        "https://clang.llvm.org/extra/clang-tidy/checks/{0}/{1}.html", Module,
-        Check);
-  }
-
   void exportSarifResult(const ClangTidyError &Error,
                          const SourceLocation Loc) {
     assert(SarifWriter &&
@@ -262,24 +256,27 @@ class ErrorReporter {
 
     if (Inserted) {
       const StringRef Name = Error.DiagnosticName;
-      SarifRule Rule =
-          SarifRule::create().setRuleId(Name).setName(Name).setDescription(
-              Error.Message.Message);
-      if (!Name.starts_with("clang-diagnostic"))
-        Rule = Rule.setHelpURI(buildClangTidyHelpURI(Name));
-
+      SarifRule Rule = SarifRule::create().setRuleId(Name).setName(Name);
       Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
       if (SarifWriter)
         RuleIndex = SarifWriter->createRule(Rule);
     }
 
-    const SarifResult Result =
+    SarifResult Result =
         SarifResult::create(RuleIndex)
             .setDiagnosticMessage(Error.Message.Message)
             .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel))
-            .setThreadFlows(createThreadFlows(Error))
             .addLocations(getResultRanges(Error, Loc));
 
+    if (StringRef(Error.DiagnosticName).starts_with("clang-analyzer-")) {
+      Result = Result.setThreadFlows(createThreadFlows(Error));
+    } else {
+      for (const tooling::DiagnosticMessage &Note : Error.Notes) {
+        const CharSourceRange Range = getNoteRange(Note);
+        if (Range.isValid())
+          Result = Result.addRelatedLocations(Range, Note.Message);
+      }
+    }
     if (SarifWriter)
       SarifWriter->appendResult(Result);
   }
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 442f9bf3f98343..693d1d42345c95 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -312,7 +312,7 @@ code with clang-apply-replacements.
                                         cl::value_desc("filename"),
                                         cl::cat(ClangTidyCategory));
 
-static cl::opt<std::string> ExportSarif("export-sarif", desc(R"(
+static cl::opt<std::string> SarifExport("sarif-export", desc(R"(
 File in which to store diagnostics in SARIF format.
 )"),
                                         cl::value_desc("filename"),
@@ -661,9 +661,9 @@ int clangTidyMain(int argc, const char **argv) {
   const SmallString<256> FilePath = makeAbsolute(FileName);
 
   std::unique_ptr<llvm::raw_fd_ostream> SarifOS;
-  if (!ExportSarif.empty()) {
+  if (!SarifExport.empty()) {
     std::error_code EC;
-    SarifOS = std::make_unique<llvm::raw_fd_ostream>(ExportSarif, EC,
+    SarifOS = std::make_unique<llvm::raw_fd_ostream>(SarifExport, EC,
                                                      llvm::sys::fs::OF_Text);
     if (EC) {
       llvm::errs() << "Error opening output file: " << EC.message() << '\n';
@@ -774,7 +774,7 @@ int clangTidyMain(int argc, const char **argv) {
 
   handleErrors(Errors, Context, DisableFixes ? FB_NoFix : Behaviour,
                WErrorCount, BaseFS, SarifOS.get(),
-               SarifOS && ExportSarif == "-");
+               SarifOS && SarifExport == "-");
 
   if (!ExportFixes.empty() && !Errors.empty()) {
     std::error_code EC;
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
index 9cd4f0d4aa883b..0e2fa2d0fc3be8 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
-// RUN: clang-tidy %t-input.cpp -checks='-*,clang-analyzer*' -export-sarif=%t.sarif > %t.msg 2>&1
+// RUN: clang-tidy %t-input.cpp -checks='-*,clang-analyzer*' -sarif-export=%t.sarif > %t.msg 2>&1
 // RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
 // RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
 void f() {
@@ -20,7 +20,7 @@ void f() {
 //CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
 //CHECK-SARIF-NEXT:           "location": {
 //CHECK-SARIF-NEXT:             "index": 0,
-//CHECK-SARIF-NEXT:             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:           },
 //CHECK-SARIF-NEXT:           "mimeType": "text/plain",
 //CHECK-SARIF-NEXT:           "roles": [
@@ -45,7 +45,7 @@ void f() {
 //CHECK-SARIF-NEXT:                         "physicalLocation": {
 //CHECK-SARIF-NEXT:                           "artifactLocation": {
 //CHECK-SARIF-NEXT:                             "index": 0,
-//CHECK-SARIF-NEXT:                             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
 //CHECK-SARIF-NEXT:                             "endColumn": 11,
@@ -65,7 +65,7 @@ void f() {
 //CHECK-SARIF-NEXT:                         "physicalLocation": {
 //CHECK-SARIF-NEXT:                           "artifactLocation": {
 //CHECK-SARIF-NEXT:                             "index": 0,
-//CHECK-SARIF-NEXT:                              "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
 //CHECK-SARIF-NEXT:                             "endColumn": 7,
@@ -75,8 +75,8 @@ void f() {
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
 //CHECK-SARIF-NEXT:                       }
-//CHECK-SARIF-NEXT:                     }                      
-//CHECK-SARIF-NEXT:                   ]        
+//CHECK-SARIF-NEXT:                     }
+//CHECK-SARIF-NEXT:                   ]
 //CHECK-SARIF-NEXT:                 }
 //CHECK-SARIF-NEXT:               ]
 //CHECK-SARIF-NEXT:             }
@@ -87,7 +87,7 @@ void f() {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 7,
@@ -118,10 +118,6 @@ void f() {
 //CHECK-SARIF-NEXT:                 "level": "warning",
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
-//CHECK-SARIF-NEXT:               "fullDescription": {
-//CHECK-SARIF-NEXT:                 "text": "Dereference of null pointer (loaded from variable 'ptr')"
-//CHECK-SARIF-NEXT:               },
-//CHECK-SARIF-NEXT:               "helpUri": "https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer/core.NullDereference.html",
 //CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",
 //CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
 //CHECK-SARIF-NEXT:             }
@@ -132,5 +128,4 @@ void f() {
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-//CHECK-SARIF-NEXT: }
-
+//CHECK-SARIF-NEXT: }
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 52fb3fc3a639cd..015eace602f2f3 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
-// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -export-sarif - -- -Wmissing-prototypes -Wzero-length-array 2>/dev/null | FileCheck %s
+// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -sarif-export - -- -Wmissing-prototypes -Wzero-length-array 2>/dev/null | FileCheck %s
 #define X(n) void n ## n() {}
 X(f)
 int a[-1];
@@ -51,6 +51,59 @@ struct Foo {
 //CHECK-NEXT:           "message": {
 //CHECK-NEXT:             "text": "no previous prototype for function 'ff'"
 //CHECK-NEXT:           },
+//CHECK-NEXT:           "relatedLocations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "message": {
+//CHECK-NEXT:                 "text": "expanded from macro 'X'"
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 20,
+//CHECK-NEXT:                   "endLine": 1,
+//CHECK-NEXT:                   "startColumn": 19,
+//CHECK-NEXT:                   "startLine": 1
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "message": {
+//CHECK-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 2,
+//CHECK-NEXT:                   "endLine": 2,
+//CHECK-NEXT:                   "startColumn": 1,
+//CHECK-NEXT:                   "startLine": 2
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "message": {
+//CHECK-NEXT:                 "text": "expanded from macro 'X'"
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 15,
+//CHECK-NEXT:                   "endLine": 1,
+//CHECK-NEXT:                   "startColumn": 14,
+//CHECK-NEXT:                   "startLine": 1
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
 //CHECK-NEXT:           "ruleId": "clang-diagnostic-missing-prototypes",
 //CHECK-NEXT:           "ruleIndex": 0
 //CHECK-NEXT:         },
@@ -81,11 +134,11 @@ struct Foo {
 //CHECK-NEXT:         {
 //CHECK-NEXT:           "level": "warning",
 //CHECK-NEXT:           "locations": [
-//CHECK-NEXT:              {
+//CHECK-NEXT:             {
 //CHECK-NEXT:               "physicalLocation": {
 //CHECK-NEXT:                 "artifactLocation": {
 //CHECK-NEXT:                   "index": 0,
-//CHECK-NEXT:                    "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-NEXT:                 },
 //CHECK-NEXT:                 "region": {
 //CHECK-NEXT:                   "endColumn": 8,
@@ -95,4 +148,134 @@ struct Foo {
 //CHECK-NEXT:                 }
 //CHECK-NEXT:               }
 //CHECK-NEXT:             }
-//CHECK-NEXT:           ],
\ No newline at end of file
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "zero size arrays are an extension"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "clang-diagnostic-zero-length-array",
+//CHECK-NEXT:           "ruleIndex": 2
+//CHECK-NEXT:         },
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "error",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 12,
+//CHECK-NEXT:                   "endLine": 6,
+//CHECK-NEXT:                   "startColumn": 11,
+//CHECK-NEXT:                   "startLine": 6
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "unknown type name 'x'"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-NEXT:           "ruleIndex": 1
+//CHECK-NEXT:         },
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "error",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 4,
+//CHECK-NEXT:                   "endLine": 8,
+//CHECK-NEXT:                   "startColumn": 3,
+//CHECK-NEXT:                   "startLine": 8
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "a type specifier is required for all declarations"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-NEXT:           "ruleIndex": 1
+//CHECK-NEXT:         },
+//CHECK-NEXT:         {
+//CHECK-NEXT:           "level": "error",
+//CHECK-NEXT:           "locations": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "physicalLocation": {
+//CHECK-NEXT:                 "artifactLocation": {
+//CHECK-NEXT:                   "index": 0,
+//CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-NEXT:                 },
+//CHECK-NEXT:                 "region": {
+//CHECK-NEXT:                   "endColumn": 4,
+//CHECK-NEXT:                   "endLine": 9,
+//CHECK-NEXT:                   "startColumn": 3,
+//CHECK-NEXT:                   "startLine": 9
+//CHECK-NEXT:                 }
+//CHECK-NEXT:               }
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "message": {
+//CHECK-NEXT:             "text": "single-argument constructors must be marked explicit to avoid unintentional implicit conversions"
+//CHECK-NEXT:           },
+//CHECK-NEXT:           "ruleId": "google-explicit-constructor",
+//CHECK-NEXT:           "ruleIndex": 3
+//CHECK-NEXT:         }
+//CHECK-NEXT:       ],
+//CHECK-NEXT:       "tool": {
+//CHECK-NEXT:         "driver": {
+//CHECK-NEXT:           "fullName": "clang-tidy",
+//CHECK-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
+//CHECK-NEXT:           "language": "en-US",
+//CHECK-NEXT:           "name": "clang-tidy",
+//CHECK-NEXT:           "rules": [
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "defaultConfiguration": {
+//CHECK-NEXT:                 "enabled": true,
+//CHECK-NEXT:                 "level": "error",
+//CHECK-NEXT:                 "rank": 50
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "id": "clang-diagnostic-missing-prototypes",
+//CHECK-NEXT:               "name": "clang-diagnostic-missing-prototypes"
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "defaultConfiguration": {
+//CHECK-NEXT:                 "enabled": true,
+//CHECK-NEXT:                 "level": "error",
+//CHECK-NEXT:                 "rank": 50
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "id": "clang-diagnostic-error",
+//CHECK-NEXT:               "name": "clang-diagnostic-error"
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "defaultConfiguration": {
+//CHECK-NEXT:                 "enabled": true,
+//CHECK-NEXT:                 "level": "warning",
+//CHECK-NEXT:                 "rank": -1
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "id": "clang-diagnostic-zero-length-array",
+//CHECK-NEXT:               "name": "clang-diagnostic-zero-length-array"
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "defaultConfiguration": {
+//CHECK-NEXT:                 "enabled": true,
+//CHECK-NEXT:                 "level": "error",
+//CHECK-NEXT:                 "rank": 50
+//CHECK-NEXT:               },
+//CHECK-NEXT:               "id": "google-explicit-constructor",
+//CHECK-NEXT:               "name": "google-explicit-constructor"
+//CHECK-NEXT:             }
+//CHECK-NEXT:           ],
+//CHECK-NEXT:           "version": "{{.*}}"
+//CHECK-NEXT:         }
+//CHECK-NEXT:       }
+//CHECK-NEXT:     }
+//CHECK-NEXT:   ],
+//CHECK-NEXT:   "version": "{{.*}}"
+//CHECK-NEXT: }
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 4ba2d3d55a4ed6..5ff0c5f9d9454a 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
-// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -export-sarif=%t.sarif -- -Wmissing-prototypes -Wzero-length-array > %t.msg 2>&1
+// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -sarif-export=%t.sarif -- -Wmissing-prototypes -Wzero-length-array > %t.msg 2>&1
 // RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
 // RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
 #define X(n) void n ## n() {}
@@ -33,7 +33,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
 //CHECK-SARIF-NEXT:           "location": {
 //CHECK-SARIF-NEXT:             "index": 0,
-//CHECK-SARIF-NEXT:             "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:           },
 //CHECK-SARIF-NEXT:           "mimeType": "text/plain",
 //CHECK-SARIF-NEXT:           "roles": [
@@ -50,7 +50,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 2,
@@ -64,6 +64,59 @@ struct Foo {
 //CHECK-SARIF-NEXT:           "message": {
 //CHECK-SARIF-NEXT:             "text": "no previous prototype for function 'ff'"
 //CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "relatedLocations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "message": {
+//CHECK-SARIF-NEXT:                 "text": "expanded from macro 'X'"
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 20,
+//CHECK-SARIF-NEXT:                   "endLine": 1,
+//CHECK-SARIF-NEXT:                   "startColumn": 19,
+//CHECK-SARIF-NEXT:                   "startLine": 1
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "message": {
+//CHECK-SARIF-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 2,
+//CHECK-SARIF-NEXT:                   "endLine": 2,
+//CHECK-SARIF-NEXT:                   "startColumn": 1,
+//CHECK-SARIF-NEXT:                   "startLine": 2
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "message": {
+//CHECK-SARIF-NEXT:                 "text": "expanded from macro 'X'"
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 15,
+//CHECK-SARIF-NEXT:                   "endLine": 1,
+//CHECK-SARIF-NEXT:                   "startColumn": 14,
+//CHECK-SARIF-NEXT:                   "startLine": 1
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
 //CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-missing-prototypes",
 //CHECK-SARIF-NEXT:           "ruleIndex": 0
 //CHECK-SARIF-NEXT:         },
@@ -74,7 +127,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 9,
@@ -98,7 +151,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 8,
@@ -122,7 +175,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp" 
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 12,
@@ -146,7 +199,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "physicalLocation": {
 //CHECK-SARIF-NEXT:                 "artifactLocation": {
 //CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
 //CHECK-SARIF-NEXT:                   "endColumn": 4,
@@ -163,3 +216,79 @@ struct Foo {
 //CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-error",
 //CHECK-SARIF-NEXT:           "ruleIndex": 1
 //CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 4,
+//CHECK-SARIF-NEXT:                   "endLine": 9,
+//CHECK-SARIF-NEXT:                   "startColumn": 3,
+//CHECK-SARIF-NEXT:                   "startLine": 9
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "single-argument constructors must be marked explicit to avoid unintentional implicit conversions"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "google-explicit-constructor",
+//CHECK-SARIF-NEXT:           "ruleIndex": 3
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "tool": {
+//CHECK-SARIF-NEXT:         "driver": {
+//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
+//CHECK-SARIF-NEXT:           "language": "en-US",
+//CHECK-SARIF-NEXT:           "name": "clang-tidy",
+//CHECK-SARIF-NEXT:           "rules": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "error",
+//CHECK-SARIF-NEXT:                 "rank": 50
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-diagnostic-missing-prototypes",
+//CHECK-SARIF-NEXT:               "name": "clang-diagnostic-missing-prototypes"
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "error",
+//CHECK-SARIF-NEXT:                 "rank": 50
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:               "name": "clang-diagnostic-error"
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "warning",
+//CHECK-SARIF-NEXT:                 "rank": -1
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-diagnostic-zero-length-array",
+//CHECK-SARIF-NEXT:               "name": "clang-diagnostic-zero-length-array"
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "error",
+//CHECK-SARIF-NEXT:                 "rank": 50
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "google-explicit-constructor",
+//CHECK-SARIF-NEXT:               "name": "google-explicit-constructor"
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "version": "{{.*}}"
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       }
+//CHECK-SARIF-NEXT:     }
+//CHECK-SARIF-NEXT:   ],
+//CHECK-SARIF-NEXT:   "version": "{{.*}}"
+//CHECK-SARIF-NEXT: }
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
new file mode 100644
index 00000000000000..b9855914cca6b9
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
@@ -0,0 +1,98 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
+// RUN: not clang-tidy %t-input.cpp -checks='-*,clang-diagnostic-*,google-explicit-constructor' -sarif-export=%t.sarif -- -fake-command > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
+// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
+class A { A(int) {} };
+
+//NOTE: "-fake-command" is rejected by the driver before a SourceManager is created,
+//NOTE: so the diagnostic is stored with an empty FilePath and ranges. Therefore, getResultRanges()
+//NOTE: omits locations entirely. 
+
+//CHECK-MESSAGES: error: unknown argument: '-fake-command' [clang-diagnostic-error]
+//CHECK-MESSAGES: -input.cpp:1:11: warning: single-argument constructors must be marked explicit to avoid unintentional implicit conversions [google-explicit-constructor]
+
+//CHECK-SARIF: {
+//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-SARIF-NEXT:   "runs": [
+//CHECK-SARIF-NEXT:     {
+//CHECK-SARIF-NEXT:       "artifacts": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
+//CHECK-SARIF-NEXT:           "location": {
+//CHECK-SARIF-NEXT:             "index": 0,
+//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
+//CHECK-SARIF-NEXT:           "roles": [
+//CHECK-SARIF-NEXT:             "resultFile"
+//CHECK-SARIF-NEXT:           ]
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-SARIF-NEXT:       "results": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "error",
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "unknown argument: '-fake-command'"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:           "ruleIndex": 0
+//CHECK-SARIF-NEXT:         },
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "warning",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 12,
+//CHECK-SARIF-NEXT:                   "endLine": 1,
+//CHECK-SARIF-NEXT:                   "startColumn": 11,
+//CHECK-SARIF-NEXT:                   "startLine": 1
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "single-argument constructors must be marked explicit to avoid unintentional implicit conversions"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "google-explicit-constructor",
+//CHECK-SARIF-NEXT:           "ruleIndex": 1
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "tool": {
+//CHECK-SARIF-NEXT:         "driver": {
+//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
+//CHECK-SARIF-NEXT:           "language": "en-US",
+//CHECK-SARIF-NEXT:           "name": "clang-tidy",
+//CHECK-SARIF-NEXT:           "rules": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "error",
+//CHECK-SARIF-NEXT:                 "rank": 50
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-diagnostic-error",
+//CHECK-SARIF-NEXT:               "name": "clang-diagnostic-error"
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "warning",
+//CHECK-SARIF-NEXT:                 "rank": -1
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "google-explicit-constructor",
+//CHECK-SARIF-NEXT:               "name": "google-explicit-constructor"
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "version": "{{.*}}"
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       }
+//CHECK-SARIF-NEXT:     }
+//CHECK-SARIF-NEXT:   ],
+//CHECK-SARIF-NEXT:   "version": "{{.*}}"
+//CHECK-SARIF-NEXT: }
diff --git a/clang/include/clang/Basic/Sarif.h b/clang/include/clang/Basic/Sarif.h
index 7651d2ac7a7681..231f28599d7854 100644
--- a/clang/include/clang/Basic/Sarif.h
+++ b/clang/include/clang/Basic/Sarif.h
@@ -332,7 +332,8 @@ class SarifResult {
   std::string HostedViewerURI;
   llvm::SmallDenseMap<StringRef, std::string, 4> PartialFingerprints;
   llvm::SmallVector<CharSourceRange, 8> Locations;
-  llvm::SmallVector<CharSourceRange, 8> RelatedLocations;
+  llvm::SmallVector<std::pair<CharSourceRange, std::string>, 8>
+      RelatedLocations;
   llvm::SmallVector<ThreadFlow, 8> ThreadFlows;
   std::optional<SarifResultLevel> LevelOverride;
 
@@ -373,7 +374,8 @@ class SarifResult {
     return *this;
   }
 
-  SarifResult addRelatedLocations(llvm::ArrayRef<CharSourceRange> DiagLocs) {
+   SarifResult addRelatedLocations(llvm::ArrayRef<CharSourceRange> DiagLocs,
+                                  llvm::StringRef Message = "") {
 #ifndef NDEBUG
     for (const auto &Loc : DiagLocs) {
       assert(
@@ -381,7 +383,8 @@ class SarifResult {
           "SARIF RelatedLocations require character granular source ranges!");
     }
 #endif
-    RelatedLocations.append(DiagLocs.begin(), DiagLocs.end());
+    for (const CharSourceRange &Loc : DiagLocs)
+      RelatedLocations.emplace_back(Loc, Message.str());
     return *this;
   }
 
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index 5536e6a02091fe..a6e154beb06842 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -276,11 +276,11 @@ void SarifDocumentWriter::endRun() {
         {"enabled", R.DefaultConfiguration.Enabled},
         {"level", resultLevelToStr(R.DefaultConfiguration.Level)},
         {"rank", R.DefaultConfiguration.Rank}};
-    json::Object Rule{
-        {"name", R.Name},
-        {"id", R.Id},
-        {"fullDescription", json::Object{{"text", R.Description}}},
-        {"defaultConfiguration", std::move(Config)}};
+    json::Object Rule{{"name", R.Name},
+                      {"id", R.Id},
+                      {"defaultConfiguration", std::move(Config)}};
+    if (!(Tool.getObject("driver")->getString("fullName") == "clang-tidy"))
+      Rule["fullDescription"] = json::Object{{"text", R.Description}};
     if (!R.HelpURI.empty())
       Rule["helpUri"] = R.HelpURI;
     if (!R.DeprecatedIds.empty())
@@ -411,9 +411,9 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
 
   if (!Result.RelatedLocations.empty()) {
     json::Array ReLocs;
-    for (auto &Range : Result.RelatedLocations) {
-      ReLocs.emplace_back(createLocation(createPhysicalLocation(Range)));
-    }
+    for (const auto &[Range, Message] : Result.RelatedLocations)
+      ReLocs.emplace_back(
+          createLocation(createPhysicalLocation(Range), Message));
     Ret["relatedLocations"] = std::move(ReLocs);
   }
 

>From c21c79856b3539cdb3830d5574164f5cdb78327d Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Wed, 9 Sep 2026 08:04:55 -0700
Subject: [PATCH 09/28] formatting

---
 clang/include/clang/Basic/Sarif.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/include/clang/Basic/Sarif.h b/clang/include/clang/Basic/Sarif.h
index 231f28599d7854..18727736f53722 100644
--- a/clang/include/clang/Basic/Sarif.h
+++ b/clang/include/clang/Basic/Sarif.h
@@ -374,7 +374,7 @@ class SarifResult {
     return *this;
   }
 
-   SarifResult addRelatedLocations(llvm::ArrayRef<CharSourceRange> DiagLocs,
+  SarifResult addRelatedLocations(llvm::ArrayRef<CharSourceRange> DiagLocs,
                                   llvm::StringRef Message = "") {
 #ifndef NDEBUG
     for (const auto &Loc : DiagLocs) {

>From d0fe1988b1977c1c2caf443b59c4b6925cedf6b5 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 28 Sep 2026 07:53:24 -0700
Subject: [PATCH 10/28] [clang-tidy] fixed macro expansions, included new test,
 modified release notes, fixed explicitly naming clang-tidy tooling name

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    |   3 +-
 .../ClangTidyDiagnosticConsumer.cpp           |  38 ++--
 clang-tools-extra/docs/ReleaseNotes.md        |   4 +-
 .../export-SARIF-Thread-flows.cpp             |   3 +
 .../export-SARIF-diagnostics-macro.cpp        | 179 ++++++++++++++++++
 .../export-SARIF-diagnostics-terminal.cpp     |  12 ++
 .../export-SARIF-diagnostics.cpp              |  12 ++
 .../export-SARIF-no-location.cpp              |   6 +
 clang/include/clang/Basic/Sarif.h             |   3 +-
 clang/lib/Basic/Sarif.cpp                     |  23 +--
 10 files changed, 245 insertions(+), 38 deletions(-)
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 530c9cfe8d4912..0adbc6bae024ae 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -117,7 +117,8 @@ class ErrorReporter {
         SarifOS(SarifOS) {
     if (SarifOS) {
       SarifWriter.emplace(SourceMgr);
-      SarifWriter->createRun("clang-tidy", "clang-tidy");
+      SarifWriter->createRun("clang-tidy", "clang-tidy", CLANG_VERSION_STRING,
+                             "https://clang.llvm.org/extra/clang-tidy/");
     }
 
     DiagOpts.setShowColors(Context.getOptions().UseColor.value_or(
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
index 61eacd5df6c251..c148056ddc22d2 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -70,37 +70,29 @@ class ClangTidyDiagnosticRenderer : public DiagnosticRenderer {
             ? tooling::DiagnosticMessage(Message, Loc.getManager(), Loc)
             : tooling::DiagnosticMessage(Message);
 
-    // Make sure that if a TokenRange is received from the check it is unfurled
-    // into a real CharRange for the diagnostic printer later.
-    // Whatever we store here gets decoupled from the current SourceManager, so
-    // we **have to** know the exact position and length of the highlight.
-    const auto ToCharRange = [this, &Loc](const CharSourceRange &SourceRange) {
-      if (SourceRange.isCharRange())
-        return SourceRange;
-      assert(SourceRange.isTokenRange());
-      const SourceLocation End = Lexer::getLocForEndOfToken(
-          SourceRange.getEnd(), 0, Loc.getManager(), LangOpts);
-      return CharSourceRange::getCharRange(SourceRange.getBegin(), End);
+    // Whatever we store here gets decoupled from the current Source Manager, so
+    // each range must become a character range in a real file now.
+    // makeFileCharRange maps a range covering a whole macro expansion to the
+    // macro call, and a range inside a macro argument to where the argument is
+    // written. Ranges it cannot map (invalid, or only part of a macro body)
+    // come back invalid and are dropped.
+    const auto StoreRanges = [&](tooling::DiagnosticMessage &Stored) {
+      for (const CharSourceRange &Range : Ranges) {
+        const CharSourceRange FileRange =
+            Lexer::makeFileCharRange(Range, Loc.getManager(), LangOpts);
+        if (FileRange.isValid())
+          Stored.Ranges.emplace_back(Loc.getManager(), FileRange);
+      }
     };
 
-    // We are only interested in valid ranges.
-    const auto ValidRanges =
-        llvm::make_filter_range(Ranges, [](const CharSourceRange &R) {
-          return R.getAsRange().isValid();
-        });
-
     if (Level == DiagnosticsEngine::Note) {
       Error.Notes.push_back(TidyMessage);
-      for (const CharSourceRange &SourceRange : ValidRanges)
-        Error.Notes.back().Ranges.emplace_back(Loc.getManager(),
-                                               ToCharRange(SourceRange));
+      StoreRanges(Error.Notes.back());
       return;
     }
     assert(Error.Message.Message.empty() && "Overwriting a diagnostic message");
     Error.Message = TidyMessage;
-    for (const CharSourceRange &SourceRange : ValidRanges)
-      Error.Message.Ranges.emplace_back(Loc.getManager(),
-                                        ToCharRange(SourceRange));
+    StoreRanges(Error.Message);
   }
 
   void emitDiagnosticLoc(FullSourceLoc Loc, PresumedLoc PLoc,
diff --git a/clang-tools-extra/docs/ReleaseNotes.md b/clang-tools-extra/docs/ReleaseNotes.md
index 4c9f10c4c7153c..e9b5362bf1c2fc 100644
--- a/clang-tools-extra/docs/ReleaseNotes.md
+++ b/clang-tools-extra/docs/ReleaseNotes.md
@@ -105,8 +105,8 @@ infrastructure are described first, followed by tool-specific sections.
   piping from {program}`git` to {program}`clang-tidy-diff.py`, where slashes
   will now be automatically normalized.
 
-- Added a new {program}`clang-tidy` command line option `-export-sarif=<file>`
-  in which clang-tidy diagnostics are exported in the `SARIF https://sarifweb.azurewebsites.net/`
+- Added a new {program}`clang-tidy` command line option `-sarif-export=<file>`
+  in which clang-tidy diagnostics are exported in the [SARIF](https://sarifweb.azurewebsites.net/)
   format.
   
 #### New checks
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
index 0e2fa2d0fc3be8..8891635865acc6 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
@@ -118,6 +118,9 @@ void f() {
 //CHECK-SARIF-NEXT:                 "level": "warning",
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",
 //CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
 //CHECK-SARIF-NEXT:             }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp
new file mode 100644
index 00000000000000..cedbaf62c88587
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp
@@ -0,0 +1,179 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
+// RUN: clang-tidy %t-input.cpp -checks='-*,clang-analyzer-*' -sarif-export=%t.sarif > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
+// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
+#define DEREF(p) (*(p))
+#define NUL nullptr
+
+int g() {
+  int *ptr = NUL;
+  return DEREF(ptr);
+}
+
+//CHECK-MESSAGES: -input.cpp:6:10: warning: Dereference of null pointer (loaded from variable 'ptr') [clang-analyzer-core.NullDereference]
+//CHECK-MESSAGES: -input.cpp:1:18: note: expanded from macro 'DEREF'
+//CHECK-MESSAGES: -input.cpp:5:3: note: 'ptr' initialized to a null pointer value
+//CHECK-MESSAGES: -input.cpp:6:10: note: Dereference of null pointer (loaded from variable 'ptr')
+//CHECK-MESSAGES: -input.cpp:1:18: note: expanded from macro 'DEREF'
+
+//CHECK-SARIF: {
+//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-SARIF-NEXT:   "runs": [
+//CHECK-SARIF-NEXT:     {
+//CHECK-SARIF-NEXT:       "artifacts": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
+//CHECK-SARIF-NEXT:           "location": {
+//CHECK-SARIF-NEXT:             "index": 0,
+//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
+//CHECK-SARIF-NEXT:           "roles": [
+//CHECK-SARIF-NEXT:             "resultFile"
+//CHECK-SARIF-NEXT:           ]
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-SARIF-NEXT:       "results": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "codeFlows": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "threadFlows": [
+//CHECK-SARIF-NEXT:                 {
+//CHECK-SARIF-NEXT:                   "locations": [
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "expanded from macro 'DEREF'"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 22,
+//CHECK-SARIF-NEXT:                             "endLine": 1,
+//CHECK-SARIF-NEXT:                             "startColumn": 21,
+//CHECK-SARIF-NEXT:                             "startLine": 1
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     },
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "'ptr' initialized to a null pointer value"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 11,
+//CHECK-SARIF-NEXT:                             "endLine": 5,
+//CHECK-SARIF-NEXT:                             "startColumn": 3,
+//CHECK-SARIF-NEXT:                             "startLine": 5
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     },
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 19,
+//CHECK-SARIF-NEXT:                             "endLine": 6,
+//CHECK-SARIF-NEXT:                             "startColumn": 16,
+//CHECK-SARIF-NEXT:                             "startLine": 6
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     },
+//CHECK-SARIF-NEXT:                     {
+//CHECK-SARIF-NEXT:                       "importance": "important",
+//CHECK-SARIF-NEXT:                       "location": {
+//CHECK-SARIF-NEXT:                         "message": {
+//CHECK-SARIF-NEXT:                           "text": "expanded from macro 'DEREF'"
+//CHECK-SARIF-NEXT:                         },
+//CHECK-SARIF-NEXT:                         "physicalLocation": {
+//CHECK-SARIF-NEXT:                           "artifactLocation": {
+//CHECK-SARIF-NEXT:                             "index": 0,
+//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                           },
+//CHECK-SARIF-NEXT:                           "region": {
+//CHECK-SARIF-NEXT:                             "endColumn": 22,
+//CHECK-SARIF-NEXT:                             "endLine": 1,
+//CHECK-SARIF-NEXT:                             "startColumn": 21,
+//CHECK-SARIF-NEXT:                             "startLine": 1
+//CHECK-SARIF-NEXT:                           }
+//CHECK-SARIF-NEXT:                         }
+//CHECK-SARIF-NEXT:                       }
+//CHECK-SARIF-NEXT:                     }
+//CHECK-SARIF-NEXT:                   ]
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               ]
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "level": "warning",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 19,
+//CHECK-SARIF-NEXT:                   "endLine": 6,
+//CHECK-SARIF-NEXT:                   "startColumn": 16,
+//CHECK-SARIF-NEXT:                   "startLine": 6
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "Dereference of null pointer (loaded from variable 'ptr')"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-analyzer-core.NullDereference",
+//CHECK-SARIF-NEXT:           "ruleIndex": 0
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "tool": {
+//CHECK-SARIF-NEXT:         "driver": {
+//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
+//CHECK-SARIF-NEXT:           "language": "en-US",
+//CHECK-SARIF-NEXT:           "name": "clang-tidy",
+//CHECK-SARIF-NEXT:           "rules": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "warning",
+//CHECK-SARIF-NEXT:                 "rank": -1
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",
+//CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "version": "24.0.0git"
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       }
+//CHECK-SARIF-NEXT:     }
+//CHECK-SARIF-NEXT:   ],
+//CHECK-SARIF-NEXT:   "version": "2.1.0"
+//CHECK-SARIF-NEXT: }
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 015eace602f2f3..3dbe5f28ab985e 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -241,6 +241,9 @@ struct Foo {
 //CHECK-NEXT:                 "level": "error",
 //CHECK-NEXT:                 "rank": 50
 //CHECK-NEXT:               },
+//CHECK-NEXT:               "fullDescription": {
+//CHECK-NEXT:                 "text": ""
+//CHECK-NEXT:               },
 //CHECK-NEXT:               "id": "clang-diagnostic-missing-prototypes",
 //CHECK-NEXT:               "name": "clang-diagnostic-missing-prototypes"
 //CHECK-NEXT:             },
@@ -250,6 +253,9 @@ struct Foo {
 //CHECK-NEXT:                 "level": "error",
 //CHECK-NEXT:                 "rank": 50
 //CHECK-NEXT:               },
+//CHECK-NEXT:               "fullDescription": {
+//CHECK-NEXT:                 "text": ""
+//CHECK-NEXT:               },
 //CHECK-NEXT:               "id": "clang-diagnostic-error",
 //CHECK-NEXT:               "name": "clang-diagnostic-error"
 //CHECK-NEXT:             },
@@ -259,6 +265,9 @@ struct Foo {
 //CHECK-NEXT:                 "level": "warning",
 //CHECK-NEXT:                 "rank": -1
 //CHECK-NEXT:               },
+//CHECK-NEXT:               "fullDescription": {
+//CHECK-NEXT:                 "text": ""
+//CHECK-NEXT:               },
 //CHECK-NEXT:               "id": "clang-diagnostic-zero-length-array",
 //CHECK-NEXT:               "name": "clang-diagnostic-zero-length-array"
 //CHECK-NEXT:             },
@@ -268,6 +277,9 @@ struct Foo {
 //CHECK-NEXT:                 "level": "error",
 //CHECK-NEXT:                 "rank": 50
 //CHECK-NEXT:               },
+//CHECK-NEXT:               "fullDescription": {
+//CHECK-NEXT:                 "text": ""
+//CHECK-NEXT:               },
 //CHECK-NEXT:               "id": "google-explicit-constructor",
 //CHECK-NEXT:               "name": "google-explicit-constructor"
 //CHECK-NEXT:             }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 5ff0c5f9d9454a..7ea3beff3d8110 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -254,6 +254,9 @@ struct Foo {
 //CHECK-SARIF-NEXT:                 "level": "error",
 //CHECK-SARIF-NEXT:                 "rank": 50
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "clang-diagnostic-missing-prototypes",
 //CHECK-SARIF-NEXT:               "name": "clang-diagnostic-missing-prototypes"
 //CHECK-SARIF-NEXT:             },
@@ -263,6 +266,9 @@ struct Foo {
 //CHECK-SARIF-NEXT:                 "level": "error",
 //CHECK-SARIF-NEXT:                 "rank": 50
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "clang-diagnostic-error",
 //CHECK-SARIF-NEXT:               "name": "clang-diagnostic-error"
 //CHECK-SARIF-NEXT:             },
@@ -272,6 +278,9 @@ struct Foo {
 //CHECK-SARIF-NEXT:                 "level": "warning",
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "clang-diagnostic-zero-length-array",
 //CHECK-SARIF-NEXT:               "name": "clang-diagnostic-zero-length-array"
 //CHECK-SARIF-NEXT:             },
@@ -281,6 +290,9 @@ struct Foo {
 //CHECK-SARIF-NEXT:                 "level": "error",
 //CHECK-SARIF-NEXT:                 "rank": 50
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "google-explicit-constructor",
 //CHECK-SARIF-NEXT:               "name": "google-explicit-constructor"
 //CHECK-SARIF-NEXT:             }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
index b9855914cca6b9..8e40667f735817 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
@@ -76,6 +76,9 @@ class A { A(int) {} };
 //CHECK-SARIF-NEXT:                 "level": "error",
 //CHECK-SARIF-NEXT:                 "rank": 50
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "clang-diagnostic-error",
 //CHECK-SARIF-NEXT:               "name": "clang-diagnostic-error"
 //CHECK-SARIF-NEXT:             },
@@ -85,6 +88,9 @@ class A { A(int) {} };
 //CHECK-SARIF-NEXT:                 "level": "warning",
 //CHECK-SARIF-NEXT:                 "rank": -1
 //CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "id": "google-explicit-constructor",
 //CHECK-SARIF-NEXT:               "name": "google-explicit-constructor"
 //CHECK-SARIF-NEXT:             }
diff --git a/clang/include/clang/Basic/Sarif.h b/clang/include/clang/Basic/Sarif.h
index 18727736f53722..35b07591b7ebbb 100644
--- a/clang/include/clang/Basic/Sarif.h
+++ b/clang/include/clang/Basic/Sarif.h
@@ -472,7 +472,8 @@ class SarifDocumentWriter {
   /// Each run requires specifying the tool that is generating reporting items.
   void createRun(const llvm::StringRef ShortToolName,
                  const llvm::StringRef LongToolName,
-                 const llvm::StringRef ToolVersion = CLANG_VERSION_STRING);
+                 const llvm::StringRef ToolVersion = CLANG_VERSION_STRING,
+                 const llvm::StringRef InformationUri = "");
 
   /// If there is a current run, end it.
   ///
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index a6e154beb06842..cf5329603a17da 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -276,11 +276,11 @@ void SarifDocumentWriter::endRun() {
         {"enabled", R.DefaultConfiguration.Enabled},
         {"level", resultLevelToStr(R.DefaultConfiguration.Level)},
         {"rank", R.DefaultConfiguration.Rank}};
-    json::Object Rule{{"name", R.Name},
-                      {"id", R.Id},
-                      {"defaultConfiguration", std::move(Config)}};
-    if (!(Tool.getObject("driver")->getString("fullName") == "clang-tidy"))
-      Rule["fullDescription"] = json::Object{{"text", R.Description}};
+    json::Object Rule{
+        {"name", R.Name},
+        {"id", R.Id},
+        {"fullDescription", json::Object{{"text", R.Description}}},
+        {"defaultConfiguration", std::move(Config)}};
     if (!R.HelpURI.empty())
       Rule["helpUri"] = R.HelpURI;
     if (!R.DeprecatedIds.empty())
@@ -344,22 +344,23 @@ SarifDocumentWriter::createCodeFlow(ArrayRef<ThreadFlow> ThreadFlows) {
 
 void SarifDocumentWriter::createRun(StringRef ShortToolName,
                                     StringRef LongToolName,
-                                    StringRef ToolVersion) {
+                                    StringRef ToolVersion,
+                                    StringRef InformationUri) {
   // Clear resources associated with a previous run.
   endRun();
 
   // Signify a new run has begun.
   Closed = false;
-
-  StringRef InformationUri = "https://clang.llvm.org/docs/UsersManual.html";
-  if (LongToolName == "clang-tidy")
-    InformationUri = "https://clang.llvm.org/extra/clang-tidy/";
+  StringRef EffectiveInformationUri =
+      InformationUri.empty() ? "https://clang.llvm.org/docs/UsersManual.html"
+                             : InformationUri;
 
   json::Object Tool{{"driver", json::Object{{"name", ShortToolName},
                                             {"fullName", LongToolName},
                                             {"language", "en-US"},
                                             {"version", ToolVersion},
-                                            {"informationUri", InformationUri},
+                                            {"informationUri",
+                                             EffectiveInformationUri},
                                             {"rules", json::Array{}}}}};
   json::Object TheRun{{"tool", std::move(Tool)},
                       {"results", {}},

>From a8caee557d9034f372682db0f60a55880963633b Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Wed, 30 Sep 2026 06:31:52 -0700
Subject: [PATCH 11/28] [clang-tidy] Fixed EOF result ranges offset failing for
 clang-tidy SARIF, updated SARIF tests

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    |  23 +--
 .../export-SARIF-Thread-flows.cpp             | 134 ------------------
 .../export-SARIF-diagnostics-EOF.cpp          |  78 ++++++++++
 ...-SARIF-diagnostics-macro-thread-flows.cpp} |  36 +++--
 4 files changed, 108 insertions(+), 163 deletions(-)
 delete mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
 rename clang-tools-extra/test/clang-tidy/infrastructure/{export-SARIF-diagnostics-macro.cpp => export-SARIF-diagnostics-macro-thread-flows.cpp} (90%)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 0adbc6bae024ae..feb4f3ac29159b 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -219,12 +219,10 @@ class ErrorReporter {
   CharSourceRange getNoteRange(const tooling::DiagnosticMessage &Note) {
     if (!Note.Ranges.empty())
       return getRange(Note.Ranges.front());
-
-    tooling::FileByteRange FBR;
-    FBR.FilePath = Note.FilePath;
-    FBR.FileOffset = Note.FileOffset;
-    FBR.Length = 1;
-    return getRange(FBR);
+    const SourceLocation Loc = getLocation(Note.FilePath, Note.FileOffset);
+    if (Loc.isInvalid())
+      return {};
+    return getOffsetRange(SourceMgr, Loc);
   }
 
   SmallVector<ThreadFlow, 8> createThreadFlows(const ClangTidyError &Error) {
@@ -282,6 +280,14 @@ class ErrorReporter {
       SarifWriter->appendResult(Result);
   }
 
+  CharSourceRange getOffsetRange(SourceManager &SM, SourceLocation Loc) {
+    const std::pair<FileID, unsigned> &DecomposedLoc = SM.getDecomposedLoc(Loc);
+    const FileID FileId = DecomposedLoc.first;
+    const unsigned Offset = DecomposedLoc.second;
+    return CharSourceRange::getCharRange(
+        Loc, Loc.getLocWithOffset(Offset < SM.getFileIDSize(FileId) ? 1 : 0));
+  }
+
   SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error,
                                                   SourceLocation Loc) {
     SmallVector<CharSourceRange, 4> Ranges;
@@ -293,9 +299,8 @@ class ErrorReporter {
       // Some Clang-Tidy diagnostics are issued with a single location (not a
       // range). For these, we create a range of length 1 at the diagnostic
       // location. As, SARIF results require a character range for each
-      // location.
-      Ranges.push_back(
-          CharSourceRange::getCharRange(Loc, Loc.getLocWithOffset(1)));
+      // location, for EOF we create a zero-length range.
+      Ranges.push_back(getOffsetRange(SourceMgr, Loc));
     }
     return Ranges;
   }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
deleted file mode 100644
index 8891635865acc6..00000000000000
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-Thread-flows.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
-// RUN: clang-tidy %t-input.cpp -checks='-*,clang-analyzer*' -sarif-export=%t.sarif > %t.msg 2>&1
-// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
-// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
-void f() {
-  int *ptr = nullptr;
-  *ptr = 1;
-}
-
-//CHECK-MESSAGES: -input.cpp:3:8: warning: Dereference of null pointer (loaded from variable 'ptr') [clang-analyzer-core.NullDereference]
-//CHECK-MESSAGES: -input.cpp:2:3: note: 'ptr' initialized to a null pointer value
-//CHECK-MESSAGES: -input.cpp:3:8: note: Dereference of null pointer (loaded from variable 'ptr')
-
-//CHECK-SARIF: {
-//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
-//CHECK-SARIF-NEXT:   "runs": [
-//CHECK-SARIF-NEXT:     {
-//CHECK-SARIF-NEXT:       "artifacts": [
-//CHECK-SARIF-NEXT:         {
-//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
-//CHECK-SARIF-NEXT:           "location": {
-//CHECK-SARIF-NEXT:             "index": 0,
-//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
-//CHECK-SARIF-NEXT:           },
-//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
-//CHECK-SARIF-NEXT:           "roles": [
-//CHECK-SARIF-NEXT:             "resultFile"
-//CHECK-SARIF-NEXT:           ]
-//CHECK-SARIF-NEXT:         }
-//CHECK-SARIF-NEXT:       ],
-//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
-//CHECK-SARIF-NEXT:       "results": [
-//CHECK-SARIF-NEXT:         {
-//CHECK-SARIF-NEXT:           "codeFlows": [
-//CHECK-SARIF-NEXT:             {
-//CHECK-SARIF-NEXT:               "threadFlows": [
-//CHECK-SARIF-NEXT:                 {
-//CHECK-SARIF-NEXT:                   "locations": [
-//CHECK-SARIF-NEXT:                     {
-//CHECK-SARIF-NEXT:                       "importance": "important",
-//CHECK-SARIF-NEXT:                       "location": {
-//CHECK-SARIF-NEXT:                         "message": {
-//CHECK-SARIF-NEXT:                           "text": "'ptr' initialized to a null pointer value"
-//CHECK-SARIF-NEXT:                         },
-//CHECK-SARIF-NEXT:                         "physicalLocation": {
-//CHECK-SARIF-NEXT:                           "artifactLocation": {
-//CHECK-SARIF-NEXT:                             "index": 0,
-//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
-//CHECK-SARIF-NEXT:                           },
-//CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 11,
-//CHECK-SARIF-NEXT:                             "endLine": 2,
-//CHECK-SARIF-NEXT:                             "startColumn": 3,
-//CHECK-SARIF-NEXT:                             "startLine": 2
-//CHECK-SARIF-NEXT:                           }
-//CHECK-SARIF-NEXT:                         }
-//CHECK-SARIF-NEXT:                       }
-//CHECK-SARIF-NEXT:                     },
-//CHECK-SARIF-NEXT:                     {
-//CHECK-SARIF-NEXT:                       "importance": "important",
-//CHECK-SARIF-NEXT:                       "location": {
-//CHECK-SARIF-NEXT:                         "message": {
-//CHECK-SARIF-NEXT:                           "text": "Dereference of null pointer (loaded from variable 'ptr')"
-//CHECK-SARIF-NEXT:                         },
-//CHECK-SARIF-NEXT:                         "physicalLocation": {
-//CHECK-SARIF-NEXT:                           "artifactLocation": {
-//CHECK-SARIF-NEXT:                             "index": 0,
-//CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
-//CHECK-SARIF-NEXT:                           },
-//CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 7,
-//CHECK-SARIF-NEXT:                             "endLine": 3,
-//CHECK-SARIF-NEXT:                             "startColumn": 4,
-//CHECK-SARIF-NEXT:                             "startLine": 3
-//CHECK-SARIF-NEXT:                           }
-//CHECK-SARIF-NEXT:                         }
-//CHECK-SARIF-NEXT:                       }
-//CHECK-SARIF-NEXT:                     }
-//CHECK-SARIF-NEXT:                   ]
-//CHECK-SARIF-NEXT:                 }
-//CHECK-SARIF-NEXT:               ]
-//CHECK-SARIF-NEXT:             }
-//CHECK-SARIF-NEXT:           ],
-//CHECK-SARIF-NEXT:           "level": "warning",
-//CHECK-SARIF-NEXT:           "locations": [
-//CHECK-SARIF-NEXT:             {
-//CHECK-SARIF-NEXT:               "physicalLocation": {
-//CHECK-SARIF-NEXT:                 "artifactLocation": {
-//CHECK-SARIF-NEXT:                   "index": 0,
-//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
-//CHECK-SARIF-NEXT:                 },
-//CHECK-SARIF-NEXT:                 "region": {
-//CHECK-SARIF-NEXT:                   "endColumn": 7,
-//CHECK-SARIF-NEXT:                   "endLine": 3,
-//CHECK-SARIF-NEXT:                   "startColumn": 4,
-//CHECK-SARIF-NEXT:                   "startLine": 3
-//CHECK-SARIF-NEXT:                 }
-//CHECK-SARIF-NEXT:               }
-//CHECK-SARIF-NEXT:             }
-//CHECK-SARIF-NEXT:           ],
-//CHECK-SARIF-NEXT:           "message": {
-//CHECK-SARIF-NEXT:             "text": "Dereference of null pointer (loaded from variable 'ptr')"
-//CHECK-SARIF-NEXT:           },
-//CHECK-SARIF-NEXT:           "ruleId": "clang-analyzer-core.NullDereference",
-//CHECK-SARIF-NEXT:           "ruleIndex": 0
-//CHECK-SARIF-NEXT:         }
-//CHECK-SARIF-NEXT:       ],
-//CHECK-SARIF-NEXT:       "tool": {
-//CHECK-SARIF-NEXT:         "driver": {
-//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
-//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
-//CHECK-SARIF-NEXT:           "language": "en-US",
-//CHECK-SARIF-NEXT:           "name": "clang-tidy",
-//CHECK-SARIF-NEXT:           "rules": [
-//CHECK-SARIF-NEXT:             {
-//CHECK-SARIF-NEXT:               "defaultConfiguration": {
-//CHECK-SARIF-NEXT:                 "enabled": true,
-//CHECK-SARIF-NEXT:                 "level": "warning",
-//CHECK-SARIF-NEXT:                 "rank": -1
-//CHECK-SARIF-NEXT:               },
-//CHECK-SARIF-NEXT:               "fullDescription": {
-//CHECK-SARIF-NEXT:                 "text": ""
-//CHECK-SARIF-NEXT:               },
-//CHECK-SARIF-NEXT:               "id": "clang-analyzer-core.NullDereference",
-//CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
-//CHECK-SARIF-NEXT:             }
-//CHECK-SARIF-NEXT:           ],
-//CHECK-SARIF-NEXT:           "version": "{{.*}}"
-//CHECK-SARIF-NEXT:         }
-//CHECK-SARIF-NEXT:       }
-//CHECK-SARIF-NEXT:     }
-//CHECK-SARIF-NEXT:   ],
-//CHECK-SARIF-NEXT:   "version": "{{.*}}"
-//CHECK-SARIF-NEXT: }
\ No newline at end of file
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
new file mode 100644
index 00000000000000..a0703fc0790ecb
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -0,0 +1,78 @@
+// RUN: echo -n 'int main() { return 0; }' > %t-input.cpp
+// RUN: clang-tidy %t-input.cpp -checks='-*,clang-diagnostic-newline-eof' --allow-no-checks -sarif-export=%t.sarif -- -Wnewline-eof > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
+// RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
+
+//CHECK-MESSAGES: -input.cpp:1:25: warning: no newline at end of file [clang-diagnostic-newline-eof]
+
+//CHECK-SARIF: {
+//CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
+//CHECK-SARIF-NEXT:   "runs": [
+//CHECK-SARIF-NEXT:     {
+//CHECK-SARIF-NEXT:       "artifacts": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "length": {{[0-9]+}},
+//CHECK-SARIF-NEXT:           "location": {
+//CHECK-SARIF-NEXT:             "index": 0,
+//CHECK-SARIF-NEXT:             "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "mimeType": "text/plain",
+//CHECK-SARIF-NEXT:           "roles": [
+//CHECK-SARIF-NEXT:             "resultFile"
+//CHECK-SARIF-NEXT:           ]
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "columnKind": "unicodeCodePoints",
+//CHECK-SARIF-NEXT:       "results": [
+//CHECK-SARIF-NEXT:         {
+//CHECK-SARIF-NEXT:           "level": "warning",
+//CHECK-SARIF-NEXT:           "locations": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "physicalLocation": {
+//CHECK-SARIF-NEXT:                 "artifactLocation": {
+//CHECK-SARIF-NEXT:                   "index": 0,
+//CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
+//CHECK-SARIF-NEXT:                 },
+//CHECK-SARIF-NEXT:                 "region": {
+//CHECK-SARIF-NEXT:                   "endColumn": 25,
+//CHECK-SARIF-NEXT:                   "startColumn": 25,
+//CHECK-SARIF-NEXT:                   "startLine": 1
+//CHECK-SARIF-NEXT:                 }
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "message": {
+//CHECK-SARIF-NEXT:             "text": "no newline at end of file"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "clang-diagnostic-newline-eof",
+//CHECK-SARIF-NEXT:           "ruleIndex": 0
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       ],
+//CHECK-SARIF-NEXT:       "tool": {
+//CHECK-SARIF-NEXT:         "driver": {
+//CHECK-SARIF-NEXT:           "fullName": "clang-tidy",
+//CHECK-SARIF-NEXT:           "informationUri": "https://clang.llvm.org/extra/clang-tidy/",
+//CHECK-SARIF-NEXT:           "language": "en-US",
+//CHECK-SARIF-NEXT:           "name": "clang-tidy",
+//CHECK-SARIF-NEXT:           "rules": [
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "defaultConfiguration": {
+//CHECK-SARIF-NEXT:                 "enabled": true,
+//CHECK-SARIF-NEXT:                 "level": "warning",
+//CHECK-SARIF-NEXT:                 "rank": -1
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "fullDescription": {
+//CHECK-SARIF-NEXT:                 "text": ""
+//CHECK-SARIF-NEXT:               },
+//CHECK-SARIF-NEXT:               "id": "clang-diagnostic-newline-eof",
+//CHECK-SARIF-NEXT:               "name": "clang-diagnostic-newline-eof"
+//CHECK-SARIF-NEXT:             }
+//CHECK-SARIF-NEXT:           ],
+//CHECK-SARIF-NEXT:           "version": "24.0.0git"
+//CHECK-SARIF-NEXT:         }
+//CHECK-SARIF-NEXT:       }
+//CHECK-SARIF-NEXT:     }
+//CHECK-SARIF-NEXT:   ],
+//CHECK-SARIF-NEXT:   "version": "2.1.0"
+
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
similarity index 90%
rename from clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
index cedbaf62c88587..f6e5d0476926ab 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
@@ -4,16 +4,12 @@
 // RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
 #define DEREF(p) (*(p))
 #define NUL nullptr
+int g() { int *ptr = NUL; return DEREF(ptr); }
 
-int g() {
-  int *ptr = NUL;
-  return DEREF(ptr);
-}
-
-//CHECK-MESSAGES: -input.cpp:6:10: warning: Dereference of null pointer (loaded from variable 'ptr') [clang-analyzer-core.NullDereference]
+//CHECK-MESSAGES: -input.cpp:3:34: warning: Dereference of null pointer (loaded from variable 'ptr') [clang-analyzer-core.NullDereference]
 //CHECK-MESSAGES: -input.cpp:1:18: note: expanded from macro 'DEREF'
-//CHECK-MESSAGES: -input.cpp:5:3: note: 'ptr' initialized to a null pointer value
-//CHECK-MESSAGES: -input.cpp:6:10: note: Dereference of null pointer (loaded from variable 'ptr')
+//CHECK-MESSAGES: -input.cpp:3:11: note: 'ptr' initialized to a null pointer value
+//CHECK-MESSAGES: -input.cpp:3:34: note: Dereference of null pointer (loaded from variable 'ptr')
 //CHECK-MESSAGES: -input.cpp:1:18: note: expanded from macro 'DEREF'
 
 //CHECK-SARIF: {
@@ -73,10 +69,10 @@ int g() {
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 11,
-//CHECK-SARIF-NEXT:                             "endLine": 5,
-//CHECK-SARIF-NEXT:                             "startColumn": 3,
-//CHECK-SARIF-NEXT:                             "startLine": 5
+//CHECK-SARIF-NEXT:                             "endColumn": 19,
+//CHECK-SARIF-NEXT:                             "endLine": 3,
+//CHECK-SARIF-NEXT:                             "startColumn": 11,
+//CHECK-SARIF-NEXT:                             "startLine": 3
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
 //CHECK-SARIF-NEXT:                       }
@@ -93,10 +89,10 @@ int g() {
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 19,
-//CHECK-SARIF-NEXT:                             "endLine": 6,
-//CHECK-SARIF-NEXT:                             "startColumn": 16,
-//CHECK-SARIF-NEXT:                             "startLine": 6
+//CHECK-SARIF-NEXT:                             "endColumn": 43,
+//CHECK-SARIF-NEXT:                             "endLine": 3,
+//CHECK-SARIF-NEXT:                             "startColumn": 40,
+//CHECK-SARIF-NEXT:                             "startLine": 3
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
 //CHECK-SARIF-NEXT:                       }
@@ -135,10 +131,10 @@ int g() {
 //CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
-//CHECK-SARIF-NEXT:                   "endColumn": 19,
-//CHECK-SARIF-NEXT:                   "endLine": 6,
-//CHECK-SARIF-NEXT:                   "startColumn": 16,
-//CHECK-SARIF-NEXT:                   "startLine": 6
+//CHECK-SARIF-NEXT:                   "endColumn": 43,
+//CHECK-SARIF-NEXT:                   "endLine": 3,
+//CHECK-SARIF-NEXT:                   "startColumn": 40,
+//CHECK-SARIF-NEXT:                   "startLine": 3
 //CHECK-SARIF-NEXT:                 }
 //CHECK-SARIF-NEXT:               }
 //CHECK-SARIF-NEXT:             }

>From 98bfad2c09c82d9b8aeb8dd9b739ce16f4e067fb Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Thu, 1 Oct 2026 02:08:39 -0700
Subject: [PATCH 12/28] [clang-tidy] fixed test versions

---
 .../infrastructure/export-SARIF-diagnostics-EOF.cpp           | 4 ++--
 .../export-SARIF-diagnostics-macro-thread-flows.cpp           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index a0703fc0790ecb..3ceb3bb8aac16f 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -68,11 +68,11 @@
 //CHECK-SARIF-NEXT:               "name": "clang-diagnostic-newline-eof"
 //CHECK-SARIF-NEXT:             }
 //CHECK-SARIF-NEXT:           ],
-//CHECK-SARIF-NEXT:           "version": "24.0.0git"
+//CHECK-SARIF-NEXT:           "version": "{{.*}}"
 //CHECK-SARIF-NEXT:         }
 //CHECK-SARIF-NEXT:       }
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
-//CHECK-SARIF-NEXT:   "version": "2.1.0"
+//CHECK-SARIF-NEXT:   "version": "{{.*}}"
 
 
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
index f6e5d0476926ab..5f8917f119ecb7 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
@@ -166,10 +166,10 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:               "name": "clang-analyzer-core.NullDereference"
 //CHECK-SARIF-NEXT:             }
 //CHECK-SARIF-NEXT:           ],
-//CHECK-SARIF-NEXT:           "version": "24.0.0git"
+//CHECK-SARIF-NEXT:           "version": "{{.*}}"
 //CHECK-SARIF-NEXT:         }
 //CHECK-SARIF-NEXT:       }
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
-//CHECK-SARIF-NEXT:   "version": "2.1.0"
+//CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
\ No newline at end of file

>From 8ac99177df8f8b8a0c4a837576a51a7b21df5a72 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 5 Oct 2026 03:47:31 -0700
Subject: [PATCH 13/28] [clang-tidy] formatting

---
 clang/lib/Basic/Sarif.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index cf5329603a17da..04f4b9f8774d1c 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -355,13 +355,13 @@ void SarifDocumentWriter::createRun(StringRef ShortToolName,
       InformationUri.empty() ? "https://clang.llvm.org/docs/UsersManual.html"
                              : InformationUri;
 
-  json::Object Tool{{"driver", json::Object{{"name", ShortToolName},
-                                            {"fullName", LongToolName},
-                                            {"language", "en-US"},
-                                            {"version", ToolVersion},
-                                            {"informationUri",
-                                             EffectiveInformationUri},
-                                            {"rules", json::Array{}}}}};
+  json::Object Tool{
+      {"driver", json::Object{{"name", ShortToolName},
+                              {"fullName", LongToolName},
+                              {"language", "en-US"},
+                              {"version", ToolVersion},
+                              {"informationUri", EffectiveInformationUri},
+                              {"rules", json::Array{}}}}};
   json::Object TheRun{{"tool", std::move(Tool)},
                       {"results", {}},
                       {"artifacts", {}},

>From edc35b076ced3fb10951184d8745db9e0af01db7 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 9 Oct 2026 03:56:44 -0700
Subject: [PATCH 14/28] Reworked createPhysicalLocation, no longer crashes if
 no location provided for macro expansions / notes without a valid location.
 Added Properties to SARIF output, updated tests. Moved SARIF file opening to
 end.

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    | 47 ++++++++-------
 clang-tools-extra/clang-tidy/ClangTidy.h      |  3 +-
 .../clang-tidy/tool/ClangTidyMain.cpp         | 14 +----
 .../export-SARIF-diagnostics-terminal.cpp     |  5 ++
 .../export-SARIF-diagnostics.cpp              |  5 ++
 clang/include/clang/Basic/Sarif.h             | 12 +++-
 clang/lib/Basic/Sarif.cpp                     | 57 ++++++++++++-------
 7 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index feb4f3ac29159b..009cbe8fbfb8e2 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -38,8 +38,10 @@
 #include "clang/Tooling/DiagnosticsYaml.h" // IWYU pragma: keep
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/raw_ostream.h"
 #include <memory>
 #include <utility>
 
@@ -105,17 +107,16 @@ class ErrorReporter {
 public:
   ErrorReporter(ClangTidyContext &Context, FixBehaviour ApplyFixes,
                 llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                llvm::raw_ostream *SarifOS = nullptr,
-                bool ExportSarifToStdout = false)
+                StringRef SarifExportPath)
       : Files(FileSystemOptions(), std::move(BaseFS)),
         DiagPrinter(
-            ExportSarifToStdout
+            SarifExportPath == "-"
                 ? static_cast<DiagnosticConsumer *>(new IgnoringDiagConsumer())
                 : new TextDiagnosticPrinter(llvm::outs(), DiagOpts)),
         Diags(DiagnosticIDs::create(), DiagOpts, DiagPrinter),
         SourceMgr(Diags, Files), Context(Context), ApplyFixes(ApplyFixes),
-        SarifOS(SarifOS) {
-    if (SarifOS) {
+        SarifExportPath(SarifExportPath) {
+    if (!SarifExportPath.empty()) {
       SarifWriter.emplace(SourceMgr);
       SarifWriter->createRun("clang-tidy", "clang-tidy", CLANG_VERSION_STRING,
                              "https://clang.llvm.org/extra/clang-tidy/");
@@ -267,15 +268,15 @@ class ErrorReporter {
             .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel))
             .addLocations(getResultRanges(Error, Loc));
 
-    if (StringRef(Error.DiagnosticName).starts_with("clang-analyzer-")) {
+    if (!Error.EnabledDiagnosticAliases.empty())
+      Result = Result.addProperty(
+          "enabledAliases", llvm::join(Error.EnabledDiagnosticAliases, ","));
+
+    if (StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
       Result = Result.setThreadFlows(createThreadFlows(Error));
-    } else {
-      for (const tooling::DiagnosticMessage &Note : Error.Notes) {
-        const CharSourceRange Range = getNoteRange(Note);
-        if (Range.isValid())
-          Result = Result.addRelatedLocations(Range, Note.Message);
-      }
-    }
+    else
+      for (const tooling::DiagnosticMessage &Note : Error.Notes)
+        Result = Result.addRelatedLocations(getNoteRange(Note), Note.Message);
     if (SarifWriter)
       SarifWriter->appendResult(Result);
   }
@@ -382,9 +383,16 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
-    if (SarifWriter && SarifOS) {
-      llvm::json::Value Document = SarifWriter->createDocument();
-      *SarifOS << llvm::formatv("{0:2}", Document);
+    if (SarifWriter && !SarifExportPath.empty()) {
+      std::error_code EC;
+      llvm::raw_fd_ostream SarifOS(SarifExportPath, EC, llvm::sys::fs::OF_Text);
+      if (EC) {
+        llvm::errs() << "Error opening SARIF export file: " << EC.message()
+                     << "\n";
+      } else {
+        llvm::json::Value Document = SarifWriter->createDocument();
+        SarifOS << llvm::formatv("{0:2}", Document);
+      }
     }
   }
 
@@ -445,7 +453,7 @@ class ErrorReporter {
   unsigned TotalFixes = 0U;
   unsigned AppliedFixes = 0U;
   unsigned WarningsAsErrors = 0U;
-  llvm::raw_ostream *SarifOS = nullptr;
+  std::string SarifExportPath;
   // ExportSarifResult is called for each SARIF rule that gets created, while a
   // SarifWriter run is created once at ErrorReporter construction.
   std::optional<SarifDocumentWriter> SarifWriter;
@@ -794,9 +802,8 @@ void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
                   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                  llvm::raw_ostream *SarifOS, bool ExportSarifToStdout) {
-  ErrorReporter Reporter(Context, Fix, std::move(BaseFS), SarifOS,
-                         ExportSarifToStdout);
+                  StringRef SarifExportPath) {
+  ErrorReporter Reporter(Context, Fix, std::move(BaseFS), SarifExportPath);
   llvm::vfs::FileSystem &FileSystem =
       Reporter.getSourceManager().getFileManager().getVirtualFileSystem();
   auto InitialWorkingDir = FileSystem.getCurrentWorkingDirectory();
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h
index 6df3d7bcc2c3b8..ee750b2339e626 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.h
+++ b/clang-tools-extra/clang-tidy/ClangTidy.h
@@ -119,8 +119,7 @@ void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
                   ClangTidyContext &Context, FixBehaviour Fix,
                   unsigned &WarningsAsErrorsCount,
                   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS,
-                  llvm::raw_ostream *SarifOS = nullptr,
-                  bool ExportSarifToStdout = false);
+                  StringRef SarifExportPath = {});
 
 /// Serializes replacements into YAML and writes them to the specified
 /// output stream.
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 693d1d42345c95..2709623a5b048f 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -660,17 +660,6 @@ int clangTidyMain(int argc, const char **argv) {
 
   const SmallString<256> FilePath = makeAbsolute(FileName);
 
-  std::unique_ptr<llvm::raw_fd_ostream> SarifOS;
-  if (!SarifExport.empty()) {
-    std::error_code EC;
-    SarifOS = std::make_unique<llvm::raw_fd_ostream>(SarifExport, EC,
-                                                     llvm::sys::fs::OF_Text);
-    if (EC) {
-      llvm::errs() << "Error opening output file: " << EC.message() << '\n';
-      return 1;
-    }
-  }
-
   ClangTidyOptions EffectiveOptions = OptionsProvider->getOptions(FilePath);
 
   const std::vector<std::string> EnabledChecks =
@@ -773,8 +762,7 @@ int clangTidyMain(int argc, const char **argv) {
   unsigned WErrorCount = 0;
 
   handleErrors(Errors, Context, DisableFixes ? FB_NoFix : Behaviour,
-               WErrorCount, BaseFS, SarifOS.get(),
-               SarifOS && SarifExport == "-");
+               WErrorCount, BaseFS, SarifExport);
 
   if (!ExportFixes.empty() && !Errors.empty()) {
     std::error_code EC;
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 3dbe5f28ab985e..f33284319c8689 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -71,6 +71,11 @@ struct Foo {
 //CHECK-NEXT:             },
 //CHECK-NEXT:             {
 //CHECK-NEXT:               "message": {
+//CHECK-NEXT:                 "text": "expanded from here"
+//CHECK-NEXT:               }
+//CHECK-NEXT:             },
+//CHECK-NEXT:             {
+//CHECK-NEXT:               "message": {
 //CHECK-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
 //CHECK-NEXT:               },
 //CHECK-NEXT:               "physicalLocation": {
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 7ea3beff3d8110..a47541077922f2 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -84,6 +84,11 @@ struct Foo {
 //CHECK-SARIF-NEXT:             },
 //CHECK-SARIF-NEXT:             {
 //CHECK-SARIF-NEXT:               "message": {
+//CHECK-SARIF-NEXT:                 "text": "expanded from here"
+//CHECK-SARIF-NEXT:               }
+//CHECK-SARIF-NEXT:             },
+//CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "message": {
 //CHECK-SARIF-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
 //CHECK-SARIF-NEXT:               },
 //CHECK-SARIF-NEXT:               "physicalLocation": {
diff --git a/clang/include/clang/Basic/Sarif.h b/clang/include/clang/Basic/Sarif.h
index 35b07591b7ebbb..89dd2ceb7bb115 100644
--- a/clang/include/clang/Basic/Sarif.h
+++ b/clang/include/clang/Basic/Sarif.h
@@ -336,6 +336,7 @@ class SarifResult {
       RelatedLocations;
   llvm::SmallVector<ThreadFlow, 8> ThreadFlows;
   std::optional<SarifResultLevel> LevelOverride;
+  llvm::StringMap<std::string> Properties;
 
   SarifResult() = delete;
   explicit SarifResult(uint32_t RuleIdx) : RuleIdx(RuleIdx) {}
@@ -398,6 +399,11 @@ class SarifResult {
     return *this;
   }
 
+  SarifResult addProperty(llvm::StringRef Key, llvm::StringRef Value) {
+    Properties[Key.str()] = Value.str();
+    return *this;
+  }
+
   SarifResult addPartialFingerprint(llvm::StringRef key,
                                     llvm::StringRef value) {
     PartialFingerprints[key] = value;
@@ -456,8 +462,10 @@ class SarifDocumentWriter {
   createThreadFlows(const llvm::ArrayRef<ThreadFlow> ThreadFlows);
 
   /// Add the given \ref CharSourceRange to the SARIF document as a physical
-  /// location, with its corresponding artifact.
-  llvm::json::Object createPhysicalLocation(const CharSourceRange &R);
+  /// location, with its corresponding artifact. Returns std::nullopt if \p R
+  /// is invalid or does not map to a file.
+  std::optional<llvm::json::Object>
+  createPhysicalLocation(const CharSourceRange &R);
 
 public:
   SarifDocumentWriter() = delete;
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index 04f4b9f8774d1c..a1845ef5f7eab7 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -162,11 +162,16 @@ static json::Object createTextRegion(const SourceManager &SM,
   return Region;
 }
 
-static json::Object createLocation(json::Object &&PhysicalLocation,
-                                   StringRef Message = "") {
-  json::Object Ret{{"physicalLocation", std::move(PhysicalLocation)}};
+/// \internal
+/// SARIF allows a location with only a message and no physicalLocation.
+static json::Object
+createLocation(std::optional<json::Object> &&PhysicalLocation,
+               StringRef Message = "") {
+  json::Object Ret;
+  if (PhysicalLocation)
+    Ret["physicalLocation"] = std::move(*PhysicalLocation);
   if (!Message.empty())
-    Ret.insert({"message", createMessage(Message)});
+    Ret["message"] = createMessage(Message);
   return Ret;
 }
 
@@ -205,15 +210,16 @@ createThreadFlowLocation(json::Object &&Location,
 }
 ///  @}
 
-json::Object
+std::optional<json::Object>
 SarifDocumentWriter::createPhysicalLocation(const CharSourceRange &R) {
-  assert(R.isValid() &&
-         "Cannot create a physicalLocation from invalid SourceRange!");
+  if (R.isInvalid())
+    return std::nullopt;
   assert(R.isCharRange() &&
          "Cannot create a physicalLocation from a token range!");
   FullSourceLoc Start{R.getBegin(), SourceMgr};
   OptionalFileEntryRef FE = Start.getExpansionLoc().getFileEntryRef();
-  assert(FE && "Diagnostic does not exist within a valid file!");
+  if (!FE)
+    return std::nullopt;
 
   const std::string &FileURI = fileNameToURI(getFileName(*FE));
   auto I = CurrentArtifacts.find(FileURI);
@@ -328,8 +334,8 @@ SarifDocumentWriter::createThreadFlows(ArrayRef<ThreadFlow> ThreadFlows) {
   json::Object Ret{{"locations", json::Array{}}};
   json::Array Locs;
   for (const auto &ThreadFlow : ThreadFlows) {
-    json::Object PLoc = createPhysicalLocation(ThreadFlow.Range);
-    json::Object Loc = createLocation(std::move(PLoc), ThreadFlow.Message);
+    json::Object Loc = createLocation(createPhysicalLocation(ThreadFlow.Range),
+                                      ThreadFlow.Message);
     Locs.emplace_back(
         createThreadFlowLocation(std::move(Loc), ThreadFlow.Importance));
   }
@@ -402,21 +408,28 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
     Ret["hostedViewerUri"] = Result.HostedViewerURI;
   }
 
-  if (!Result.Locations.empty()) {
-    json::Array Locs;
-    for (auto &Range : Result.Locations) {
-      Locs.emplace_back(createLocation(createPhysicalLocation(Range)));
-    }
-    Ret["locations"] = std::move(Locs);
+  if (!Result.Properties.empty()) {
+    json::Object Properties;
+    for (const auto &[Key, Value] : Result.Properties)
+      Properties[Key] = Value;
+    Ret["properties"] = std::move(Properties);
   }
 
-  if (!Result.RelatedLocations.empty()) {
-    json::Array ReLocs;
-    for (const auto &[Range, Message] : Result.RelatedLocations)
-      ReLocs.emplace_back(
-          createLocation(createPhysicalLocation(Range), Message));
-    Ret["relatedLocations"] = std::move(ReLocs);
+  json::Array Locs;
+  for (const auto &Range : Result.Locations)
+    if (std::optional<json::Object> PL = createPhysicalLocation(Range))
+      Locs.emplace_back(createLocation(std::move(PL)));
+  if (!Locs.empty())
+    Ret["locations"] = std::move(Locs);
+
+  json::Array ReLocs;
+  for (const auto &[Range, Message] : Result.RelatedLocations) {
+    json::Object Loc = createLocation(createPhysicalLocation(Range), Message);
+    if (!Loc.empty())
+      ReLocs.emplace_back(std::move(Loc));
   }
+  if (!ReLocs.empty())
+    Ret["relatedLocations"] = std::move(ReLocs);
 
   if (!Result.PartialFingerprints.empty()) {
     json::Object fingerprints = {};

>From 0ddb9d258d02dd8babac2a7d835af76decc0904a Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Fri, 9 Oct 2026 07:01:07 -0700
Subject: [PATCH 15/28] fixed tests

---
 .../infrastructure/export-SARIF-diagnostics.cpp     | 13 ++++++++-----
 clang/lib/Basic/Sarif.cpp                           |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index a47541077922f2..a9ef3702003e6c 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t-input.cpp
-// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -sarif-export=%t.sarif -- -Wmissing-prototypes -Wzero-length-array > %t.msg 2>&1
+// RUN: not clang-tidy %t-input.cpp -checks='-*,google-explicit-constructor,cppcoreguidelines-explicit-constructor,clang-diagnostic-missing-prototypes,clang-diagnostic-zero-length-array' --warnings-as-errors='clang-diagnostic-missing-prototypes,google-explicit-constructor' -sarif-export=%t.sarif -- -Wmissing-prototypes -Wzero-length-array > %t.msg 2>&1
 // RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s -implicit-check-not='{{warning|error|note}}:'
 // RUN: FileCheck -input-file=%t.sarif -check-prefix=CHECK-SARIF %s
 #define X(n) void n ## n() {}
@@ -22,7 +22,7 @@ struct Foo {
 //CHECK-MESSAGES: -input.cpp:4:7: warning: zero size arrays are an extension [clang-diagnostic-zero-length-array]
 //CHECK-MESSAGES: -input.cpp:6:11: error: unknown type name 'x' [clang-diagnostic-error]
 //CHECK-MESSAGES: -input.cpp:8:3: error: a type specifier is required for all declarations [clang-diagnostic-error]
-//CHECK-MESSAGES: -input.cpp:9:3: error: single-argument constructors must be marked explicit to avoid unintentional implicit conversions [google-explicit-constructor,-warnings-as-errors]
+//CHECK-MESSAGES: -input.cpp:9:3: error: single-argument constructors must be marked explicit to avoid unintentional implicit conversions [cppcoreguidelines-explicit-constructor,google-explicit-constructor,-warnings-as-errors]
 
 //CHECK-SARIF: {
 //CHECK-SARIF-NEXT:   "$schema": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/cos02/schemas/sarif-schema-2.1.0.json",
@@ -242,7 +242,10 @@ struct Foo {
 //CHECK-SARIF-NEXT:           "message": {
 //CHECK-SARIF-NEXT:             "text": "single-argument constructors must be marked explicit to avoid unintentional implicit conversions"
 //CHECK-SARIF-NEXT:           },
-//CHECK-SARIF-NEXT:           "ruleId": "google-explicit-constructor",
+//CHECK-SARIF-NEXT:           "properties": {
+//CHECK-SARIF-NEXT:             "enabledAliases": "google-explicit-constructor"
+//CHECK-SARIF-NEXT:           },
+//CHECK-SARIF-NEXT:           "ruleId": "cppcoreguidelines-explicit-constructor",
 //CHECK-SARIF-NEXT:           "ruleIndex": 3
 //CHECK-SARIF-NEXT:         }
 //CHECK-SARIF-NEXT:       ],
@@ -298,8 +301,8 @@ struct Foo {
 //CHECK-SARIF-NEXT:               "fullDescription": {
 //CHECK-SARIF-NEXT:                 "text": ""
 //CHECK-SARIF-NEXT:               },
-//CHECK-SARIF-NEXT:               "id": "google-explicit-constructor",
-//CHECK-SARIF-NEXT:               "name": "google-explicit-constructor"
+//CHECK-SARIF-NEXT:               "id": "cppcoreguidelines-explicit-constructor",
+//CHECK-SARIF-NEXT:               "name": "cppcoreguidelines-explicit-constructor"
 //CHECK-SARIF-NEXT:             }
 //CHECK-SARIF-NEXT:           ],
 //CHECK-SARIF-NEXT:           "version": "{{.*}}"
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index a1845ef5f7eab7..24a43aec3652e5 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -411,7 +411,7 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
   if (!Result.Properties.empty()) {
     json::Object Properties;
     for (const auto &[Key, Value] : Result.Properties)
-      Properties[Key] = Value;
+      Properties[Key.str()] = Value;
     Ret["properties"] = std::move(Properties);
   }
 

>From 487feabdc51a69971ed54764e3efbefba827c02c Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 12 Oct 2026 02:51:41 -0700
Subject: [PATCH 16/28] used Loc object instead of highlight ranges

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 009cbe8fbfb8e2..ca30c5a1455d92 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -218,11 +218,10 @@ class ErrorReporter {
   }
 
   CharSourceRange getNoteRange(const tooling::DiagnosticMessage &Note) {
-    if (!Note.Ranges.empty())
-      return getRange(Note.Ranges.front());
     const SourceLocation Loc = getLocation(Note.FilePath, Note.FileOffset);
     if (Loc.isInvalid())
-      return {};
+      return Note.Ranges.empty() ? CharSourceRange()
+                                 : getRange(Note.Ranges.front());
     return getOffsetRange(SourceMgr, Loc);
   }
 
@@ -265,8 +264,10 @@ class ErrorReporter {
     SarifResult Result =
         SarifResult::create(RuleIndex)
             .setDiagnosticMessage(Error.Message.Message)
-            .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel))
-            .addLocations(getResultRanges(Error, Loc));
+            .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel));
+    Result =
+        (Loc.isValid() ? Result.addLocations(getOffsetRange(SourceMgr, Loc))
+                       : Result.addLocations(getResultRanges(Error)));
 
     if (!Error.EnabledDiagnosticAliases.empty())
       Result = Result.addProperty(
@@ -281,6 +282,7 @@ class ErrorReporter {
       SarifWriter->appendResult(Result);
   }
 
+    // SARIF regions need a character range: use 1 char at Loc, or 0 at EOF.
   CharSourceRange getOffsetRange(SourceManager &SM, SourceLocation Loc) {
     const std::pair<FileID, unsigned> &DecomposedLoc = SM.getDecomposedLoc(Loc);
     const FileID FileId = DecomposedLoc.first;
@@ -289,20 +291,11 @@ class ErrorReporter {
         Loc, Loc.getLocWithOffset(Offset < SM.getFileIDSize(FileId) ? 1 : 0));
   }
 
-  SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error,
-                                                  SourceLocation Loc) {
+  SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error) {
     SmallVector<CharSourceRange, 4> Ranges;
     Ranges.reserve(Error.Message.Ranges.size());
     for (const FileByteRange &FBR : Error.Message.Ranges)
       Ranges.push_back(getRange(FBR));
-
-    if (Ranges.empty() && Loc.isValid()) {
-      // Some Clang-Tidy diagnostics are issued with a single location (not a
-      // range). For these, we create a range of length 1 at the diagnostic
-      // location. As, SARIF results require a character range for each
-      // location, for EOF we create a zero-length range.
-      Ranges.push_back(getOffsetRange(SourceMgr, Loc));
-    }
     return Ranges;
   }
 

>From 6b0a7e1ce69221fc03acce6220db359ea1012223 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 12 Oct 2026 03:57:34 -0700
Subject: [PATCH 17/28] Export fixes and SARIF can't output to the same
 location

---
 clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp       | 7 +++++++
 .../infrastructure/export-SARIF-conflicting-output.cpp    | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp

diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 2709623a5b048f..6f3efab23f3e44 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -641,6 +641,13 @@ int clangTidyMain(int argc, const char **argv) {
     return 1;
   }
 
+  if (!SarifExport.empty() && SarifExport == ExportFixes) {
+    llvm::errs() << "Error: --sarif-export and --export-fixes cannot write to "
+                    "the same output '"
+                 << SarifExport << "'.\n";
+    return 1;
+  }
+
   const llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> BaseFS =
       createBaseFS();
   if (!BaseFS)
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
new file mode 100644
index 00000000000000..cdcf3c04106132
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
@@ -0,0 +1,8 @@
+// RUN: not clang-tidy %s -checks='-*,google-explicit-constructor' -sarif-export=- -export-fixes=- -- 2>&1 | FileCheck %s --check-prefix=CHECK-STDOUT
+// RUN: not clang-tidy %s -checks='-*,google-explicit-constructor' -sarif-export=%t.out -export-fixes=%t.out -- 2>&1 | FileCheck %s --check-prefix=CHECK-FILE
+
+// CHECK-STDOUT: Error: --sarif-export and --export-fixes cannot write to the same output '-'.
+// CHECK-STDOUT-NOT: warning:
+// CHECK-FILE: Error: --sarif-export and --export-fixes cannot write to the same output '{{.*}}.out'.
+
+struct A { A(int) {} };

>From a49eaf91fd660ba3d200f5d54b89c3d25d2208c4 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 12 Oct 2026 08:25:48 -0700
Subject: [PATCH 18/28] fixed tests showing incorrect locations + whitespace,
 fixed badartifactlocation error from CTIT, incorrectly comparing indexes

---
 .../export-SARIF-diagnostics-EOF.cpp          |  2 --
 ...t-SARIF-diagnostics-macro-thread-flows.cpp | 20 +++++++++----------
 .../export-SARIF-diagnostics-terminal.cpp     |  4 ++--
 .../export-SARIF-diagnostics.cpp              |  4 ++--
 .../export-SARIF-no-location.cpp              |  1 +
 clang/lib/Basic/Sarif.cpp                     | 12 ++++++++---
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index 3ceb3bb8aac16f..3070a14e7158e5 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -74,5 +74,3 @@
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
index 5f8917f119ecb7..f0a90426e04640 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
@@ -49,9 +49,9 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 22,
+//CHECK-SARIF-NEXT:                             "endColumn": 19,
 //CHECK-SARIF-NEXT:                             "endLine": 1,
-//CHECK-SARIF-NEXT:                             "startColumn": 21,
+//CHECK-SARIF-NEXT:                             "startColumn": 18,
 //CHECK-SARIF-NEXT:                             "startLine": 1
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
@@ -69,7 +69,7 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 19,
+//CHECK-SARIF-NEXT:                             "endColumn": 12,
 //CHECK-SARIF-NEXT:                             "endLine": 3,
 //CHECK-SARIF-NEXT:                             "startColumn": 11,
 //CHECK-SARIF-NEXT:                             "startLine": 3
@@ -89,9 +89,9 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 43,
+//CHECK-SARIF-NEXT:                             "endColumn": 35,
 //CHECK-SARIF-NEXT:                             "endLine": 3,
-//CHECK-SARIF-NEXT:                             "startColumn": 40,
+//CHECK-SARIF-NEXT:                             "startColumn": 34,
 //CHECK-SARIF-NEXT:                             "startLine": 3
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
@@ -109,9 +109,9 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:                             "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                           },
 //CHECK-SARIF-NEXT:                           "region": {
-//CHECK-SARIF-NEXT:                             "endColumn": 22,
+//CHECK-SARIF-NEXT:                             "endColumn": 19,
 //CHECK-SARIF-NEXT:                             "endLine": 1,
-//CHECK-SARIF-NEXT:                             "startColumn": 21,
+//CHECK-SARIF-NEXT:                             "startColumn": 18,
 //CHECK-SARIF-NEXT:                             "startLine": 1
 //CHECK-SARIF-NEXT:                           }
 //CHECK-SARIF-NEXT:                         }
@@ -131,9 +131,9 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
-//CHECK-SARIF-NEXT:                   "endColumn": 43,
+//CHECK-SARIF-NEXT:                   "endColumn": 35,
 //CHECK-SARIF-NEXT:                   "endLine": 3,
-//CHECK-SARIF-NEXT:                   "startColumn": 40,
+//CHECK-SARIF-NEXT:                   "startColumn": 34,
 //CHECK-SARIF-NEXT:                   "startLine": 3
 //CHECK-SARIF-NEXT:                 }
 //CHECK-SARIF-NEXT:               }
@@ -172,4 +172,4 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-//CHECK-SARIF-NEXT: }
\ No newline at end of file
+//CHECK-SARIF-NEXT: }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index f33284319c8689..1770db81ecf8ab 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -122,7 +122,7 @@ struct Foo {
 //CHECK-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-NEXT:                 },
 //CHECK-NEXT:                 "region": {
-//CHECK-NEXT:                   "endColumn": 9,
+//CHECK-NEXT:                   "endColumn": 8,
 //CHECK-NEXT:                   "endLine": 3,
 //CHECK-NEXT:                   "startColumn": 7,
 //CHECK-NEXT:                   "startLine": 3
@@ -295,4 +295,4 @@ struct Foo {
 //CHECK-NEXT:     }
 //CHECK-NEXT:   ],
 //CHECK-NEXT:   "version": "{{.*}}"
-//CHECK-NEXT: }
\ No newline at end of file
+//CHECK-NEXT: }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index a9ef3702003e6c..0fc9429a3aa83c 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -135,7 +135,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:                   "uri": "file://{{.*}}-input.cpp"
 //CHECK-SARIF-NEXT:                 },
 //CHECK-SARIF-NEXT:                 "region": {
-//CHECK-SARIF-NEXT:                   "endColumn": 9,
+//CHECK-SARIF-NEXT:                   "endColumn": 8,
 //CHECK-SARIF-NEXT:                   "endLine": 3,
 //CHECK-SARIF-NEXT:                   "startColumn": 7,
 //CHECK-SARIF-NEXT:                   "startLine": 3
@@ -311,4 +311,4 @@ struct Foo {
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-//CHECK-SARIF-NEXT: }
\ No newline at end of file
+//CHECK-SARIF-NEXT: }
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
index 8e40667f735817..e8911e629622ad 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
@@ -102,3 +102,4 @@ class A { A(int) {} };
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
+
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index 24a43aec3652e5..cf16c4bcb8914b 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -303,7 +303,11 @@ void SarifDocumentWriter::endRun() {
   SmallVector<std::pair<StringRef, SarifArtifact>, 0> Vec;
   for (const auto &[K, V] : CurrentArtifacts)
     Vec.emplace_back(K, V);
-  llvm::sort(Vec, llvm::less_first());
+  // artifactLocation.index refers to the position in this array.
+  llvm::sort(Vec, [](const std::pair<StringRef, SarifArtifact> &L,
+                     const std::pair<StringRef, SarifArtifact> &R) {
+    return L.second.Location.Index < R.second.Location.Index;
+  });
   for (const auto &[_, A] : Vec) {
     json::Object Loc{{"uri", A.Location.URI}};
     if (A.Location.Index.has_value()) {
@@ -424,10 +428,12 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
 
   json::Array ReLocs;
   for (const auto &[Range, Message] : Result.RelatedLocations) {
-    json::Object Loc = createLocation(createPhysicalLocation(Range), Message);
-    if (!Loc.empty())
+    json::Value Loc = createLocation(createPhysicalLocation(Range), Message);
+    if (!Loc.getAsObject()->empty() && !llvm::is_contained(ReLocs, Loc)) {
       ReLocs.emplace_back(std::move(Loc));
+    }
   }
+
   if (!ReLocs.empty())
     Ret["relatedLocations"] = std::move(ReLocs);
 

>From f5fb521383d52db21e3fe3fe2f70651ae6e823fd Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 12 Oct 2026 08:29:54 -0700
Subject: [PATCH 19/28] end of file line

---
 .../infrastructure/export-SARIF-conflicting-output.cpp           | 1 +
 .../clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp   | 1 +
 .../export-SARIF-diagnostics-macro-thread-flows.cpp              | 1 +
 .../infrastructure/export-SARIF-diagnostics-terminal.cpp         | 1 +
 .../test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
index cdcf3c04106132..74f99299c57deb 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
@@ -6,3 +6,4 @@
 // CHECK-FILE: Error: --sarif-export and --export-fixes cannot write to the same output '{{.*}}.out'.
 
 struct A { A(int) {} };
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index 3070a14e7158e5..80fe41188bd73a 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -74,3 +74,4 @@
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
index f0a90426e04640..e6aa4ea6dd9c9f 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
@@ -173,3 +173,4 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 1770db81ecf8ab..5e23318c7d4e21 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -296,3 +296,4 @@ struct Foo {
 //CHECK-NEXT:   ],
 //CHECK-NEXT:   "version": "{{.*}}"
 //CHECK-NEXT: }
+
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 0fc9429a3aa83c..547fbe4bda9c20 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -312,3 +312,4 @@ struct Foo {
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
+

>From 6dd8773bac3cd75aec0cf9f5daf01c70dcbe042f Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 12 Oct 2026 09:31:07 -0700
Subject: [PATCH 20/28] check file intiially, don't wait till end of analysis

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp          | 10 ++++------
 clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp | 12 ++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index ca30c5a1455d92..53d384377897ca 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -257,8 +257,7 @@ class ErrorReporter {
       const StringRef Name = Error.DiagnosticName;
       SarifRule Rule = SarifRule::create().setRuleId(Name).setName(Name);
       Rule = addDiagnosticLevelToRule(Rule, EffectiveLevel);
-      if (SarifWriter)
-        RuleIndex = SarifWriter->createRule(Rule);
+      RuleIndex = SarifWriter->createRule(Rule);
     }
 
     SarifResult Result =
@@ -278,11 +277,10 @@ class ErrorReporter {
     else
       for (const tooling::DiagnosticMessage &Note : Error.Notes)
         Result = Result.addRelatedLocations(getNoteRange(Note), Note.Message);
-    if (SarifWriter)
-      SarifWriter->appendResult(Result);
+    SarifWriter->appendResult(Result);
   }
 
-    // SARIF regions need a character range: use 1 char at Loc, or 0 at EOF.
+  // SARIF regions need a character range: use 1 char at Loc, or 0 at EOF.
   CharSourceRange getOffsetRange(SourceManager &SM, SourceLocation Loc) {
     const std::pair<FileID, unsigned> &DecomposedLoc = SM.getDecomposedLoc(Loc);
     const FileID FileId = DecomposedLoc.first;
@@ -376,7 +374,7 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
-    if (SarifWriter && !SarifExportPath.empty()) {
+    if (SarifWriter) {
       std::error_code EC;
       llvm::raw_fd_ostream SarifOS(SarifExportPath, EC, llvm::sys::fs::OF_Text);
       if (EC) {
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 6f3efab23f3e44..0e118bcd0caf6c 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -745,6 +745,18 @@ int clangTidyMain(int argc, const char **argv) {
     return 1;
   }
 
+  if (!SarifExport.empty()) {
+    std::error_code EC;
+    {
+      llvm::raw_fd_ostream Probe(SarifExport, EC, llvm::sys::fs::OF_Append);
+    }
+    if (EC) {
+      llvm::errs() << "Error opening SARIF export file: " << EC.message()
+                   << '\n';
+      return 1;
+    }
+  }
+
   llvm::InitializeAllTargetInfos();
   llvm::InitializeAllTargetMCs();
   llvm::InitializeAllAsmParsers();

>From 22e7547e24c2227d4e5d9580bc675a979376f7f8 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 13 Oct 2026 03:30:26 -0700
Subject: [PATCH 21/28] cleanup

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp | 11 +++--------
 clang/lib/Basic/Sarif.cpp                  | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 53d384377897ca..9a079a88fa4011 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -38,8 +38,9 @@
 #include "clang/Tooling/DiagnosticsYaml.h" // IWYU pragma: keep
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
-#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Error.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/raw_ostream.h"
 #include <memory>
@@ -219,17 +220,11 @@ class ErrorReporter {
 
   CharSourceRange getNoteRange(const tooling::DiagnosticMessage &Note) {
     const SourceLocation Loc = getLocation(Note.FilePath, Note.FileOffset);
-    if (Loc.isInvalid())
-      return Note.Ranges.empty() ? CharSourceRange()
-                                 : getRange(Note.Ranges.front());
-    return getOffsetRange(SourceMgr, Loc);
+    return Loc.isValid() ? getOffsetRange(SourceMgr, Loc) : CharSourceRange();
   }
 
   SmallVector<ThreadFlow, 8> createThreadFlows(const ClangTidyError &Error) {
     SmallVector<ThreadFlow, 8> Flows;
-    if (!StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
-      return Flows;
-
     Flows.reserve(Error.Notes.size());
     for (const tooling::DiagnosticMessage &Note : Error.Notes) {
       Flows.push_back(ThreadFlow::create()
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index cf16c4bcb8914b..09f4ccd06551bd 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -340,6 +340,8 @@ SarifDocumentWriter::createThreadFlows(ArrayRef<ThreadFlow> ThreadFlows) {
   for (const auto &ThreadFlow : ThreadFlows) {
     json::Object Loc = createLocation(createPhysicalLocation(ThreadFlow.Range),
                                       ThreadFlow.Message);
+    if (Loc.empty())
+      continue;
     Locs.emplace_back(
         createThreadFlowLocation(std::move(Loc), ThreadFlow.Importance));
   }
@@ -365,13 +367,13 @@ void SarifDocumentWriter::createRun(StringRef ShortToolName,
       InformationUri.empty() ? "https://clang.llvm.org/docs/UsersManual.html"
                              : InformationUri;
 
-  json::Object Tool{
-      {"driver", json::Object{{"name", ShortToolName},
-                              {"fullName", LongToolName},
-                              {"language", "en-US"},
-                              {"version", ToolVersion},
-                              {"informationUri", EffectiveInformationUri},
-                              {"rules", json::Array{}}}}};
+  json::Object Tool{{"driver", json::Object{{"name", ShortToolName},
+                                            {"fullName", LongToolName},
+                                            {"language", "en-US"},
+                                            {"version", ToolVersion},
+                                            {"informationUri",
+                                             EffectiveInformationUri},
+                                            {"rules", json::Array{}}}}};
   json::Object TheRun{{"tool", std::move(Tool)},
                       {"results", {}},
                       {"artifacts", {}},
@@ -426,12 +428,12 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
   if (!Locs.empty())
     Ret["locations"] = std::move(Locs);
 
+  // The schema requires relatedLocations items to be unique.
   json::Array ReLocs;
   for (const auto &[Range, Message] : Result.RelatedLocations) {
     json::Value Loc = createLocation(createPhysicalLocation(Range), Message);
-    if (!Loc.getAsObject()->empty() && !llvm::is_contained(ReLocs, Loc)) {
+    if (!Loc.getAsObject()->empty() && !llvm::is_contained(ReLocs, Loc))
       ReLocs.emplace_back(std::move(Loc));
-    }
   }
 
   if (!ReLocs.empty())

>From 63b86816fb3b3d7fe5bef3a326fd1c3f752de03b Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 13 Oct 2026 07:49:59 -0700
Subject: [PATCH 22/28] fixed and reworked sarif file opening, + cleanup

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    | 26 ++++++++++++-------
 .../clang-tidy/tool/ClangTidyMain.cpp         | 11 +++++---
 clang/lib/Basic/Sarif.cpp                     | 14 +++++-----
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 9a079a88fa4011..6be58192c39401 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -263,6 +263,9 @@ class ErrorReporter {
         (Loc.isValid() ? Result.addLocations(getOffsetRange(SourceMgr, Loc))
                        : Result.addLocations(getResultRanges(Error)));
 
+    // Same-location, same-message diagnostics from other checks are merged,
+    // with the first alphabetically as the check name, not necessarily the
+    // canon name.
     if (!Error.EnabledDiagnosticAliases.empty())
       Result = Result.addProperty(
           "enabledAliases", llvm::join(Error.EnabledDiagnosticAliases, ","));
@@ -369,17 +372,20 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
-    if (SarifWriter) {
-      std::error_code EC;
-      llvm::raw_fd_ostream SarifOS(SarifExportPath, EC, llvm::sys::fs::OF_Text);
-      if (EC) {
-        llvm::errs() << "Error opening SARIF export file: " << EC.message()
-                     << "\n";
-      } else {
-        llvm::json::Value Document = SarifWriter->createDocument();
-        SarifOS << llvm::formatv("{0:2}", Document);
-      }
+    const llvm::json::Value Document = SarifWriter->createDocument();
+    if (SarifExportPath == "-") {
+      llvm::outs() << llvm::formatv("{0:2}", Document);
+      return;
+    }
+    // Reopened here as the file may have changed during the analysis.
+    std::error_code EC;
+    llvm::raw_fd_ostream SarifOS(SarifExportPath, EC, llvm::sys::fs::OF_Text);
+    if (EC) {
+      llvm::errs() << "Error opening SARIF export file '" << SarifExportPath
+                   << "': " << EC.message() << "\n";
+      return;
     }
+    SarifOS << llvm::formatv("{0:2}", Document);
   }
 
   void reportFix(const DiagnosticBuilder &Diag,
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 0e118bcd0caf6c..732934e4abb85a 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -314,6 +314,8 @@ code with clang-apply-replacements.
 
 static cl::opt<std::string> SarifExport("sarif-export", desc(R"(
 File in which to store diagnostics in SARIF format.
+Use '-' to write to stdout instead of the
+usual diagnostic output.
 )"),
                                         cl::value_desc("filename"),
                                         cl::cat(ClangTidyCategory));
@@ -745,14 +747,15 @@ int clangTidyMain(int argc, const char **argv) {
     return 1;
   }
 
-  if (!SarifExport.empty()) {
+  // Checked after the informational modes so they never truncate the file.
+  if (!SarifExport.empty() && SarifExport != "-") {
     std::error_code EC;
     {
-      llvm::raw_fd_ostream Probe(SarifExport, EC, llvm::sys::fs::OF_Append);
+      llvm::raw_fd_ostream OS(SarifExport, EC, llvm::sys::fs::OF_Text);
     }
     if (EC) {
-      llvm::errs() << "Error opening SARIF export file: " << EC.message()
-                   << '\n';
+      llvm::errs() << "Error opening SARIF export file '" << SarifExport
+                   << "': " << EC.message() << '\n';
       return 1;
     }
   }
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index 09f4ccd06551bd..593a02917b8f6e 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -367,13 +367,13 @@ void SarifDocumentWriter::createRun(StringRef ShortToolName,
       InformationUri.empty() ? "https://clang.llvm.org/docs/UsersManual.html"
                              : InformationUri;
 
-  json::Object Tool{{"driver", json::Object{{"name", ShortToolName},
-                                            {"fullName", LongToolName},
-                                            {"language", "en-US"},
-                                            {"version", ToolVersion},
-                                            {"informationUri",
-                                             EffectiveInformationUri},
-                                            {"rules", json::Array{}}}}};
+  json::Object Tool{
+      {"driver", json::Object{{"name", ShortToolName},
+                              {"fullName", LongToolName},
+                              {"language", "en-US"},
+                              {"version", ToolVersion},
+                              {"informationUri", EffectiveInformationUri},
+                              {"rules", json::Array{}}}}};
   json::Object TheRun{{"tool", std::move(Tool)},
                       {"results", {}},
                       {"artifacts", {}},

>From 55f916155f5ea5428a1324849e9601999452ea82 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Tue, 13 Oct 2026 08:44:52 -0700
Subject: [PATCH 23/28] added relevant TODOs, cleaned up tests, added unit test
 for bad artifact location error

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp      |  7 +++++++
 .../export-SARIF-conflicting-output.cpp         |  1 -
 .../export-SARIF-diagnostics-EOF.cpp            |  1 -
 ...ort-SARIF-diagnostics-macro-thread-flows.cpp |  1 -
 .../export-SARIF-diagnostics-terminal.cpp       |  1 -
 .../infrastructure/export-SARIF-diagnostics.cpp |  1 -
 .../infrastructure/export-SARIF-no-location.cpp |  1 -
 clang/include/clang/Basic/Sarif.h               |  2 +-
 clang/lib/Basic/Sarif.cpp                       |  2 --
 clang/unittests/Basic/SarifTest.cpp             | 17 +++++++++++++++++
 10 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 6be58192c39401..541f81aee5f1ba 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -259,6 +259,9 @@ class ErrorReporter {
         SarifResult::create(RuleIndex)
             .setDiagnosticMessage(Error.Message.Message)
             .setDiagnosticLevel(getSarifResultLevel(EffectiveLevel));
+    // TODO: Extend SarifDocumentWriter to add an annotations property that can
+    // represent highlight ranges, when both a valid location and highlight
+    // ranges are present.
     Result =
         (Loc.isValid() ? Result.addLocations(getOffsetRange(SourceMgr, Loc))
                        : Result.addLocations(getResultRanges(Error)));
@@ -270,6 +273,10 @@ class ErrorReporter {
       Result = Result.addProperty(
           "enabledAliases", llvm::join(Error.EnabledDiagnosticAliases, ","));
 
+    // TODO: CSA stores fullDescription from the HELPTEXT field in Checkers.inc,
+    // strip clang-analyzer- prefix then populate fullDescription with this.
+    // Also, add helpUri with this for in-tree checks, pointing to their
+    // documentation pages.
     if (StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
       Result = Result.setThreadFlows(createThreadFlows(Error));
     else
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
index 74f99299c57deb..cdcf3c04106132 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-conflicting-output.cpp
@@ -6,4 +6,3 @@
 // CHECK-FILE: Error: --sarif-export and --export-fixes cannot write to the same output '{{.*}}.out'.
 
 struct A { A(int) {} };
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index 80fe41188bd73a..3070a14e7158e5 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -74,4 +74,3 @@
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
index e6aa4ea6dd9c9f..f0a90426e04640 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-macro-thread-flows.cpp
@@ -173,4 +173,3 @@ int g() { int *ptr = NUL; return DEREF(ptr); }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 5e23318c7d4e21..1770db81ecf8ab 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -296,4 +296,3 @@ struct Foo {
 //CHECK-NEXT:   ],
 //CHECK-NEXT:   "version": "{{.*}}"
 //CHECK-NEXT: }
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 547fbe4bda9c20..0fc9429a3aa83c 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -312,4 +312,3 @@ struct Foo {
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
index e8911e629622ad..8e40667f735817 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-no-location.cpp
@@ -102,4 +102,3 @@ class A { A(int) {} };
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
 //CHECK-SARIF-NEXT: }
-
diff --git a/clang/include/clang/Basic/Sarif.h b/clang/include/clang/Basic/Sarif.h
index 89dd2ceb7bb115..5edee63233e9c9 100644
--- a/clang/include/clang/Basic/Sarif.h
+++ b/clang/include/clang/Basic/Sarif.h
@@ -400,7 +400,7 @@ class SarifResult {
   }
 
   SarifResult addProperty(llvm::StringRef Key, llvm::StringRef Value) {
-    Properties[Key.str()] = Value.str();
+    Properties[Key] = Value.str();
     return *this;
   }
 
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index 593a02917b8f6e..c72e7478f01d3c 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -340,8 +340,6 @@ SarifDocumentWriter::createThreadFlows(ArrayRef<ThreadFlow> ThreadFlows) {
   for (const auto &ThreadFlow : ThreadFlows) {
     json::Object Loc = createLocation(createPhysicalLocation(ThreadFlow.Range),
                                       ThreadFlow.Message);
-    if (Loc.empty())
-      continue;
     Locs.emplace_back(
         createThreadFlowLocation(std::move(Loc), ThreadFlow.Importance));
   }
diff --git a/clang/unittests/Basic/SarifTest.cpp b/clang/unittests/Basic/SarifTest.cpp
index 42e85085d646eb..5e214d52de57a5 100644
--- a/clang/unittests/Basic/SarifTest.cpp
+++ b/clang/unittests/Basic/SarifTest.cpp
@@ -388,4 +388,21 @@ TEST_F(SarifDocumentWriterTest, checkSerializingCodeflows) {
   ASSERT_THAT(Output, ::testing::StrEq(ExpectedOutput));
 }
 
+TEST_F(SarifDocumentWriterTest, artifactIndexMatchesArrayPosition) {
+  SarifDocumentWriter Writer{SourceMgr};
+  Writer.createRun("sarif test", "sarif test runner");
+  unsigned RuleIdx = Writer.createRule(SarifRule::create());
+
+  // "/z.cpp" is seen first (index 0) but sorts after "/a.h" by name.
+  FileID ZFile = registerSource("/z.cpp", "int z;\n");
+  FileID AFile = registerSource("/a.h", "int a;\n");
+  Writer.appendResult(SarifResult::create(RuleIdx).addLocations(
+      {getFakeCharSourceRange(ZFile, {1, 1}, {1, 2}),
+       getFakeCharSourceRange(AFile, {1, 1}, {1, 2})}));
+
+  std::string Output = serializeSarifDocument(Writer.createDocument());
+  EXPECT_THAT(Output, ::testing::HasSubstr(
+                          R"("location":{"index":0,"uri":"file:///z.cpp"})"));
+}
+
 } // namespace

>From d9799df58ec2627e55480df81df6f7a7f95f6a9c Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Wed, 14 Oct 2026 06:24:13 -0700
Subject: [PATCH 24/28] added missing new line

---
 .../infrastructure/export-SARIF-diagnostics-terminal.cpp         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 1770db81ecf8ab..5e23318c7d4e21 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -296,3 +296,4 @@ struct Foo {
 //CHECK-NEXT:   ],
 //CHECK-NEXT:   "version": "{{.*}}"
 //CHECK-NEXT: }
+

>From 142559893a846eee5060a251f118b20ae7860899 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Wed, 14 Oct 2026 07:24:58 -0700
Subject: [PATCH 25/28] fixed code linter issues

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp          | 9 ++++++---
 clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 541f81aee5f1ba..272ff73320f5c7 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -236,8 +236,8 @@ class ErrorReporter {
 
   void exportSarifResult(const ClangTidyError &Error,
                          const SourceLocation Loc) {
-    assert(SarifWriter &&
-           "SarifWriter must be initialized to export SARIF results");
+    if (!SarifWriter)
+      return;
 
     const auto [RuleIndexEntryIt, Inserted] =
         SarifRuleIdx.try_emplace(Error.DiagnosticName, 0);
@@ -282,7 +282,8 @@ class ErrorReporter {
     else
       for (const tooling::DiagnosticMessage &Note : Error.Notes)
         Result = Result.addRelatedLocations(getNoteRange(Note), Note.Message);
-    SarifWriter->appendResult(Result);
+    if (SarifWriter)
+      SarifWriter->appendResult(Result);
   }
 
   // SARIF regions need a character range: use 1 char at Loc, or 0 at EOF.
@@ -379,6 +380,8 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
+    if (!SarifWriter)
+      return;
     const llvm::json::Value Document = SarifWriter->createDocument();
     if (SarifExportPath == "-") {
       llvm::outs() << llvm::formatv("{0:2}", Document);
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 732934e4abb85a..fa56d969f8db70 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -751,7 +751,7 @@ int clangTidyMain(int argc, const char **argv) {
   if (!SarifExport.empty() && SarifExport != "-") {
     std::error_code EC;
     {
-      llvm::raw_fd_ostream OS(SarifExport, EC, llvm::sys::fs::OF_Text);
+      const llvm::raw_fd_ostream OS(SarifExport, EC, llvm::sys::fs::OF_Text);
     }
     if (EC) {
       llvm::errs() << "Error opening SARIF export file '" << SarifExport

>From fec9c1e75dec2a432927cc909b0c8b5161906532 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Wed, 14 Oct 2026 08:22:56 -0700
Subject: [PATCH 26/28] trailing newline

---
 .../clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index 3070a14e7158e5..80fe41188bd73a 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -74,3 +74,4 @@
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
+

>From 6ea5228b32ef7715cb9c376a5417bdf52d1200fb Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 19 Oct 2026 03:31:49 -0700
Subject: [PATCH 27/28] added --help listing for SARIf output

---
 clang-tools-extra/docs/clang-tidy/index.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/clang-tools-extra/docs/clang-tidy/index.rst b/clang-tools-extra/docs/clang-tidy/index.rst
index cfa77eb670ecf4..b619cec35b42f2 100644
--- a/clang-tools-extra/docs/clang-tidy/index.rst
+++ b/clang-tools-extra/docs/clang-tidy/index.rst
@@ -192,6 +192,9 @@ An overview of all the command-line options:
     --export-fixes=<filename>        - YAML file to store suggested fixes in. The
                                        stored fixes can be applied to the input source
                                        code with clang-apply-replacements.
+    --sarif-export=<filename>        - File in which to store diagnostics in SARIF format.
+                                       Use '-' to write to stdout instead of the usual
+                                       diagnostic output.
     --extra-arg=<string>             - Additional argument to append to the compiler command line
     --extra-arg-before=<string>      - Additional argument to prepend to the compiler command line
     --fix                            - Apply suggested fixes. Without -fix-errors

>From 1dc682adc154b620296b025cb2f782bd1284b643 Mon Sep 17 00:00:00 2001
From: "Jones, Matthew (DI SW SIM FRWK PLAT SIMFW HPC)"
 <jones.matthew at siemens.com>
Date: Mon, 2 Nov 2026 09:15:34 -0800
Subject: [PATCH 28/28] [clang-tidy] defined rank numbers, fixed deduplicating
 relatedLocations dropping notes, small vector changes, added asserts, changed
 binding

---
 clang-tools-extra/clang-tidy/ClangTidy.cpp    | 25 +++++++------------
 .../clang-tidy/tool/ClangTidyMain.cpp         |  4 +--
 .../export-SARIF-diagnostics-EOF.cpp          |  1 -
 .../export-SARIF-diagnostics-terminal.cpp     |  5 +++-
 .../export-SARIF-diagnostics.cpp              |  4 +++
 clang/lib/Basic/Sarif.cpp                     | 12 ++++++---
 clang/lib/Frontend/SARIFDiagnostic.cpp        | 14 ++++++++---
 7 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 272ff73320f5c7..3bf142437b53c5 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -223,8 +223,8 @@ class ErrorReporter {
     return Loc.isValid() ? getOffsetRange(SourceMgr, Loc) : CharSourceRange();
   }
 
-  SmallVector<ThreadFlow, 8> createThreadFlows(const ClangTidyError &Error) {
-    SmallVector<ThreadFlow, 8> Flows;
+  SmallVector<ThreadFlow> createNotesThreadFlows(const ClangTidyError &Error) {
+    SmallVector<ThreadFlow> Flows;
     Flows.reserve(Error.Notes.size());
     for (const tooling::DiagnosticMessage &Note : Error.Notes) {
       Flows.push_back(ThreadFlow::create()
@@ -236,8 +236,7 @@ class ErrorReporter {
 
   void exportSarifResult(const ClangTidyError &Error,
                          const SourceLocation Loc) {
-    if (!SarifWriter)
-      return;
+    assert(SarifWriter && "SARIF writer must be initialized");
 
     const auto [RuleIndexEntryIt, Inserted] =
         SarifRuleIdx.try_emplace(Error.DiagnosticName, 0);
@@ -278,25 +277,22 @@ class ErrorReporter {
     // Also, add helpUri with this for in-tree checks, pointing to their
     // documentation pages.
     if (StringRef(Error.DiagnosticName).starts_with("clang-analyzer-"))
-      Result = Result.setThreadFlows(createThreadFlows(Error));
+      Result = Result.setThreadFlows(createNotesThreadFlows(Error));
     else
       for (const tooling::DiagnosticMessage &Note : Error.Notes)
         Result = Result.addRelatedLocations(getNoteRange(Note), Note.Message);
-    if (SarifWriter)
-      SarifWriter->appendResult(Result);
+    SarifWriter->appendResult(Result);
   }
 
   // SARIF regions need a character range: use 1 char at Loc, or 0 at EOF.
   CharSourceRange getOffsetRange(SourceManager &SM, SourceLocation Loc) {
-    const std::pair<FileID, unsigned> &DecomposedLoc = SM.getDecomposedLoc(Loc);
-    const FileID FileId = DecomposedLoc.first;
-    const unsigned Offset = DecomposedLoc.second;
+    const auto [FileId, Offset] = SM.getDecomposedLoc(Loc);
     return CharSourceRange::getCharRange(
         Loc, Loc.getLocWithOffset(Offset < SM.getFileIDSize(FileId) ? 1 : 0));
   }
 
-  SmallVector<CharSourceRange, 4> getResultRanges(const ClangTidyError &Error) {
-    SmallVector<CharSourceRange, 4> Ranges;
+  SmallVector<CharSourceRange> getResultRanges(const ClangTidyError &Error) {
+    SmallVector<CharSourceRange> Ranges;
     Ranges.reserve(Error.Message.Ranges.size());
     for (const FileByteRange &FBR : Error.Message.Ranges)
       Ranges.push_back(getRange(FBR));
@@ -380,8 +376,7 @@ class ErrorReporter {
   }
 
   void finalizeSarif() {
-    if (!SarifWriter)
-      return;
+    assert(SarifWriter && "SARIF writer must be initialized");
     const llvm::json::Value Document = SarifWriter->createDocument();
     if (SarifExportPath == "-") {
       llvm::outs() << llvm::formatv("{0:2}", Document);
@@ -456,8 +451,6 @@ class ErrorReporter {
   unsigned AppliedFixes = 0U;
   unsigned WarningsAsErrors = 0U;
   std::string SarifExportPath;
-  // ExportSarifResult is called for each SARIF rule that gets created, while a
-  // SarifWriter run is created once at ErrorReporter construction.
   std::optional<SarifDocumentWriter> SarifWriter;
   // SarifRuleIdx is used across multiple calls of exportSarifResult as cache to
   // avoid creating duplicate SARIF rules.
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index fa56d969f8db70..69245d1e1691bb 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -643,7 +643,8 @@ int clangTidyMain(int argc, const char **argv) {
     return 1;
   }
 
-  if (!SarifExport.empty() && SarifExport == ExportFixes) {
+  if (!SarifExport.empty() && SarifExport == ExportFixes &&
+      !llvm::sys::fs::equivalent(SarifExport, ExportFixes)) {
     llvm::errs() << "Error: --sarif-export and --export-fixes cannot write to "
                     "the same output '"
                  << SarifExport << "'.\n";
@@ -668,7 +669,6 @@ int clangTidyMain(int argc, const char **argv) {
     FileName = PathList.front();
 
   const SmallString<256> FilePath = makeAbsolute(FileName);
-
   ClangTidyOptions EffectiveOptions = OptionsProvider->getOptions(FilePath);
 
   const std::vector<std::string> EnabledChecks =
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
index 80fe41188bd73a..3070a14e7158e5 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-EOF.cpp
@@ -74,4 +74,3 @@
 //CHECK-SARIF-NEXT:     }
 //CHECK-SARIF-NEXT:   ],
 //CHECK-SARIF-NEXT:   "version": "{{.*}}"
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
index 5e23318c7d4e21..af343a2c61fe01 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics-terminal.cpp
@@ -53,6 +53,7 @@ struct Foo {
 //CHECK-NEXT:           },
 //CHECK-NEXT:           "relatedLocations": [
 //CHECK-NEXT:             {
+//CHECK-NEXT:               "id": 0,
 //CHECK-NEXT:               "message": {
 //CHECK-NEXT:                 "text": "expanded from macro 'X'"
 //CHECK-NEXT:               },
@@ -70,11 +71,13 @@ struct Foo {
 //CHECK-NEXT:               }
 //CHECK-NEXT:             },
 //CHECK-NEXT:             {
+//CHECK-NEXT:               "id": 1,
 //CHECK-NEXT:               "message": {
 //CHECK-NEXT:                 "text": "expanded from here"
 //CHECK-NEXT:               }
 //CHECK-NEXT:             },
 //CHECK-NEXT:             {
+//CHECK-NEXT:               "id": 2,
 //CHECK-NEXT:               "message": {
 //CHECK-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
 //CHECK-NEXT:               },
@@ -92,6 +95,7 @@ struct Foo {
 //CHECK-NEXT:               }
 //CHECK-NEXT:             },
 //CHECK-NEXT:             {
+//CHECK-NEXT:               "id": 3,
 //CHECK-NEXT:               "message": {
 //CHECK-NEXT:                 "text": "expanded from macro 'X'"
 //CHECK-NEXT:               },
@@ -296,4 +300,3 @@ struct Foo {
 //CHECK-NEXT:   ],
 //CHECK-NEXT:   "version": "{{.*}}"
 //CHECK-NEXT: }
-
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
index 0fc9429a3aa83c..4e4ef3a36d85e4 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-SARIF-diagnostics.cpp
@@ -66,6 +66,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:           },
 //CHECK-SARIF-NEXT:           "relatedLocations": [
 //CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "id": 0,
 //CHECK-SARIF-NEXT:               "message": {
 //CHECK-SARIF-NEXT:                 "text": "expanded from macro 'X'"
 //CHECK-SARIF-NEXT:               },
@@ -83,11 +84,13 @@ struct Foo {
 //CHECK-SARIF-NEXT:               }
 //CHECK-SARIF-NEXT:             },
 //CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "id": 1,
 //CHECK-SARIF-NEXT:               "message": {
 //CHECK-SARIF-NEXT:                 "text": "expanded from here"
 //CHECK-SARIF-NEXT:               }
 //CHECK-SARIF-NEXT:             },
 //CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "id": 2,
 //CHECK-SARIF-NEXT:               "message": {
 //CHECK-SARIF-NEXT:                 "text": "declare 'static' if the function is not intended to be used outside of this translation unit"
 //CHECK-SARIF-NEXT:               },
@@ -105,6 +108,7 @@ struct Foo {
 //CHECK-SARIF-NEXT:               }
 //CHECK-SARIF-NEXT:             },
 //CHECK-SARIF-NEXT:             {
+//CHECK-SARIF-NEXT:               "id": 3,
 //CHECK-SARIF-NEXT:               "message": {
 //CHECK-SARIF-NEXT:                 "text": "expanded from macro 'X'"
 //CHECK-SARIF-NEXT:               },
diff --git a/clang/lib/Basic/Sarif.cpp b/clang/lib/Basic/Sarif.cpp
index c72e7478f01d3c..4edb162a1cfc0d 100644
--- a/clang/lib/Basic/Sarif.cpp
+++ b/clang/lib/Basic/Sarif.cpp
@@ -426,12 +426,16 @@ void SarifDocumentWriter::appendResult(const SarifResult &Result) {
   if (!Locs.empty())
     Ret["locations"] = std::move(Locs);
 
-  // The schema requires relatedLocations items to be unique.
+  // relatedLocations must hold unique items, a distinct Id per location is
+  // added to keep notes unique.
   json::Array ReLocs;
+  int64_t RelatedLocationId = 0;
   for (const auto &[Range, Message] : Result.RelatedLocations) {
-    json::Value Loc = createLocation(createPhysicalLocation(Range), Message);
-    if (!Loc.getAsObject()->empty() && !llvm::is_contained(ReLocs, Loc))
-      ReLocs.emplace_back(std::move(Loc));
+    json::Object Loc = createLocation(createPhysicalLocation(Range), Message);
+    if (Loc.empty())
+      continue;
+    Loc["id"] = RelatedLocationId++;
+    ReLocs.emplace_back(std::move(Loc));
   }
 
   if (!ReLocs.empty())
diff --git a/clang/lib/Frontend/SARIFDiagnostic.cpp b/clang/lib/Frontend/SARIFDiagnostic.cpp
index b2df1772e4ee5a..f449ba0172a79b 100644
--- a/clang/lib/Frontend/SARIFDiagnostic.cpp
+++ b/clang/lib/Frontend/SARIFDiagnostic.cpp
@@ -30,6 +30,13 @@
 
 namespace clang {
 
+// SARIF reportingConfiguration.rank is given to each severity. Notes, remarks
+// and warnings keep the default -1.
+namespace rank {
+constexpr float Error = 50.0f;
+constexpr float Fatal = 100.0f;
+} // namespace rank
+
 SarifResultLevel getSarifResultLevel(DiagnosticsEngine::Level level) {
   switch (level) {
   case DiagnosticsEngine::Ignored:
@@ -44,8 +51,7 @@ SarifResultLevel getSarifResultLevel(DiagnosticsEngine::Level level) {
   case DiagnosticsEngine::Fatal:
     return SarifResultLevel::Error;
   }
-  llvm_unreachable("Potentially un-handled DiagnosticsEngine::Level. "
-                   "Is the switch not fully covered?");
+  llvm_unreachable("Un-handled DiagnosticsEngine::Level occured.");
 }
 
 SarifRule addDiagnosticLevelToRule(SarifRule Rule,
@@ -55,9 +61,9 @@ SarifRule addDiagnosticLevelToRule(SarifRule Rule,
           getSarifResultLevel(Level));
 
   if (Level == DiagnosticsEngine::Error)
-    Config = Config.setRank(50);
+    Config = Config.setRank(rank::Error);
   else if (Level == DiagnosticsEngine::Fatal)
-    Config = Config.setRank(100);
+    Config = Config.setRank(rank::Fatal);
 
   return Rule.setDefaultConfiguration(Config);
 }



More information about the cfe-commits mailing list