-
Notifications
You must be signed in to change notification settings - Fork 14.6k
[Clang] [Driver] Canoncalise -internal-isystem
include paths
#148745
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Sirraide
wants to merge
4
commits into
llvm:main
Choose a base branch
from
Sirraide:perf/canonicalise-system-include-paths
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1370,19 +1370,40 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ | |
return *cxxStdlibType; | ||
} | ||
|
||
static void ResolveAndAddSystemIncludePath(const ArgList &DriverArgs, | ||
ArgStringList &CC1Args, | ||
const Twine &Path) { | ||
bool Canonicalize = | ||
DriverArgs.hasFlag(options::OPT_canonical_prefixes, | ||
options::OPT_no_canonical_prefixes, true); | ||
|
||
if (!Canonicalize) { | ||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
return; | ||
} | ||
|
||
// We canonicalise system include paths that were added automatically | ||
// since those can end up quite long otherwise. | ||
SmallString<256> Canonical, PathStorage; | ||
StringRef SimplifiedPath = Path.toStringRef(PathStorage); | ||
if (!sys::fs::real_path(SimplifiedPath, Canonical)) | ||
SimplifiedPath = Canonical; | ||
CC1Args.push_back(DriverArgs.MakeArgString(SimplifiedPath)); | ||
} | ||
|
||
/// Utility function to add a system framework directory to CC1 arguments. | ||
void ToolChain::addSystemFrameworkInclude(const llvm::opt::ArgList &DriverArgs, | ||
llvm::opt::ArgStringList &CC1Args, | ||
const Twine &Path) { | ||
CC1Args.push_back("-internal-iframework"); | ||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
ResolveAndAddSystemIncludePath(DriverArgs, CC1Args, Path); | ||
} | ||
|
||
/// Utility function to add a system include directory to CC1 arguments. | ||
void ToolChain::addSystemInclude(const ArgList &DriverArgs, | ||
ArgStringList &CC1Args, const Twine &Path) { | ||
CC1Args.push_back("-internal-isystem"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps "-internal-isystem" should be an argument to the |
||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
ResolveAndAddSystemIncludePath(DriverArgs, CC1Args, Path); | ||
} | ||
|
||
/// Utility function to add a system include directory with extern "C" | ||
|
@@ -1397,7 +1418,7 @@ void ToolChain::addExternCSystemInclude(const ArgList &DriverArgs, | |
ArgStringList &CC1Args, | ||
const Twine &Path) { | ||
CC1Args.push_back("-internal-externc-isystem"); | ||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
ResolveAndAddSystemIncludePath(DriverArgs, CC1Args, Path); | ||
} | ||
|
||
void ToolChain::addExternCSystemIncludeIfExists(const ArgList &DriverArgs, | ||
|
@@ -1411,20 +1432,16 @@ void ToolChain::addExternCSystemIncludeIfExists(const ArgList &DriverArgs, | |
void ToolChain::addSystemFrameworkIncludes(const ArgList &DriverArgs, | ||
ArgStringList &CC1Args, | ||
ArrayRef<StringRef> Paths) { | ||
for (const auto &Path : Paths) { | ||
CC1Args.push_back("-internal-iframework"); | ||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
} | ||
for (const auto &Path : Paths) | ||
addSystemFrameworkInclude(DriverArgs, CC1Args, Path); | ||
} | ||
|
||
/// Utility function to add a list of system include directories to CC1. | ||
void ToolChain::addSystemIncludes(const ArgList &DriverArgs, | ||
ArgStringList &CC1Args, | ||
ArrayRef<StringRef> Paths) { | ||
for (const auto &Path : Paths) { | ||
CC1Args.push_back("-internal-isystem"); | ||
CC1Args.push_back(DriverArgs.MakeArgString(Path)); | ||
} | ||
for (const auto &Path : Paths) | ||
addSystemInclude(DriverArgs, CC1Args, Path); | ||
} | ||
|
||
std::string ToolChain::concat(StringRef Path, const Twine &A, const Twine &B, | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For new functions, use
functionName
style