Revert "serialization: obfuscate the serialized search paths"

This commit is contained in:
Saleem Abdulrasool
2021-12-02 08:18:23 -08:00
committed by GitHub
parent 8a7ca32cf0
commit 11d5d6d4ca
21 changed files with 27 additions and 139 deletions

View File

@@ -404,9 +404,7 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
bool isFramework = false;
serialization::ValidationInfo loadInfo = ModuleFileSharedCore::load(
modulePath.str(), std::move(moduleBuf.get()), nullptr, nullptr,
isFramework, isRequiredOSSAModules(),
Ctx.SearchPathOpts.DeserializedPathRecoverer,
loadedModuleFile);
isFramework, isRequiredOSSAModules(), loadedModuleFile);
const std::string moduleDocPath;
const std::string sourceInfoPath;
@@ -732,9 +730,7 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
serialization::ValidationInfo loadInfo = ModuleFileSharedCore::load(
moduleInterfacePath, std::move(moduleInputBuffer),
std::move(moduleDocInputBuffer), std::move(moduleSourceInfoInputBuffer),
isFramework, isRequiredOSSAModules(),
Ctx.SearchPathOpts.DeserializedPathRecoverer,
loadedModuleFileCore);
isFramework, isRequiredOSSAModules(), loadedModuleFileCore);
SerializedASTFile *fileUnit = nullptr;
if (loadInfo.status == serialization::Status::Valid) {
@@ -1559,8 +1555,3 @@ void SerializedASTFile::collectBasicSourceFileInfo(
llvm::function_ref<void(const BasicSourceFileInfo &)> callback) const {
File.collectBasicSourceFileInfo(callback);
}
void SerializedASTFile::collectSerializedSearchPath(
llvm::function_ref<void(StringRef)> callback) const {
File.collectSerializedSearchPath(callback);
}