mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-13 10:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2 minor cleanups

Browse Source
This commit is contained in:
Andrew Kelley 2021-10-19 19:38:43 -07:00
parent 2192d404d5
commit c1508c98f4
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Sema.zig
View File

@ -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;
while (true) switch (ty.tag()) {
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) {
return Value.initTag(.zero);
if (!tag_ty.hasCodeGenBits()) {
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;
return Value.initTag(.the_only_possible_value);
if ((try sema.typeHasOnePossibleValue(block, src, ty.elemType())) != null) {
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 {

19
src/type.zig
View File

@ -2676,7 +2676,7 @@ pub const Type = extern union {
.pointer => return self.castTag(.pointer).?.data.sentinel,
.array_sentinel => return self.castTag(.array_sentinel).?.data.sentinel,
.array_u8_sentinel_0 => return Value.initTag(.zero),
.array_u8_sentinel_0 => return Value.zero,
else => unreachable,
};
@ -3115,15 +3115,15 @@ pub const Type = extern union {
.enum_simple => {
const enum_simple = 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) {
return Value.initTag(.zero);
if (!tag_ty.hasCodeGenBits()) {
return Value.zero;
} else {
return null;
}
@ -3143,7 +3143,7 @@ pub const Type = extern union {
.int_unsigned, .int_signed => {
if (ty.cast(Payload.Bits).?.data == 0) {
return Value.initTag(.zero);
return Value.zero;
} else {
return null;
}
@ -3151,8 +3151,9 @@ pub const Type = extern union {
.vector, .array, .array_u8 => {
if (ty.arrayLen() == 0)
return Value.initTag(.empty_array);
_ = ty.elemType().onePossibleValue() orelse return null;
return Value.initTag(.the_only_possible_value);
if (ty.elemType().onePossibleValue() != null)
return Value.initTag(.the_only_possible_value);
return null;
},
.inferred_alloc_const => unreachable,
@ -3193,7 +3194,7 @@ pub const Type = extern union {
const info = self.intInfo(target);
if (info.signedness == .unsigned) {
return Value.initTag(.zero);
return Value.zero;
}
if (info.bits <= 6) {
@ -4027,7 +4028,7 @@ pub const Type = extern union {
) Allocator.Error!Type {
if (elem_type.eql(Type.u8)) {
if (sent) |some| {
if (some.eql(Value.initTag(.zero), elem_type)) {
if (some.eql(Value.zero, elem_type)) {
return Tag.array_u8_sentinel_0.create(arena, len);
}
} else {