authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-21 17:09:22-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-21 17:09:22-07:00
log7bebb24838a603a436b58e49ee85110af9e8e05f
treeb0cade24a1ee14777be05644c19d76d158c3ab29
parentd3ddb480756dc10b80e795db07aa5fcc7f9290d1

fix unused locals from merge conflict

2 files changed, 1 insertions(+), 1 deletions(-)

lib/std/debug.zig+1
......@@ -681,6 +681,7 @@ fn readCoffDebugInfo(allocator: *mem.Allocator, coff_file: File) !ModuleDebugInf
681681 try di.coff.loadSections();
682682 if (di.coff.getSection(".debug_info")) |sec| {
683683 // This coff file has embedded DWARF debug info
684 _ = sec;
684685 // TODO: free the section data slices
685686 const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null;
686687 const debug_abbrev_data = di.coff.getSectionData(".debug_abbrev", allocator) catch null;
src/Sema.zig-1
......@@ -5809,7 +5809,6 @@ fn zirIntToPtr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerErro
58095809 return sema.mod.fail(&block.base, type_src, "expected pointer, found '{}'", .{type_res});
58105810 const ptr_align = type_res.ptrAlignment(sema.mod.getTarget());
58115811
5812 const uncasted_operand = try sema.resolveInst(extra.rhs);
58135812 if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| {
58145813 const addr = val.toUnsignedInt();
58155814 if (!type_res.isAllowzeroPtr() and addr == 0)