diff options
| author | Reid Kleckner <rnk@google.com> | 2020-03-19 11:52:22 -0700 |
|---|---|---|
| committer | tstellar <tstellar@redhat.com> | 2020-04-13 10:34:45 -0700 |
| commit | 68cd4f72beae67a9bdbc11c85fd745dec8fc0999 (patch) | |
| tree | 925088f5442206050bcb922ef03f579382fa4acc /clang/lib/CodeGen/CGVTables.cpp | |
| parent | 1feb33299961fc90c84da8b8c134a731bc892449 (diff) | |
| download | bcm5719-llvm-68cd4f72beae67a9bdbc11c85fd745dec8fc0999.tar.gz bcm5719-llvm-68cd4f72beae67a9bdbc11c85fd745dec8fc0999.zip | |
Use FinishThunk to finish musttail thunks
FinishThunk, and the invariant of setting and then unsetting
CurCodeDecl, was added in 7f416cc42638 (2015). The invariant didn't
exist when I added this musttail codepath in ab2090d10765 (2014).
Recently in 28328c3771, I started using this codepath on non-Windows
platforms, and users reported problems during release testing (PR44987).
The issue was already present for users of EH on i686-windows-msvc, so I
added a test for that case as well.
Reviewed By: hans
Differential Revision: https://reviews.llvm.org/D76444
(cherry picked from commit ce5173c0e174870934d1b3a026f631d996136191)
Diffstat (limited to 'clang/lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 59631e80237..e97f7e41499 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -437,7 +437,8 @@ void CodeGenFunction::EmitMustTailThunk(GlobalDecl GD, // Finish the function to maintain CodeGenFunction invariants. // FIXME: Don't emit unreachable code. EmitBlock(createBasicBlock()); - FinishFunction(); + + FinishThunk(); } void CodeGenFunction::generateThunk(llvm::Function *Fn, @@ -564,7 +565,7 @@ llvm::Constant *CodeGenVTables::maybeEmitThunk(GlobalDecl GD, CGM.SetLLVMFunctionAttributesForDefinition(GD.getDecl(), ThunkFn); // Thunks for variadic methods are special because in general variadic - // arguments cannot be perferctly forwarded. In the general case, clang + // arguments cannot be perfectly forwarded. In the general case, clang // implements such thunks by cloning the original function body. However, for // thunks with no return adjustment on targets that support musttail, we can // use musttail to perfectly forward the variadic arguments. |
