Skip to content

ClangImporter.cpp: Fix compilation on some linux systems #58922

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 14, 2022
Merged

ClangImporter.cpp: Fix compilation on some linux systems #58922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ importer::addCommonInvocationArguments(
/// On Linux, some platform libraries (glibc, libstdc++) are not modularized.
/// We inject modulemaps for those libraries into their include directories
/// to allow using them from Swift.
static SmallVector<std::pair<std::string, std::string>>
static SmallVector<std::pair<std::string, std::string>, 16>
getClangInvocationFileMapping(ASTContext &ctx) {
using Path = SmallString<128>;

Expand Down Expand Up @@ -923,7 +923,7 @@ getClangInvocationFileMapping(ASTContext &ctx) {
cxxStdlibDirs.push_back(Path(iter->path()));
}

SmallVector<std::pair<std::string, std::string>> result;
SmallVector<std::pair<std::string, std::string>, 16> result;
// Inject a modulemap into the VFS for each of the libstdc++ versions.
for (const Path &cxxStdlibDir : cxxStdlibDirs) {
// Only inject the module map if the module does not already exist at
Expand Down