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

Merge pull request #8119 from huonw/imported-modules

Browse Source
This commit is contained in:
swift-ci
2017-03-20 17:52:41 -07:00
committed by GitHub
parent ba4691b87a 0b2a02d083
commit 099effd29b
30 changed files with 303 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Frontend/CompilerInvocation.cpp
View File

@@ -265,6 +265,8 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Action = FrontendOptions::EmitSIBGen;
} else if (Opt.matches(OPT_emit_pch)) {
Action = FrontendOptions::EmitPCH;
} else if (Opt.matches(OPT_emit_imported_modules)) {
Action = FrontendOptions::EmitImportedModules;
} else if (Opt.matches(OPT_parse)) {
Action = FrontendOptions::Parse;
} else if (Opt.matches(OPT_typecheck)) {
@@ -543,6 +545,13 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitObject:
Suffix = "o";
break;
case FrontendOptions::EmitImportedModules:
if (Opts.OutputFilenames.empty())
Opts.setSingleOutputFilename("-");
else
Suffix = "importedmodules";
break;
}
if (!Suffix.empty()) {
@@ -697,6 +706,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitBC:
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
break;
}
}
@@ -726,6 +736,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitBC:
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
break;
}
}
@@ -759,6 +770,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitBC:
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
break;
}
}
@@ -1020,6 +1032,8 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts,
Opts.DisableModulesValidateSystemHeaders |= Args.hasArg(OPT_disable_modules_validate_system_headers);
Opts.DisableAdapterModules |= Args.hasArg(OPT_emit_imported_modules);
return false;
}