gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix regression from incorrect conflict resolution in prev commit

Browse Source 
thanks for catching this LemonBoy
This commit is contained in:
Andrew Kelley 2019-09-13 14:41:59 -04:00
parent 187a6d198f
commit 2b698888ce
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/codegen.cpp
View File

@ -516,9 +516,9 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
}
}
if (g->have_stack_probing && !fn->def_scope->safety_off) {
addLLVMFnAttrStr(fn->llvm_value, "probe-stack", "__zig_probe_stack");
addLLVMFnAttrStr(llvm_fn, "probe-stack", "__zig_probe_stack");
} else {
addLLVMFnAttrStr(fn->llvm_value, "no-stack-arg-probe", "");
addLLVMFnAttrStr(llvm_fn, "no-stack-arg-probe", "");
}
} else {
maybe_import_dll(g, llvm_fn, linkage);