authorgravatar for david.martschenko@web.deDavid Martschenko <david.martschenko@web.de> 2022-02-19 13:01:22+01:00
committergravatar for david.martschenko@web.deDavid Martschenko <david.martschenko@web.de> 2022-02-19 13:05:09+01:00
log176f7b86004b6e882d628ee50b272f859e5e9aba
tree1b6a6733e732b724c3145b47d38dc33d6c2d95bc
parent4a6454fb8d910a22d888262ea80165ec24c9f190

C backend: adjust order of parameters in renderDeclName

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

src/codegen/c.zig+14-14
......@@ -389,19 +389,19 @@ pub const DeclGen = struct {
389389 // Determine if we must pointer cast.
390390 if (ty.eql(decl.ty)) {
391391 try writer.writeByte('&');
392 try dg.renderDeclName(decl, writer);
392 try dg.renderDeclName(writer, decl);
393393 return;
394394 }
395395
396396 try writer.writeAll("((");
397397 try dg.renderTypecast(writer, ty);
398398 try writer.writeAll(")&");
399 try dg.renderDeclName(decl, writer);
399 try dg.renderDeclName(writer, decl);
400400 try writer.writeByte(')');
401401 return;
402402 }
403403
404 try dg.renderDeclName(decl, writer);
404 try dg.renderDeclName(writer, decl);
405405 }
406406
407407 fn renderInt128(
......@@ -464,7 +464,7 @@ pub const DeclGen = struct {
464464 .variable => ptr_val.castTag(.variable).?.data.owner_decl,
465465 else => unreachable,
466466 };
467 try dg.renderDeclName(decl, writer);
467 try dg.renderDeclName(writer, decl);
468468 return decl.ty;
469469 },
470470 .field_ptr => {
......@@ -599,11 +599,11 @@ pub const DeclGen = struct {
599599 },
600600 .function => {
601601 const func = val.castTag(.function).?.data;
602 try dg.renderDeclName(func.owner_decl, writer);
602 try dg.renderDeclName(writer, func.owner_decl);
603603 },
604604 .extern_fn => {
605605 const extern_fn = val.castTag(.extern_fn).?.data;
606 try dg.renderDeclName(extern_fn.owner_decl, writer);
606 try dg.renderDeclName(writer, extern_fn.owner_decl);
607607 },
608608 .int_u64, .one => {
609609 try writer.writeAll("((");
......@@ -834,7 +834,7 @@ pub const DeclGen = struct {
834834 try w.writeAll("void");
835835 }
836836 try w.writeAll(" ");
837 try dg.renderDeclName(dg.decl, w);
837 try dg.renderDeclName(w, dg.decl);
838838 try w.writeAll("(");
839839 const param_len = dg.decl.ty.fnParamLen();
840840
......@@ -1058,7 +1058,7 @@ pub const DeclGen = struct {
10581058 if (err_set_type.castTag(.error_set_inferred)) |inf_err_set_payload| {
10591059 const func = inf_err_set_payload.data.func;
10601060 try bw.writeAll("zig_E_");
1061 try dg.renderDeclName(func.owner_decl, bw);
1061 try dg.renderDeclName(bw, func.owner_decl);
10621062 try bw.writeAll(";\n");
10631063 } else {
10641064 try bw.print("zig_E_{s}_{s};\n", .{
......@@ -1391,10 +1391,10 @@ pub const DeclGen = struct {
13911391 .local_ref => |i| return w.print("&t{d}", .{i}),
13921392 .constant => unreachable,
13931393 .arg => |i| return w.print("a{d}", .{i}),
1394 .decl => |decl| return dg.renderDeclName(decl, w),
1394 .decl => |decl| return dg.renderDeclName(w, decl),
13951395 .decl_ref => |decl| {
13961396 try w.writeByte('&');
1397 return dg.renderDeclName(decl, w);
1397 return dg.renderDeclName(w, decl);
13981398 },
13991399 .undefined_ptr => {
14001400 const target = dg.module.getTarget();
......@@ -1418,10 +1418,10 @@ pub const DeclGen = struct {
14181418 .arg => |i| return w.print("(*a{d})", .{i}),
14191419 .decl => |decl| {
14201420 try w.writeAll("(*");
1421 try dg.renderDeclName(decl, w);
1421 try dg.renderDeclName(w, decl);
14221422 return w.writeByte(')');
14231423 },
1424 .decl_ref => |decl| return dg.renderDeclName(decl, w),
1424 .decl_ref => |decl| return dg.renderDeclName(w, decl),
14251425 .undefined_ptr => unreachable,
14261426 .identifier => |ident| return w.print("(*{ })", .{fmtIdent(ident)}),
14271427 .bytes => |bytes| {
......@@ -1432,7 +1432,7 @@ pub const DeclGen = struct {
14321432 }
14331433 }
14341434
1435 fn renderDeclName(dg: DeclGen, decl: *Decl, writer: anytype) !void {
1435 fn renderDeclName(dg: DeclGen, writer: anytype, decl: *Decl) !void {
14361436 if (dg.module.decl_exports.get(decl)) |exports| {
14371437 return writer.writeAll(exports[0].options.name);
14381438 } else if (decl.val.tag() == .extern_fn) {
......@@ -2585,7 +2585,7 @@ fn airCall(f: *Function, inst: Air.Inst.Index) !CValue {
25852585 else => break :known,
25862586 };
25872587 };
2588 try f.object.dg.renderDeclName(fn_decl, writer);
2588 try f.object.dg.renderDeclName(writer, fn_decl);
25892589 break :callee;
25902590 }
25912591 // Fall back to function pointer call.