Skip to content

Commit a3a4d21

Browse files
committed
WIP rdar://123491072
1 parent 9a0598c commit a3a4d21

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

lib/IRGen/TBDGen.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ TBDGenVisitor::parsePreviousModuleInstallNameMap() {
233233
}
234234

235235
static LinkerPlatformId
236-
getLinkerPlatformId(OriginallyDefinedInAttr::ActiveVersion Ver) {
236+
getLinkerPlatformId(OriginallyDefinedInAttr::ActiveVersion Ver,
237+
ASTContext &Ctx) {
237238
switch(Ver.Platform) {
238239
case swift::PlatformKind::none:
239240
llvm_unreachable("cannot find platform kind");
@@ -264,8 +265,9 @@ getLinkerPlatformId(OriginallyDefinedInAttr::ActiveVersion Ver) {
264265
}
265266

266267
static StringRef
267-
getLinkerPlatformName(OriginallyDefinedInAttr::ActiveVersion Ver) {
268-
return getLinkerPlatformName((uint8_t)getLinkerPlatformId(Ver));
268+
getLinkerPlatformName(OriginallyDefinedInAttr::ActiveVersion Ver,
269+
ASTContext &Ctx) {
270+
return getLinkerPlatformName(getLinkerPlatformId(Ver, Ctx));
269271
}
270272

271273
/// Find the most relevant introducing version of the decl stack we have visited
@@ -313,17 +315,17 @@ void TBDGenVisitor::addLinkerDirectiveSymbolsLdPrevious(
313315
// so we don't need the linker directives.
314316
if (*IntroVer >= Ver.Version)
315317
continue;
316-
auto PlatformNumber = getLinkerPlatformId(Ver);
318+
auto PlatformNumber = getLinkerPlatformId(Ver, Ctx);
317319
auto It = previousInstallNameMap->find(Ver.ModuleName.str());
318320
if (It == previousInstallNameMap->end()) {
319321
Ctx.Diags.diagnose(SourceLoc(), diag::cannot_find_install_name,
320-
Ver.ModuleName, getLinkerPlatformName(Ver));
322+
Ver.ModuleName, getLinkerPlatformName(Ver, Ctx));
321323
continue;
322324
}
323325
auto InstallName = It->second.getInstallName(PlatformNumber);
324326
if (InstallName.empty()) {
325327
Ctx.Diags.diagnose(SourceLoc(), diag::cannot_find_install_name,
326-
Ver.ModuleName, getLinkerPlatformName(Ver));
328+
Ver.ModuleName, getLinkerPlatformName(Ver, Ctx));
327329
continue;
328330
}
329331
llvm::SmallString<64> Buffer;

0 commit comments

Comments
 (0)