zig

commit 63a4dbc30d3ef3c7f8a8c6a2ba2087eaab8b830a (tree)
parent 1479c28b496e7c1db134b51f23dd2eb934b123bb
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 18 Mar 2020 11:11:41 -0400

array sentinel does not count towards type_has_one_possible_value

Diffstat:
M
src/analyze.cpp
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/analyze.cpp b/src/analyze.cpp
@@ -1447,8 +1447,7 @@ static OnePossibleValue type_val_resolve_has_one_possible_value(CodeGen *g, ZigV
         case LazyValueIdArrayType: {
             LazyValueArrayType *lazy_array_type =
                 reinterpret_cast<LazyValueArrayType *>(type_val->data.x_lazy);
-            // The sentinel counts as an extra element
-            if (lazy_array_type->length == 0 && lazy_array_type->sentinel == nullptr)
+            if (lazy_array_type->length == 0)
                 return OnePossibleValueYes;
             return type_val_resolve_has_one_possible_value(g, lazy_array_type->elem_type->value);
         }
@@ -5735,8 +5734,7 @@ OnePossibleValue type_has_one_possible_value(CodeGen *g, ZigType *type_entry) {
         case ZigTypeIdUnreachable:
             return OnePossibleValueYes;
         case ZigTypeIdArray:
-            // The sentinel counts as an extra element
-            if (type_entry->data.array.len == 0 && type_entry->data.array.sentinel == nullptr)
+            if (type_entry->data.array.len == 0)
                 return OnePossibleValueYes;
             return type_has_one_possible_value(g, type_entry->data.array.child_type);
         case ZigTypeIdStruct: