diff options
| author | Michael Kutowski <skytrias@protonmail.com> | 2022-12-24 10:39:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-24 10:39:01 +0100 |
| commit | 4ee413aa32373d8fd3d75288a885f671953cd25e (patch) | |
| tree | fcd6acff675d8af64bad9c37b5e00730cd83b570 /src | |
| parent | 9474c997953fc11df1de03997809e9b4ae44760d (diff) | |
| parent | 5d0f9c428aa8b358f0bbfb2f9949a64ed214d345 (diff) | |
Merge branch 'odin-lang:master' into skytrias-vendor-additions
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 166fcb3ee..2cabc2dc7 100644 --- a/src/llvm_abi.cpp +++ b/src/llvm_abi.cpp @@ -987,8 +987,8 @@ namespace lbAbiArm64 { 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 3b0a599db..e816906d6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -764,7 +764,7 @@ 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); @@ -1930,7 +1930,7 @@ 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 == "query") { print_usage_line(1, "query [experimental] Parse, type check, and output a .json file containing information about the program"); } else if (command == "doc") { |