Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use template instead of raw C prefixes in genTypeInfo #24439

Merged
merged 2 commits into from
Nov 15, 2024
+20 −12
Merged

use template instead of raw C prefixes in genTypeInfo #24439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d24c324
use template instead of raw C prefixes in genTypeInfo
metagn Nov 15, 2024
ae899d3
make cAddr wrap parens, thought this was already the case
metagn Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/cbuilderexprs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ template addCast(builder: var Builder, typ: Snippet, valueBody: typed) =
builder.add ")"

proc cAddr(value: Snippet): Snippet =
"&" & value
"(&" & value & ")"

proc cLabelAddr(value: TLabel): Snippet =
"&&" & value
Expand Down
30 changes: 19 additions & 11 deletions compiler/ccgtypes.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,20 +1853,24 @@ proc genTypeInfoV2(m: BModule; t: PType; info: TLineInfo): Rope =
# distinct types can have their own destructors
var t = skipTypes(origType, irrelevantForBackend + tyUserTypeClasses - {tyDistinct})

let prefixTI = if m.hcrOn: "(" else: "(&"
template prefixTI(x: Snippet): Snippet =
if m.hcrOn:
wrapPar(x)
else:
cAddr(x)

let sig = hashType(origType, m.config)
result = m.typeInfoMarkerV2.getOrDefault(sig)
if result != "":
return prefixTI.rope & result & ")".rope
return prefixTI(result)

let marker = m.g.typeInfoMarkerV2.getOrDefault(sig)
if marker.str != "":
cgsym(m, "TNimTypeV2")
declareNimType(m, "TNimTypeV2", marker.str, marker.owner)
# also store in local type section:
m.typeInfoMarkerV2[sig] = marker.str
return prefixTI.rope & marker.str & ")".rope
return prefixTI(marker.str)

result = "NTIv2$1_" % [rope($sig)]
m.typeInfoMarkerV2[sig] = result
Expand All @@ -1878,14 +1882,14 @@ proc genTypeInfoV2(m: BModule; t: PType; info: TLineInfo): Rope =
# reference the type info as extern here
cgsym(m, "TNimTypeV2")
declareNimType(m, "TNimTypeV2", result, owner)
return prefixTI.rope & result & ")".rope
return prefixTI(result)

m.g.typeInfoMarkerV2[sig] = (str: result, owner: owner)
if m.compileToCpp or m.hcrOn:
genTypeInfoV2OldImpl(m, t, origType, result, info)
else:
genTypeInfoV2Impl(m, t, origType, result, info)
result = prefixTI.rope & result & ")".rope
result = prefixTI(result)

proc openArrayToTuple(m: BModule; t: PType): PType =
result = newType(tyTuple, m.idgen, t.owner)
Expand Down Expand Up @@ -1926,12 +1930,16 @@ proc genTypeInfoV1(m: BModule; t: PType; info: TLineInfo): Rope =
let origType = t
var t = skipTypes(origType, irrelevantForBackend + tyUserTypeClasses)

let prefixTI = if m.hcrOn: "(" else: "(&"
template prefixTI(x: Snippet): Snippet =
if m.hcrOn:
wrapPar(x)
else:
cAddr(x)

let sig = hashType(origType, m.config)
result = m.typeInfoMarker.getOrDefault(sig)
if result != "":
return prefixTI.rope & result & ")".rope
return prefixTI(result)

let marker = m.g.typeInfoMarker.getOrDefault(sig)
if marker.str != "":
Expand All @@ -1940,7 +1948,7 @@ proc genTypeInfoV1(m: BModule; t: PType; info: TLineInfo): Rope =
declareNimType(m, "TNimType", marker.str, marker.owner)
# also store in local type section:
m.typeInfoMarker[sig] = marker.str
return prefixTI.rope & marker.str & ")".rope
return prefixTI(marker.str)

result = "NTI$1$2_" % [rope(typeToC(t)), rope($sig)]
m.typeInfoMarker[sig] = result
Expand All @@ -1950,7 +1958,7 @@ proc genTypeInfoV1(m: BModule; t: PType; info: TLineInfo): Rope =
cgsym(m, "TNimType")
cgsym(m, "TNimNode")
declareNimType(m, "TNimType", result, old.int)
return prefixTI.rope & result & ")".rope
return prefixTI(result)

var owner = t.skipTypes(typedescPtrs).itemId.module
if owner != m.module.position and moduleOpenForCodegen(m.g.graph, FileIndex owner):
Expand All @@ -1960,7 +1968,7 @@ proc genTypeInfoV1(m: BModule; t: PType; info: TLineInfo): Rope =
cgsym(m, "TNimType")
cgsym(m, "TNimNode")
declareNimType(m, "TNimType", result, owner)
return prefixTI.rope & result & ")".rope
return prefixTI(result)
else:
owner = m.module.position.int32

Expand Down Expand Up @@ -2021,7 +2029,7 @@ proc genTypeInfoV1(m: BModule; t: PType; info: TLineInfo): Rope =
m.s[cfsTypeInit3].addDerefFieldAssignment(v2info, "typeInfoV1", cCast("void*", cAddr(result)))
m.s[cfsTypeInit3].addFieldAssignment(result, "typeInfoV2", cCast("void*", v2info))

result = prefixTI.rope & result & ")".rope
result = prefixTI(result)

proc genTypeInfo*(config: ConfigRef, m: BModule; t: PType; info: TLineInfo): Rope =
if optTinyRtti in config.globalOptions:
Expand Down