From 4d50bc3f8dd2b9fd5b7dde6f63f104aaba6dbf5a Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sat, 23 Mar 2019 18:46:20 -0400
Subject: add peer type resolution for `*const T` and `?*T`

closes #1298
---
 src/ir.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/ir.cpp')

diff --git a/src/ir.cpp b/src/ir.cpp
index f8301f0116..54b567efe5 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -9658,6 +9658,23 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
             continue;
         }
 
+        if (prev_type->id == ZigTypeIdOptional &&
+            types_match_const_cast_only(ira, cur_type, prev_type->data.maybe.child_type,
+                source_node, false).id == ConstCastResultIdOk)
+        {
+            prev_inst = cur_inst;
+            any_are_null = true;
+            continue;
+        }
+
+        if (cur_type->id == ZigTypeIdOptional &&
+            types_match_const_cast_only(ira, prev_type, cur_type->data.maybe.child_type,
+                source_node, false).id == ConstCastResultIdOk)
+        {
+            any_are_null = true;
+            continue;
+        }
+
         if (cur_type->id == ZigTypeIdUndefined) {
             continue;
         }
-- 
cgit v1.2.3