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

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

Browse Source 
# Conflicts:
#	include/swift/Frontend/FrontendInputsAndOutputs.h
This commit is contained in:
Karoy Lorentey
2020-06-08 16:43:40 -07:00
parent 3eb82c1836 77cbdeedc8
commit 1c9b0908e6
53 changed files with 263 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/ModuleInterfaceLoader.cpp
View File

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