This is an archive of the discontinued LLVM Phabricator instance.

Differential D48736

[frontend] Don't include the C++ stdlib for -x assembler-with-cpp
ClosedPublic

Authored by arphaman on Jun 28 2018, 12:33 PM.

Details

Reviewers
bruno
Commits
rG9b1baabc4e8c: [frontend] Don't include the C++ stdlib for -x assembler-with-cpp
rL335940: [frontend] Don't include the C++ stdlib for -x assembler-with-cpp
rC335940: [frontend] Don't include the C++ stdlib for -x assembler-with-cpp
Summary

The new C++ stdlib warning added in https://reviews.llvm.org/D48297 gets triggered when compiling an assembly file with -x assembler-with-cpp.
This commit ensures that the C++ stdlib is not included when compiling assembly. In general, it's not really useful to include the C++ stdlib search path when compiling assembly source.

Diff Detail

Repository
rC Clang

Event Timeline

arphaman created this revision.Jun 28 2018, 12:33 PM
Herald added a subscriber: dexonsmith. · View Herald TranscriptJun 28 2018, 12:33 PM
bruno added inline comments.Jun 28 2018, 2:58 PM
lib/Frontend/InitHeaderSearch.cpp
474

Since you added HSOpts.UseStandardCXXIncludes to the condition, would it be worth adding a test case for triggering this option when !Lang.AsmPreprocessor evals to true?

arphaman added inline comments.Jun 28 2018, 3:55 PM
lib/Frontend/InitHeaderSearch.cpp
474

This option was already there. I only added '&& !Lang.AsmPreprocessor'. Or do you mean something else?

bruno accepted this revision.Jun 28 2018, 3:57 PM

LGTM

lib/Frontend/InitHeaderSearch.cpp
474

Oh, right!

This revision is now accepted and ready to land.Jun 28 2018, 3:57 PM
Closed by commit rC335940: [frontend] Don't include the C++ stdlib for -x assembler-with-cpp (authored by arphaman). · Explain WhyJun 28 2018, 4:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Frontend/
4 lines
test/
Frontend/
5 lines

Diff 153420

lib/Frontend/InitHeaderSearch.cpp

Show First 20 Lines • Show All 464 Lines • ▼ Show 20 Linesvoid InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang,
case llvm::Triple::Win32: case llvm::Triple::Win32:
if (triple.getEnvironment() != llvm::Triple::Cygnus || if (triple.getEnvironment() != llvm::Triple::Cygnus ||
triple.isOSBinFormatMachO()) triple.isOSBinFormatMachO())
return; return;
break; break;
} }
if (Lang.CPlusPlus && HSOpts.UseStandardCXXIncludes && if (Lang.CPlusPlus && !Lang.AsmPreprocessor &&
HSOpts.UseStandardSystemIncludes) { HSOpts.UseStandardCXXIncludes && HSOpts.UseStandardSystemIncludes) {
brunoUnsubmitted
Not Done
ReplyInline Actions

Since you added HSOpts.UseStandardCXXIncludes to the condition, would it be worth adding a test case for triggering this option when !Lang.AsmPreprocessor evals to true?

bruno: Since you added `HSOpts.UseStandardCXXIncludes` to the condition, would it be worth adding a…
arphamanAuthorUnsubmitted
Not Done
ReplyInline Actions

This option was already there. I only added '&& !Lang.AsmPreprocessor'. Or do you mean something else?

arphaman: This option was already there. I only added '&& !Lang.AsmPreprocessor'. Or do you mean…
brunoUnsubmitted
Not Done
ReplyInline Actions

Oh, right!

bruno: Oh, right!
if (HSOpts.UseLibcxx) { if (HSOpts.UseLibcxx) {
if (triple.isOSDarwin()) { if (triple.isOSDarwin()) {
// On Darwin, libc++ may be installed alongside the compiler in // On Darwin, libc++ may be installed alongside the compiler in
// include/c++/v1. // include/c++/v1.
if (!HSOpts.ResourceDir.empty()) { if (!HSOpts.ResourceDir.empty()) {
// Remove version from foo/lib/clang/version // Remove version from foo/lib/clang/version
StringRef NoVer = llvm::sys::path::parent_path(HSOpts.ResourceDir); StringRef NoVer = llvm::sys::path::parent_path(HSOpts.ResourceDir);
// Remove clang from foo/lib/clang // Remove clang from foo/lib/clang
▲ Show 20 Lines • Show All 212 Lines • Show Last 20 Lines

test/Frontend/nostdlib-for-asmpp.s

// RUN: %clang -cc1 -x assembler-with-cpp -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist -std=c++11 -v %s 2>&1 | FileCheck %s
// The C++ stdlib path should not be included for an assembly source.
// CHECK-NOT: usr/include/c++/
// CHECK-NOT: include path for stdlibc++ headers not found; pass '-std=libc++' on the command line to use the libc++ standard library instead