[llvm] f8c84da - Revert "[SjLj] Insert UnregisterFn before musttail call"

[Xun Li via llvm-commits]

Author: Xun Li
Date: 2021-06-23T15:31:35-07:00
New Revision: f8c84da23bc93e66f7a161e09a470b85b557740e

URL: https://github.com/llvm/llvm-project/commit/f8c84da23bc93e66f7a161e09a470b85b557740e
DIFF: https://github.com/llvm/llvm-project/commit/f8c84da23bc93e66f7a161e09a470b85b557740e.diff

LOG: Revert "[SjLj] Insert UnregisterFn before musttail call"

This reverts commit f36703ada3dc18388ef5cdcbb8f39f74c27ad8e9.
Test failure: https://lab.llvm.org/buildbot#builders/104/builds/3450

Added: 
    

Modified: 
    llvm/lib/CodeGen/SjLjEHPrepare.cpp

Removed: 
    llvm/test/CodeGen/X86/sjlj-eh-musttail.ll


################################################################################
diff  --git a/llvm/lib/CodeGen/SjLjEHPrepare.cpp b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
index 8211e3d6a9dd..d2fd4a6d8fd9 100644
--- a/llvm/lib/CodeGen/SjLjEHPrepare.cpp
+++ b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
@@ -472,12 +472,8 @@ bool SjLjEHPrepare::setupEntryBlockAndCallSites(Function &F) {
 
   // Finally, for any returns from this function, if this function contains an
   // invoke, add a call to unregister the function context.
-  for (ReturnInst *Return : Returns) {
-    Instruction *InsertPoint = Return;
-    if (CallInst *CI = Return->getParent()->getTerminatingMustTailCall())
-      InsertPoint = CI;
-    CallInst::Create(UnregisterFn, FuncCtx, "", InsertPoint);
-  }
+  for (ReturnInst *Return : Returns)
+    CallInst::Create(UnregisterFn, FuncCtx, "", Return);
 
   return true;
 }

diff  --git a/llvm/test/CodeGen/X86/sjlj-eh-musttail.ll b/llvm/test/CodeGen/X86/sjlj-eh-musttail.ll
deleted file mode 100644
index 52766d668db9..000000000000
--- a/llvm/test/CodeGen/X86/sjlj-eh-musttail.ll
+++ /dev/null
@@ -1,30 +0,0 @@
-; RUN: llc -mtriple i386-windows-gnu -exception-model sjlj -filetype asm -o - %s | FileCheck %s
-
-declare void @_Z20function_that_throwsv()
-declare i32 @__gxx_personality_sj0(...)
-declare i8* @__cxa_begin_catch(i8*)
-declare void @__cxa_end_catch()
-declare void @_callee();
-
-define void @_Z8functionv() personality i8* bitcast (i32 (...)* @__gxx_personality_sj0 to i8*) {
-entry:
-  invoke void @_Z20function_that_throwsv()
-          to label %try.cont unwind label %lpad
-
-lpad:
-  %0 = landingpad { i8*, i32 }
-          catch i8* null
-  %1 = extractvalue { i8*, i32 } %0, 0
-  %2 = tail call i8* @__cxa_begin_catch(i8* %1)
-  tail call void @__cxa_end_catch()
-  br label %try.cont
-
-try.cont:
-  musttail call void @_callee();
-  ret void
-}
-
-; CHECK-LABEL: __Z8functionv:
-; CHECK:         calll   __Unwind_SjLj_Unregister
-; CHECK-NOT:     {{.*}}:
-; CHECK:         jmp     __callee