aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Transforms/Utils/Local.cpp
diff options
context:
space:
mode:
authorEllis Hoag <ellis.sparky.hoag@gmail.com>2025-05-12 14:37:26 -0700
committerGitHub <noreply@github.com>2025-05-12 14:37:26 -0700
commit78f0af5d895be284e4f7448fed007a04ee6a35d4 (patch)
tree6fc143ced1ccdc191373775c3017da0f157325bb /llvm/lib/Transforms/Utils/Local.cpp
parent6b7b289038acb297f433fe1c0cb66158277e9974 (diff)
downloadllvm-78f0af5d895be284e4f7448fed007a04ee6a35d4.zip
llvm-78f0af5d895be284e4f7448fed007a04ee6a35d4.tar.gz
llvm-78f0af5d895be284e4f7448fed007a04ee6a35d4.tar.bz2
[SimplifyCFG][swifterror] Don't sink calls with swifterror params (#139015)
We've encountered an LLVM verification failure when building Swift with the SimplifyCFG pass enabled. I found that https://reviews.llvm.org/D158083 fixed this pass by preventing sinking loads or stores of swifterror values, but it did not implement the same protection for call or invokes. In `Verifier.cpp` [here](https://github.com/ellishg/llvm-project/blob/c68535581135a1513c9c4c1c7672307d4b5e616e/llvm/lib/IR/Verifier.cpp#L4360-L4364) and [here](https://github.com/ellishg/llvm-project/blob/c68535581135a1513c9c4c1c7672307d4b5e616e/llvm/lib/IR/Verifier.cpp#L3661-L3662) we can see that swifterror values must also be used directly by call instructions.
Diffstat (limited to 'llvm/lib/Transforms/Utils/Local.cpp')
-rw-r--r--llvm/lib/Transforms/Utils/Local.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp
index 1db01b2..3dbd605 100644
--- a/llvm/lib/Transforms/Utils/Local.cpp
+++ b/llvm/lib/Transforms/Utils/Local.cpp
@@ -4220,12 +4220,19 @@ void llvm::maybeMarkSanitizerLibraryCallNoBuiltin(
}
bool llvm::canReplaceOperandWithVariable(const Instruction *I, unsigned OpIdx) {
+ const auto *Op = I->getOperand(OpIdx);
// We can't have a PHI with a metadata type.
- if (I->getOperand(OpIdx)->getType()->isMetadataTy())
+ if (Op->getType()->isMetadataTy())
+ return false;
+
+ // swifterror pointers can only be used by a load, store, or as a swifterror
+ // argument; swifterror pointers are not allowed to be used in select or phi
+ // instructions.
+ if (Op->isSwiftError())
return false;
// Early exit.
- if (!isa<Constant, InlineAsm>(I->getOperand(OpIdx)))
+ if (!isa<Constant, InlineAsm>(Op))
return true;
switch (I->getOpcode()) {