Skip to content

Commit 5164766

Browse files
committed
---
yaml --- r: 445653 b: refs/heads/master-rebranch c: c0c9763 h: refs/heads/master i: 445651: f0d7859
1 parent 8e323bb commit 5164766

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-19-a: 550bd4128211e1135c31ab186d2a9
17011701
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a: f3e865a19683d7e9664718c41e4e956686efb1b3
17021702
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-21-a: 0852188b163c7ebd7054379e729cedc41c361f95
17031703
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-22-a: 4832e0c5e8723b7b4a2c626ac6a8a523576f1317
1704-
refs/heads/master-rebranch: 24a054cc59649d0139419751bdc98914924357f0
1704+
refs/heads/master-rebranch: c0c976355c4c2aa05cc12eb531a1eac6de9320aa
17051705
refs/heads/revert-29064-handle-csdiag-coerce-diagnostics: 69656f1629e2cde21bb7f44179c535c1f3ad5dfd
17061706
refs/heads/swift-5.1-DEVELOPMENT-SNAPSHOT-2018-11-16-a: 51fe19105062bb86b997c7698bb3f83ffc536d2c
17071707
refs/heads/tgmath-derivatives-wip: 00adac82d118281f701c26fe8702ecb4bbe33e82

branches/master-rebranch/lib/Frontend/ModuleInterfaceLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
12231223
// FIXME: we shouldn't need this. Remove it?
12241224
StringRef explictSwiftModuleMap = searchPathOpts.ExplicitSwiftModuleMap;
12251225
subInvocation.getSearchPathOptions().ExplicitSwiftModuleMap =
1226-
explictSwiftModuleMap;
1226+
explictSwiftModuleMap.str();
12271227
if (!explictSwiftModuleMap.empty()) {
12281228
GenericArgs.push_back("-explicit-swift-module-map-file");
12291229
GenericArgs.push_back(explictSwiftModuleMap);

0 commit comments

Comments
 (0)