From 91af552f87817f3a5fa23d812cecc79649c7e506 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 25 Feb 2022 18:47:10 -0800
Subject: [PATCH] stage2: resolve peer types that trivially coerce

---
 src/Sema.zig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Sema.zig b/src/Sema.zig
index af240d43d1..650349f744 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -16993,6 +16993,18 @@ fn resolvePeerTypes(
         const chosen_ty = sema.typeOf(chosen);
         if (candidate_ty.eql(chosen_ty))
             continue;
+
+        // If the candidate can coernce into our chosen type, we're done.
+        // If the chosen type can coerce into the candidate, use that.
+        if ((try sema.coerceInMemoryAllowed(block, chosen_ty, candidate_ty, false, target, src, src)) == .ok) {
+            continue;
+        }
+        if ((try sema.coerceInMemoryAllowed(block, candidate_ty, chosen_ty, false, target, src, src)) == .ok) {
+            chosen = candidate;
+            chosen_i = candidate_i + 1;
+            continue;
+        }
+
         const candidate_ty_tag = candidate_ty.zigTypeTag();
         const chosen_ty_tag = chosen_ty.zigTypeTag();