| author |  Andrew Kelley <andrew@ziglang.org> 2024-08-30 14:55:28-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2024-08-30 14:55:28-07:00 |
| log | e084c46ed6906dc51724d99b29f0992272384f5a |
| tree | 8b62495ea0038cb63386cdc9b24d144b7dfa4456 |
| parent | cb0e6d8aa6f258e2ad9b21287c49c34a434750b2 |
fix invisible merge conflict
1 files changed, 1 insertions(+), 1 deletions(-)
src
src/zig_llvm.cpp+1-1
| ... | @@ -368,7 +368,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi | ... | @@ -368,7 +368,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi |
| 368 | } | 368 | } |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | if (options.allow_fast_isel) { | 371 | if (options->allow_fast_isel) { |
| 372 | target_machine.setO0WantsFastISel(true); | 372 | target_machine.setO0WantsFastISel(true); |
| 373 | } else { | 373 | } else { |
| 374 | target_machine.setFastISel(false); | 374 | target_machine.setFastISel(false); |