Files
swift-mirror/lib/AST/SearchPathOptions.cpp
Alex Hoppen bffd3ca608 [Serialization] Store the path inside ModuleSearchPath as a string, not a StringRef
The idea behind storing a StringRef was to reduce the memory footprint because we made the assumption that a `ModuleSearchPath` always outlives the `SearchPathOptions` it was created from. What I did not consider was that the path was referencing into a `std::vector`, which could get resized, thus invaliding the memory the `ModuleSearchPath`’s `StringRef` was pointing to, causing memory corruption.

To fix this, store the path string inisde the `ModuleSearchPath` itself. Since we store a `ModuleSearchPath` for every file inside that module search path in the `LookupTable`, by itself this would cause a new copy of the path to be stored for every file inside a module search path. To avoid this, make `ModuleSearchPath` ref counted and only store a reference to one shared `ModuleSearchPath` entry in the lookup table.

rdar://88888679
2022-02-19 09:44:08 +01:00

117 lines
4.9 KiB
C++

//===----------------------- SearchPathOptions.cpp ------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//
#include "swift/AST/SearchPathOptions.h"
#include "llvm/ADT/SmallSet.h"
using namespace swift;
void ModuleSearchPathLookup::addFilesInPathToLookupTable(
llvm::vfs::FileSystem *FS, StringRef SearchPath, ModuleSearchPathKind Kind,
bool IsSystem, unsigned SearchPathIndex) {
std::error_code Error;
auto entryAlreadyExists = [this](ModuleSearchPathKind Kind,
unsigned SearchPathIndex) -> bool {
return llvm::any_of(LookupTable, [&](const auto &LookupTableEntry) {
return llvm::any_of(
LookupTableEntry.second, [&](ModuleSearchPathPtr ExistingSearchPath) {
return ExistingSearchPath->getKind() == Kind &&
ExistingSearchPath->getIndex() == SearchPathIndex;
});
});
};
assert(!entryAlreadyExists(Kind, SearchPathIndex) &&
"Search path with this kind and index already exists");
ModuleSearchPathPtr TableEntry =
new ModuleSearchPath(SearchPath, Kind, IsSystem, SearchPathIndex);
for (auto Dir = FS->dir_begin(SearchPath, Error);
!Error && Dir != llvm::vfs::directory_iterator(); Dir.increment(Error)) {
StringRef Filename = llvm::sys::path::filename(Dir->path());
LookupTable[Filename].push_back(TableEntry);
}
}
void ModuleSearchPathLookup::rebuildLookupTable(const SearchPathOptions *Opts,
llvm::vfs::FileSystem *FS,
bool IsOSDarwin) {
clearLookupTable();
for (auto Entry : llvm::enumerate(Opts->getImportSearchPaths())) {
addFilesInPathToLookupTable(FS, Entry.value(),
ModuleSearchPathKind::Import,
/*isSystem=*/false, Entry.index());
}
for (auto Entry : llvm::enumerate(Opts->getFrameworkSearchPaths())) {
addFilesInPathToLookupTable(FS, Entry.value().Path, ModuleSearchPathKind::Framework,
Entry.value().IsSystem, Entry.index());
}
// Apple platforms have extra implicit framework search paths:
// $SDKROOT/System/Library/Frameworks/ and $SDKROOT/Library/Frameworks/.
if (IsOSDarwin) {
for (auto Entry : llvm::enumerate(Opts->getDarwinImplicitFrameworkSearchPaths())) {
addFilesInPathToLookupTable(FS, Entry.value(),
ModuleSearchPathKind::DarwinImplictFramework,
/*isSystem=*/true, Entry.index());
}
}
for (auto Entry : llvm::enumerate(Opts->getRuntimeLibraryImportPaths())) {
addFilesInPathToLookupTable(FS, Entry.value(),
ModuleSearchPathKind::RuntimeLibrary,
/*isSystem=*/true, Entry.index());
}
State.FileSystem = FS;
State.IsOSDarwin = IsOSDarwin;
State.Opts = Opts;
State.IsPopulated = true;
}
SmallVector<const ModuleSearchPath *, 4>
ModuleSearchPathLookup::searchPathsContainingFile(
const SearchPathOptions *Opts, llvm::ArrayRef<std::string> Filenames,
llvm::vfs::FileSystem *FS, bool IsOSDarwin) {
if (!State.IsPopulated || State.FileSystem != FS ||
State.IsOSDarwin != IsOSDarwin || State.Opts != Opts) {
rebuildLookupTable(Opts, FS, IsOSDarwin);
}
// Gather all search paths that include a file whose name is in Filenames.
// To make sure that we don't include the same search paths twice, keep track
// of which search paths have already been added to Result by their kind and
// Index in ResultIds.
// Note that if a search path is specified twice by including it twice in
// compiler arguments or by specifying it as different kinds (e.g. once as
// import and once as framework search path), these search paths are
// considered different (because they have different indicies/kinds and may
// thus still be included twice.
llvm::SmallVector<const ModuleSearchPath *, 4> Result;
llvm::SmallSet<std::pair<ModuleSearchPathKind, unsigned>, 4> ResultIds;
for (auto &Filename : Filenames) {
for (auto &Entry : LookupTable[Filename]) {
if (ResultIds.insert(std::make_pair(Entry->getKind(), Entry->getIndex()))
.second) {
Result.push_back(Entry.get());
}
}
}
// Make sure we maintain the same search paths order that we had used in
// populateLookupTableIfNecessary after merging results from
// different filenames.
llvm::sort(Result, [](const ModuleSearchPath *Lhs,
const ModuleSearchPath *Rhs) { return *Lhs < *Rhs; });
return Result;
}