mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig_clang: Fix ZigClangAPValue being underaligned vs clang::APValue.

Browse Source 
Also add a static_assert to catch future alignment mismatches on this type, and
reflect recent layout changes in the Zig bindings.
This commit is contained in:
Alex Rønne Petersen 2025-04-07 20:36:26 +02:00
parent 70437354c0
commit 79a620d617
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clang.zig
View File

@ -63,8 +63,8 @@ pub const APValueKind = enum(c_int) {
}; };
pub const APValue = extern struct { pub const APValue = extern struct {
Kind: APValueKind, Kind: APValueKind align(if (builtin.cpu.arch == .x86 and builtin.os.tag != .windows) 4 else 8),
Data: if (builtin.os.tag == .windows and (builtin.abi == .msvc or builtin.abi == .itanium)) [52]u8 else [68]u8, Data: if (builtin.cpu.arch == .x86 and builtin.os.tag != .windows) [44]u8 else [52]u8,
pub const getKind = ZigClangAPValue_getKind; pub const getKind = ZigClangAPValue_getKind;
extern fn ZigClangAPValue_getKind(*const APValue) APValueKind; extern fn ZigClangAPValue_getKind(*const APValue) APValueKind;

1
src/zig_clang.cpp
View File

@ -2329,6 +2329,7 @@ static_assert((clang::UnaryExprOrTypeTrait)ZigClangUnaryExprOrTypeTrait_Kind::Zi
static_assert((clang::UnaryExprOrTypeTrait)ZigClangUnaryExprOrTypeTrait_Kind::ZigClangUnaryExprOrTypeTrait_KindOpenMPRequiredSimdAlign == clang::UnaryExprOrTypeTrait::UETT_OpenMPRequiredSimdAlign, ""); static_assert((clang::UnaryExprOrTypeTrait)ZigClangUnaryExprOrTypeTrait_Kind::ZigClangUnaryExprOrTypeTrait_KindOpenMPRequiredSimdAlign == clang::UnaryExprOrTypeTrait::UETT_OpenMPRequiredSimdAlign, "");
static_assert(sizeof(ZigClangAPValue) == sizeof(clang::APValue), ""); static_assert(sizeof(ZigClangAPValue) == sizeof(clang::APValue), "");
static_assert(alignof(ZigClangAPValue) == alignof(clang::APValue), "");
static_assert(sizeof(ZigClangSourceLocation) == sizeof(clang::SourceLocation), ""); static_assert(sizeof(ZigClangSourceLocation) == sizeof(clang::SourceLocation), "");
static ZigClangSourceLocation bitcast(clang::SourceLocation src) { static ZigClangSourceLocation bitcast(clang::SourceLocation src) {

19
src/zig_clang.h
View File

@ -9,6 +9,7 @@
#define ZIG_ZIG_CLANG_H #define ZIG_ZIG_CLANG_H
#include <inttypes.h> #include <inttypes.h>
#include <stdalign.h>
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -65,16 +66,18 @@ enum ZigClangAPValueKind {
ZigClangAPValueAddrLabelDiff, ZigClangAPValueAddrLabelDiff,
}; };
struct ZigClangAPValue { #if defined(__i386__) && !defined(_WIN32)
# define ZIG_CLANG_APVALUE_SIZE 44
# define ZIG_CLANG_APVALUE_ALIGN 4
#else
# define ZIG_CLANG_APVALUE_SIZE 52
# define ZIG_CLANG_APVALUE_ALIGN 8
#endif
struct alignas(ZIG_CLANG_APVALUE_ALIGN) ZigClangAPValue {
enum ZigClangAPValueKind Kind; enum ZigClangAPValueKind Kind;
// experimentally-derived size of clang::APValue::DataType // experimentally-derived size of clang::APValue::DataType
#if defined(_WIN32) && defined(_MSC_VER) char Data[ZIG_CLANG_APVALUE_SIZE];
char Data[52];
#elif defined(__i386__) && !defined(_WIN32)
char Data[44];
#else
char Data[52];
#endif
}; };
struct ZigClangExprEvalResult { struct ZigClangExprEvalResult {