Skip to content

Commit 1b610d7

Browse files
committed
Merge remote-tracking branch 'origin/master' into llvm14
2 parents 18950e8 + f3069f5 commit 1b610d7

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/Sema.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6042,12 +6042,12 @@ fn instantiateGenericCall(
60426042
.param_comptime, .param_anytype_comptime, .param, .param_anytype => {},
60436043
else => continue,
60446044
}
6045+
const arg_src = call_src; // TODO: better source location
60456046
const is_runtime = comptime_args[total_i].val.tag() == .generic_poison and
60466047
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));
60486049
if (is_runtime) {
60496050
const param_ty = new_fn_info.param_types[runtime_i];
6050-
const arg_src = call_src; // TODO: better source location
60516051
const uncasted_arg = uncasted_args[total_i];
60526052
const casted_arg = try sema.coerce(block, param_ty, uncasted_arg, arg_src);
60536053
try sema.queueFullTypeResolution(param_ty);

test/standalone.zig

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,15 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
6262
cases.add("tools/process_headers.zig");
6363
cases.add("tools/update-license-headers.zig");
6464
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+
6670
cases.add("tools/update_cpu_features.zig");
6771
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");
6976
}

0 commit comments

Comments
 (0)