authorgravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2023-11-04 19:37:19-04:00
committergravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2023-11-05 20:34:13-05:00
log192e9a315d92133b27d757f18bd4fd619976b755
treebcfe68372b997e7c4247432112b686fe4ba04125
parentce293c982e1b6d9db775e02fefb8905caa4ee748

cbe: add DeclVisibility and zig_extern_mangled to handle exporting mangled symbols under a different name

3 files changed, 89 insertions(+), 45 deletions(-)

lib/zig.h+27-21
......@@ -174,6 +174,12 @@ typedef char bool;
174174#define zig_extern extern
175175#endif
176176
177#if _MSC_VER
178#define zig_extern_mangled zig_extern
179#else
180#define zig_extern_mangled static
181#endif
182
177183#if zig_has_attribute(alias)
178184#define zig_export(sig, symbol, name) zig_extern sig __attribute__((alias(#symbol)))
179185#elif _MSC_VER
......@@ -190,14 +196,14 @@ typedef char bool;
190196
191197#if _MSC_VER
192198#if _M_X64
193#define zig_import(sig, symbol, name) sig;\
199#define zig_import(sig, symbol, name) zig_extern sig;\
194200 __pragma(comment(linker, "/alternatename:" #symbol "=" #name ))
195201#else /*_M_X64 */
196#define zig_import(sig, symbol, name) sig;\
202#define zig_import(sig, symbol, name) zig_extern sig;\
197203 __pragma(comment(linker, "/alternatename:_" #symbol "=_" #name ))
198204#endif /*_M_X64 */
199205#else
200#define zig_import(sig, symbol, name) zig_extern sig asm(#name);
206#define zig_import(sig, symbol, name) zig_extern sig __asm(#name);
201207#endif
202208
203209#define zig_expand_import(sig, symbol, name) zig_import(sig, symbol, name)
......@@ -3344,24 +3350,24 @@ zig_float_negate_builtin(128, zig_make_u128, (UINT64_C(1) << 63, UINT64_C(0)))
33443350 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, sub, -) \
33453351 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, mul, *) \
33463352 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, div, /) \
3347 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_sqrt(zig_f##w), zig_float_fn_f##w##_sqrt, zig_libc_name_f##w(sqrt)) \
3348 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_sin(zig_f##w), zig_float_fn_f##w##_sin, zig_libc_name_f##w(sin)) \
3349 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_cos(zig_f##w), zig_float_fn_f##w##_cos, zig_libc_name_f##w(cos)) \
3350 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_tan(zig_f##w), zig_float_fn_f##w##_tan, zig_libc_name_f##w(tan)) \
3351 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_exp(zig_f##w), zig_float_fn_f##w##_exp, zig_libc_name_f##w(exp)) \
3352 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_exp2(zig_f##w), zig_float_fn_f##w##_exp2, zig_libc_name_f##w(exp2)) \
3353 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_log(zig_f##w), zig_float_fn_f##w##_log, zig_libc_name_f##w(log)) \
3354 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_log2(zig_f##w), zig_float_fn_f##w##_log2, zig_libc_name_f##w(log2)) \
3355 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_log10(zig_f##w), zig_float_fn_f##w##_log10, zig_libc_name_f##w(log10)) \
3356 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_fabs(zig_f##w), zig_float_fn_f##w##_fabs, zig_libc_name_f##w(fabs)) \
3357 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_floor(zig_f##w), zig_float_fn_f##w##_floor, zig_libc_name_f##w(floor)) \
3358 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_ceil(zig_f##w), zig_float_fn_f##w##_ceil, zig_libc_name_f##w(ceil)) \
3359 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_round(zig_f##w), zig_float_fn_f##w##_round, zig_libc_name_f##w(round)) \
3360 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_trunc(zig_f##w), zig_float_fn_f##w##_trunc, zig_libc_name_f##w(trunc)) \
3361 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_fmod(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmod, zig_libc_name_f##w(fmod)) \
3362 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_fmin(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmin, zig_libc_name_f##w(fmin)) \
3363 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_fmax(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmax, zig_libc_name_f##w(fmax)) \
3364 zig_expand_import(zig_extern zig_f##w zig_float_fn_f##w##_fma(zig_f##w, zig_f##w, zig_f##w), zig_float_fn_f##w##_fma, zig_libc_name_f##w(fma)) \
3353 zig_expand_import(zig_f##w zig_float_fn_f##w##_sqrt(zig_f##w), zig_float_fn_f##w##_sqrt, zig_libc_name_f##w(sqrt)) \
3354 zig_expand_import(zig_f##w zig_float_fn_f##w##_sin(zig_f##w), zig_float_fn_f##w##_sin, zig_libc_name_f##w(sin)) \
3355 zig_expand_import(zig_f##w zig_float_fn_f##w##_cos(zig_f##w), zig_float_fn_f##w##_cos, zig_libc_name_f##w(cos)) \
3356 zig_expand_import(zig_f##w zig_float_fn_f##w##_tan(zig_f##w), zig_float_fn_f##w##_tan, zig_libc_name_f##w(tan)) \
3357 zig_expand_import(zig_f##w zig_float_fn_f##w##_exp(zig_f##w), zig_float_fn_f##w##_exp, zig_libc_name_f##w(exp)) \
3358 zig_expand_import(zig_f##w zig_float_fn_f##w##_exp2(zig_f##w), zig_float_fn_f##w##_exp2, zig_libc_name_f##w(exp2)) \
3359 zig_expand_import(zig_f##w zig_float_fn_f##w##_log(zig_f##w), zig_float_fn_f##w##_log, zig_libc_name_f##w(log)) \
3360 zig_expand_import(zig_f##w zig_float_fn_f##w##_log2(zig_f##w), zig_float_fn_f##w##_log2, zig_libc_name_f##w(log2)) \
3361 zig_expand_import(zig_f##w zig_float_fn_f##w##_log10(zig_f##w), zig_float_fn_f##w##_log10, zig_libc_name_f##w(log10)) \
3362 zig_expand_import(zig_f##w zig_float_fn_f##w##_fabs(zig_f##w), zig_float_fn_f##w##_fabs, zig_libc_name_f##w(fabs)) \
3363 zig_expand_import(zig_f##w zig_float_fn_f##w##_floor(zig_f##w), zig_float_fn_f##w##_floor, zig_libc_name_f##w(floor)) \
3364 zig_expand_import(zig_f##w zig_float_fn_f##w##_ceil(zig_f##w), zig_float_fn_f##w##_ceil, zig_libc_name_f##w(ceil)) \
3365 zig_expand_import(zig_f##w zig_float_fn_f##w##_round(zig_f##w), zig_float_fn_f##w##_round, zig_libc_name_f##w(round)) \
3366 zig_expand_import(zig_f##w zig_float_fn_f##w##_trunc(zig_f##w), zig_float_fn_f##w##_trunc, zig_libc_name_f##w(trunc)) \
3367 zig_expand_import(zig_f##w zig_float_fn_f##w##_fmod(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmod, zig_libc_name_f##w(fmod)) \
3368 zig_expand_import(zig_f##w zig_float_fn_f##w##_fmin(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmin, zig_libc_name_f##w(fmin)) \
3369 zig_expand_import(zig_f##w zig_float_fn_f##w##_fmax(zig_f##w, zig_f##w), zig_float_fn_f##w##_fmax, zig_libc_name_f##w(fmax)) \
3370 zig_expand_import(zig_f##w zig_float_fn_f##w##_fma(zig_f##w, zig_f##w, zig_f##w), zig_float_fn_f##w##_fma, zig_libc_name_f##w(fma)) \
33653371\
33663372 static inline zig_f##w zig_div_trunc_f##w(zig_f##w lhs, zig_f##w rhs) { \
33673373 return zig_float_fn_f##w##_trunc(zig_div_f##w(lhs, rhs)); \
src/codegen/c.zig+61-23
......@@ -272,6 +272,28 @@ pub fn isMangledIdent(ident: []const u8, solo: bool) bool {
272272 return false;
273273}
274274
275const DeclVisibility = enum {
276 global,
277 global_mangled,
278 local,
279
280 fn renderFwd(visibility: DeclVisibility, w: anytype) !void {
281 try w.writeAll(switch (visibility) {
282 .global => "zig_extern ",
283 // MSVC doesn't support exporting `static` functions, so they need special treatment
284 .global_mangled => "zig_extern_mangled ",
285 .local => "static ",
286 });
287 }
288
289 fn renderDef(visibility: DeclVisibility, w: anytype) !void {
290 return switch (visibility) {
291 .global => {},
292 else => visibility.renderFwd(w),
293 };
294 }
295};
296
275297/// This data is available when outputting .c code for a `InternPool.Index`
276298/// that corresponds to `func`.
277299/// It is not available when generating .h file.
......@@ -1825,19 +1847,25 @@ pub const DeclGen = struct {
18251847 try renderTypeSuffix(dg.pass, store.*, mod, w, cty_idx, .suffix, .{});
18261848 }
18271849
1828 fn declIsGlobal(dg: *DeclGen, tv: TypedValue) bool {
1850 fn declVisibility(dg: *DeclGen, tv: TypedValue) DeclVisibility {
18291851 const mod = dg.module;
18301852 return switch (mod.intern_pool.indexToKey(tv.val.ip_index)) {
18311853 .variable => |variable| {
18321854 if (mod.decl_exports.get(variable.decl)) |exports| {
1833 return !isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true);
1834 } else return false;
1855 return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
1856 .global_mangled
1857 else
1858 .global;
1859 } else return .local;
18351860 },
1836 .extern_func => true,
1861 .extern_func => .global,
18371862 .func => |func| {
18381863 if (mod.decl_exports.get(func.owner_decl)) |exports| {
1839 return !isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true);
1840 } else return false;
1864 return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
1865 .global_mangled
1866 else
1867 .global;
1868 } else return .local;
18411869 },
18421870 else => unreachable,
18431871 };
......@@ -1923,8 +1951,8 @@ pub const DeclGen = struct {
19231951 fn renderFwdDecl(dg: *DeclGen, decl_index: Decl.Index, variable: InternPool.Key.Variable) !void {
19241952 const decl = dg.module.declPtr(decl_index);
19251953 const fwd = dg.fwd_decl.writer();
1926 const is_global = dg.declIsGlobal(.{ .ty = decl.ty, .val = decl.val }) or variable.is_extern;
1927 try fwd.writeAll(if (is_global) "zig_extern " else "static ");
1954 const visibility = if (variable.is_extern) .global else dg.declVisibility(.{ .ty = decl.ty, .val = decl.val });
1955 try visibility.renderFwd(fwd);
19281956 const export_weak_linkage = if (dg.module.decl_exports.get(decl_index)) |exports|
19291957 exports.items[0].opts.linkage == .Weak
19301958 else
......@@ -2735,9 +2763,10 @@ pub fn genFunc(f: *Function) !void {
27352763 o.code_header = std.ArrayList(u8).init(gpa);
27362764 defer o.code_header.deinit();
27372765
2738 const is_global = o.dg.declIsGlobal(tv);
2766 const visibility = o.dg.declVisibility(tv);
27392767 const fwd_decl_writer = o.dg.fwd_decl.writer();
2740 try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static ");
2768 try visibility.renderFwd(fwd_decl_writer);
2769
27412770 if (mod.decl_exports.get(decl_index)) |exports|
27422771 if (exports.items[0].opts.linkage == .Weak) try fwd_decl_writer.writeAll("zig_weak_linkage_fn ");
27432772 try o.dg.renderFunctionSignature(fwd_decl_writer, decl_index, .forward, .{ .export_index = 0 });
......@@ -2745,7 +2774,7 @@ pub fn genFunc(f: *Function) !void {
27452774 try genExports(o);
27462775
27472776 try o.indent_writer.insertNewline();
2748 if (!is_global) try o.writer().writeAll("static ");
2777 try visibility.renderDef(o.writer());
27492778 try o.dg.renderFunctionSignature(o.writer(), decl_index, .complete, .{ .export_index = 0 });
27502779 try o.writer().writeByte(' ');
27512780
......@@ -2829,9 +2858,9 @@ pub fn genDecl(o: *Object) !void {
28292858
28302859 if (variable.is_extern) return;
28312860
2832 const is_global = o.dg.declIsGlobal(tv) or variable.is_extern;
2861 const visibility = if (variable.is_extern) .global else o.dg.declVisibility(tv);
28332862 const w = o.writer();
2834 if (!is_global) try w.writeAll("static ");
2863 try visibility.renderDef(w);
28352864 if (variable.is_weak_linkage) try w.writeAll("zig_weak_linkage ");
28362865 if (variable.is_threadlocal) try w.writeAll("zig_threadlocal ");
28372866 if (mod.intern_pool.stringToSliceUnwrap(decl.@"linksection")) |s|
......@@ -2844,16 +2873,21 @@ pub fn genDecl(o: *Object) !void {
28442873 try w.writeByte(';');
28452874 try o.indent_writer.insertNewline();
28462875 } else {
2847 const is_global = o.dg.module.decl_exports.contains(decl_index);
2876 const visibility: DeclVisibility = if (o.dg.module.decl_exports.get(decl_index)) |exports| b: {
2877 break :b if (isMangledIdent(o.dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
2878 .global_mangled
2879 else
2880 .global;
2881 } else .local;
28482882 const decl_c_value = .{ .decl = decl_index };
2849 return genDeclValue(o, tv, is_global, decl_c_value, decl.alignment, decl.@"linksection");
2883 return genDeclValue(o, tv, visibility, decl_c_value, decl.alignment, decl.@"linksection");
28502884 }
28512885}
28522886
28532887pub fn genDeclValue(
28542888 o: *Object,
28552889 tv: TypedValue,
2856 is_global: bool,
2890 visibility: DeclVisibility,
28572891 decl_c_value: CValue,
28582892 alignment: Alignment,
28592893 link_section: InternPool.OptionalNullTerminatedString,
......@@ -2861,12 +2895,13 @@ pub fn genDeclValue(
28612895 const mod = o.dg.module;
28622896 const fwd_decl_writer = o.dg.fwd_decl.writer();
28632897
2864 try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static ");
2898 try visibility.renderFwd(fwd_decl_writer);
28652899 try o.dg.renderTypeAndName(fwd_decl_writer, tv.ty, decl_c_value, Const, alignment, .complete);
28662900 try fwd_decl_writer.writeAll(";\n");
28672901
28682902 const w = o.writer();
2869 if (!is_global) try w.writeAll("static ");
2903 try visibility.renderDef(w);
2904
28702905 if (mod.intern_pool.stringToSliceUnwrap(link_section)) |s|
28712906 try w.print("zig_linksection(\"{s}\", ", .{s});
28722907 try o.dg.renderTypeAndName(w, tv.ty, decl_c_value, Const, alignment, .complete);
......@@ -2891,11 +2926,14 @@ pub fn genHeader(dg: *DeclGen) error{ AnalysisFail, OutOfMemory }!void {
28912926
28922927 switch (tv.ty.zigTypeTag(mod)) {
28932928 .Fn => {
2894 const is_global = dg.declIsGlobal(tv);
2895 if (is_global) {
2896 try writer.writeAll("zig_extern ");
2897 try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 });
2898 try dg.fwd_decl.appendSlice(";\n");
2929 const visibility = dg.declVisibility(tv);
2930 switch (visibility) {
2931 .global, .global_mangled => {
2932 try visibility.renderFwd(writer);
2933 try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 });
2934 try dg.fwd_decl.appendSlice(";\n");
2935 },
2936 .local => {},
28992937 }
29002938 },
29012939 else => {},
src/link/C.zig+1-1
......@@ -259,7 +259,7 @@ fn updateAnonDecl(self: *C, module: *Module, i: usize) !void {
259259 };
260260 const c_value: codegen.CValue = .{ .constant = anon_decl };
261261 const alignment: Alignment = self.aligned_anon_decls.get(anon_decl) orelse .none;
262 codegen.genDeclValue(&object, tv, false, c_value, alignment, .none) catch |err| switch (err) {
262 codegen.genDeclValue(&object, tv, .local, c_value, alignment, .none) catch |err| switch (err) {
263263 error.AnalysisFail => {
264264 @panic("TODO: C backend AnalysisFail on anonymous decl");
265265 //try module.failed_decls.put(gpa, decl_index, object.dg.error_msg.?);