From 0eb3cb9e8cd263172fec797ed916aade3e5404f0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 27 Feb 2022 19:13:52 -0800 Subject: stage2: order of error set merging should match stage1 --- src/Sema.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Sema.zig') 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; -- cgit v1.2.3