From 13cca95e46581c82ca1d6c3aff1885d5a1672d47 Mon Sep 17 00:00:00 2001 From: tnowicki Date: Thu, 14 Nov 2024 16:56:57 -0500 Subject: [PATCH] [Coroutines][Swift] Remove replaceSwiftErrorOps while cloning I am confused by what replaceSwiftErrorOps is supposed to do and it doesn't seem to be well covered by lit-tests. At least in tree. The function appears to primarily operate on the original function, because it processes the SwiftErrorOps in Shape, collected from the unsplit function. However, it is called during cloning process of each resume function and from reading the code it seems to do something strange. After cloning the first resume funnction it may add Load and Store instructions to the original function. These would then appear in any subsequent resume functions that are cloned from the original, but not the one being processed. Instead an alloca will be created in the first resume function. After the first call to replaceSwiftErrorOps the SwiftErrorOps list is cleared so no other resume functions will get the alloca. Following this replaceSwiftErrorOps is called again after splitting but that would do nothing (right?). Removing the call within the Cloner::create() doesn't break any lit-tests. Can this be safely removed? I am looking at this because I am working on splitting. As explained in https://github.com/llvm/llvm-project/pull/116285 I want to CloneAndPrune to create resume functions that only include the code they need and not the entire original function. However, this call causes coro-swifterror.ll to fail by: swifterror argument should come from an alloca or parameter ptr poison tail call void @maybeThrow(ptr swifterror poison) The swifterror argument is not correctly used in a few places in the IR and some how removing the replaceSwiftErrorOps call in Cloner::create() resolves the problem. --- llvm/lib/Transforms/Coroutines/CoroSplit.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/llvm/lib/Transforms/Coroutines/CoroSplit.cpp b/llvm/lib/Transforms/Coroutines/CoroSplit.cpp index 25a962ddf1b0d..da2c66b1827cc 100644 --- a/llvm/lib/Transforms/Coroutines/CoroSplit.cpp +++ b/llvm/lib/Transforms/Coroutines/CoroSplit.cpp @@ -190,7 +190,6 @@ class CoroCloner { void replaceRetconOrAsyncSuspendUses(); void replaceCoroSuspends(); void replaceCoroEnds(); - void replaceSwiftErrorOps(); void salvageDebugInfo(); void handleFinalSuspend(); }; @@ -750,10 +749,6 @@ collectDbgVariableIntrinsics(Function &F) { return {Intrinsics, DbgVariableRecords}; } -void CoroCloner::replaceSwiftErrorOps() { - ::replaceSwiftErrorOps(*NewF, Shape, &VMap); -} - void CoroCloner::salvageDebugInfo() { auto [Worklist, DbgVariableRecords] = collectDbgVariableIntrinsics(*NewF); SmallDenseMap ArgToAllocaMap; @@ -1204,9 +1199,6 @@ void CoroCloner::create() { // Handle suspends. replaceCoroSuspends(); - // Handle swifterror. - replaceSwiftErrorOps(); - // Remove coro.end intrinsics. replaceCoroEnds();