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

codegen: optimized generation of proc headers (#20770)

Browse source
This commit is contained in:
Andreas Rumpf 2022-11-06 11:46:19 +01:00 • committed by GitHub
commit 3c2c728eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/ccgtypes.nim
View file

@ -425,7 +425,7 @@ proc paramStorageLoc(param: PSym): TStorageLoc =
proc genProcParams(m: BModule, t: PType, rettype, params: var Rope, proc genProcParams(m: BModule, t: PType, rettype, params: var Rope,
check: var IntSet, declareEnvironment=true; check: var IntSet, declareEnvironment=true;
weakDep=false) = weakDep=false) =
params = "" params = "("
if t[0] == nil or isInvalidReturnType(m.config, t): if t[0] == nil or isInvalidReturnType(m.config, t):
rettype = "void" rettype = "void"
else: else:
@ -434,7 +434,7 @@ proc genProcParams(m: BModule, t: PType, rettype, params: var Rope,
if t.n[i].kind != nkSym: internalError(m.config, t.n.info, "genProcParams") if t.n[i].kind != nkSym: internalError(m.config, t.n.info, "genProcParams")
var param = t.n[i].sym var param = t.n[i].sym
if isCompileTimeOnly(param.typ): continue if isCompileTimeOnly(param.typ): continue
if params != "": params.add(", ") if params != "(": params.add(", ")
fillParamName(m, param) fillParamName(m, param)
fillLoc(param.loc, locParam, t.n[i], fillLoc(param.loc, locParam, t.n[i],
param.paramStorageLoc) param.paramStorageLoc)
@ -464,7 +464,7 @@ proc genProcParams(m: BModule, t: PType, rettype, params: var Rope,
arr = arr[0].skipTypes({tySink}) arr = arr[0].skipTypes({tySink})
if t[0] != nil and isInvalidReturnType(m.config, t): if t[0] != nil and isInvalidReturnType(m.config, t):
var arr = t[0] var arr = t[0]
if params != "": params.add(", ") if params != "(": params.add(", ")
if mapReturnType(m.config, t[0]) != ctArray: if mapReturnType(m.config, t[0]) != ctArray:
if isHeaderFile in m.flags: if isHeaderFile in m.flags:
# still generates types for `--header` # still generates types for `--header`
@ -477,14 +477,13 @@ proc genProcParams(m: BModule, t: PType, rettype, params: var Rope,
params.add(getTypeDescAux(m, arr, check, skResult)) params.add(getTypeDescAux(m, arr, check, skResult))
params.addf(" Result", []) params.addf(" Result", [])
if t.callConv == ccClosure and declareEnvironment: if t.callConv == ccClosure and declareEnvironment:
if params != "": params.add(", ") if params != "(": params.add(", ")
params.add("void* ClE_0") params.add("void* ClE_0")
if tfVarargs in t.flags: if tfVarargs in t.flags:
if params != "": params.add(", ") if params != "(": params.add(", ")
params.add("...") params.add("...")
if params == "": params.add("void)") if params == "(": params.add("void)")
else: params.add(")") else: params.add(")")
params = "(" & params
proc mangleRecFieldName(m: BModule; field: PSym): Rope = proc mangleRecFieldName(m: BModule; field: PSym): Rope =
if {sfImportc, sfExportc} * field.flags != {}: if {sfImportc, sfExportc} * field.flags != {}: