averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-07-10 21:13:31 -07:00
parent 3e3700ce37 8fca31efde
commit 787d4b51d2
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/IRGen/GenCall.cpp
View File

@@ -650,7 +650,7 @@ void SignatureExpansion::expandResult(
const TypeInfo *directResultTypeInfo;
std::tie(ResultIRType, directResultTypeInfo) = expandDirectResult();
if (!fnConv.hasIndirectSILErrorResults()) {
if (!fnConv.hasIndirectSILResults() && !fnConv.hasIndirectSILErrorResults()) {
llvm::Type *directErrorType;
const TypeInfo *directErrorTypeInfo;
std::tie(directErrorType, directErrorTypeInfo) = expandDirectErrorType();
@@ -1997,7 +1997,8 @@ void SignatureExpansion::expandParameters(
auto &errorTI = IGM.getTypeInfo(errorType);
auto &nativeError = errorTI.nativeReturnValueSchema(IGM);
if (getSILFuncConventions().hasIndirectSILErrorResults() ||
if (getSILFuncConventions().hasIndirectSILResults() ||
getSILFuncConventions().hasIndirectSILErrorResults() ||
native.requiresIndirect() ||
nativeError.shouldReturnTypedErrorIndirectly()) {
ParamIRTypes.push_back(IGM.getStorageType(errorType)->getPointerTo());
@@ -2560,7 +2561,8 @@ public:
auto &errorSchema =
IGF.IGM.getTypeInfo(silErrorTy).nativeReturnValueSchema(IGF.IGM);
if (nativeSchema.requiresIndirect() ||
if (fnConv.hasIndirectSILResults() ||
nativeSchema.requiresIndirect() ||
errorSchema.shouldReturnTypedErrorIndirectly()) {
// Return the error indirectly.
auto buf = IGF.getCalleeTypedErrorResultSlot(silErrorTy);
@@ -4329,8 +4331,9 @@ bool CallEmission::mayReturnTypedErrorDirectly() const {
SILFunctionConventions fnConv(getCallee().getOrigFunctionType(),
IGF.getSILModule());
bool mayReturnErrorDirectly = false;
if (!convertDirectToIndirectReturn && !fnConv.hasIndirectSILErrorResults() &&
fnConv.funcTy->hasErrorResult() && fnConv.isTypedError()) {
if (!convertDirectToIndirectReturn && !fnConv.hasIndirectSILResults() &&
!fnConv.hasIndirectSILErrorResults() && fnConv.funcTy->hasErrorResult() &&
fnConv.isTypedError()) {
auto errorType =
fnConv.getSILErrorType(IGF.IGM.getMaximalTypeExpansionContext());
auto &errorSchema =