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

remove name field for ARC (#20797)

Browse source 
* remove name field for ARC

* mistake

* improvement

* better

* typo

* fixes a pre-existing bug
This commit is contained in:
ringabout 2022-11-09 23:22:55 +08:00 • committed by GitHub
commit f11b7debf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/ccgtypes.nim
View file

@ -1349,15 +1349,6 @@ proc genDisplay(t: PType, depth: int): Rope =
result.add "}" result.add "}"
proc genTypeInfoV2Impl(m: BModule; t, origType: PType, name: Rope; info: TLineInfo) = proc genTypeInfoV2Impl(m: BModule; t, origType: PType, name: Rope; info: TLineInfo) =
var typeName: Rope
if isDefined(m.config, "nimTypeNames") and t.kind in {tyObject, tyDistinct}:
if incompleteType(t):
localError(m.config, info, "request for RTTI generation for incomplete object: " &
typeToString(t))
typeName = genTypeInfo2Name(m, t)
else:
typeName = rope("NIM_NIL")
cgsym(m, "TNimTypeV2") cgsym(m, "TNimTypeV2")
m.s[cfsStrData].addf("N_LIB_PRIVATE TNimTypeV2 $1;$n", [name]) m.s[cfsStrData].addf("N_LIB_PRIVATE TNimTypeV2 $1;$n", [name])
@ -1373,14 +1364,26 @@ proc genTypeInfoV2Impl(m: BModule; t, origType: PType, name: Rope; info: TLineIn
let objDepth = if t.kind == tyObject: getObjDepth(t) else: -1 let objDepth = if t.kind == tyObject: getObjDepth(t) else: -1
addf(typeEntry, "; $1.name = $2;$n; $1.size = sizeof($3); $1.align = (NI16) NIM_ALIGNOF($3); $1.depth = $4; $1.flags = $5;",
[name, typeName, getTypeDesc(m, t), rope(objDepth), rope(flags)]) if t.kind in {tyObject, tyDistinct} and incompleteType(t):
localError(m.config, info, "request for RTTI generation for incomplete object: " &
typeToString(t))
if isDefined(m.config, "nimTypeNames"):
var typeName: Rope
if t.kind in {tyObject, tyDistinct}:
typeName = genTypeInfo2Name(m, t)
else:
typeName = rope("NIM_NIL")
addf(typeEntry, "; $1.name = $2", [name, typeName])
addf(typeEntry, "; $1.size = sizeof($2); $1.align = (NI16) NIM_ALIGNOF($2); $1.depth = $3; $1.flags = $4;",
[name, getTypeDesc(m, t), rope(objDepth), rope(flags)])
if objDepth >= 0: if objDepth >= 0:
let objDisplay = genDisplay(t, objDepth) let objDisplay = genDisplay(t, objDepth)
let objDisplayStore = getTempName(m) let objDisplayStore = getTempName(m)
m.s[cfsVars].addf("static $1 $2[$3] = $4;$n", [getTypeDesc(m, getSysType(m.g.graph, unknownLineInfo, tyUInt32), skVar), objDisplayStore, rope(objDepth+1), objDisplay]) m.s[cfsVars].addf("static $1 $2[$3] = $4;$n", [getTypeDesc(m, getSysType(m.g.graph, unknownLineInfo, tyUInt32), skVar), objDisplayStore, rope(objDepth+1), objDisplay])
addf(typeEntry, "; $1.display = $2;$n", [name, rope(objDisplayStore)]) addf(typeEntry, "$1.display = $2;$n", [name, rope(objDisplayStore)])
m.s[cfsTypeInit3].add typeEntry m.s[cfsTypeInit3].add typeEntry

1
lib/system.nim
View file

@ -1595,6 +1595,7 @@ when not defined(js) and defined(nimV2):
align: int16 align: int16
depth: int16 depth: int16
display: ptr UncheckedArray[uint32] # classToken display: ptr UncheckedArray[uint32] # classToken
when defined(nimTypeNames):
name: cstring name: cstring
traceImpl: pointer traceImpl: pointer
typeInfoV1: pointer # for backwards compat, usually nil typeInfoV1: pointer # for backwards compat, usually nil

1
lib/system/cyclebreaker.nim
View file

@ -138,6 +138,7 @@ proc breakCycles(s: Cell; desc: PNimTypeV2) =
else: else:
# anyhow as a link that the produced destructor does not have to follow: # anyhow as a link that the produced destructor does not have to follow:
u[] = nil u[] = nil
when traceCollector:
cprintf("[Bug] %p %s RC %ld\n", t, desc.name, t.rc shr rcShift) cprintf("[Bug] %p %s RC %ld\n", t, desc.name, t.rc shr rcShift)
deinit j.traceStack deinit j.traceStack