aboutsummaryrefslogtreecommitdiff
path: root/src/codegen/llvm.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-11-02 14:10:07 -0400
committerGitHub <noreply@github.com>2022-11-02 14:10:07 -0400
commit57dbeb90affb81501d18210db0075620e40dfefb (patch)
tree0cd16da2f626ea37276ed065dfaa3775897fdbc5 /src/codegen/llvm.zig
parentc22f17e15f79fdc97b6c5482c796649529eb61d7 (diff)
parentef0df24626cc6c3cfe0b87164d481eeb26cc57fb (diff)
downloadzig-57dbeb90affb81501d18210db0075620e40dfefb.tar.gz
zig-57dbeb90affb81501d18210db0075620e40dfefb.zip
Merge pull request #13396 from Luukdegram/fix-12880
llvm: mangle extern function names for Wasm target
Diffstat (limited to 'src/codegen/llvm.zig')
-rw-r--r--src/codegen/llvm.zig14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
index bd2807d1bb..8daffaefe0 100644
--- a/src/codegen/llvm.zig
+++ b/src/codegen/llvm.zig
@@ -1279,8 +1279,18 @@ pub const Object = struct {
const llvm_global = self.decl_map.get(decl_index) orelse return;
const decl = module.declPtr(decl_index);
if (decl.isExtern()) {
- llvm_global.setValueName(decl.name);
- if (self.getLlvmGlobal(decl.name)) |other_global| {
+ const is_wasm_fn = module.getTarget().isWasm() and try decl.isFunction();
+ const mangle_name = is_wasm_fn and
+ decl.getExternFn().?.lib_name != null and
+ !std.mem.eql(u8, std.mem.sliceTo(decl.getExternFn().?.lib_name.?, 0), "c");
+ const decl_name = if (mangle_name) name: {
+ const tmp = try std.fmt.allocPrintZ(module.gpa, "{s}|{s}", .{ decl.name, decl.getExternFn().?.lib_name.? });
+ break :name tmp.ptr;
+ } else decl.name;
+ defer if (mangle_name) module.gpa.free(std.mem.sliceTo(decl_name, 0));
+
+ llvm_global.setValueName(decl_name);
+ if (self.getLlvmGlobal(decl_name)) |other_global| {
if (other_global != llvm_global) {
log.debug("updateDeclExports isExtern()=true setValueName({s}) conflict", .{decl.name});
try self.extern_collisions.put(module.gpa, decl_index, {});