authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-13 14:41:59-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-13 14:42:30-04:00
log2b698888ce6cd78e74258990b7519c9689c9d345
treeb4abb2abb9fe344c24608bcd6564f05884d72bd4
parent187a6d198fd06dfedbb121aa5a79791b34b24794
signaturelock-open Commit is signed but in an unrecognized format.

fix regression from incorrect conflict resolution in prev commit

thanks for catching this LemonBoy

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

src/codegen.cpp+2-2
...@@ -516,9 +516,9 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {...@@ -516,9 +516,9 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
516 }516 }
517 }517 }
518 if (g->have_stack_probing && !fn->def_scope->safety_off) {518 if (g->have_stack_probing && !fn->def_scope->safety_off) {
519 addLLVMFnAttrStr(fn->llvm_value, "probe-stack", "__zig_probe_stack");519 addLLVMFnAttrStr(llvm_fn, "probe-stack", "__zig_probe_stack");
520 } else {520 } else {
521 addLLVMFnAttrStr(fn->llvm_value, "no-stack-arg-probe", "");521 addLLVMFnAttrStr(llvm_fn, "no-stack-arg-probe", "");
522 }522 }
523 } else {523 } else {
524 maybe_import_dll(g, llvm_fn, linkage);524 maybe_import_dll(g, llvm_fn, linkage);