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

add primitive type abi check

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

13
compiler/ccgtypes.nim
View file

@ -206,6 +206,10 @@ proc cacheGetType(tab: TIdTable, key: PType): Rope =
# linear search is not necessary anymore: # linear search is not necessary anymore:
result = Rope(idTableGet(tab, key)) result = Rope(idTableGet(tab, key))
proc addAbiCheck(m: BModule, t: PType, name: Rope) =
if isDefined("checkabi"):
addf(m.s[cfsTypeInfo], "NIM_CHECK_SIZE($1, $2);$n", [name, rope(getSize(t))])
proc getTempName(m: BModule): Rope = proc getTempName(m: BModule): Rope =
result = m.tmpBase & rope(m.labels) result = m.tmpBase & rope(m.labels)
inc m.labels inc m.labels
@ -267,6 +271,11 @@ proc getSimpleTypeDesc(m: BModule, typ: PType): Rope =
result = getSimpleTypeDesc(m, lastSon typ) result = getSimpleTypeDesc(m, lastSon typ)
else: result = nil else: result = nil
if result != nil and typ.isImportedType():
if cacheGetType(m.typeCache, typ) == nil:
idTablePut(m.typeCache, typ, result)
addAbiCheck(m, typ, result)
proc pushType(m: BModule, typ: PType) = proc pushType(m: BModule, typ: PType) =
add(m.typeStack, typ) add(m.typeStack, typ)
@ -656,6 +665,7 @@ proc getTypeDescAux(m: BModule, typ: PType, check: var IntSet): Rope =
let foo = getTypeDescAux(m, t.sons[1], check) let foo = getTypeDescAux(m, t.sons[1], check)
addf(m.s[cfsTypes], "typedef $1 $2[$3];$n", addf(m.s[cfsTypes], "typedef $1 $2[$3];$n",
[foo, result, rope(n)]) [foo, result, rope(n)])
else: addAbiCheck(m, t, result)
of tyObject, tyTuple: of tyObject, tyTuple:
if isImportedCppType(t) and typ.kind == tyGenericInst: if isImportedCppType(t) and typ.kind == tyGenericInst:
# for instantiated templates we do not go through the type cache as the # for instantiated templates we do not go through the type cache as the
@ -703,8 +713,7 @@ proc getTypeDescAux(m: BModule, typ: PType, check: var IntSet): Rope =
else: getTupleDesc(m, t, result, check) else: getTupleDesc(m, t, result, check)
if not isImportedType(t): if not isImportedType(t):
add(m.s[cfsTypes], recdesc) add(m.s[cfsTypes], recdesc)
elif tfIncompleteStruct notin t.flags and isDefined("checkabi"): elif tfIncompleteStruct notin t.flags: addAbiCheck(m, t, result)
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)