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' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-06-15 10:09:02 -07:00
parent 09c3bdaf7c 8d43ec3ad7
commit f71dc72e79
10 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1075,8 +1075,11 @@ static void setPrivateDiscriminatorIfNeeded(IRGenOptions &IRGenOpts,
!MSF.is<SourceFile *>())
return;
Identifier PD = MSF.get<SourceFile *>()->getPrivateDiscriminator();
if (!PD.empty())
IRGenOpts.DWARFDebugFlags += (" -private-discriminator " + PD.str()).str();
if (!PD.empty()) {
if (!IRGenOpts.DWARFDebugFlags.empty())
IRGenOpts.DWARFDebugFlags += " ";
IRGenOpts.DWARFDebugFlags += ("-private-discriminator " + PD.str()).str();
}
}
static bool serializeSIB(SILModule *SM, const PrimarySpecificPaths &PSPs,