Commit 7bebb24838

Andrew Kelley <andrew@ziglang.org>
2021-06-22 02:09:22
fix unused locals from merge conflict
master
1 parent d3ddb48
Changed files (2)
lib
std
debug.zig
src
Sema.zig
lib/std/debug.zig
@@ -681,6 +681,7 @@ fn readCoffDebugInfo(allocator: *mem.Allocator, coff_file: File) !ModuleDebugInf
         try di.coff.loadSections();
         if (di.coff.getSection(".debug_info")) |sec| {
             // This coff file has embedded DWARF debug info
+            _ = sec;
             // TODO: free the section data slices
             const debug_info_data = di.coff.getSectionData(".debug_info", allocator) catch null;
             const debug_abbrev_data = di.coff.getSectionData(".debug_abbrev", allocator) catch null;
src/Sema.zig
@@ -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});
     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| {
         const addr = val.toUnsignedInt();
         if (!type_res.isAllowzeroPtr() and addr == 0)