| author |  Andrew Kelley <andrew@ziglang.org> 2023-10-13 00:31:22-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2023-10-13 00:31:22-07:00 |
| log | b6762c2473fc02e0fa71212a5556f4aed3f1942c |
| tree | 522002ada28df5adae70f16600e3dcff598b7732 |
| parent | e6b73be870a39f4da7a08a40da23e38b5e9613da |
Sema: fix crash when ref coercion dest is var args
When analyzing the `validate_ref_ty` ZIR instruction, an assertion would
trip if the result type was a var args function argument. The fix is the
same as e6b73be870a39f4da7a08a40da23e38b5e9613da - inline the logic of
`resolveType` and handle the case of var args.
Closes #174942 files changed, 42 insertions(+), 5 deletions(-)
src- test
- behavior
src/Sema.zig+11-5
| ... | @@ -4371,13 +4371,19 @@ fn zirValidateRefTy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErr | ... | @@ -4371,13 +4371,19 @@ fn zirValidateRefTy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErr |
| 4371 | const mod = sema.mod; | 4371 | const mod = sema.mod; |
| 4372 | const un_tok = sema.code.instructions.items(.data)[inst].un_tok; | 4372 | const un_tok = sema.code.instructions.items(.data)[inst].un_tok; |
| 4373 | const src = un_tok.src(); | 4373 | const src = un_tok.src(); |
| 4374 | const ty_operand = sema.resolveType(block, src, un_tok.operand) catch |err| switch (err) { | 4374 | // In case of GenericPoison, we don't actually have a type, so this will be |
| 4375 | error.GenericPoison => { | 4375 | // treated as an untyped address-of operator. |
| 4376 | // We don't actually have a type, so this will be treated as an untyped address-of operator. | 4376 | if (un_tok.operand == .var_args_param_type) return; |
| 4377 | return; | 4377 | const operand_air_inst = sema.resolveInst(un_tok.operand) catch |err| switch (err) { |
| 4378 | }, | 4378 | error.GenericPoison => return, |
| 4379 | else => |e| return e, | ||
| 4380 | }; | ||
| 4381 | if (operand_air_inst == .var_args_param_type) return; | ||
| 4382 | const ty_operand = sema.analyzeAsType(block, src, operand_air_inst) catch |err| switch (err) { | ||
| 4383 | error.GenericPoison => return, | ||
| 4379 | else => |e| return e, | 4384 | else => |e| return e, |
| 4380 | }; | 4385 | }; |
| 4386 | if (ty_operand.isGenericPoison()) return; | ||
| 4381 | if (ty_operand.optEuBaseType(mod).zigTypeTag(mod) != .Pointer) { | 4387 | if (ty_operand.optEuBaseType(mod).zigTypeTag(mod) != .Pointer) { |
| 4382 | return sema.failWithOwnedErrorMsg(block, msg: { | 4388 | return sema.failWithOwnedErrorMsg(block, msg: { |
| 4383 | const msg = try sema.errMsg(block, src, "expected type '{}', found pointer", .{ty_operand.fmt(mod)}); | 4389 | const msg = try sema.errMsg(block, src, "expected type '{}', found pointer", .{ty_operand.fmt(mod)}); |
test/behavior/var_args.zig+31
| ... | @@ -161,6 +161,37 @@ test "simple variadic function" { | ... | @@ -161,6 +161,37 @@ test "simple variadic function" { |
| 161 | } | 161 | } |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | test "coerce reference to var arg" { | ||
| 165 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO | ||
| 166 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | ||
| 167 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | ||
| 168 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO | ||
| 169 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | ||
| 170 | if (builtin.os.tag != .macos and comptime builtin.cpu.arch.isAARCH64()) { | ||
| 171 | // https://github.com/ziglang/zig/issues/14096 | ||
| 172 | return error.SkipZigTest; | ||
| 173 | } | ||
| 174 | if (builtin.cpu.arch == .x86_64 and builtin.os.tag == .windows) return error.SkipZigTest; // TODO | ||
| 175 | |||
| 176 | const S = struct { | ||
| 177 | fn addPtr(count: c_int, ...) callconv(.C) c_int { | ||
| 178 | var ap = @cVaStart(); | ||
| 179 | defer @cVaEnd(&ap); | ||
| 180 | var i: usize = 0; | ||
| 181 | var sum: c_int = 0; | ||
| 182 | while (i < count) : (i += 1) { | ||
| 183 | sum += @cVaArg(&ap, *c_int).*; | ||
| 184 | } | ||
| 185 | return sum; | ||
| 186 | } | ||
| 187 | }; | ||
| 188 | |||
| 189 | // Originally reported at https://github.com/ziglang/zig/issues/17494 | ||
| 190 | var a: i32 = 12; | ||
| 191 | var b: i32 = 34; | ||
| 192 | try expect(46 == S.addPtr(2, &a, &b)); | ||
| 193 | } | ||
| 194 | |||
| 164 | test "variadic functions" { | 195 | test "variadic functions" { |
| 165 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO | 196 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 166 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 197 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |