| author |  kkHAIKE <kkhaike@gmail.com> 2022-09-25 21:14:15+08:00 |
| committer |  Veikka Tuominen <git@vexu.eu> 2022-09-29 14:44:37+03:00 |
| log | 317cb629fb919938569b9ef8a782e1f9619d6244 |
| tree | a49058baf6c74940c95bcd36384f7e23b399f74c |
| parent | 8d288a5fa77485121c3d3eafeedaaa381884c245 |
Sema: fix resolveInferredErrorSet panic when generic inline function
3 files changed, 23 insertions(+), 1 deletions(-)
src- test
- behavior.zig
- behavior
- bugs
src/Sema.zig+7-1
| ... | ... | @@ -28499,7 +28499,13 @@ fn resolveInferredErrorSet( |
| 28499 | 28499 | // in this case, it may be a generic function which would cause an assertion failure |
| 28500 | 28500 | // if we called `ensureFuncBodyAnalyzed` on it here. |
| 28501 | 28501 | const ies_func_owner_decl = sema.mod.declPtr(ies.func.owner_decl); |
| 28502 | if (ies_func_owner_decl.ty.fnInfo().return_type.errorUnionSet().castTag(.error_set_inferred).?.data == ies) { | |
| 28502 | const ies_func_info = ies_func_owner_decl.ty.fnInfo(); | |
| 28503 | // if ies declared by a inline function with generic return type, the return_type should be generic_poison, | |
| 28504 | // because inline function does not create a new declaration, and the ies has been filled with analyzeCall, | |
| 28505 | // so here we can simply skip this case. | |
| 28506 | if (ies_func_info.return_type.tag() == .generic_poison) { | |
| 28507 | assert(ies_func_info.cc == .Inline); | |
| 28508 | } else if (ies_func_info.return_type.errorUnionSet().castTag(.error_set_inferred).?.data == ies) { | |
| 28503 | 28509 | // In this case we are dealing with the actual InferredErrorSet object that |
| 28504 | 28510 | // corresponds to the function, not one created to track an inline/comptime call. |
| 28505 | 28511 | try sema.ensureFuncBodyAnalyzed(ies.func); |
test/behavior.zig+1
| ... | ... | @@ -87,6 +87,7 @@ test { |
| 87 | 87 | _ = @import("behavior/bugs/12430.zig"); |
| 88 | 88 | _ = @import("behavior/bugs/12486.zig"); |
| 89 | 89 | _ = @import("behavior/bugs/12551.zig"); |
| 90 | _ = @import("behavior/bugs/12644.zig"); | |
| 90 | 91 | _ = @import("behavior/bugs/12680.zig"); |
| 91 | 92 | _ = @import("behavior/bugs/12776.zig"); |
| 92 | 93 | _ = @import("behavior/bugs/12786.zig"); |
test/behavior/bugs/12644.zig created+15
| ... | ... | @@ -0,0 +1,15 @@ |
| 1 | const std = @import("std"); | |
| 2 | ||
| 3 | inline fn foo(comptime T: type) !T { | |
| 4 | return error.AnError; | |
| 5 | } | |
| 6 | ||
| 7 | fn main0() !void { | |
| 8 | _ = try foo(u8); | |
| 9 | } | |
| 10 | ||
| 11 | test "issue12644" { | |
| 12 | main0() catch |e| { | |
| 13 | try std.testing.expect(e == error.AnError); | |
| 14 | }; | |
| 15 | } |