jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a simple sizeof checker to compare nim & c types

Browse source
This commit is contained in:
Jacek Sieka 2016-11-03 21:11:39 +08:00
commit be1e3c4e09
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/ccgtypes.nim
View file

@ -701,7 +701,10 @@ proc getTypeDescAux(m: BModule, typ: PType, check: var IntSet): Rope =
idTablePut(m.typeCache, t, result) # always call for sideeffects: idTablePut(m.typeCache, t, result) # always call for sideeffects:
let recdesc = if t.kind != tyTuple: getRecordDesc(m, t, result, check) let recdesc = if t.kind != tyTuple: getRecordDesc(m, t, result, check)
else: getTupleDesc(m, t, result, check) else: getTupleDesc(m, t, result, check)
if not isImportedType(t): add(m.s[cfsTypes], recdesc) if not isImportedType(t):
add(m.s[cfsTypes], recdesc)
elif tfIncompleteStruct notin t.flags:
addf(m.s[cfsTypeInfo], "NIM_CHECK_SIZE($1, $2);$n", [result, rope(getSize(t))])
of tySet: of tySet:
result = getTypeName(t.lastSon) & "Set" result = getTypeName(t.lastSon) & "Set"
idTablePut(m.typeCache, t, result) idTablePut(m.typeCache, t, result)

8
lib/nimbase.h
View file

@ -459,3 +459,11 @@ typedef int Nim_and_C_compiler_disagree_on_target_architecture[sizeof(NI) == siz
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
# include <sys/types.h> # include <sys/types.h>
#endif #endif
/* Compile with -t:-DNIM_CHECK_ABI to enable */
#ifdef NIM_CHECK_ABI
# define NIM_CHECK_SIZE(typ, sz) \
_Static_assert(sizeof(typ) == sz, "Nim & C disagree on type size")
#else
# define NIM_CHECK_SIZE(typ, sz)
#endif