mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-17 19:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unused locals from merge conflict

Browse Source
This commit is contained in:
Andrew Kelley 2021-06-21 17:09:22 -07:00
parent d3ddb48075
commit 7bebb24838
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/std/debug.zig
View File

@ -681,6 +681,7 @@ fn readCoffDebugInfo(allocator: *mem.Allocator, coff_file: File) !ModuleDebugInf
try di.coff.loadSections(); try di.coff.loadSections();
if (di.coff.getSection(".debug_info")) |sec| { if (di.coff.getSection(".debug_info")) |sec| {
// This coff file has embedded DWARF debug info // This coff file has embedded DWARF debug info
_ = sec;
// TODO: free the section data slices // TODO: free the section data slices
const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null; const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null;
const debug_abbrev_data = di.coff.getSectionData(".debug_abbrev", allocator) catch null; const debug_abbrev_data = di.coff.getSectionData(".debug_abbrev", allocator) catch null;

1
src/Sema.zig
View File

@ -5809,7 +5809,6 @@ fn zirIntToPtr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerErro
return sema.mod.fail(&block.base, type_src, "expected pointer, found '{}'", .{type_res}); return sema.mod.fail(&block.base, type_src, "expected pointer, found '{}'", .{type_res});
const ptr_align = type_res.ptrAlignment(sema.mod.getTarget()); const ptr_align = type_res.ptrAlignment(sema.mod.getTarget());
const uncasted_operand = try sema.resolveInst(extra.rhs);
if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| { if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| {
const addr = val.toUnsignedInt(); const addr = val.toUnsignedInt();
if (!type_res.isAllowzeroPtr() and addr == 0) if (!type_res.isAllowzeroPtr() and addr == 0)