Author: Jan Svoboda Date: 2021-06-14T12:23:33+02:00 New Revision: cf7d9704688db746b26d739a6e154ad54b6b676e
URL: https://github.com/llvm/llvm-project/commit/cf7d9704688db746b26d739a6e154ad54b6b676e DIFF: https://github.com/llvm/llvm-project/commit/cf7d9704688db746b26d739a6e154ad54b6b676e.diff LOG: [clang][deps] Move injection of `-Wno-error` from `clang-scan-deps` to `DependencyScanning` library This moves another piece of logic specific to `clang-scan-deps` into the `DependencyScanning` library. This makes it easier to check how the original command-line looked like in the library and will enable the library to stop inventing `-Wno-error` for modular dependencies (see D104036). Reviewed By: arphaman Differential Revision: https://reviews.llvm.org/D104031 Added: Modified: clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp clang/tools/clang-scan-deps/ClangScanDeps.cpp Removed: ################################################################################ diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp index e9392ee824a6..0011a5672bf2 100644 --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp @@ -107,6 +107,8 @@ class DependencyScanningAction : public tooling::ToolAction { Compiler.getDiagnosticOpts().ShowCarets = false; // Don't write out diagnostic file. Compiler.getDiagnosticOpts().DiagnosticSerializationFile.clear(); + // Don't treat warnings as errors. + Compiler.getDiagnosticOpts().Warnings.push_back("no-error"); // Create the compiler's actual diagnostics engine. Compiler.createDiagnostics(DiagConsumer, /*ShouldOwnClient=*/false); if (!Compiler.hasDiagnostics()) diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp index d9f1b586d71a..8a1575083d8e 100644 --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -504,7 +504,6 @@ int main(int argc, const char **argv) { } AdjustedArgs.push_back("-Xclang"); AdjustedArgs.push_back("-sys-header-deps"); - AdjustedArgs.push_back("-Wno-error"); if (!HasResourceDir) { StringRef ResourceDir = _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits