diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2018-12-06 22:45:58 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2018-12-06 22:45:58 +0000 |
| commit | 2e7ab55e657fff6eecd8e46f2852af4ef78e1356 (patch) | |
| tree | 24bb08fb4d722ca7f546d4dc86afd81d4223bd4f | |
| parent | 0961cd1a1ace8916578d1b272be759db3264e74b (diff) | |
| download | bcm5719-llvm-2e7ab55e657fff6eecd8e46f2852af4ef78e1356.tar.gz bcm5719-llvm-2e7ab55e657fff6eecd8e46f2852af4ef78e1356.zip | |
[frontend][darwin] warn_stdlibcxx_not_found: supress warning for preprocessed input
Addresses second post-commit feedback for r335081 from Nico
llvm-svn: 348540
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Frontend/warning-stdlibcxx-darwin.cpp | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 1d488633936..1eeb9732fd9 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -3240,6 +3240,7 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, Res.getTargetOpts(), Res.getFrontendOpts()); ParseHeaderSearchArgs(Res.getHeaderSearchOpts(), Args, Res.getFileSystemOpts().WorkingDir); + llvm::Triple T(Res.getTargetOpts().Triple); if (DashX.getFormat() == InputKind::Precompiled || DashX.getLanguage() == InputKind::LLVM_IR) { // ObjCAAutoRefCount and Sanitize LangOpts are used to setup the @@ -3260,6 +3261,12 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, Res.getPreprocessorOpts(), Diags); if (Res.getFrontendOpts().ProgramAction == frontend::RewriteObjC) LangOpts.ObjCExceptions = 1; + if (T.isOSDarwin() && DashX.isPreprocessed()) { + // Supress the darwin-specific 'stdlibcxx-not-found' diagnostic for + // preprocessed input as we don't expect it to be used with -std=libc++ + // anyway. + Res.getDiagnosticOpts().Warnings.push_back("no-stdlibcxx-not-found"); + } } LangOpts.FunctionAlignment = @@ -3291,7 +3298,6 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, Res.getFrontendOpts().ProgramAction); // Turn on -Wspir-compat for SPIR target. - llvm::Triple T(Res.getTargetOpts().Triple); auto Arch = T.getArch(); if (Arch == llvm::Triple::spir || Arch == llvm::Triple::spir64) { Res.getDiagnosticOpts().Warnings.push_back("spir-compat"); diff --git a/clang/test/Frontend/warning-stdlibcxx-darwin.cpp b/clang/test/Frontend/warning-stdlibcxx-darwin.cpp index 9f31373be7f..697fe27c730 100644 --- a/clang/test/Frontend/warning-stdlibcxx-darwin.cpp +++ b/clang/test/Frontend/warning-stdlibcxx-darwin.cpp @@ -1,5 +1,6 @@ // RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist %s 2>&1 | FileCheck %s // RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist -stdlib=libc++ %s -verify +// RUN: %clang -cc1 -x c++-cpp-output -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist %s -verify // CHECK: include path for stdlibc++ headers not found; pass '-stdlib=libc++' on the command line to use the libc++ standard library instead // expected-no-diagnostics |
