From e084c46ed6906dc51724d99b29f0992272384f5a Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Fri, 30 Aug 2024 14:55:28 -0700
Subject: [PATCH] fix invisible merge conflict

---
 src/zig_llvm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
index aeaf2d29cc..dd0243b660 100644
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -368,7 +368,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi
         }
     }
 
-    if (options.allow_fast_isel) {
+    if (options->allow_fast_isel) {
         target_machine.setO0WantsFastISel(true);
     } else {
         target_machine.setFastISel(false);