Support sentinel in @type

Author: marler8997

src/analyze.cpp

@@ -533,9 +533,10 @@ ZigType *get_pointer_to_type_extra2(CodeGen *g, ZigType *child_type, bool is_con
 
     TypeId type_id = {};
     ZigType **parent_pointer = nullptr;
+    ZigValue *sentinel_unwrapped = get_sentinel_value(sentinel);
     if (host_int_bytes != 0 || is_volatile || byte_alignment != 0 || ptr_len != PtrLenSingle ||
         allow_zero || vector_index != VECTOR_INDEX_NONE || inferred_struct_field != nullptr ||
-        sentinel != nullptr)
+        sentinel_unwrapped != nullptr)
     {
         type_id.id = ZigTypeIdPointer;
         type_id.data.pointer.codegen = g;
@@ -549,7 +550,6 @@ ZigType *get_pointer_to_type_extra2(CodeGen *g, ZigType *child_type, bool is_con
         type_id.data.pointer.allow_zero = allow_zero;
         type_id.data.pointer.vector_index = vector_index;
         type_id.data.pointer.inferred_struct_field = inferred_struct_field;
-        assert(!sentinel || sentinel->type->id == ZigTypeIdOptional);
         type_id.data.pointer.sentinel = sentinel;
 
         auto existing_entry = g->type_table.maybe_get(type_id);
@@ -578,13 +578,13 @@ ZigType *get_pointer_to_type_extra2(CodeGen *g, ZigType *child_type, bool is_con
             buf_appendf(&entry->name, "[*");
             break;
         case PtrLenC:
-            assert(sentinel == nullptr);
+            assert(sentinel_unwrapped == nullptr);
             buf_appendf(&entry->name, "[*c]");
             break;
     }
-    if (sentinel != nullptr) {
+    if (sentinel_unwrapped != nullptr) {
         buf_appendf(&entry->name, ":");
-        render_const_value(g, &entry->name, sentinel);
+        render_const_value(g, &entry->name, sentinel_unwrapped);
     }
     switch (ptr_len) {
         case PtrLenSingle:
@@ -623,7 +623,6 @@ ZigType *get_pointer_to_type_extra2(CodeGen *g, ZigType *child_type, bool is_con
     entry->data.pointer.allow_zero = allow_zero;
     entry->data.pointer.vector_index = vector_index;
     entry->data.pointer.inferred_struct_field = inferred_struct_field;
-    assert(!sentinel || sentinel->type->id == ZigTypeIdOptional);
     entry->data.pointer.sentinel = sentinel;
 
     append_ptr_type_attrs(&entry->name, entry);
@@ -768,7 +767,6 @@ ZigType *get_array_type(CodeGen *g, ZigType *child_type, uint64_t array_size, Zi
     type_id.data.array.codegen = g;
     type_id.data.array.child_type = child_type;
     type_id.data.array.size = array_size;
-    assert(!sentinel || sentinel->type->id == ZigTypeIdOptional);
     type_id.data.array.sentinel = sentinel;
     auto existing_entry = g->type_table.maybe_get(type_id);
     if (existing_entry) {
@@ -778,21 +776,22 @@ ZigType *get_array_type(CodeGen *g, ZigType *child_type, uint64_t array_size, Zi
     assert(type_is_resolved(child_type, ResolveStatusSizeKnown));
 
     ZigType *entry = new_type_table_entry(ZigTypeIdArray);
+    ZigValue *sentinel_unwrapped = get_sentinel_value(sentinel);
 
     buf_resize(&entry->name, 0);
     buf_appendf(&entry->name, "[%" ZIG_PRI_u64, array_size);
-    if (sentinel != nullptr) {
-        assert(sentinel->type == get_optional_type(g, child_type));
+    if (sentinel_unwrapped != nullptr) {
+      assert(sentinel_unwrapped->type == child_type);
         buf_appendf(&entry->name, ":");
-        render_const_value(g, &entry->name, sentinel);
+        render_const_value(g, &entry->name, sentinel_unwrapped);
     }
     buf_appendf(&entry->name, "]%s", buf_ptr(&child_type->name));
 
     size_t full_array_size;
     if (array_size == 0) {
         full_array_size = 0;
     } else {
-        full_array_size = array_size + ((sentinel != nullptr) ? 1 : 0);
+        full_array_size = array_size + ((sentinel_unwrapped != nullptr) ? 1 : 0);
     }
 
     entry->size_in_bits = child_type->size_in_bits * full_array_size;
@@ -801,7 +800,6 @@ ZigType *get_array_type(CodeGen *g, ZigType *child_type, uint64_t array_size, Zi
 
     entry->data.array.child_type = child_type;
     entry->data.array.len = array_size;
-    assert(!sentinel || sentinel->type->id == ZigTypeIdOptional);
     entry->data.array.sentinel = sentinel;
 
     g->type_table.put(type_id, entry);