Commit c1508c98f479497c2b2586ea944be9f3ddae28fc | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-10-19 19:38:43-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-10-19 19:38:43-07:00
log	c1508c98f479497c2b2586ea944be9f3ddae28fc
tree	d8a05453ecd23c9e1dbbc912731958e3b84c9c7a
parent	2192d404d58a3e95d8fbb26e7fd73a95756172a6

stage2 minor cleanups

2 files changed, 25 insertions(+), 23 deletions(-)

src
- Sema.zig
- type.zig

src/Sema.zig+15-14

 @@ -9362,7 +9362,7 @@ fn zirTruncate(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
     const dest_info = dest_ty.intInfo(target);
     if (src_info.bits == 0 or dest_info.bits == 0) {
-        return sema.addConstant(dest_ty, Value.initTag(.zero));
+        return sema.addConstant(dest_ty, Value.zero);
     }
     if (!src_is_comptime_int) {
 @@ -10884,7 +10884,7 @@ fn fieldVal(
         },
         else => {},
     }
-    return sema.fail(block, src, "type '{}' does not support field access (fieldVal, {}.{s})", .{ object_ty, object_ty, field_name });
+    return sema.fail(block, src, "type '{}' does not support field access", .{object_ty});
 }
 fn fieldPtr(
 @@ -13742,10 +13742,9 @@ fn typeHasOnePossibleValue(
     sema: *Sema,
     block: *Block,
     src: LazySrcLoc,
-    starting_type: Type,
+    ty: Type,
 ) CompileError!?Value {
-    var ty = starting_type;
+    switch (ty.tag()) {
-    while (true) switch (ty.tag()) {
         .f16,
         .f32,
         .f64,
 @@ -13839,7 +13838,7 @@ fn typeHasOnePossibleValue(
             const enum_obj = resolved_ty.castTag(.enum_numbered).?.data;
             if (enum_obj.fields.count() == 1) {
                 if (enum_obj.values.count() == 0) {
-                    return Value.initTag(.zero); // auto-numbered
+                    return Value.zero; // auto-numbered
                 } else {
                     return enum_obj.values.keys()[0];
                 }
 @@ -13852,7 +13851,7 @@ fn typeHasOnePossibleValue(
             const enum_obj = resolved_ty.castTag(.enum_full).?.data;
             if (enum_obj.fields.count() == 1) {
                 if (enum_obj.values.count() == 0) {
-                    return Value.initTag(.zero); // auto-numbered
+                    return Value.zero; // auto-numbered
                 } else {
                     return enum_obj.values.keys()[0];
                 }
 @@ -13864,15 +13863,15 @@ fn typeHasOnePossibleValue(
             const resolved_ty = try sema.resolveTypeFields(block, src, ty);
             const enum_simple = resolved_ty.castTag(.enum_simple).?.data;
             if (enum_simple.fields.count() == 1) {
-                return Value.initTag(.zero);
+                return Value.zero;
             } else {
                 return null;
             }
         },
         .enum_nonexhaustive => {
             const tag_ty = ty.castTag(.enum_nonexhaustive).?.data.tag_ty;
-            if (tag_ty.cast(Type.Payload.Bits).?.data == 0) {
+            if (!tag_ty.hasCodeGenBits()) {
-                return Value.initTag(.zero);
+                return Value.zero;
             } else {
                 return null;
             }
 @@ -13892,7 +13891,7 @@ fn typeHasOnePossibleValue(
         .int_unsigned, .int_signed => {
             if (ty.cast(Type.Payload.Bits).?.data == 0) {
-                return Value.initTag(.zero);
+                return Value.zero;
             } else {
                 return null;
             }
 @@ -13900,14 +13899,16 @@ fn typeHasOnePossibleValue(
         .vector, .array, .array_u8 => {
             if (ty.arrayLen() == 0)
                 return Value.initTag(.empty_array);
-            _ = (try sema.typeHasOnePossibleValue(block, src, ty.elemType())) orelse return null;
+            if ((try sema.typeHasOnePossibleValue(block, src, ty.elemType())) != null) {
-            return Value.initTag(.the_only_possible_value);
+                return Value.initTag(.the_only_possible_value);
+            }
+            return null;
         },
         .inferred_alloc_const => unreachable,
         .inferred_alloc_mut => unreachable,
         .generic_poison => return error.GenericPoison,
-    };
+    }
 }
 fn getAstTree(sema: *Sema, block: *Block) CompileError!*const std.zig.Ast {

src/type.zig+10-9

...	@@ -2676,7 +2676,7 @@ pub const Type = extern union {	...	@@ -2676,7 +2676,7 @@ pub const Type = extern union {
2676		2676
2677	.pointer => return self.castTag(.pointer).?.data.sentinel,	2677	.pointer => return self.castTag(.pointer).?.data.sentinel,
2678	.array_sentinel => return self.castTag(.array_sentinel).?.data.sentinel,	2678	.array_sentinel => return self.castTag(.array_sentinel).?.data.sentinel,
2679	.array_u8_sentinel_0 => return Value.initTag(.zero),	2679	.array_u8_sentinel_0 => return Value.zero,
2680		2680
2681	else => unreachable,	2681	else => unreachable,
2682	};	2682	};
...	@@ -3115,15 +3115,15 @@ pub const Type = extern union {	...	@@ -3115,15 +3115,15 @@ pub const Type = extern union {
3115	.enum_simple => {	3115	.enum_simple => {
3116	const enum_simple = ty.castTag(.enum_simple).?.data;	3116	const enum_simple = ty.castTag(.enum_simple).?.data;
3117	if (enum_simple.fields.count() == 1) {	3117	if (enum_simple.fields.count() == 1) {
3118	return Value.initTag(.zero);	3118	return Value.zero;
3119	} else {	3119	} else {
3120	return null;	3120	return null;
3121	}	3121	}
3122	},	3122	},
3123	.enum_nonexhaustive => {	3123	.enum_nonexhaustive => {
3124	const tag_ty = ty.castTag(.enum_nonexhaustive).?.data.tag_ty;	3124	const tag_ty = ty.castTag(.enum_nonexhaustive).?.data.tag_ty;
3125	if (tag_ty.cast(Type.Payload.Bits).?.data == 0) {	3125	if (!tag_ty.hasCodeGenBits()) {
3126	return Value.initTag(.zero);	3126	return Value.zero;
3127	} else {	3127	} else {
3128	return null;	3128	return null;
3129	}	3129	}
...	@@ -3143,7 +3143,7 @@ pub const Type = extern union {	...	@@ -3143,7 +3143,7 @@ pub const Type = extern union {
3143		3143
3144	.int_unsigned, .int_signed => {	3144	.int_unsigned, .int_signed => {
3145	if (ty.cast(Payload.Bits).?.data == 0) {	3145	if (ty.cast(Payload.Bits).?.data == 0) {
3146	return Value.initTag(.zero);	3146	return Value.zero;
3147	} else {	3147	} else {
3148	return null;	3148	return null;
3149	}	3149	}
...	@@ -3151,8 +3151,9 @@ pub const Type = extern union {	...	@@ -3151,8 +3151,9 @@ pub const Type = extern union {
3151	.vector, .array, .array_u8 => {	3151	.vector, .array, .array_u8 => {
3152	if (ty.arrayLen() == 0)	3152	if (ty.arrayLen() == 0)
3153	return Value.initTag(.empty_array);	3153	return Value.initTag(.empty_array);
3154	_ = ty.elemType().onePossibleValue() orelse return null;	3154	if (ty.elemType().onePossibleValue() != null)
3155	return Value.initTag(.the_only_possible_value);	3155	return Value.initTag(.the_only_possible_value);
		3156	return null;
3156	},	3157	},
3157		3158
3158	.inferred_alloc_const => unreachable,	3159	.inferred_alloc_const => unreachable,
...	@@ -3193,7 +3194,7 @@ pub const Type = extern union {	...	@@ -3193,7 +3194,7 @@ pub const Type = extern union {
3193	const info = self.intInfo(target);	3194	const info = self.intInfo(target);
3194		3195
3195	if (info.signedness == .unsigned) {	3196	if (info.signedness == .unsigned) {
3196	return Value.initTag(.zero);	3197	return Value.zero;
3197	}	3198	}
3198		3199
3199	if (info.bits <= 6) {	3200	if (info.bits <= 6) {
...	@@ -4027,7 +4028,7 @@ pub const Type = extern union {	...	@@ -4027,7 +4028,7 @@ pub const Type = extern union {
4027	) Allocator.Error!Type {	4028	) Allocator.Error!Type {
4028	if (elem_type.eql(Type.u8)) {	4029	if (elem_type.eql(Type.u8)) {
4029	if (sent) \|some\| {	4030	if (sent) \|some\| {
4030	if (some.eql(Value.initTag(.zero), elem_type)) {	4031	if (some.eql(Value.zero, elem_type)) {
4031	return Tag.array_u8_sentinel_0.create(arena, len);	4032	return Tag.array_u8_sentinel_0.create(arena, len);
4032	}	4033	}
4033	} else {	4034	} else {