Revert "Merge remote-tracking branch 'origin/master-next'"

This reverts commit 1c9b0908e6, reversing
changes made to 3eb82c1836.
This commit is contained in:
Karoy Lorentey
2020-06-08 16:48:38 -07:00
parent 1c9b0908e6
commit 68351d2110
53 changed files with 234 additions and 262 deletions

View File

@@ -1131,7 +1131,7 @@ bool InterfaceSubContextDelegateImpl::extractSwiftInterfaceVersionAndArgs(
if (CompRe.match(SB, &CompMatches)) {
assert(CompMatches.size() == 2);
CompilerVersion = ArgSaver.save(CompMatches[1]).str();
CompilerVersion = ArgSaver.save(CompMatches[1]);
}
else {
// Don't diagnose; handwritten module interfaces don't include this field.