From 98b633ff176f0ec5cc4d86c24ad4bece26cab421 Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Tue, 2 Jan 2024 07:57:36 -0500 Subject: [PATCH] Reapply "Merge pull request #17824 from kcbanner/fixup_msvc_fmax" This reverts commit 2b589783602c5428ecde9dbb3f41a81f85eb0f25. --- ci/x86_64-windows-debug.ps1 | 11 ++- ci/x86_64-windows-release.ps1 | 11 ++- lib/std/math.zig | 1 + lib/zig.h | 106 +++++++++++++++++-------- src/codegen/c.zig | 145 ++++++++++++++++++++++++---------- src/link/C.zig | 2 +- test/behavior/bugs/12680.zig | 5 -- 7 files changed, 187 insertions(+), 94 deletions(-) diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index bb6ff3ebee..f5706cf273 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -96,9 +96,8 @@ Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\E CheckLastExitCode Write-Output "Build and run behavior tests with msvc..." -Write-Output "Skipped due to https://github.com/ziglang/zig/issues/17817" -#& cl.exe -I..\lib test-x86_64-windows-msvc.c compiler_rt-x86_64-windows-msvc.c /W3 /Z7 -link -nologo -debug -subsystem:console kernel32.lib ntdll.lib libcmt.lib -#CheckLastExitCode -# -#& .\test-x86_64-windows-msvc.exe -#CheckLastExitCode +& cl.exe -I..\lib test-x86_64-windows-msvc.c compiler_rt-x86_64-windows-msvc.c /W3 /Z7 -link -nologo -debug -subsystem:console kernel32.lib ntdll.lib libcmt.lib +CheckLastExitCode + +& .\test-x86_64-windows-msvc.exe +CheckLastExitCode diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 7467e3deaa..ea20d668ad 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -95,9 +95,8 @@ Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\E CheckLastExitCode Write-Output "Build and run behavior tests with msvc..." -Write-Output "Skipped due to https://github.com/ziglang/zig/issues/17817" -#& cl.exe -I..\lib test-x86_64-windows-msvc.c compiler_rt-x86_64-windows-msvc.c /W3 /Z7 -link -nologo -debug -subsystem:console kernel32.lib ntdll.lib libcmt.lib -#CheckLastExitCode -# -#& .\test-x86_64-windows-msvc.exe -#CheckLastExitCode +& cl.exe -I..\lib test-x86_64-windows-msvc.c compiler_rt-x86_64-windows-msvc.c /W3 /Z7 -link -nologo -debug -subsystem:console kernel32.lib ntdll.lib libcmt.lib +CheckLastExitCode + +& .\test-x86_64-windows-msvc.exe +CheckLastExitCode diff --git a/lib/std/math.zig b/lib/std/math.zig index 6e27df0b21..b7a44bd927 100644 --- a/lib/std/math.zig +++ b/lib/std/math.zig @@ -1266,6 +1266,7 @@ pub fn lerp(a: anytype, b: anytype, t: anytype) @TypeOf(a, b, t) { } test "lerp" { + if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/17884 if (builtin.zig_backend == .stage2_x86_64 and !comptime std.Target.x86.featureSetHas(builtin.cpu.features, .fma)) return error.SkipZigTest; diff --git a/lib/zig.h b/lib/zig.h index acd7b1d700..c387a704c5 100644 --- a/lib/zig.h +++ b/lib/zig.h @@ -112,7 +112,7 @@ typedef char bool; #define zig_never_tail zig_never_tail_unavailable #endif -#if zig_has_attribute(always_inline) +#if zig_has_attribute(musttail) #define zig_always_tail __attribute__((musttail)) #else #define zig_always_tail zig_always_tail_unavailable @@ -180,19 +180,55 @@ typedef char bool; #define zig_extern extern #endif -#if zig_has_attribute(alias) -#define zig_export(sig, symbol, name) zig_extern sig __attribute__((alias(symbol))) -#elif _MSC_VER -#if _M_X64 -#define zig_export(sig, symbol, name) sig;\ - __pragma(comment(linker, "/alternatename:" name "=" symbol )) -#else /*_M_X64 */ -#define zig_export(sig, symbol, name) sig;\ - __pragma(comment(linker, "/alternatename:_" name "=_" symbol )) -#endif /*_M_X64 */ +#if _MSC_VER +#define zig_extern_mangled zig_extern #else -#define zig_export(sig, symbol, name) __asm(name " = " symbol) +#if zig_has_attribute(visibility) +#define zig_extern_mangled zig_extern __attribute__((visibility("hidden"))) +#else +#define zig_extern_mangled zig_extern #endif +#endif + +#if _MSC_VER +#if _M_X64 +#define zig_export(sig, symbol, name) zig_extern sig;\ + __pragma(comment(linker, "/alternatename:" name "=" #symbol )) +#else /*_M_X64 */ +#define zig_export(sig, symbol, name) zig_extern sig;\ + __pragma(comment(linker, "/alternatename:" name "=" #symbol )) +#endif /*_M_X64 */ +#else /* _MSC_VER */ +#if __APPLE__ +#define zig_export(sig, symbol, name) zig_extern sig;\ + __asm("_" name " = _" #symbol) +#else /* __APPLE__ */ +#define zig_export(sig, symbol, name) zig_extern sig;\ + __asm(name " = " #symbol) +#endif /* __APPLE__ */ +#endif /* _MSC_VER */ + +#if _MSC_VER +#if _M_X64 +#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args;\ + __pragma(comment(linker, "/alternatename:" #fn_name "=" #libc_name )); +#else /*_M_X64 */ +#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args;\ + __pragma(comment(linker, "/alternatename:_" #fn_name "=_" #libc_name )); +#endif /*_M_X64 */ +#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_import(Type, fn_name, sig_args, call_args) +#else /* _MSC_VER */ +#if __APPLE__ +#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args __asm("_" #libc_name); +#else /* __APPLE__ */ +#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args __asm(#libc_name); +#endif /* __APPLE__ */ +#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type libc_name sig_args; \ + static inline Type fn_name sig_args { return libc_name call_args; } +#endif + +#define zig_expand_import_0(Type, fn_name, libc_name, sig_args, call_args) zig_import(Type, fn_name, libc_name, sig_args, call_args) +#define zig_expand_import_1(Type, fn_name, libc_name, sig_args, call_args) zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) #if zig_has_attribute(weak) || defined(zig_gnuc) #define zig_weak_linkage __attribute__((weak)) @@ -3093,6 +3129,7 @@ ypedef uint32_t zig_f32; #define zig_has_f64 1 #define zig_libc_name_f64(name) name + #if _MSC_VER #define zig_init_special_f64(sign, name, arg, repr) sign zig_make_f64(zig_msvc_flt_##name, ) #else @@ -3318,6 +3355,7 @@ zig_float_negate_builtin(128, zig_make_u128, (UINT64_C(1) << 63, UINT64_C(0))) return lhs operator rhs; \ } +#define zig_expand_has_builtin(b) zig_has_builtin(b) #define zig_common_float_builtins(w) \ zig_convert_builtin( int64_t, int64_t, fix, zig_f##w, zig_f##w, ) \ zig_convert_builtin(zig_i128, zig_i128, fix, zig_f##w, zig_f##w, ) \ @@ -3336,31 +3374,31 @@ zig_float_negate_builtin(128, zig_make_u128, (UINT64_C(1) << 63, UINT64_C(0))) zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, sub, -) \ zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, mul, *) \ zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, div, /) \ - zig_extern zig_f##w zig_libc_name_f##w(sqrt)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(sin)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(cos)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(tan)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(exp)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(exp2)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(log)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(log2)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(log10)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(fabs)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(floor)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(ceil)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(round)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(trunc)(zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(fmod)(zig_f##w, zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(fmin)(zig_f##w, zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(fmax)(zig_f##w, zig_f##w); \ - zig_extern zig_f##w zig_libc_name_f##w(fma)(zig_f##w, zig_f##w, zig_f##w); \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(sqrt)))(zig_f##w, zig_float_fn_f##w##_sqrt, zig_libc_name_f##w(sqrt), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(sin)))(zig_f##w, zig_float_fn_f##w##_sin, zig_libc_name_f##w(sin), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(cos)))(zig_f##w, zig_float_fn_f##w##_cos, zig_libc_name_f##w(cos), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(tan)))(zig_f##w, zig_float_fn_f##w##_tan, zig_libc_name_f##w(tan), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(exp)))(zig_f##w, zig_float_fn_f##w##_exp, zig_libc_name_f##w(exp), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(exp2)))(zig_f##w, zig_float_fn_f##w##_exp2, zig_libc_name_f##w(exp2), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(log)))(zig_f##w, zig_float_fn_f##w##_log, zig_libc_name_f##w(log), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(log2)))(zig_f##w, zig_float_fn_f##w##_log2, zig_libc_name_f##w(log2), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(log10)))(zig_f##w, zig_float_fn_f##w##_log10, zig_libc_name_f##w(log10), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(fabs)))(zig_f##w, zig_float_fn_f##w##_fabs, zig_libc_name_f##w(fabs), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(floor)))(zig_f##w, zig_float_fn_f##w##_floor, zig_libc_name_f##w(floor), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(ceil)))(zig_f##w, zig_float_fn_f##w##_ceil, zig_libc_name_f##w(ceil), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(round)))(zig_f##w, zig_float_fn_f##w##_round, zig_libc_name_f##w(round), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(trunc)))(zig_f##w, zig_float_fn_f##w##_trunc, zig_libc_name_f##w(trunc), (zig_f##w x), (x)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(fmod)))(zig_f##w, zig_float_fn_f##w##_fmod, zig_libc_name_f##w(fmod), (zig_f##w x, zig_f##w y), (x, y)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(fmin)))(zig_f##w, zig_float_fn_f##w##_fmin, zig_libc_name_f##w(fmin), (zig_f##w x, zig_f##w y), (x, y)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(fmax)))(zig_f##w, zig_float_fn_f##w##_fmax, zig_libc_name_f##w(fmax), (zig_f##w x, zig_f##w y), (x, y)) \ + zig_expand_concat(zig_expand_import_, zig_expand_has_builtin(zig_libc_name_f##w(fma)))(zig_f##w, zig_float_fn_f##w##_fma, zig_libc_name_f##w(fma), (zig_f##w x, zig_f##w y, zig_f##w z), (x, y, z)) \ \ static inline zig_f##w zig_div_trunc_f##w(zig_f##w lhs, zig_f##w rhs) { \ - return zig_libc_name_f##w(trunc)(zig_div_f##w(lhs, rhs)); \ + return zig_float_fn_f##w##_trunc(zig_div_f##w(lhs, rhs)); \ } \ \ static inline zig_f##w zig_div_floor_f##w(zig_f##w lhs, zig_f##w rhs) { \ - return zig_libc_name_f##w(floor)(zig_div_f##w(lhs, rhs)); \ + return zig_float_fn_f##w##_floor(zig_div_f##w(lhs, rhs)); \ } \ \ static inline zig_f##w zig_mod_f##w(zig_f##w lhs, zig_f##w rhs) { \ @@ -3464,7 +3502,7 @@ zig_float_builtins(64) zig_##Type zig_atomicrmw_desired; \ zig_atomic_load(zig_atomicrmw_expected, obj, memory_order_relaxed, Type, ReprType); \ do { \ - zig_atomicrmw_desired = zig_libc_name_##Type(fmin)(zig_atomicrmw_expected, arg); \ + zig_atomicrmw_desired = zig_float_fn_##Type##_fmin(zig_atomicrmw_expected, arg); \ } while (!zig_cmpxchg_weak(obj, zig_atomicrmw_expected, zig_atomicrmw_desired, order, memory_order_relaxed, Type, ReprType)); \ res = zig_atomicrmw_expected; \ } while (0) @@ -3473,7 +3511,7 @@ zig_float_builtins(64) zig_##Type zig_atomicrmw_desired; \ zig_atomic_load(zig_atomicrmw_expected, obj, memory_order_relaxed, Type, ReprType); \ do { \ - zig_atomicrmw_desired = zig_libc_name_##Type(fmax)(zig_atomicrmw_expected, arg); \ + zig_atomicrmw_desired = zig_float_fn_##Type##_fmax(zig_atomicrmw_expected, arg); \ } while (!zig_cmpxchg_weak(obj, zig_atomicrmw_expected, zig_atomicrmw_desired, order, memory_order_relaxed, Type, ReprType)); \ res = zig_atomicrmw_expected; \ } while (0) diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 4b7ac15b94..d6151d337b 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -258,6 +258,42 @@ pub fn fmtIdent(ident: []const u8) std.fmt.Formatter(formatIdent) { return .{ .data = ident }; } +// Returns true if `formatIdent` would make any edits to ident. +// This must be kept in sync with `formatIdent`. +pub fn isMangledIdent(ident: []const u8, solo: bool) bool { + if (solo and isReservedIdent(ident)) return true; + for (ident, 0..) |c, i| { + switch (c) { + 'a'...'z', 'A'...'Z', '_' => {}, + '0'...'9' => if (i == 0) return true, + else => return true, + } + } + return false; +} + +const DeclVisibility = enum { + global, + global_mangled, + local, + + fn renderFwd(visibility: DeclVisibility, w: anytype) !void { + try w.writeAll(switch (visibility) { + .global => "zig_extern ", + // MSVC doesn't support exporting `static` functions, so they need special treatment + .global_mangled => "zig_extern_mangled ", + .local => "static ", + }); + } + + fn renderDef(visibility: DeclVisibility, w: anytype) !void { + return switch (visibility) { + .global => {}, + else => visibility.renderFwd(w), + }; + } +}; + /// This data is available when outputting .c code for a `InternPool.Index` /// that corresponds to `func`. /// It is not available when generating .h file. @@ -530,6 +566,7 @@ pub const DeclGen = struct { is_naked_fn: bool, /// This is a borrowed reference from `link.C`. fwd_decl: std.ArrayList(u8), + error_msg: ?*Module.ErrorMsg, ctypes: CType.Store, /// Keeps track of anonymous decls that need to be rendered before this @@ -1631,7 +1668,7 @@ pub const DeclGen = struct { switch (name) { .export_index => |export_index| try dg.renderDeclName(w, fn_decl_index, export_index), - .string => |string| try w.writeAll(string), + .string => |string| try w.print("{ }", .{fmtIdent(string)}), } try renderTypeSuffix( @@ -1843,12 +1880,26 @@ pub const DeclGen = struct { try renderTypeSuffix(dg.pass, store.*, mod, w, cty_idx, .suffix, .{}); } - fn declIsGlobal(dg: *DeclGen, tv: TypedValue) bool { + fn declVisibility(dg: *DeclGen, tv: TypedValue) DeclVisibility { const mod = dg.module; return switch (mod.intern_pool.indexToKey(tv.val.ip_index)) { - .variable => |variable| mod.decl_exports.contains(variable.decl), - .extern_func => true, - .func => |func| mod.decl_exports.contains(func.owner_decl), + .variable => |variable| { + if (mod.decl_exports.get(variable.decl)) |exports| { + return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true)) + .global_mangled + else + .global; + } else return .local; + }, + .extern_func => .global, + .func => |func| { + if (mod.decl_exports.get(func.owner_decl)) |exports| { + return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true)) + .global_mangled + else + .global; + } else return .local; + }, else => unreachable, }; } @@ -1933,8 +1984,8 @@ pub const DeclGen = struct { fn renderFwdDecl(dg: *DeclGen, decl_index: InternPool.DeclIndex, variable: InternPool.Key.Variable) !void { const decl = dg.module.declPtr(decl_index); const fwd = dg.fwd_decl.writer(); - const is_global = dg.declIsGlobal(.{ .ty = decl.ty, .val = decl.val }) or variable.is_extern; - try fwd.writeAll(if (is_global) "zig_extern " else "static "); + const visibility = if (variable.is_extern) .global else dg.declVisibility(.{ .ty = decl.ty, .val = decl.val }); + try visibility.renderFwd(fwd); const export_weak_linkage = if (dg.module.decl_exports.get(decl_index)) |exports| exports.items[0].opts.linkage == .Weak else @@ -1958,7 +2009,7 @@ pub const DeclGen = struct { try mod.markDeclAlive(decl); if (mod.decl_exports.get(decl_index)) |exports| { - try writer.print("{}", .{exports.items[export_index].opts.name.fmt(&mod.intern_pool)}); + try writer.print("{ }", .{fmtIdent(mod.intern_pool.stringToSlice(exports.items[export_index].opts.name))}); } else if (decl.getExternDecl(mod).unwrap()) |extern_decl_index| { try writer.print("{}", .{mod.declPtr(extern_decl_index).name.fmt(&mod.intern_pool)}); } else { @@ -2598,16 +2649,19 @@ fn genExports(o: *Object) !void { const fwd = o.dg.fwd_decl.writer(); const exports = mod.decl_exports.get(decl_index) orelse return; - if (exports.items.len < 2) return; + + const is_mangled = isMangledIdent(ip.stringToSlice(exports.items[0].opts.name), true); + if (exports.items.len < 2 and !is_mangled) return; switch (ip.indexToKey(tv.val.toIntern())) { .func => { - for (exports.items[1..], 1..) |@"export", i| { + const start_i = 1 - @intFromBool(is_mangled); + for (exports.items[start_i..], start_i..) |@"export", i| { try fwd.writeAll("zig_export("); if (exports.items[i].opts.linkage == .Weak) try fwd.writeAll("zig_weak_linkage_fn "); try o.dg.renderFunctionSignature(fwd, decl_index, .forward, .{ .export_index = @as(u32, @intCast(i)) }); - try fwd.print(", {s}, {s});\n", .{ - fmtStringLiteral(ip.stringToSlice(exports.items[0].opts.name), null), + try fwd.print(", { }, {s});\n", .{ + fmtIdent(ip.stringToSlice(exports.items[0].opts.name)), fmtStringLiteral(ip.stringToSlice(@"export".opts.name), null), }); } @@ -2617,7 +2671,8 @@ fn genExports(o: *Object) !void { unreachable; }, .variable => |variable| { - for (exports.items[1..], 1..) |@"export", i| { + const start_i = 1 - @intFromBool(is_mangled); + for (exports.items[start_i..], start_i..) |@"export", i| { try fwd.writeAll("zig_export("); if (exports.items[i].opts.linkage == .Weak) try fwd.writeAll("zig_weak_linkage "); const alias = ip.stringToSlice(@"export".opts.name); @@ -2629,8 +2684,8 @@ fn genExports(o: *Object) !void { decl.alignment, .complete, ); - try fwd.print(", {s}, {s});\n", .{ - fmtStringLiteral(ip.stringToSlice(exports.items[0].opts.name), null), + try fwd.print(", { }, {s});\n", .{ + fmtIdent(ip.stringToSlice(exports.items[0].opts.name)), fmtStringLiteral(alias, null), }); } @@ -2742,9 +2797,10 @@ pub fn genFunc(f: *Function) !void { o.code_header = std.ArrayList(u8).init(gpa); defer o.code_header.deinit(); - const is_global = o.dg.declIsGlobal(tv); + const visibility = o.dg.declVisibility(tv); const fwd_decl_writer = o.dg.fwd_decl.writer(); - try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static "); + try visibility.renderFwd(fwd_decl_writer); + if (mod.decl_exports.get(decl_index)) |exports| if (exports.items[0].opts.linkage == .Weak) try fwd_decl_writer.writeAll("zig_weak_linkage_fn "); try o.dg.renderFunctionSignature(fwd_decl_writer, decl_index, .forward, .{ .export_index = 0 }); @@ -2752,7 +2808,7 @@ pub fn genFunc(f: *Function) !void { try genExports(o); try o.indent_writer.insertNewline(); - if (!is_global) try o.writer().writeAll("static "); + try visibility.renderDef(o.writer()); try o.dg.renderFunctionSignature(o.writer(), decl_index, .complete, .{ .export_index = 0 }); try o.writer().writeByte(' '); @@ -2836,9 +2892,9 @@ pub fn genDecl(o: *Object) !void { if (variable.is_extern) return; - const is_global = o.dg.declIsGlobal(tv) or variable.is_extern; + const visibility = if (variable.is_extern) .global else o.dg.declVisibility(tv); const w = o.writer(); - if (!is_global) try w.writeAll("static "); + try visibility.renderDef(w); if (variable.is_weak_linkage) try w.writeAll("zig_weak_linkage "); if (variable.is_threadlocal) try w.writeAll("zig_threadlocal "); if (mod.intern_pool.stringToSliceUnwrap(decl.@"linksection")) |s| @@ -2851,16 +2907,21 @@ pub fn genDecl(o: *Object) !void { try w.writeByte(';'); try o.indent_writer.insertNewline(); } else { - const is_global = o.dg.module.decl_exports.contains(decl_index); + const visibility: DeclVisibility = if (o.dg.module.decl_exports.get(decl_index)) |exports| b: { + break :b if (isMangledIdent(o.dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true)) + .global_mangled + else + .global; + } else .local; const decl_c_value = .{ .decl = decl_index }; - return genDeclValue(o, tv, is_global, decl_c_value, decl.alignment, decl.@"linksection"); + return genDeclValue(o, tv, visibility, decl_c_value, decl.alignment, decl.@"linksection"); } } pub fn genDeclValue( o: *Object, tv: TypedValue, - is_global: bool, + visibility: DeclVisibility, decl_c_value: CValue, alignment: Alignment, link_section: InternPool.OptionalNullTerminatedString, @@ -2868,12 +2929,13 @@ pub fn genDeclValue( const mod = o.dg.module; const fwd_decl_writer = o.dg.fwd_decl.writer(); - try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static "); + try visibility.renderFwd(fwd_decl_writer); try o.dg.renderTypeAndName(fwd_decl_writer, tv.ty, decl_c_value, Const, alignment, .complete); try fwd_decl_writer.writeAll(";\n"); const w = o.writer(); - if (!is_global) try w.writeAll("static "); + try visibility.renderDef(w); + if (mod.intern_pool.stringToSliceUnwrap(link_section)) |s| try w.print("zig_linksection(\"{s}\", ", .{s}); try o.dg.renderTypeAndName(w, tv.ty, decl_c_value, Const, alignment, .complete); @@ -2898,11 +2960,14 @@ pub fn genHeader(dg: *DeclGen) error{ AnalysisFail, OutOfMemory }!void { switch (tv.ty.zigTypeTag(mod)) { .Fn => { - const is_global = dg.declIsGlobal(tv); - if (is_global) { - try writer.writeAll("zig_extern "); - try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 }); - try dg.fwd_decl.appendSlice(";\n"); + const visibility = dg.declVisibility(tv); + switch (visibility) { + .global, .global_mangled => { + try visibility.renderFwd(writer); + try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 }); + try dg.fwd_decl.appendSlice(";\n"); + }, + .local => {}, } }, else => {}, @@ -6895,9 +6960,9 @@ fn airReduce(f: *Function, inst: Air.Inst.Index) !CValue { try f.writeCValue(writer, accum, .Other); switch (op) { .float_op => |func| { - try writer.writeAll(" = zig_libc_name_"); + try writer.writeAll(" = zig_float_fn_"); try f.object.dg.renderTypeForBuiltinFnName(writer, scalar_ty); - try writer.print("({s})(", .{func.operation}); + try writer.print("_{s}(", .{func.operation}); try f.writeCValue(writer, accum, .FunctionArgument); try writer.writeAll(", "); try f.writeCValue(writer, operand, .Other); @@ -7229,11 +7294,9 @@ fn unFloatOp(f: *Function, inst: Air.Inst.Index, operand: CValue, ty: Type, oper const v = try Vectorize.start(f, inst, writer, ty); try f.writeCValue(writer, local, .Other); try v.elem(f, writer); - try writer.writeAll(" = zig_libc_name_"); + try writer.writeAll(" = zig_float_fn_"); try f.object.dg.renderTypeForBuiltinFnName(writer, scalar_ty); - try writer.writeByte('('); - try writer.writeAll(operation); - try writer.writeAll(")("); + try writer.print("_{s}(", .{operation}); try f.writeCValue(writer, operand, .FunctionArgument); try v.elem(f, writer); try writer.writeAll(");\n"); @@ -7268,11 +7331,9 @@ fn airBinFloatOp(f: *Function, inst: Air.Inst.Index, operation: []const u8) !CVa const v = try Vectorize.start(f, inst, writer, inst_ty); try f.writeCValue(writer, local, .Other); try v.elem(f, writer); - try writer.writeAll(" = zig_libc_name_"); + try writer.writeAll(" = zig_float_fn_"); try f.object.dg.renderTypeForBuiltinFnName(writer, inst_scalar_ty); - try writer.writeByte('('); - try writer.writeAll(operation); - try writer.writeAll(")("); + try writer.print("_{s}(", .{operation}); try f.writeCValue(writer, lhs, .FunctionArgument); try v.elem(f, writer); try writer.writeAll(", "); @@ -7302,9 +7363,9 @@ fn airMulAdd(f: *Function, inst: Air.Inst.Index) !CValue { const v = try Vectorize.start(f, inst, writer, inst_ty); try f.writeCValue(writer, local, .Other); try v.elem(f, writer); - try writer.writeAll(" = zig_libc_name_"); + try writer.writeAll(" = zig_float_fn_"); try f.object.dg.renderTypeForBuiltinFnName(writer, inst_scalar_ty); - try writer.writeAll("(fma)("); + try writer.writeAll("_fma("); try f.writeCValue(writer, mulend1, .FunctionArgument); try v.elem(f, writer); try writer.writeAll(", "); diff --git a/src/link/C.zig b/src/link/C.zig index 68facb374b..8c8c42a244 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -291,7 +291,7 @@ fn updateAnonDecl(self: *C, module: *Module, i: usize) !void { }; const c_value: codegen.CValue = .{ .constant = anon_decl }; const alignment: Alignment = self.aligned_anon_decls.get(anon_decl) orelse .none; - codegen.genDeclValue(&object, tv, false, c_value, alignment, .none) catch |err| switch (err) { + codegen.genDeclValue(&object, tv, .local, c_value, alignment, .none) catch |err| switch (err) { error.AnalysisFail => { @panic("TODO: C backend AnalysisFail on anonymous decl"); //try module.failed_decls.put(gpa, decl_index, object.dg.error_msg.?); diff --git a/test/behavior/bugs/12680.zig b/test/behavior/bugs/12680.zig index e75cf6ec3b..883303c4f8 100644 --- a/test/behavior/bugs/12680.zig +++ b/test/behavior/bugs/12680.zig @@ -12,11 +12,6 @@ test "export a function twice" { if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest; - if (builtin.os.tag == .macos and builtin.zig_backend == .stage2_c) { - // TODO: test.c: error: aliases are not supported on darwin - return error.SkipZigTest; - } - // If it exports the function correctly, `test_func` and `testFunc` will points to the same address. try expectEqual(test_func(), other_file.testFunc()); }