diff options
author | Nathan Gauër <brioche@google.com> | 2024-12-17 13:26:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-17 13:26:03 +0100 |
commit | 52b07d971c89ab8fbcc497f22c43931b488256ea (patch) | |
tree | f7a65a7f14a9e4644ab205ff43c3a1613c16dc5b /clang/lib/CodeGen | |
parent | 56fd46edb38e4bab7e48c668683ba72709beb64f (diff) | |
download | llvm-52b07d971c89ab8fbcc497f22c43931b488256ea.zip llvm-52b07d971c89ab8fbcc497f22c43931b488256ea.tar.gz llvm-52b07d971c89ab8fbcc497f22c43931b488256ea.tar.bz2 |
[HLSL] Fix call convention mismatch for ctor/dtor (#118651)
Before this patch, there was a calling-convention mismatch between the
constructors and the actual call emitted for the entrypoint wrapper.
Such mismatch causes the InstCombine pass to replace this call with an
`unreachable`, breaking the whole function.
Signed-off-by: Nathan Gauër <brioche@google.com>
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r-- | clang/lib/CodeGen/CGHLSLRuntime.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp index fb15b19..c354e58 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.cpp +++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp @@ -512,13 +512,17 @@ void CGHLSLRuntime::generateGlobalCtorDtorCalls() { IP = Token->getNextNode(); } IRBuilder<> B(IP); - for (auto *Fn : CtorFns) - B.CreateCall(FunctionCallee(Fn), {}, OB); + for (auto *Fn : CtorFns) { + auto CI = B.CreateCall(FunctionCallee(Fn), {}, OB); + CI->setCallingConv(Fn->getCallingConv()); + } // Insert global dtors before the terminator of the last instruction B.SetInsertPoint(F.back().getTerminator()); - for (auto *Fn : DtorFns) - B.CreateCall(FunctionCallee(Fn), {}, OB); + for (auto *Fn : DtorFns) { + auto CI = B.CreateCall(FunctionCallee(Fn), {}, OB); + CI->setCallingConv(Fn->getCallingConv()); + } } // No need to keep global ctors/dtors for non-lib profile after call to |