motiejus/zig
1
Fork 0
Code Releases Activity

stage2: LLVM codegen of arrays should use type length, not value length

Browse Source 
It is possible for the value length to be longer than the type because
we allow in-memory coercing of types such as `[5:0]u8` to `[5]u8`. In
such a case, the value length is 6 but the type length if 5.

The `.repeated` value type already got this right, so this is extending
similar logic out to `.aggregate` and `.bytes`. Both scenarios are
tested in behavior tests.

Fixes #11165
This commit is contained in:
Mitchell Hashimoto
2022-03-14 16:21:11 -07:00
parent 5ea94e7715
commit a859f94644
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/codegen/llvm.zig
View File

@@ -1507,7 +1507,7 @@ pub const DeclGen = struct {
const bytes = tv.val.castTag(.bytes).?.data;
return dg.context.constString(
bytes.ptr,
@intCast(c_uint, bytes.len),
@intCast(c_uint, tv.ty.arrayLenIncludingSentinel()),
.True, // don't null terminate. bytes has the sentinel, if any.
);
},
@@ -1515,10 +1515,11 @@ pub const DeclGen = struct {
const elem_vals = tv.val.castTag(.aggregate).?.data;
const elem_ty = tv.ty.elemType();
const gpa = dg.gpa;
const llvm_elems = try gpa.alloc(*const llvm.Value, elem_vals.len);
const len = @intCast(usize, tv.ty.arrayLenIncludingSentinel());
const llvm_elems = try gpa.alloc(*const llvm.Value, len);
defer gpa.free(llvm_elems);
var need_unnamed = false;
for (elem_vals) |elem_val, i| {
for (elem_vals[0..len]) |elem_val, i| {
llvm_elems[i] = try dg.genTypedValue(.{ .ty = elem_ty, .val = elem_val });
need_unnamed = need_unnamed or dg.isUnnamedType(elem_ty, llvm_elems[i]);
}