Skip to content

Commit e82f7d3

Browse files
authored
Merge pull request #20653 from mlugg/incremental-fix
Zcu: updateZirRefs typo
2 parents 20563d8 + 6bd640c commit e82f7d3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Sema.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30007,7 +30007,7 @@ const InMemoryCoercionResult = union(enum) {
3000730007
},
3000830008
.comptime_int_not_coercible => |int| {
3000930009
try sema.errNote(src, msg, "type '{}' cannot represent value '{}'", .{
30010-
int.wanted.fmt(pt), int.actual.fmtValue(pt),
30010+
int.wanted.fmt(pt), int.actual.fmtValueSema(pt, sema),
3001130011
});
3001230012
break;
3001330013
},

src/Zcu/PerThread.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,16 @@ pub fn updateZirRefs(pt: Zcu.PerThread) Allocator.Error!void {
444444
{
445445
var it = new_zir.declIterator(tracked_inst.inst);
446446
while (it.next()) |decl_inst| {
447-
const decl_name = old_zir.getDeclaration(decl_inst)[0].name;
447+
const decl_name = new_zir.getDeclaration(decl_inst)[0].name;
448448
switch (decl_name) {
449449
.@"comptime", .@"usingnamespace", .unnamed_test, .decltest => continue,
450-
_ => if (decl_name.isNamedTest(old_zir)) continue,
450+
_ => if (decl_name.isNamedTest(new_zir)) continue,
451451
}
452-
const name_zir = decl_name.toString(old_zir).?;
452+
const name_zir = decl_name.toString(new_zir).?;
453453
const name_ip = try zcu.intern_pool.getOrPutString(
454454
zcu.gpa,
455455
pt.tid,
456-
old_zir.nullTerminatedString(name_zir),
456+
new_zir.nullTerminatedString(name_zir),
457457
.no_embedded_nulls,
458458
);
459459
if (!old_names.swapRemove(name_ip)) continue;

0 commit comments

Comments
 (0)