| author |  Andrew Kelley <andrew@ziglang.org> 2022-07-06 17:55:05-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-07-06 17:55:05-07:00 |
| log | 1b610d7853b479392470d1933c81aafe70e714d4 |
| tree | cde73d8127fdd090b7957844f458176e12f51067 |
| parent | 18950e865ec96f55d7549c2118ba033711bd5824 |
| parent | f3069f51aa0e395ce9de60a2876c37042b2a1a35 |
Merge remote-tracking branch 'origin/master' into llvm14
2 files changed, 11 insertions(+), 4 deletions(-)
src- test
src/Sema.zig+2-2
| ... | @@ -6042,12 +6042,12 @@ fn instantiateGenericCall( | ... | @@ -6042,12 +6042,12 @@ fn instantiateGenericCall( |
| 6042 | .param_comptime, .param_anytype_comptime, .param, .param_anytype => {}, | 6042 | .param_comptime, .param_anytype_comptime, .param, .param_anytype => {}, |
| 6043 | else => continue, | 6043 | else => continue, |
| 6044 | } | 6044 | } |
| 6045 | const arg_src = call_src; // TODO: better source location | ||
| 6045 | const is_runtime = comptime_args[total_i].val.tag() == .generic_poison and | 6046 | const is_runtime = comptime_args[total_i].val.tag() == .generic_poison and |
| 6046 | comptime_args[total_i].ty.hasRuntimeBits() and | 6047 | comptime_args[total_i].ty.hasRuntimeBits() and |
| 6047 | !comptime_args[total_i].ty.comptimeOnly(); | 6048 | !(try sema.typeRequiresComptime(block, arg_src, comptime_args[total_i].ty)); |
| 6048 | if (is_runtime) { | 6049 | if (is_runtime) { |
| 6049 | const param_ty = new_fn_info.param_types[runtime_i]; | 6050 | const param_ty = new_fn_info.param_types[runtime_i]; |
| 6050 | const arg_src = call_src; // TODO: better source location | ||
| 6051 | const uncasted_arg = uncasted_args[total_i]; | 6051 | const uncasted_arg = uncasted_args[total_i]; |
| 6052 | const casted_arg = try sema.coerce(block, param_ty, uncasted_arg, arg_src); | 6052 | const casted_arg = try sema.coerce(block, param_ty, uncasted_arg, arg_src); |
| 6053 | try sema.queueFullTypeResolution(param_ty); | 6053 | try sema.queueFullTypeResolution(param_ty); |
test/standalone.zig+9-2
| ... | @@ -62,8 +62,15 @@ pub fn addCases(cases: *tests.StandaloneContext) void { | ... | @@ -62,8 +62,15 @@ pub fn addCases(cases: *tests.StandaloneContext) void { |
| 62 | cases.add("tools/process_headers.zig"); | 62 | cases.add("tools/process_headers.zig"); |
| 63 | cases.add("tools/update-license-headers.zig"); | 63 | cases.add("tools/update-license-headers.zig"); |
| 64 | cases.add("tools/update-linux-headers.zig"); | 64 | cases.add("tools/update-linux-headers.zig"); |
| 65 | cases.add("tools/update_clang_options.zig"); | 65 | |
| 66 | // Disabled due to tripping LLVM 13 assertion: | ||
| 67 | // https://github.com/ziglang/zig/issues/12022 | ||
| 68 | //cases.add("tools/update_clang_options.zig"); | ||
| 69 | |||
| 66 | cases.add("tools/update_cpu_features.zig"); | 70 | cases.add("tools/update_cpu_features.zig"); |
| 67 | cases.add("tools/update_glibc.zig"); | 71 | cases.add("tools/update_glibc.zig"); |
| 68 | cases.add("tools/update_spirv_features.zig"); | 72 | |
| 73 | // Disabled due to tripping LLVM 13 assertion: | ||
| 74 | // https://github.com/ziglang/zig/issues/12015 | ||
| 75 | //cases.add("tools/update_spirv_features.zig"); | ||
| 69 | } | 76 | } |