Skip to content

Zcu: updateZirRefs typo #20653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Zcu: updateZirRefs typo #20653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21cde7a
Zcu: updateZirRefs typo
mlugg Jul 16, 2024
6bd640c
Sema: typo
mlugg Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Sema.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30007,7 +30007,7 @@ const InMemoryCoercionResult = union(enum) {
},
.comptime_int_not_coercible => |int| {
try sema.errNote(src, msg, "type '{}' cannot represent value '{}'", .{
int.wanted.fmt(pt), int.actual.fmtValue(pt),
int.wanted.fmt(pt), int.actual.fmtValueSema(pt, sema),
});
break;
},
Expand Down
8 changes: 4 additions & 4 deletions src/Zcu/PerThread.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,16 +443,16 @@ pub fn updateZirRefs(pt: Zcu.PerThread) Allocator.Error!void {
{
var it = new_zir.declIterator(tracked_inst.inst);
while (it.next()) |decl_inst| {
const decl_name = old_zir.getDeclaration(decl_inst)[0].name;
const decl_name = new_zir.getDeclaration(decl_inst)[0].name;
switch (decl_name) {
.@"comptime", .@"usingnamespace", .unnamed_test, .decltest => continue,
_ => if (decl_name.isNamedTest(old_zir)) continue,
_ => if (decl_name.isNamedTest(new_zir)) continue,
}
const name_zir = decl_name.toString(old_zir).?;
const name_zir = decl_name.toString(new_zir).?;
const name_ip = try zcu.intern_pool.getOrPutString(
zcu.gpa,
pt.tid,
old_zir.nullTerminatedString(name_zir),
new_zir.nullTerminatedString(name_zir),
.no_embedded_nulls,
);
if (!old_names.swapRemove(name_ip)) continue;
Expand Down