authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-21 14:14:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-21 17:03:04-07:00
log06412e04f9f954f168b23a9bc6a1c03882055433
treeb3420aebf7fb545e0fc7643fc5efdbb0b7cc3e58
parentd279a23c9362bd3716aa6fd65e2e832df714a775

cleanups related to unused params

10 files changed, 83 insertions(+), 72 deletions(-)

src/Sema.zig+36-27
......@@ -3506,8 +3506,6 @@ fn zirSwitchCapture(
35063506 is_multi: bool,
35073507 is_ref: bool,
35083508) InnerError!*Inst {
3509 _ = is_ref;
3510 _ = is_multi;
35113509 const tracy = trace(@src());
35123510 defer tracy.end();
35133511
......@@ -3516,6 +3514,8 @@ fn zirSwitchCapture(
35163514 const switch_info = zir_datas[capture_info.switch_inst].pl_node;
35173515 const src = switch_info.src();
35183516
3517 _ = is_ref;
3518 _ = is_multi;
35193519 return sema.mod.fail(&block.base, src, "TODO implement Sema for zirSwitchCapture", .{});
35203520}
35213521
......@@ -3525,7 +3525,6 @@ fn zirSwitchCaptureElse(
35253525 inst: Zir.Inst.Index,
35263526 is_ref: bool,
35273527) InnerError!*Inst {
3528 _ = is_ref;
35293528 const tracy = trace(@src());
35303529 defer tracy.end();
35313530
......@@ -3534,6 +3533,7 @@ fn zirSwitchCaptureElse(
35343533 const switch_info = zir_datas[capture_info.switch_inst].pl_node;
35353534 const src = switch_info.src();
35363535
3536 _ = is_ref;
35373537 return sema.mod.fail(&block.base, src, "TODO implement Sema for zirSwitchCaptureElse", .{});
35383538}
35393539
......@@ -4528,17 +4528,19 @@ fn zirImport(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!
45284528}
45294529
45304530fn zirShl(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
4531 _ = block;
4532 _ = inst;
45334531 const tracy = trace(@src());
45344532 defer tracy.end();
4533
4534 _ = block;
4535 _ = inst;
45354536 return sema.mod.fail(&block.base, sema.src, "TODO implement zirShl", .{});
45364537}
45374538
45384539fn zirShr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
4539 _ = inst;
45404540 const tracy = trace(@src());
45414541 defer tracy.end();
4542
4543 _ = inst;
45424544 return sema.mod.fail(&block.base, sema.src, "TODO implement zirShr", .{});
45434545}
45444546
......@@ -4606,23 +4608,26 @@ fn zirBitwise(
46064608}
46074609
46084610fn zirBitNot(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
4609 _ = inst;
46104611 const tracy = trace(@src());
46114612 defer tracy.end();
4613
4614 _ = inst;
46124615 return sema.mod.fail(&block.base, sema.src, "TODO implement zirBitNot", .{});
46134616}
46144617
46154618fn zirArrayCat(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
4616 _ = inst;
46174619 const tracy = trace(@src());
46184620 defer tracy.end();
4621
4622 _ = inst;
46194623 return sema.mod.fail(&block.base, sema.src, "TODO implement zirArrayCat", .{});
46204624}
46214625
46224626fn zirArrayMul(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
4623 _ = inst;
46244627 const tracy = trace(@src());
46254628 defer tracy.end();
4629
4630 _ = inst;
46264631 return sema.mod.fail(&block.base, sema.src, "TODO implement zirArrayMul", .{});
46274632}
46284633
......@@ -5529,7 +5534,6 @@ fn zirUnionInitPtr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) Inner
55295534}
55305535
55315536fn zirStructInit(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref: bool) InnerError!*Inst {
5532 _ = is_ref;
55335537 const mod = sema.mod;
55345538 const gpa = sema.gpa;
55355539 const zir_datas = sema.code.instructions.items(.data);
......@@ -5618,6 +5622,10 @@ fn zirStructInit(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref:
56185622 return mod.failWithOwnedErrorMsg(&block.base, msg);
56195623 }
56205624
5625 if (is_ref) {
5626 return mod.fail(&block.base, src, "TODO: Sema.zirStructInit is_ref=true", .{});
5627 }
5628
56215629 const is_comptime = for (field_inits) |field_init| {
56225630 if (field_init.value() == null) {
56235631 break false;
......@@ -5639,23 +5647,26 @@ fn zirStructInit(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref:
56395647}
56405648
56415649fn zirStructInitAnon(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref: bool) InnerError!*Inst {
5642 _ = is_ref;
56435650 const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
56445651 const src = inst_data.src();
5652
5653 _ = is_ref;
56455654 return sema.mod.fail(&block.base, src, "TODO: Sema.zirStructInitAnon", .{});
56465655}
56475656
56485657fn zirArrayInit(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref: bool) InnerError!*Inst {
5649 _ = is_ref;
56505658 const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
56515659 const src = inst_data.src();
5660
5661 _ = is_ref;
56525662 return sema.mod.fail(&block.base, src, "TODO: Sema.zirArrayInit", .{});
56535663}
56545664
56555665fn zirArrayInitAnon(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index, is_ref: bool) InnerError!*Inst {
5656 _ = is_ref;
56575666 const inst_data = sema.code.instructions.items(.data)[inst].pl_node;
56585667 const src = inst_data.src();
5668
5669 _ = is_ref;
56595670 return sema.mod.fail(&block.base, src, "TODO: Sema.zirArrayInitAnon", .{});
56605671}
56615672
......@@ -6050,9 +6061,10 @@ fn zirAwait(
60506061 inst: Zir.Inst.Index,
60516062 is_nosuspend: bool,
60526063) InnerError!*Inst {
6053 _ = is_nosuspend;
60546064 const inst_data = sema.code.instructions.items(.data)[inst].un_node;
60556065 const src = inst_data.src();
6066
6067 _ = is_nosuspend;
60566068 return sema.mod.fail(&block.base, src, "TODO: Sema.zirAwait", .{});
60576069}
60586070
......@@ -6632,8 +6644,6 @@ fn elemPtrArray(
66326644 elem_index: *Inst,
66336645 elem_index_src: LazySrcLoc,
66346646) InnerError!*Inst {
6635 _ = elem_index;
6636 _ = elem_index_src;
66376647 if (array_ptr.value()) |array_ptr_val| {
66386648 if (elem_index.value()) |index_val| {
66396649 // Both array pointer and index are compile-time known.
......@@ -6649,6 +6659,8 @@ fn elemPtrArray(
66496659 });
66506660 }
66516661 }
6662 _ = elem_index;
6663 _ = elem_index_src;
66526664 return sema.mod.fail(&block.base, src, "TODO implement more analyze elemptr for arrays", .{});
66536665}
66546666
......@@ -7508,14 +7520,14 @@ fn resolveTypeFields(sema: *Sema, block: *Scope.Block, src: LazySrcLoc, ty: Type
75087520 struct_obj.status = .have_field_types;
75097521 return ty;
75107522 },
7511 .extern_options => return sema.resolveBuiltinTypeFields(block, src, ty, "ExternOptions"),
7512 .export_options => return sema.resolveBuiltinTypeFields(block, src, ty, "ExportOptions"),
7513 .atomic_ordering => return sema.resolveBuiltinTypeFields(block, src, ty, "AtomicOrdering"),
7514 .atomic_rmw_op => return sema.resolveBuiltinTypeFields(block, src, ty, "AtomicRmwOp"),
7515 .calling_convention => return sema.resolveBuiltinTypeFields(block, src, ty, "CallingConvention"),
7516 .float_mode => return sema.resolveBuiltinTypeFields(block, src, ty, "FloatMode"),
7517 .reduce_op => return sema.resolveBuiltinTypeFields(block, src, ty, "ReduceOp"),
7518 .call_options => return sema.resolveBuiltinTypeFields(block, src, ty, "CallOptions"),
7523 .extern_options => return sema.resolveBuiltinTypeFields(block, src, "ExternOptions"),
7524 .export_options => return sema.resolveBuiltinTypeFields(block, src, "ExportOptions"),
7525 .atomic_ordering => return sema.resolveBuiltinTypeFields(block, src, "AtomicOrdering"),
7526 .atomic_rmw_op => return sema.resolveBuiltinTypeFields(block, src, "AtomicRmwOp"),
7527 .calling_convention => return sema.resolveBuiltinTypeFields(block, src, "CallingConvention"),
7528 .float_mode => return sema.resolveBuiltinTypeFields(block, src, "FloatMode"),
7529 .reduce_op => return sema.resolveBuiltinTypeFields(block, src, "ReduceOp"),
7530 .call_options => return sema.resolveBuiltinTypeFields(block, src, "CallOptions"),
75197531
75207532 .@"union", .union_tagged => {
75217533 const union_obj = ty.cast(Type.Payload.Union).?.data;
......@@ -7541,11 +7553,8 @@ fn resolveBuiltinTypeFields(
75417553 sema: *Sema,
75427554 block: *Scope.Block,
75437555 src: LazySrcLoc,
7544 ty: Type,
75457556 name: []const u8,
75467557) InnerError!Type {
7547 _ = ty;
7548 _ = name;
75497558 const resolved_ty = try sema.getBuiltinType(block, src, name);
75507559 return sema.resolveTypeFields(block, src, resolved_ty);
75517560}
src/codegen.zig+20-10
......@@ -3321,7 +3321,8 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
33213321 const reg = try self.copyToTmpRegister(src, ty, mcv);
33223322 return self.genSetStack(src, ty, stack_offset, MCValue{ .register = reg });
33233323 },
3324 .embedded_in_code => {
3324 .embedded_in_code => |code_offset| {
3325 _ = code_offset;
33253326 return self.fail(src, "TODO implement set stack variable from embedded_in_code", .{});
33263327 },
33273328 .register => |reg| {
......@@ -3357,7 +3358,8 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
33573358 else => return self.fail(src, "TODO implement storing other types abi_size={}", .{abi_size}),
33583359 }
33593360 },
3360 .memory => {
3361 .memory => |vaddr| {
3362 _ = vaddr;
33613363 return self.fail(src, "TODO implement set stack variable from memory vaddr", .{});
33623364 },
33633365 .stack_offset => |off| {
......@@ -3385,10 +3387,12 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
33853387 else => return self.fail(src, "TODO implement memset", .{}),
33863388 }
33873389 },
3388 .compare_flags_unsigned => {
3390 .compare_flags_unsigned => |op| {
3391 _ = op;
33893392 return self.fail(src, "TODO implement set stack variable with compare flags value (unsigned)", .{});
33903393 },
3391 .compare_flags_signed => {
3394 .compare_flags_signed => |op| {
3395 _ = op;
33923396 return self.fail(src, "TODO implement set stack variable with compare flags value (signed)", .{});
33933397 },
33943398 .immediate => |x_big| {
......@@ -3440,13 +3444,15 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
34403444 },
34413445 }
34423446 },
3443 .embedded_in_code => {
3447 .embedded_in_code => |code_offset| {
3448 _ = code_offset;
34443449 return self.fail(src, "TODO implement set stack variable from embedded_in_code", .{});
34453450 },
34463451 .register => |reg| {
34473452 try self.genX8664ModRMRegToStack(src, ty, stack_offset, reg, 0x89);
34483453 },
3449 .memory => {
3454 .memory => |vaddr| {
3455 _ = vaddr;
34503456 return self.fail(src, "TODO implement set stack variable from memory vaddr", .{});
34513457 },
34523458 .stack_offset => |off| {
......@@ -3474,17 +3480,20 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
34743480 else => return self.fail(src, "TODO implement memset", .{}),
34753481 }
34763482 },
3477 .compare_flags_unsigned => {
3483 .compare_flags_unsigned => |op| {
3484 _ = op;
34783485 return self.fail(src, "TODO implement set stack variable with compare flags value (unsigned)", .{});
34793486 },
3480 .compare_flags_signed => {
3487 .compare_flags_signed => |op| {
3488 _ = op;
34813489 return self.fail(src, "TODO implement set stack variable with compare flags value (signed)", .{});
34823490 },
34833491 .immediate => {
34843492 const reg = try self.copyToTmpRegister(src, ty, mcv);
34853493 return self.genSetStack(src, ty, stack_offset, MCValue{ .register = reg });
34863494 },
3487 .embedded_in_code => {
3495 .embedded_in_code => |code_offset| {
3496 _ = code_offset;
34883497 return self.fail(src, "TODO implement set stack variable from embedded_in_code", .{});
34893498 },
34903499 .register => |reg| {
......@@ -3516,7 +3525,8 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
35163525 else => return self.fail(src, "TODO implement storing other types abi_size={}", .{abi_size}),
35173526 }
35183527 },
3519 .memory => {
3528 .memory => |vaddr| {
3529 _ = vaddr;
35203530 return self.fail(src, "TODO implement set stack variable from memory vaddr", .{});
35213531 },
35223532 .stack_offset => |off| {
src/codegen/wasm.zig+2-2
......@@ -910,10 +910,10 @@ pub const Context = struct {
910910 },
911911 else => unreachable,
912912 },
913 .local => {
913 .local => |local| {
914914 try self.emitWValue(rhs);
915915 try writer.writeByte(wasm.opcode(.local_set));
916 try leb.writeULEB128(writer, lhs.local);
916 try leb.writeULEB128(writer, local);
917917 },
918918 else => unreachable,
919919 }
src/link/C.zig+6-10
......@@ -77,10 +77,8 @@ pub fn deinit(self: *C) void {
7777}
7878
7979pub fn allocateDeclIndexes(self: *C, decl: *Module.Decl) !void {
80 if (false) {
81 self;
82 decl;
83 }
80 _ = self;
81 _ = decl;
8482}
8583
8684pub fn freeDecl(self: *C, decl: *Module.Decl) void {
......@@ -313,10 +311,8 @@ pub fn updateDeclExports(
313311 decl: *Module.Decl,
314312 exports: []const *Module.Export,
315313) !void {
316 if (false) {
317 exports;
318 decl;
319 module;
320 self;
321 }
314 _ = exports;
315 _ = decl;
316 _ = module;
317 _ = self;
322318}
src/link/Elf.zig+3-5
......@@ -1938,11 +1938,9 @@ fn freeTextBlock(self: *Elf, text_block: *TextBlock) void {
19381938}
19391939
19401940fn shrinkTextBlock(self: *Elf, text_block: *TextBlock, new_block_size: u64) void {
1941 if (false) {
1942 self;
1943 text_block;
1944 new_block_size;
1945 }
1941 _ = self;
1942 _ = text_block;
1943 _ = new_block_size;
19461944 // TODO check the new capacity, and if it crosses the size threshold into a big enough
19471945 // capacity, insert a free list node for it.
19481946}
src/link/SpirV.zig+4-6
......@@ -113,12 +113,10 @@ pub fn updateDeclExports(
113113 decl: *const Module.Decl,
114114 exports: []const *Module.Export,
115115) !void {
116 if (false) {
117 self;
118 module;
119 decl;
120 exports;
121 }
116 _ = self;
117 _ = module;
118 _ = decl;
119 _ = exports;
122120}
123121
124122pub fn freeDecl(self: *SpirV, decl: *Module.Decl) void {
src/link/Wasm.zig+4-6
......@@ -259,12 +259,10 @@ pub fn updateDeclExports(
259259 decl: *const Module.Decl,
260260 exports: []const *Module.Export,
261261) !void {
262 if (false) {
263 self;
264 module;
265 decl;
266 exports;
267 }
262 _ = self;
263 _ = module;
264 _ = decl;
265 _ = exports;
268266}
269267
270268pub fn freeDecl(self: *Wasm, decl: *Module.Decl) void {
src/main.zig+2-1
......@@ -2560,11 +2560,12 @@ pub const usage_init =
25602560;
25612561
25622562pub fn cmdInit(
2563 _: *Allocator,
2563 gpa: *Allocator,
25642564 arena: *Allocator,
25652565 args: []const []const u8,
25662566 output_mode: std.builtin.OutputMode,
25672567) !void {
2568 _ = gpa;
25682569 {
25692570 var i: usize = 0;
25702571 while (i < args.len) : (i += 1) {
test/behavior/type.zig+2-4
......@@ -431,10 +431,8 @@ test "Type.Fn" {
431431
432432 const foo = struct {
433433 fn func(a: usize, b: bool) align(4) callconv(.C) usize {
434 if (false) {
435 a;
436 b;
437 }
434 _ = a;
435 _ = b;
438436 return 0;
439437 }
440438 }.func;
test/standalone/issue_8550/main.zig+4-1
......@@ -1,4 +1,7 @@
1export fn main() callconv(.C) noreturn {
1export fn main(r0: u32, r1: u32, atags: u32) callconv(.C) noreturn {
2 _ = r0;
3 _ = r1;
4 _ = atags;
25 unreachable; // never gets run so it doesn't matter
36}
47pub fn panic(msg: []const u8, error_return_trace: ?*@import("std").builtin.StackTrace) noreturn {