diff options
| author | Mitchell Hashimoto <mitchell.hashimoto@gmail.com> | 2022-02-27 19:13:52 -0800 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-02-28 20:42:13 -0700 |
| commit | 0eb3cb9e8cd263172fec797ed916aade3e5404f0 (patch) | |
| tree | d9639a8320f0c65030f6c011834ad6695dfb38e2 /src/Sema.zig | |
| parent | 6dae1de017f6d9e49fc99eb14c689180e08fb7fe (diff) | |
| download | zig-0eb3cb9e8cd263172fec797ed916aade3e5404f0.tar.gz zig-0eb3cb9e8cd263172fec797ed916aade3e5404f0.zip | |
stage2: order of error set merging should match stage1
Diffstat (limited to 'src/Sema.zig')
| -rw-r--r-- | src/Sema.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index e5cad45e90..e69d0829f1 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -17763,7 +17763,7 @@ fn resolvePeerTypes( } // Merge errors - err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty); + err_set_ty = try candidate_ty.errorSetMerge(sema.arena, err_set_ty.?); chosen = candidate; chosen_i = candidate_i + 1; continue; @@ -17850,7 +17850,7 @@ fn resolvePeerTypes( } // Not a superset, create merged error set - err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, eu_set_ty); + err_set_ty = try eu_set_ty.errorSetMerge(sema.arena, err_set_ty.?); chosen = candidate; chosen_i = candidate_i + 1; continue; |