Revert "[clang][deps] During scanning don't emit warnings-as-errors t…

…hat are ignored with diagnostic pragmas." This reverts commit eac90d1. This change is causing a test failure on the PS4/PS5 bots: https://lab.llvm.org/buildbot/#/builders/139/builds/31784 https://lab.llvm.org/buildbot/#/builders/216/builds/13476
llvm · Nov 29, 2022 · 2f8ac18 · 2f8ac18
1 parent bec8a37
commit 2f8ac18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 37 deletions.
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -135,8 +135,8 @@ static void sanitizeDiagOpts(DiagnosticOptions &DiagOpts) {
   DiagOpts.ShowCarets = false;
   // Don't write out diagnostic file.
   DiagOpts.DiagnosticSerializationFile.clear();
-  // Don't emit warnings as errors (and all other warnings too).
-  DiagOpts.IgnoreWarnings = true;
+  // Don't treat warnings as errors.
+  DiagOpts.Warnings.push_back("no-error");
 }
 
 /// A clang tool that runs the preprocessor in a mode that's optimized for

diff --git a/clang/test/ClangScanDeps/diagnostic-pragmas.c b/clang/test/ClangScanDeps/diagnostic-pragmas.c