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

ModuleInterface: refactor out a utility to extract compiler flags from a module interface file. NFC

Browse Source
This commit is contained in:
Xi Ge
2021-05-02 22:41:39 -07:00
parent 57a893bdb3
commit 3d6662f382
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1191,24 +1191,21 @@ bool InterfaceSubContextDelegateImpl::extractSwiftInterfaceVersionAndArgs(
auto SB = FileOrError.get()->getBuffer();
auto VersRe = getSwiftInterfaceFormatVersionRegex();
auto CompRe = getSwiftInterfaceCompilerVersionRegex();
auto FlagRe = getSwiftInterfaceModuleFlagsRegex();
SmallVector<StringRef, 1> VersMatches, FlagMatches, CompMatches;
SmallVector<StringRef, 1> VersMatches, CompMatches;
if (!VersRe.match(SB, &VersMatches)) {
diagnose(interfacePath, diagnosticLoc,
diag::error_extracting_version_from_module_interface);
return true;
}
if (!FlagRe.match(SB, &FlagMatches)) {
if (extractCompilerFlagsFromInterface(SB, ArgSaver, SubArgs)) {
diagnose(interfacePath, diagnosticLoc,
diag::error_extracting_version_from_module_interface);
return true;
}
assert(VersMatches.size() == 2);
assert(FlagMatches.size() == 2);
// FIXME We should diagnose this at a location that makes sense:
auto Vers = swift::version::Version(VersMatches[1], SourceLoc(), &Diags);
llvm::cl::TokenizeGNUCommandLine(FlagMatches[1], ArgSaver, SubArgs);
if (CompRe.match(SB, &CompMatches)) {
assert(CompMatches.size() == 2);