mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-05 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15308 from kcbanner/dynlib_lookup_alignment

Browse Source 
DynLib.lookup: cast the pointer to the correct alignment
This commit is contained in:
Jakub Konka 2023-04-17 12:02:57 +02:00 committed by GitHub
commit 1fb0b5a044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/dynamic_library.zig
View File

@ -348,7 +348,7 @@ pub const WindowsDynLib = struct {
pub fn lookup(self: *WindowsDynLib, comptime T: type, name: [:0]const u8) ?T {
if (windows.kernel32.GetProcAddress(self.dll, name.ptr)) |addr| {
return @ptrCast(T, addr);
return @ptrCast(T, @alignCast(@alignOf(@typeInfo(T).Pointer.child), addr));
} else {
return null;
}
@ -382,7 +382,7 @@ pub const DlDynlib = struct {
// dlsym (and other dl-functions) secretly take shadow parameter - return address on stack
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66826
if (@call(.never_tail, system.dlsym, .{ self.handle, name.ptr })) |symbol| {
return @ptrCast(T, symbol);
return @ptrCast(T, @alignCast(@alignOf(@typeInfo(T).Pointer.child), symbol));
} else {
return null;
}

7
test/standalone/load_dynamic_library/build.zig
View File

@ -8,12 +8,7 @@ pub fn build(b: *std.Build) void {
const optimize: std.builtin.OptimizeMode = .Debug;
const target: std.zig.CrossTarget = .{};
const ok = (builtin.os.tag != .wasi and
// https://github.com/ziglang/zig/issues/13550
(builtin.os.tag != .macos or builtin.cpu.arch != .aarch64) and
// https://github.com/ziglang/zig/issues/13686
(builtin.os.tag != .windows or builtin.cpu.arch != .aarch64));
if (!ok) return;
if (builtin.os.tag == .wasi) return;
const lib = b.addSharedLibrary(.{
.name = "add",