averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[frontend] Moved ImportSearchPaths out of CompilerInvocation/ASTContext and into SearchPathOptions.

Browse Source 
Also updated findModule() in SourceLoader.cpp and SerializedModuleLoader.cpp to get the ImportSearchPaths from the ASTContext’s SearchPathOpts, instead of directly from the ASTContext.

Swift SVN r11214
This commit is contained in:
Connor Wakamo
2013-12-12 22:15:58 +00:00
parent 86b4a3b049
commit 1ecc5cc3e6
7 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -75,7 +75,7 @@ static llvm::error_code findModule(ASTContext &ctx, AccessPathElem moduleID,
}
// If we fail, search each import search path.
for (auto Path : ctx.ImportSearchPaths) {
for (auto Path : ctx.SearchPathOpts.ImportSearchPaths) {
inputFilename = Path;
llvm::sys::path::append(inputFilename, moduleFilename.str());
err = llvm::MemoryBuffer::getFile(inputFilename.str(), bufferRef);