diff options
| author | gingerBill <bill@gingerbill.org> | 2021-09-30 11:46:02 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2021-09-30 11:46:02 +0100 |
| commit | cf94fd7b824685949a01fda71b733dcc2abc1f80 (patch) | |
| tree | 964391ca6fb68c5f0da53ed8dabc83bbb1bc6f8a /src | |
| parent | 6ca793f0e9e050dec9085017af1b5a3f7cf3733e (diff) | |
| parent | bd1e1c66f3e56ba03fbd18ea1e928a6eb1f90205 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'src')
| -rw-r--r-- | src/llvm_backend.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 5c00bb05f..840c7b4a5 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -21,7 +21,7 @@ #include "llvm_backend_stmt.cpp" #include "llvm_backend_proc.cpp" -#if LLVM_VERSION_MAJOR < 11 +#if LLVM_VERSION_MAJOR < 11 #error "LLVM Version 11 is the minimum required" #elif LLVM_VERSION_MAJOR == 12 && !(LLVM_VERSION_MINOR > 0 || LLVM_VERSION_PATCH > 0) #error "If LLVM Version 12.x.y is wanted, at least LLVM 12.0.1 is required" @@ -1207,9 +1207,13 @@ void lb_generate_code(lbGenerator *gen) { LLVMBool is_optimized = build_context.optimization_level > 0; AstFile *init_file = m->info->init_package->files[0]; - Ast *ident = m->info->entry_point->identifier.load(); - if (m->info->entry_point && ident && ident->file) { - init_file = ident->file; + + if (Entity *entry_point = m->info->entry_point) { + if (Ast *ident = entry_point->identifier.load()) { + if (ident->file) { + init_file = ident->file; + } + } } LLVMBool split_debug_inlining = false; |