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

[NFC] Refactor getRenameDecl to use the request evaluator

Browse Source 
Move `getRenameDecl` from `PrintAsObjC` into its own request so that
other components can re-use this functionality.
This commit is contained in:
Ben Barham
2021-07-17 09:04:58 +10:00
parent 35aa862e1d
commit f1c45de2a9
14 changed files with 185 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/FrontendTool/FrontendTool.cpp
View File

@@ -174,14 +174,12 @@ static bool writeSIL(SILModule &SM, const PrimarySpecificPaths &PSPs,
///
/// \see swift::printAsObjC
static bool printAsObjCIfNeeded(StringRef outputPath, ModuleDecl *M,
StringRef bridgingHeader, bool moduleIsPublic) {
StringRef bridgingHeader) {
if (outputPath.empty())
return false;
return withOutputFile(M->getDiags(), outputPath,
[&](raw_ostream &out) -> bool {
auto requiredAccess = moduleIsPublic ? AccessLevel::Public
: AccessLevel::Internal;
return printAsObjC(out, M, bridgingHeader, requiredAccess);
return printAsObjC(out, M, bridgingHeader);
});
}
@@ -853,8 +851,7 @@ static bool emitAnyWholeModulePostTypeCheckSupplementaryOutputs(
}
hadAnyError |= printAsObjCIfNeeded(
Invocation.getObjCHeaderOutputPathForAtMostOnePrimary(),
Instance.getMainModule(), BridgingHeaderPathForPrint,
Invocation.isModuleExternallyConsumed(Instance.getMainModule()));
Instance.getMainModule(), BridgingHeaderPathForPrint);
}
// Only want the header if there's been any errors, ie. there's not much