diff options
| author | gingerBill <bill@gingerbill.org> | 2022-12-21 23:59:31 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-12-21 23:59:31 +0000 |
| commit | b9a2426e577e15ae861ce73b7c5a86a0df496e65 (patch) | |
| tree | 04380830523707263d399cce9152ea03174266ef /src | |
| parent | 3040361faca44fd8b1c8a5a7bb86c73a1c46e08f (diff) | |
| parent | 81037b30919340b4d2d0cf1304fbf8fde0591c1f (diff) | |
Merge branch 'master' into compiler-improvements-2022-12
Diffstat (limited to 'src')
| -rw-r--r-- | src/llvm_abi.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/llvm_abi.cpp b/src/llvm_abi.cpp index 7b82fddeb..1204050ef 100644 --- a/src/llvm_abi.cpp +++ b/src/llvm_abi.cpp @@ -987,8 +987,8 @@ namespace lbAbiArm64 { gb_internal LB_ABI_INFO(abi_info) { lbFunctionType *ft = gb_alloc_item(permanent_allocator(), lbFunctionType); ft->ctx = c; + ft->args = compute_arg_types(c, arg_types, arg_count); ft->ret = compute_return_type(ft, c, return_type, return_is_defined, return_is_tuple); - ft -> args = compute_arg_types(c, arg_types, arg_count); ft->calling_convention = calling_convention; return ft; } diff --git a/src/main.cpp b/src/main.cpp index c7250aa8b..6d910c7bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -769,7 +769,7 @@ gb_internal bool parse_build_flags(Array<String> args) { auto build_flags = array_make<BuildFlag>(heap_allocator(), 0, BuildFlag_COUNT); add_flag(&build_flags, BuildFlag_Help, str_lit("help"), BuildFlagParam_None, Command_all); add_flag(&build_flags, BuildFlag_SingleFile, str_lit("file"), BuildFlagParam_None, Command__does_build | Command__does_check); - add_flag(&build_flags, BuildFlag_OutFile, str_lit("out"), BuildFlagParam_String, Command__does_build &~ Command_test); + add_flag(&build_flags, BuildFlag_OutFile, str_lit("out"), BuildFlagParam_String, Command__does_build | Command_test); add_flag(&build_flags, BuildFlag_OptimizationMode, str_lit("o"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_OptimizationMode, str_lit("O"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_ShowTimings, str_lit("show-timings"), BuildFlagParam_None, Command__does_check); @@ -1886,7 +1886,7 @@ gb_internal void print_show_help(String const arg0, String const &command) { print_usage_line(3, "odin check <dir> # Type check package in <dir>"); print_usage_line(3, "odin check filename.odin -file # Type check single-file package, must contain entry point."); } else if (command == "test") { - print_usage_line(1, "test Build ands runs procedures with the attribute @(test) in the initial package"); + print_usage_line(1, "test Build and runs procedures with the attribute @(test) in the initial package"); } else if (command == "doc") { print_usage_line(1, "doc generate documentation from a directory of .odin files"); print_usage_line(2, "Examples:"); |