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

Separated out the Onone module handling from stdlib handling

Browse Source 
Also refactored the Onone module predicate. I believe there is no functional change, but I don't understand the correctness of what was there.
This commit is contained in:
David Ungar
2017-09-07 14:48:37 -07:00
parent 249718e1bd
commit add13798be
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Frontend/Frontend.cpp
View File

@@ -294,15 +294,15 @@ addAdditionalInitialImportsTo(SourceFile *SF, CompilerInstance::ImplicitImports
/// builds. This allows for use of popular specialized functions
/// from the standard library, which makes the non-optimized builds
/// execute much faster.
static bool shouldImplicityImportSwiftOnoneSupportModule(
SILOptions::SILOptMode optimization,
FrontendOptions::ActionType requestedAction) {
return ((optimization <= SILOptions::SILOptMode::None &&
(requestedAction == FrontendOptions::EmitObject ||
requestedAction == FrontendOptions::Immediate ||
requestedAction == FrontendOptions::EmitSIL)) ||
(optimization == SILOptions::SILOptMode::None &&
requestedAction >= FrontendOptions::EmitSILGen));
static bool shouldImplicityImportSwiftOnoneSupportModule(CompilerInvocation &Invocation) {
if (Invocation.getImplicitModuleImportKind() != SourceFile::ImplicitModuleImportKind::Stdlib)
return false;
SILOptions::SILOptMode optimization = Invocation.getSILOptions().Optimization;
if (optimization <= SILOptions::SILOptMode::None &&
Invocation.getFrontendOptions().shouldImportSwiftOnoneModuleIfNoneOrImplicitOptimization()) {
return true;
}
return optimization == SILOptions::SILOptMode::None && Invocation.getFrontendOptions().isCreatingSIL();
}
void CompilerInstance::performSema() {
@@ -316,8 +316,11 @@ void CompilerInstance::performSema() {
}
if (Invocation.getImplicitModuleImportKind() == SourceFile::ImplicitModuleImportKind::Stdlib) {
if (!loadStdlibAndMaybeSwiftOnoneSupport())
return;
if (!loadStdlib())
return;
}
if (shouldImplicityImportSwiftOnoneSupportModule(Invocation)) {
Invocation.getFrontendOptions().ImplicitImportModuleNames.push_back(SWIFT_ONONE_SUPPORT);
}
ImplicitImports implicitImports(*this);
@@ -359,8 +362,8 @@ CompilerInstance::ImplicitImports::ImplicitImports(CompilerInstance &compiler) {
}
// Return true if should continue, i.e. no error
bool CompilerInstance::loadStdlibAndMaybeSwiftOnoneSupport() {
SharedTimer timer("performSema-loadStdlibAndMaybeSwiftOnoneSupport");
bool CompilerInstance::loadStdlib() {
SharedTimer timer("performSema-loadStdlib");
ModuleDecl *M = Context->getStdlibModule(true);
if (!M) {
@@ -375,12 +378,6 @@ bool CompilerInstance::loadStdlibAndMaybeSwiftOnoneSupport() {
"Module failed to load but nothing was diagnosed?");
return false;
}
if (shouldImplicityImportSwiftOnoneSupportModule(
Invocation.getSILOptions().Optimization,
Invocation.getFrontendOptions().RequestedAction)) {
Invocation.getFrontendOptions().ImplicitImportModuleNames.push_back(
SWIFT_ONONE_SUPPORT);
}
return true;
}