authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-09-26 23:05:39+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-09-26 23:05:39+02:00
log9c2fb6e1860d1ea7fab85ceedae290053756d543
treeb068c102c64c406e419413cb56d093d491d9c052
parent9cd521a24f6062889ed574535aa8abc9bf057f81
parent1cc890e5c3b5f7fffb826dc8d62a7129987e78ff
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #12959 from kcbanner/fix_uwtable

llvm: fix missing unwind info (wrong uwtable attribute value)

2 files changed, 2 insertions(+), 2 deletions(-)

src/codegen/llvm.zig+1-1
......@@ -2572,7 +2572,7 @@ pub const DeclGen = struct {
25722572 }
25732573 dg.addFnAttr(llvm_fn, "nounwind");
25742574 if (comp.unwind_tables) {
2575 dg.addFnAttrString(llvm_fn, "uwtable", "sync");
2575 dg.addFnAttrInt(llvm_fn, "uwtable", 2);
25762576 }
25772577 if (comp.bin_file.options.skip_linker_dependencies or
25782578 comp.bin_file.options.no_builtin)
src/stage1/codegen.cpp+1-1
......@@ -223,7 +223,7 @@ static ZigLLVM_CallingConv get_llvm_cc(CodeGen *g, CallingConvention cc) {
223223
224224static void add_uwtable_attr(CodeGen *g, LLVMValueRef fn_val) {
225225 if (g->unwind_tables) {
226 addLLVMFnAttrStr(fn_val, "uwtable", "sync");
226 addLLVMFnAttrInt(fn_val, "uwtable", 2);
227227 }
228228}
229229