authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-12-03 05:26:43-05:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-12-03 08:21:03-05:00
log7fb6eb3d14c232d397a4737f9dbd24dbae3db60f
tree3f95b1f1998409107b085c334da45381d21a46d0
parent81c271cc6298bf164b202a194ef18b56665ce2d9

cbe: implement multiple exports of a symbols

3 files changed, 40 insertions(+), 17 deletions(-)

lib/zig.h+6
......@@ -81,6 +81,12 @@ typedef char bool;
8181#define zig_extern extern
8282#endif
8383
84#if zig_has_attribute(alias)
85#define zig_export(sig, symbol, name) zig_extern sig __attribute__((alias(symbol)))
86#else
87#define zig_export(sig, symbol, name) __asm(name " = " symbol)
88#endif
89
8490#if zig_has_builtin(debugtrap)
8591#define zig_breakpoint() __builtin_debugtrap()
8692#elif zig_has_builtin(trap)
src/codegen/c.zig+34-16
......@@ -569,7 +569,7 @@ pub const DeclGen = struct {
569569 try writer.writeByte(')');
570570 }
571571 try writer.writeByte('&');
572 try dg.renderDeclName(writer, decl_index);
572 try dg.renderDeclName(writer, decl_index, 0);
573573 if (need_typecast) try writer.writeByte(')');
574574 }
575575
......@@ -1026,11 +1026,11 @@ pub const DeclGen = struct {
10261026 },
10271027 .function => {
10281028 const func = val.castTag(.function).?.data;
1029 try dg.renderDeclName(writer, func.owner_decl);
1029 try dg.renderDeclName(writer, func.owner_decl, 0);
10301030 },
10311031 .extern_fn => {
10321032 const extern_fn = val.castTag(.extern_fn).?.data;
1033 try dg.renderDeclName(writer, extern_fn.owner_decl);
1033 try dg.renderDeclName(writer, extern_fn.owner_decl, 0);
10341034 },
10351035 .int_u64, .one => {
10361036 try writer.writeAll("((");
......@@ -1356,7 +1356,7 @@ pub const DeclGen = struct {
13561356 }
13571357 }
13581358
1359 fn renderFunctionSignature(dg: *DeclGen, w: anytype, kind: TypedefKind) !void {
1359 fn renderFunctionSignature(dg: *DeclGen, w: anytype, kind: TypedefKind, export_index: u32) !void {
13601360 const fn_info = dg.decl.ty.fnInfo();
13611361 if (fn_info.cc == .Naked) try w.writeAll("zig_naked ");
13621362 if (dg.decl.val.castTag(.function)) |func_payload|
......@@ -1368,7 +1368,7 @@ pub const DeclGen = struct {
13681368
13691369 try dg.renderType(w, ret_ty, kind);
13701370 try w.writeByte(' ');
1371 try dg.renderDeclName(w, dg.decl_index);
1371 try dg.renderDeclName(w, dg.decl_index, export_index);
13721372 try w.writeByte('(');
13731373
13741374 var index: usize = 0;
......@@ -2213,10 +2213,10 @@ pub const DeclGen = struct {
22132213 .constant => unreachable,
22142214 .arg => |i| return w.print("a{d}", .{i}),
22152215 .field => |i| return w.print("f{d}", .{i}),
2216 .decl => |decl| return dg.renderDeclName(w, decl),
2216 .decl => |decl| return dg.renderDeclName(w, decl, 0),
22172217 .decl_ref => |decl| {
22182218 try w.writeByte('&');
2219 return dg.renderDeclName(w, decl);
2219 return dg.renderDeclName(w, decl, 0);
22202220 },
22212221 .undef => |ty| return dg.renderValue(w, ty, Value.undef, .Other),
22222222 .identifier => |ident| return w.print("{ }", .{fmtIdent(ident)}),
......@@ -2234,10 +2234,10 @@ pub const DeclGen = struct {
22342234 .field => |i| return w.print("f{d}", .{i}),
22352235 .decl => |decl| {
22362236 try w.writeAll("(*");
2237 try dg.renderDeclName(w, decl);
2237 try dg.renderDeclName(w, decl, 0);
22382238 return w.writeByte(')');
22392239 },
2240 .decl_ref => |decl| return dg.renderDeclName(w, decl),
2240 .decl_ref => |decl| return dg.renderDeclName(w, decl, 0),
22412241 .undef => unreachable,
22422242 .identifier => |ident| return w.print("(*{ })", .{fmtIdent(ident)}),
22432243 .bytes => |bytes| {
......@@ -2269,12 +2269,12 @@ pub const DeclGen = struct {
22692269 try dg.writeCValue(writer, member);
22702270 }
22712271
2272 fn renderDeclName(dg: *DeclGen, writer: anytype, decl_index: Decl.Index) !void {
2272 fn renderDeclName(dg: *DeclGen, writer: anytype, decl_index: Decl.Index, export_index: u32) !void {
22732273 const decl = dg.module.declPtr(decl_index);
22742274 dg.module.markDeclAlive(decl);
22752275
22762276 if (dg.module.decl_exports.get(decl_index)) |exports| {
2277 return writer.writeAll(exports.items[0].options.name);
2277 return writer.writeAll(exports.items[export_index].options.name);
22782278 } else if (decl.isExtern()) {
22792279 return writer.writeAll(mem.sliceTo(decl.name, 0));
22802280 } else if (dg.module.test_functions.get(decl_index)) |_| {
......@@ -2422,6 +2422,21 @@ pub fn genErrDecls(o: *Object) !void {
24222422 try writer.writeAll("};\n");
24232423}
24242424
2425fn genExports(o: *Object) !void {
2426 const tracy = trace(@src());
2427 defer tracy.end();
2428
2429 const fwd_decl_writer = o.dg.fwd_decl.writer();
2430 if (o.dg.module.decl_exports.get(o.dg.decl_index)) |exports| for (exports.items[1..]) |@"export", i| {
2431 try fwd_decl_writer.writeAll("zig_export(");
2432 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward, @intCast(u32, 1 + i));
2433 try fwd_decl_writer.print(", {s}, {s});\n", .{
2434 fmtStringLiteral(exports.items[0].options.name),
2435 fmtStringLiteral(@"export".options.name),
2436 });
2437 };
2438}
2439
24252440pub fn genFunc(f: *Function) !void {
24262441 const tracy = trace(@src());
24272442 defer tracy.end();
......@@ -2438,12 +2453,13 @@ pub fn genFunc(f: *Function) !void {
24382453 const is_global = o.dg.declIsGlobal(tv);
24392454 const fwd_decl_writer = o.dg.fwd_decl.writer();
24402455 try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static ");
2441 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward);
2456 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward, 0);
24422457 try fwd_decl_writer.writeAll(";\n");
2458 try genExports(o);
24432459
24442460 try o.indent_writer.insertNewline();
24452461 if (!is_global) try o.writer().writeAll("static ");
2446 try o.dg.renderFunctionSignature(o.writer(), .Complete);
2462 try o.dg.renderFunctionSignature(o.writer(), .Complete, 0);
24472463 try o.writer().writeByte(' ');
24482464
24492465 // In case we need to use the header, populate it with a copy of the function
......@@ -2478,8 +2494,9 @@ pub fn genDecl(o: *Object) !void {
24782494 if (tv.val.tag() == .extern_fn) {
24792495 const fwd_decl_writer = o.dg.fwd_decl.writer();
24802496 try fwd_decl_writer.writeAll("zig_extern ");
2481 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward);
2497 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward, 0);
24822498 try fwd_decl_writer.writeAll(";\n");
2499 try genExports(o);
24832500 } else if (tv.val.castTag(.variable)) |var_payload| {
24842501 const variable: *Module.Var = var_payload.data;
24852502
......@@ -2492,6 +2509,7 @@ pub fn genDecl(o: *Object) !void {
24922509 if (variable.is_threadlocal) try fwd_decl_writer.writeAll("zig_threadlocal ");
24932510 try o.dg.renderTypeAndName(fwd_decl_writer, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
24942511 try fwd_decl_writer.writeAll(";\n");
2512 try genExports(o);
24952513
24962514 if (variable.is_extern) return;
24972515
......@@ -2537,7 +2555,7 @@ pub fn genHeader(dg: *DeclGen) error{ AnalysisFail, OutOfMemory }!void {
25372555 const is_global = dg.declIsGlobal(tv);
25382556 if (is_global) {
25392557 try writer.writeAll("zig_extern ");
2540 try dg.renderFunctionSignature(writer, .Complete);
2558 try dg.renderFunctionSignature(writer, .Complete, 0);
25412559 try dg.fwd_decl.appendSlice(";\n");
25422560 }
25432561 },
......@@ -3677,7 +3695,7 @@ fn airCall(
36773695 };
36783696 };
36793697 name = f.object.dg.module.declPtr(fn_decl).name;
3680 try f.object.dg.renderDeclName(writer, fn_decl);
3698 try f.object.dg.renderDeclName(writer, fn_decl, 0);
36813699 break :callee;
36823700 }
36833701 // Fall back to function pointer call.
test/behavior/bugs/12680.zig-1
......@@ -8,7 +8,6 @@ extern fn test_func() callconv(.C) usize;
88test "export a function twice" {
99 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1010 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
11 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
1211 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
1312 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
1413