motiejus/zig
1
Fork 0
Code Releases Activity

Sema: add coerceTupleToStruct result to the InternPool

Browse Source
This commit is contained in:
Jacob Young
2023-05-19 22:24:29 -04:00
committed by Andrew Kelley
parent d28fc5bacb
commit f8b6eb63d5
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Sema.zig
View File

@@ -28986,7 +28986,7 @@ fn coerceTupleToStruct(
}
const fields = struct_ty.structFields(mod);
const field_vals = try sema.arena.alloc(Value, fields.count());
const field_vals = try sema.arena.alloc(InternPool.Index, fields.count());
const field_refs = try sema.arena.alloc(Air.Inst.Ref, field_vals.len);
@memset(field_refs, .none);
@@ -29017,7 +29017,8 @@ fn coerceTupleToStruct(
}
if (runtime_src == null) {
if (try sema.resolveMaybeUndefVal(coerced)) |field_val| {
field_vals[field_index] = field_val;
assert(field_val.ip_index != .none);
field_vals[field_index] = field_val.ip_index;
} else {
runtime_src = field_src;
}
@@ -29045,7 +29046,8 @@ fn coerceTupleToStruct(
continue;
}
if (runtime_src == null) {
field_vals[i] = field.default_val;
assert(field.default_val.ip_index != .none);
field_vals[i] = field.default_val.ip_index;
} else {
field_ref.* = try sema.addConstant(field.ty, field.default_val);
}
@@ -29062,10 +29064,14 @@ fn coerceTupleToStruct(
return block.addAggregateInit(struct_ty, field_refs);
}
return sema.addConstant(
struct_ty,
try Value.Tag.aggregate.create(sema.arena, field_vals),
);
assert(struct_ty.ip_index != .none);
const struct_val = try mod.intern(.{ .aggregate = .{
.ty = struct_ty.ip_index,
.storage = .{ .elems = field_vals },
} });
errdefer mod.intern_pool.remove(struct_val);
return sema.addConstant(struct_ty, struct_val.toValue());
}
fn coerceTupleToTuple(