| author |  Andrew Kelley <andrew@ziglang.org> 2021-06-21 17:09:22-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-06-21 17:09:22-07:00 |
| log | 7bebb24838a603a436b58e49ee85110af9e8e05f |
| tree | b0cade24a1ee14777be05644c19d76d158c3ab29 |
| parent | d3ddb480756dc10b80e795db07aa5fcc7f9290d1 |
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 | ... | @@ -681,6 +681,7 @@ fn readCoffDebugInfo(allocator: *mem.Allocator, coff_file: File) !ModuleDebugInf |
| 681 | try di.coff.loadSections(); | 681 | try di.coff.loadSections(); |
| 682 | if (di.coff.getSection(".debug_info")) |sec| { | 682 | if (di.coff.getSection(".debug_info")) |sec| { |
| 683 | // This coff file has embedded DWARF debug info | 683 | // This coff file has embedded DWARF debug info |
| 684 | _ = sec; | ||
| 684 | // TODO: free the section data slices | 685 | // TODO: free the section data slices |
| 685 | const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null; | 686 | const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null; |
| 686 | const debug_abbrev_data = di.coff.getSectionData(".debug_abbrev", allocator) catch null; | 687 | 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 | ... | @@ -5809,7 +5809,6 @@ fn zirIntToPtr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerErro |
| 5809 | return sema.mod.fail(&block.base, type_src, "expected pointer, found '{}'", .{type_res}); | 5809 | return sema.mod.fail(&block.base, type_src, "expected pointer, found '{}'", .{type_res}); |
| 5810 | const ptr_align = type_res.ptrAlignment(sema.mod.getTarget()); | 5810 | const ptr_align = type_res.ptrAlignment(sema.mod.getTarget()); |
| 5811 | 5811 | ||
| 5812 | const uncasted_operand = try sema.resolveInst(extra.rhs); | ||
| 5813 | if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| { | 5812 | if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| { |
| 5814 | const addr = val.toUnsignedInt(); | 5813 | const addr = val.toUnsignedInt(); |
| 5815 | if (!type_res.isAllowzeroPtr() and addr == 0) | 5814 | if (!type_res.isAllowzeroPtr() and addr == 0) |