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

Revert "Add support for Axle library." It breaks the build.

Browse Source 
This reverts commit r9292.

Swift SVN r9296
This commit is contained in:
Joe Groff
2013-10-13 22:38:22 +00:00
parent c5f20cabcc
commit cf457d2210
17 changed files with 26 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AST/Module.cpp
View File

@@ -1084,7 +1084,6 @@ 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;
@@ -1096,16 +1095,8 @@ 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.
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)));
auto Import = std::make_pair(Module::ImportedModule({}, M), false);
SF.setImports(SF.TU.Ctx.AllocateCopy(llvm::makeArrayRef(Import)));
}
SourceFile::SourceFile(TranslationUnit &tu, SourceKind K,