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

Reintroduce "Add support for Axle library." from 9292. Added an dependency to prevent building the

Browse Source 
core and axle core at the same time.


Swift SVN r9309
This commit is contained in:
Mon Ping Wang
2013-10-14 07:51:19 +00:00
parent f40ba621a8
commit 00467ba953
17 changed files with 326 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AST/Module.cpp
View File

@@ -1084,6 +1084,7 @@ static void performAutoImport(SourceFile &SF, bool hasBuiltinModuleAccess) {
// If we're building the standard library, import the magic Builtin module,
// otherwise, import the standard library.
std::pair<Module::ImportedModule, bool> Imports[2];
Module *M;
if (hasBuiltinModuleAccess)
M = SF.TU.Ctx.TheBuiltinModule;
@@ -1095,8 +1096,16 @@ static void performAutoImport(SourceFile &SF, bool hasBuiltinModuleAccess) {
// FIXME: These will be the same for most source files, but we copy them
// over and over again.
auto Import = std::make_pair(Module::ImportedModule({}, M), false);
SF.setImports(SF.TU.Ctx.AllocateCopy(llvm::makeArrayRef(Import)));
Imports[0] = std::make_pair(Module::ImportedModule({}, M), false);
if (SF.TU.Ctx.LangOpts.Axle && !hasBuiltinModuleAccess) {
Module* AxleM =
SF.TU.Ctx.getModule({{SF.TU.Ctx.AxleStdlibModuleName, SourceLoc()}});
Imports[1] = std::make_pair(Module::ImportedModule({}, AxleM), false);
SF.setImports(SF.TU.Ctx.AllocateCopy(llvm::makeArrayRef(Imports, 2)));
} else
SF.setImports(SF.TU.Ctx.AllocateCopy(llvm::makeArrayRef(Imports, 1)));
}
SourceFile::SourceFile(TranslationUnit &tu, SourceKind K,