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

[TBDGen] Take options as a struct instead of arguments.

Browse Source
This commit is contained in:
Huon Wilson
2018-05-23 00:02:15 +10:00
parent 4385d9042c
commit 38e45c4be5
6 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/FrontendTool/FrontendTool.cpp
View File

@@ -61,6 +61,7 @@
#include "swift/SILOptimizer/PassManager/Passes.h"
#include "swift/Syntax/Serialization/SyntaxSerialization.h"
#include "swift/Syntax/SyntaxNodes.h"
#include "swift/TBDGen/TBDGen.h"
// FIXME: We're just using CompilerInstance::createOutputFile.
// This API should be sunk down to LLVM.
@@ -775,9 +776,11 @@ static bool writeTBDIfNeeded(CompilerInvocation &Invocation,
? "lib" + Invocation.getModuleName().str() + ".dylib"
: Invocation.getFrontendOptions().TBDInstallName;
return writeTBD(Instance.getMainModule(),
Invocation.getSILOptions().hasMultipleIGMs(), TBDPath,
installName);
TBDGenOptions opts;
opts.InstallName = installName;
opts.HasMultipleIGMs = Invocation.getSILOptions().hasMultipleIGMs();
return writeTBD(Instance.getMainModule(), TBDPath, opts);
}
static std::deque<PostSILGenInputs>
@@ -1147,12 +1150,13 @@ static bool validateTBDIfNeeded(CompilerInvocation &Invocation,
case FrontendOptions::TBDValidationMode::MissingFromTBD:
break;
}
const auto hasMultipleIGMs = Invocation.getSILOptions().hasMultipleIGMs();
TBDGenOptions opts;
opts.HasMultipleIGMs = Invocation.getSILOptions().hasMultipleIGMs();
const bool allSymbols = mode == FrontendOptions::TBDValidationMode::All;
return MSF.is<SourceFile *>() ? validateTBD(MSF.get<SourceFile *>(), IRModule,
hasMultipleIGMs, allSymbols)
: validateTBD(MSF.get<ModuleDecl *>(), IRModule,
hasMultipleIGMs, allSymbols);
return MSF.is<SourceFile *>()
? validateTBD(MSF.get<SourceFile *>(), IRModule, opts, allSymbols)
: validateTBD(MSF.get<ModuleDecl *>(), IRModule, opts, allSymbols);
}
static bool generateCode(CompilerInvocation &Invocation,