[llvm] StackProtector: use isInTailCallPosition to verify tail call position (PR #68997)

Timm Baeder via llvm-commits llvm-commits at lists.llvm.org
Sun Oct 29 07:42:31 PDT 2023


================
@@ -519,18 +520,11 @@ bool StackProtector::InsertStackProtectors() {
     HasIRCheck = true;
 
     // If we're instrumenting a block with a tail call, the check has to be
-    // inserted before the call rather than between it and the return. The
-    // verifier guarantees that a tail call is either directly before the
-    // return or with a single correct bitcast of the return value in between so
-    // we don't need to worry about many situations here.
+    // inserted before the call rather than between it and the return.
     Instruction *Prev = CheckLoc->getPrevNonDebugInstruction();
-    if (Prev && isa<CallInst>(Prev) && cast<CallInst>(Prev)->isTailCall())
-      CheckLoc = Prev;
-    else if (Prev) {
-      Prev = Prev->getPrevNonDebugInstruction();
-      if (Prev && isa<CallInst>(Prev) && cast<CallInst>(Prev)->isTailCall())
+    if (auto *CI = dyn_cast_or_null<CallInst>(Prev))
----------------
tbaederr wrote:

```suggestion
    if (auto *CI = dyn_cast_if_present<CallInst>(Prev))
```

https://github.com/llvm/llvm-project/pull/68997


More information about the llvm-commits mailing list