authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 17:48:40-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 17:49:57-07:00
log2b589783602c5428ecde9dbb3f41a81f85eb0f25
tree1243f6c66249ccee39c22f39f7b7144dba9d60b9
parente426ae43aec0e57ddbdde9813365cad0394a0030

Revert "Merge pull request #17824 from kcbanner/fixup_msvc_fmax"

This reverts commit 7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8, reversing changes made to 3f2a65594e1d3c0a4f4943a4ea522e8405db81e0. Unfortunately, this sat in the PR queue too long and the merge broke the zig1.wasm bootstrap process.

7 files changed, 92 insertions(+), 185 deletions(-)

ci/x86_64-windows-debug.ps1+6-5
......@@ -96,8 +96,9 @@ Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\E
9696CheckLastExitCode
9797
9898Write-Output "Build and run behavior tests with msvc..."
99& 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
100CheckLastExitCode
101
102& .\test-x86_64-windows-msvc.exe
103CheckLastExitCode
99Write-Output "Skipped due to https://github.com/ziglang/zig/issues/17817"
100#& 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
101#CheckLastExitCode
102#
103#& .\test-x86_64-windows-msvc.exe
104#CheckLastExitCode
ci/x86_64-windows-release.ps1+6-5
......@@ -95,8 +95,9 @@ Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\E
9595CheckLastExitCode
9696
9797Write-Output "Build and run behavior tests with msvc..."
98& 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
99CheckLastExitCode
100
101& .\test-x86_64-windows-msvc.exe
102CheckLastExitCode
98Write-Output "Skipped due to https://github.com/ziglang/zig/issues/17817"
99#& 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
100#CheckLastExitCode
101#
102#& .\test-x86_64-windows-msvc.exe
103#CheckLastExitCode
lib/std/math.zig-1
......@@ -1266,7 +1266,6 @@ pub fn lerp(a: anytype, b: anytype, t: anytype) @TypeOf(a, b, t) {
12661266}
12671267
12681268test "lerp" {
1269 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/17884
12701269 if (builtin.zig_backend == .stage2_x86_64 and
12711270 !comptime std.Target.x86.featureSetHas(builtin.cpu.features, .fma)) return error.SkipZigTest;
12721271
lib/zig.h+32-70
......@@ -112,7 +112,7 @@ typedef char bool;
112112#define zig_never_tail zig_never_tail_unavailable
113113#endif
114114
115#if zig_has_attribute(musttail)
115#if zig_has_attribute(always_inline)
116116#define zig_always_tail __attribute__((musttail))
117117#else
118118#define zig_always_tail zig_always_tail_unavailable
......@@ -180,56 +180,20 @@ typedef char bool;
180180#define zig_extern extern
181181#endif
182182
183#if _MSC_VER
184#define zig_extern_mangled zig_extern
185#else
186#if zig_has_attribute(visibility)
187#define zig_extern_mangled zig_extern __attribute__((visibility("hidden")))
188#else
189#define zig_extern_mangled zig_extern
190#endif
191#endif
192
193#if _MSC_VER
194#if _M_X64
195#define zig_export(sig, symbol, name) zig_extern sig;\
196 __pragma(comment(linker, "/alternatename:" name "=" #symbol ))
197#else /*_M_X64 */
198#define zig_export(sig, symbol, name) zig_extern sig;\
199 __pragma(comment(linker, "/alternatename:" name "=" #symbol ))
200#endif /*_M_X64 */
201#else /* _MSC_VER */
202#if __APPLE__
203#define zig_export(sig, symbol, name) zig_extern sig;\
204 __asm("_" name " = _" #symbol)
205#else /* __APPLE__ */
206#define zig_export(sig, symbol, name) zig_extern sig;\
207 __asm(name " = " #symbol)
208#endif /* __APPLE__ */
209#endif /* _MSC_VER */
210
211#if _MSC_VER
183#if zig_has_attribute(alias)
184#define zig_export(sig, symbol, name) zig_extern sig __attribute__((alias(symbol)))
185#elif _MSC_VER
212186#if _M_X64
213#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args;\
214 __pragma(comment(linker, "/alternatename:" #fn_name "=" #libc_name ));
187#define zig_export(sig, symbol, name) sig;\
188 __pragma(comment(linker, "/alternatename:" name "=" symbol ))
215189#else /*_M_X64 */
216#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args;\
217 __pragma(comment(linker, "/alternatename:_" #fn_name "=_" #libc_name ));
190#define zig_export(sig, symbol, name) sig;\
191 __pragma(comment(linker, "/alternatename:_" name "=_" symbol ))
218192#endif /*_M_X64 */
219#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_import(Type, fn_name, sig_args, call_args)
220#else /* _MSC_VER */
221#if __APPLE__
222#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args __asm("_" #libc_name);
223#else /* __APPLE__ */
224#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args __asm(#libc_name);
225#endif /* __APPLE__ */
226#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type libc_name sig_args; \
227 static inline Type fn_name sig_args { return libc_name call_args; }
193#else
194#define zig_export(sig, symbol, name) __asm(name " = " symbol)
228195#endif
229196
230#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)
231#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)
232
233197#if zig_has_attribute(weak) || defined(zig_gnuc)
234198#define zig_weak_linkage __attribute__((weak))
235199#define zig_weak_linkage_fn __attribute__((weak))
......@@ -3129,7 +3093,6 @@ ypedef uint32_t zig_f32;
31293093
31303094#define zig_has_f64 1
31313095#define zig_libc_name_f64(name) name
3132
31333096#if _MSC_VER
31343097#define zig_init_special_f64(sign, name, arg, repr) sign zig_make_f64(zig_msvc_flt_##name, )
31353098#else
......@@ -3355,7 +3318,6 @@ zig_float_negate_builtin(128, zig_make_u128, (UINT64_C(1) << 63, UINT64_C(0)))
33553318 return lhs operator rhs; \
33563319 }
33573320
3358#define zig_expand_has_builtin(b) zig_has_builtin(b)
33593321#define zig_common_float_builtins(w) \
33603322 zig_convert_builtin( int64_t, int64_t, fix, zig_f##w, zig_f##w, ) \
33613323 zig_convert_builtin(zig_i128, zig_i128, fix, zig_f##w, zig_f##w, ) \
......@@ -3374,31 +3336,31 @@ zig_float_negate_builtin(128, zig_make_u128, (UINT64_C(1) << 63, UINT64_C(0)))
33743336 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, sub, -) \
33753337 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, mul, *) \
33763338 zig_expand_concat(zig_float_binary_builtin_, zig_has_f##w)(f##w, div, /) \
3377 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)) \
3378 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)) \
3379 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)) \
3380 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)) \
3381 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)) \
3382 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)) \
3383 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)) \
3384 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)) \
3385 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)) \
3386 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)) \
3387 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)) \
3388 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)) \
3389 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)) \
3390 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)) \
3391 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)) \
3392 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)) \
3393 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)) \
3394 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)) \
3339 zig_extern zig_f##w zig_libc_name_f##w(sqrt)(zig_f##w); \
3340 zig_extern zig_f##w zig_libc_name_f##w(sin)(zig_f##w); \
3341 zig_extern zig_f##w zig_libc_name_f##w(cos)(zig_f##w); \
3342 zig_extern zig_f##w zig_libc_name_f##w(tan)(zig_f##w); \
3343 zig_extern zig_f##w zig_libc_name_f##w(exp)(zig_f##w); \
3344 zig_extern zig_f##w zig_libc_name_f##w(exp2)(zig_f##w); \
3345 zig_extern zig_f##w zig_libc_name_f##w(log)(zig_f##w); \
3346 zig_extern zig_f##w zig_libc_name_f##w(log2)(zig_f##w); \
3347 zig_extern zig_f##w zig_libc_name_f##w(log10)(zig_f##w); \
3348 zig_extern zig_f##w zig_libc_name_f##w(fabs)(zig_f##w); \
3349 zig_extern zig_f##w zig_libc_name_f##w(floor)(zig_f##w); \
3350 zig_extern zig_f##w zig_libc_name_f##w(ceil)(zig_f##w); \
3351 zig_extern zig_f##w zig_libc_name_f##w(round)(zig_f##w); \
3352 zig_extern zig_f##w zig_libc_name_f##w(trunc)(zig_f##w); \
3353 zig_extern zig_f##w zig_libc_name_f##w(fmod)(zig_f##w, zig_f##w); \
3354 zig_extern zig_f##w zig_libc_name_f##w(fmin)(zig_f##w, zig_f##w); \
3355 zig_extern zig_f##w zig_libc_name_f##w(fmax)(zig_f##w, zig_f##w); \
3356 zig_extern zig_f##w zig_libc_name_f##w(fma)(zig_f##w, zig_f##w, zig_f##w); \
33953357\
33963358 static inline zig_f##w zig_div_trunc_f##w(zig_f##w lhs, zig_f##w rhs) { \
3397 return zig_float_fn_f##w##_trunc(zig_div_f##w(lhs, rhs)); \
3359 return zig_libc_name_f##w(trunc)(zig_div_f##w(lhs, rhs)); \
33983360 } \
33993361\
34003362 static inline zig_f##w zig_div_floor_f##w(zig_f##w lhs, zig_f##w rhs) { \
3401 return zig_float_fn_f##w##_floor(zig_div_f##w(lhs, rhs)); \
3363 return zig_libc_name_f##w(floor)(zig_div_f##w(lhs, rhs)); \
34023364 } \
34033365\
34043366 static inline zig_f##w zig_mod_f##w(zig_f##w lhs, zig_f##w rhs) { \
......@@ -3502,7 +3464,7 @@ zig_float_builtins(64)
35023464 zig_##Type zig_atomicrmw_desired; \
35033465 zig_atomic_load(zig_atomicrmw_expected, obj, memory_order_relaxed, Type, ReprType); \
35043466 do { \
3505 zig_atomicrmw_desired = zig_float_fn_##Type##_fmin(zig_atomicrmw_expected, arg); \
3467 zig_atomicrmw_desired = zig_libc_name_##Type(fmin)(zig_atomicrmw_expected, arg); \
35063468 } while (!zig_cmpxchg_weak(obj, zig_atomicrmw_expected, zig_atomicrmw_desired, order, memory_order_relaxed, Type, ReprType)); \
35073469 res = zig_atomicrmw_expected; \
35083470} while (0)
......@@ -3511,7 +3473,7 @@ zig_float_builtins(64)
35113473 zig_##Type zig_atomicrmw_desired; \
35123474 zig_atomic_load(zig_atomicrmw_expected, obj, memory_order_relaxed, Type, ReprType); \
35133475 do { \
3514 zig_atomicrmw_desired = zig_float_fn_##Type##_fmax(zig_atomicrmw_expected, arg); \
3476 zig_atomicrmw_desired = zig_libc_name_##Type(fmax)(zig_atomicrmw_expected, arg); \
35153477 } while (!zig_cmpxchg_weak(obj, zig_atomicrmw_expected, zig_atomicrmw_desired, order, memory_order_relaxed, Type, ReprType)); \
35163478 res = zig_atomicrmw_expected; \
35173479} while (0)
src/codegen/c.zig+42-103
......@@ -258,42 +258,6 @@ pub fn fmtIdent(ident: []const u8) std.fmt.Formatter(formatIdent) {
258258 return .{ .data = ident };
259259}
260260
261// Returns true if `formatIdent` would make any edits to ident.
262// This must be kept in sync with `formatIdent`.
263pub fn isMangledIdent(ident: []const u8, solo: bool) bool {
264 if (solo and isReservedIdent(ident)) return true;
265 for (ident, 0..) |c, i| {
266 switch (c) {
267 'a'...'z', 'A'...'Z', '_' => {},
268 '0'...'9' => if (i == 0) return true,
269 else => return true,
270 }
271 }
272 return false;
273}
274
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
297261/// This data is available when outputting .c code for a `InternPool.Index`
298262/// that corresponds to `func`.
299263/// It is not available when generating .h file.
......@@ -566,7 +530,6 @@ pub const DeclGen = struct {
566530 is_naked_fn: bool,
567531 /// This is a borrowed reference from `link.C`.
568532 fwd_decl: std.ArrayList(u8),
569
570533 error_msg: ?*Module.ErrorMsg,
571534 ctypes: CType.Store,
572535 /// Keeps track of anonymous decls that need to be rendered before this
......@@ -1668,7 +1631,7 @@ pub const DeclGen = struct {
16681631
16691632 switch (name) {
16701633 .export_index => |export_index| try dg.renderDeclName(w, fn_decl_index, export_index),
1671 .string => |string| try w.print("{ }", .{fmtIdent(string)}),
1634 .string => |string| try w.writeAll(string),
16721635 }
16731636
16741637 try renderTypeSuffix(
......@@ -1880,26 +1843,12 @@ pub const DeclGen = struct {
18801843 try renderTypeSuffix(dg.pass, store.*, mod, w, cty_idx, .suffix, .{});
18811844 }
18821845
1883 fn declVisibility(dg: *DeclGen, tv: TypedValue) DeclVisibility {
1846 fn declIsGlobal(dg: *DeclGen, tv: TypedValue) bool {
18841847 const mod = dg.module;
18851848 return switch (mod.intern_pool.indexToKey(tv.val.ip_index)) {
1886 .variable => |variable| {
1887 if (mod.decl_exports.get(variable.decl)) |exports| {
1888 return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
1889 .global_mangled
1890 else
1891 .global;
1892 } else return .local;
1893 },
1894 .extern_func => .global,
1895 .func => |func| {
1896 if (mod.decl_exports.get(func.owner_decl)) |exports| {
1897 return if (isMangledIdent(dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
1898 .global_mangled
1899 else
1900 .global;
1901 } else return .local;
1902 },
1849 .variable => |variable| mod.decl_exports.contains(variable.decl),
1850 .extern_func => true,
1851 .func => |func| mod.decl_exports.contains(func.owner_decl),
19031852 else => unreachable,
19041853 };
19051854 }
......@@ -1984,8 +1933,8 @@ pub const DeclGen = struct {
19841933 fn renderFwdDecl(dg: *DeclGen, decl_index: InternPool.DeclIndex, variable: InternPool.Key.Variable) !void {
19851934 const decl = dg.module.declPtr(decl_index);
19861935 const fwd = dg.fwd_decl.writer();
1987 const visibility = if (variable.is_extern) .global else dg.declVisibility(.{ .ty = decl.ty, .val = decl.val });
1988 try visibility.renderFwd(fwd);
1936 const is_global = dg.declIsGlobal(.{ .ty = decl.ty, .val = decl.val }) or variable.is_extern;
1937 try fwd.writeAll(if (is_global) "zig_extern " else "static ");
19891938 const export_weak_linkage = if (dg.module.decl_exports.get(decl_index)) |exports|
19901939 exports.items[0].opts.linkage == .Weak
19911940 else
......@@ -2009,7 +1958,7 @@ pub const DeclGen = struct {
20091958 try mod.markDeclAlive(decl);
20101959
20111960 if (mod.decl_exports.get(decl_index)) |exports| {
2012 try writer.print("{ }", .{fmtIdent(mod.intern_pool.stringToSlice(exports.items[export_index].opts.name))});
1961 try writer.print("{}", .{exports.items[export_index].opts.name.fmt(&mod.intern_pool)});
20131962 } else if (decl.getExternDecl(mod).unwrap()) |extern_decl_index| {
20141963 try writer.print("{}", .{mod.declPtr(extern_decl_index).name.fmt(&mod.intern_pool)});
20151964 } else {
......@@ -2649,19 +2598,16 @@ fn genExports(o: *Object) !void {
26492598 const fwd = o.dg.fwd_decl.writer();
26502599
26512600 const exports = mod.decl_exports.get(decl_index) orelse return;
2652
2653 const is_mangled = isMangledIdent(ip.stringToSlice(exports.items[0].opts.name), true);
2654 if (exports.items.len < 2 and !is_mangled) return;
2601 if (exports.items.len < 2) return;
26552602
26562603 switch (ip.indexToKey(tv.val.toIntern())) {
26572604 .func => {
2658 const start_i = 1 - @intFromBool(is_mangled);
2659 for (exports.items[start_i..], start_i..) |@"export", i| {
2605 for (exports.items[1..], 1..) |@"export", i| {
26602606 try fwd.writeAll("zig_export(");
26612607 if (exports.items[i].opts.linkage == .Weak) try fwd.writeAll("zig_weak_linkage_fn ");
26622608 try o.dg.renderFunctionSignature(fwd, decl_index, .forward, .{ .export_index = @as(u32, @intCast(i)) });
2663 try fwd.print(", { }, {s});\n", .{
2664 fmtIdent(ip.stringToSlice(exports.items[0].opts.name)),
2609 try fwd.print(", {s}, {s});\n", .{
2610 fmtStringLiteral(ip.stringToSlice(exports.items[0].opts.name), null),
26652611 fmtStringLiteral(ip.stringToSlice(@"export".opts.name), null),
26662612 });
26672613 }
......@@ -2671,8 +2617,7 @@ fn genExports(o: *Object) !void {
26712617 unreachable;
26722618 },
26732619 .variable => |variable| {
2674 const start_i = 1 - @intFromBool(is_mangled);
2675 for (exports.items[start_i..], start_i..) |@"export", i| {
2620 for (exports.items[1..], 1..) |@"export", i| {
26762621 try fwd.writeAll("zig_export(");
26772622 if (exports.items[i].opts.linkage == .Weak) try fwd.writeAll("zig_weak_linkage ");
26782623 const alias = ip.stringToSlice(@"export".opts.name);
......@@ -2684,8 +2629,8 @@ fn genExports(o: *Object) !void {
26842629 decl.alignment,
26852630 .complete,
26862631 );
2687 try fwd.print(", { }, {s});\n", .{
2688 fmtIdent(ip.stringToSlice(exports.items[0].opts.name)),
2632 try fwd.print(", {s}, {s});\n", .{
2633 fmtStringLiteral(ip.stringToSlice(exports.items[0].opts.name), null),
26892634 fmtStringLiteral(alias, null),
26902635 });
26912636 }
......@@ -2797,10 +2742,9 @@ pub fn genFunc(f: *Function) !void {
27972742 o.code_header = std.ArrayList(u8).init(gpa);
27982743 defer o.code_header.deinit();
27992744
2800 const visibility = o.dg.declVisibility(tv);
2745 const is_global = o.dg.declIsGlobal(tv);
28012746 const fwd_decl_writer = o.dg.fwd_decl.writer();
2802 try visibility.renderFwd(fwd_decl_writer);
2803
2747 try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static ");
28042748 if (mod.decl_exports.get(decl_index)) |exports|
28052749 if (exports.items[0].opts.linkage == .Weak) try fwd_decl_writer.writeAll("zig_weak_linkage_fn ");
28062750 try o.dg.renderFunctionSignature(fwd_decl_writer, decl_index, .forward, .{ .export_index = 0 });
......@@ -2808,7 +2752,7 @@ pub fn genFunc(f: *Function) !void {
28082752 try genExports(o);
28092753
28102754 try o.indent_writer.insertNewline();
2811 try visibility.renderDef(o.writer());
2755 if (!is_global) try o.writer().writeAll("static ");
28122756 try o.dg.renderFunctionSignature(o.writer(), decl_index, .complete, .{ .export_index = 0 });
28132757 try o.writer().writeByte(' ');
28142758
......@@ -2892,9 +2836,9 @@ pub fn genDecl(o: *Object) !void {
28922836
28932837 if (variable.is_extern) return;
28942838
2895 const visibility = if (variable.is_extern) .global else o.dg.declVisibility(tv);
2839 const is_global = o.dg.declIsGlobal(tv) or variable.is_extern;
28962840 const w = o.writer();
2897 try visibility.renderDef(w);
2841 if (!is_global) try w.writeAll("static ");
28982842 if (variable.is_weak_linkage) try w.writeAll("zig_weak_linkage ");
28992843 if (variable.is_threadlocal) try w.writeAll("zig_threadlocal ");
29002844 if (mod.intern_pool.stringToSliceUnwrap(decl.@"linksection")) |s|
......@@ -2907,21 +2851,16 @@ pub fn genDecl(o: *Object) !void {
29072851 try w.writeByte(';');
29082852 try o.indent_writer.insertNewline();
29092853 } else {
2910 const visibility: DeclVisibility = if (o.dg.module.decl_exports.get(decl_index)) |exports| b: {
2911 break :b if (isMangledIdent(o.dg.module.intern_pool.stringToSlice(exports.items[0].opts.name), true))
2912 .global_mangled
2913 else
2914 .global;
2915 } else .local;
2854 const is_global = o.dg.module.decl_exports.contains(decl_index);
29162855 const decl_c_value = .{ .decl = decl_index };
2917 return genDeclValue(o, tv, visibility, decl_c_value, decl.alignment, decl.@"linksection");
2856 return genDeclValue(o, tv, is_global, decl_c_value, decl.alignment, decl.@"linksection");
29182857 }
29192858}
29202859
29212860pub fn genDeclValue(
29222861 o: *Object,
29232862 tv: TypedValue,
2924 visibility: DeclVisibility,
2863 is_global: bool,
29252864 decl_c_value: CValue,
29262865 alignment: Alignment,
29272866 link_section: InternPool.OptionalNullTerminatedString,
......@@ -2929,13 +2868,12 @@ pub fn genDeclValue(
29292868 const mod = o.dg.module;
29302869 const fwd_decl_writer = o.dg.fwd_decl.writer();
29312870
2932 try visibility.renderFwd(fwd_decl_writer);
2871 try fwd_decl_writer.writeAll(if (is_global) "zig_extern " else "static ");
29332872 try o.dg.renderTypeAndName(fwd_decl_writer, tv.ty, decl_c_value, Const, alignment, .complete);
29342873 try fwd_decl_writer.writeAll(";\n");
29352874
29362875 const w = o.writer();
2937 try visibility.renderDef(w);
2938
2876 if (!is_global) try w.writeAll("static ");
29392877 if (mod.intern_pool.stringToSliceUnwrap(link_section)) |s|
29402878 try w.print("zig_linksection(\"{s}\", ", .{s});
29412879 try o.dg.renderTypeAndName(w, tv.ty, decl_c_value, Const, alignment, .complete);
......@@ -2960,14 +2898,11 @@ pub fn genHeader(dg: *DeclGen) error{ AnalysisFail, OutOfMemory }!void {
29602898
29612899 switch (tv.ty.zigTypeTag(mod)) {
29622900 .Fn => {
2963 const visibility = dg.declVisibility(tv);
2964 switch (visibility) {
2965 .global, .global_mangled => {
2966 try visibility.renderFwd(writer);
2967 try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 });
2968 try dg.fwd_decl.appendSlice(";\n");
2969 },
2970 .local => {},
2901 const is_global = dg.declIsGlobal(tv);
2902 if (is_global) {
2903 try writer.writeAll("zig_extern ");
2904 try dg.renderFunctionSignature(writer, dg.pass.decl, .complete, .{ .export_index = 0 });
2905 try dg.fwd_decl.appendSlice(";\n");
29712906 }
29722907 },
29732908 else => {},
......@@ -6960,9 +6895,9 @@ fn airReduce(f: *Function, inst: Air.Inst.Index) !CValue {
69606895 try f.writeCValue(writer, accum, .Other);
69616896 switch (op) {
69626897 .float_op => |func| {
6963 try writer.writeAll(" = zig_float_fn_");
6898 try writer.writeAll(" = zig_libc_name_");
69646899 try f.object.dg.renderTypeForBuiltinFnName(writer, scalar_ty);
6965 try writer.print("_{s}(", .{func.operation});
6900 try writer.print("({s})(", .{func.operation});
69666901 try f.writeCValue(writer, accum, .FunctionArgument);
69676902 try writer.writeAll(", ");
69686903 try f.writeCValue(writer, operand, .Other);
......@@ -7294,9 +7229,11 @@ fn unFloatOp(f: *Function, inst: Air.Inst.Index, operand: CValue, ty: Type, oper
72947229 const v = try Vectorize.start(f, inst, writer, ty);
72957230 try f.writeCValue(writer, local, .Other);
72967231 try v.elem(f, writer);
7297 try writer.writeAll(" = zig_float_fn_");
7232 try writer.writeAll(" = zig_libc_name_");
72987233 try f.object.dg.renderTypeForBuiltinFnName(writer, scalar_ty);
7299 try writer.print("_{s}(", .{operation});
7234 try writer.writeByte('(');
7235 try writer.writeAll(operation);
7236 try writer.writeAll(")(");
73007237 try f.writeCValue(writer, operand, .FunctionArgument);
73017238 try v.elem(f, writer);
73027239 try writer.writeAll(");\n");
......@@ -7331,9 +7268,11 @@ fn airBinFloatOp(f: *Function, inst: Air.Inst.Index, operation: []const u8) !CVa
73317268 const v = try Vectorize.start(f, inst, writer, inst_ty);
73327269 try f.writeCValue(writer, local, .Other);
73337270 try v.elem(f, writer);
7334 try writer.writeAll(" = zig_float_fn_");
7271 try writer.writeAll(" = zig_libc_name_");
73357272 try f.object.dg.renderTypeForBuiltinFnName(writer, inst_scalar_ty);
7336 try writer.print("_{s}(", .{operation});
7273 try writer.writeByte('(');
7274 try writer.writeAll(operation);
7275 try writer.writeAll(")(");
73377276 try f.writeCValue(writer, lhs, .FunctionArgument);
73387277 try v.elem(f, writer);
73397278 try writer.writeAll(", ");
......@@ -7363,9 +7302,9 @@ fn airMulAdd(f: *Function, inst: Air.Inst.Index) !CValue {
73637302 const v = try Vectorize.start(f, inst, writer, inst_ty);
73647303 try f.writeCValue(writer, local, .Other);
73657304 try v.elem(f, writer);
7366 try writer.writeAll(" = zig_float_fn_");
7305 try writer.writeAll(" = zig_libc_name_");
73677306 try f.object.dg.renderTypeForBuiltinFnName(writer, inst_scalar_ty);
7368 try writer.writeAll("_fma(");
7307 try writer.writeAll("(fma)(");
73697308 try f.writeCValue(writer, mulend1, .FunctionArgument);
73707309 try v.elem(f, writer);
73717310 try writer.writeAll(", ");
src/link/C.zig+1-1
......@@ -262,7 +262,7 @@ fn updateAnonDecl(self: *C, module: *Module, i: usize) !void {
262262 };
263263 const c_value: codegen.CValue = .{ .constant = anon_decl };
264264 const alignment: Alignment = self.aligned_anon_decls.get(anon_decl) orelse .none;
265 codegen.genDeclValue(&object, tv, .local, c_value, alignment, .none) catch |err| switch (err) {
265 codegen.genDeclValue(&object, tv, false, c_value, alignment, .none) catch |err| switch (err) {
266266 error.AnalysisFail => {
267267 @panic("TODO: C backend AnalysisFail on anonymous decl");
268268 //try module.failed_decls.put(gpa, decl_index, object.dg.error_msg.?);
test/behavior/bugs/12680.zig+5
......@@ -12,6 +12,11 @@ test "export a function twice" {
1212 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1313 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
1414
15 if (builtin.os.tag == .macos and builtin.zig_backend == .stage2_c) {
16 // TODO: test.c: error: aliases are not supported on darwin
17 return error.SkipZigTest;
18 }
19
1520 // If it exports the function correctly, `test_func` and `testFunc` will points to the same address.
1621 try expectEqual(test_func(), other_file.testFunc());
1722}