motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #13396 from Luukdegram/fix-12880

Browse Source 
llvm: mangle extern function names for Wasm target
This commit is contained in:
Andrew Kelley
2022-11-02 14:10:07 -04:00
parent f354ad638a
commit 5f11e341d8
6 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/codegen/llvm.zig
View File

@@ -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, {});