Skip to content

Commit 8195d5e

Browse files
committed
SIL: Tweak SILModuleConventions to use more appropriate type lowering APIs
SILType::isAddressOnly(SILModule) is going away.
1 parent c93ec45 commit 8195d5e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

lib/SIL/SILType.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,15 +446,21 @@ SILModuleConventions::SILModuleConventions(const SILModule &M)
446446

447447
bool SILModuleConventions::isReturnedIndirectlyInSIL(SILType type,
448448
SILModule &M) {
449-
if (SILModuleConventions(M).loweredAddresses)
450-
return type.isAddressOnly(M);
449+
if (SILModuleConventions(M).loweredAddresses) {
450+
return M.Types.getTypeLowering(type,
451+
ResilienceExpansion::Minimal)
452+
.isAddressOnly();
453+
}
451454

452455
return false;
453456
}
454457

455458
bool SILModuleConventions::isPassedIndirectlyInSIL(SILType type, SILModule &M) {
456-
if (SILModuleConventions(M).loweredAddresses)
457-
return type.isAddressOnly(M);
459+
if (SILModuleConventions(M).loweredAddresses) {
460+
return M.Types.getTypeLowering(type,
461+
ResilienceExpansion::Minimal)
462+
.isAddressOnly();
463+
}
458464

459465
return false;
460466
}

0 commit comments

Comments
 (0)