From 2b698888ce6cd78e74258990b7519c9689c9d345 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Fri, 13 Sep 2019 14:41:59 -0400
Subject: [PATCH] fix regression from incorrect conflict resolution in prev
 commit

thanks for catching this LemonBoy
---
 src/codegen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/codegen.cpp b/src/codegen.cpp
index b720b84ec..62aaabb27 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -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);