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

fixes #14578 (#14615)

Browse source
This commit is contained in:
Andreas Rumpf 2020-06-09 17:05:01 +02:00 • committed by GitHub
commit b3029ba213
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

11
compiler/ccgtypes.nim
View file

@ -268,19 +268,18 @@ proc ccgIntroducedPtr(conf: ConfigRef; s: PSym, retType: PType): bool =
result = true result = true
elif (optByRef in s.options) or (getSize(conf, pt) > conf.target.floatSize * 3): elif (optByRef in s.options) or (getSize(conf, pt) > conf.target.floatSize * 3):
result = true # requested anyway result = true # requested anyway
elif retType != nil and retType.kind == tyLent:
result = true
elif (tfFinal in pt.flags) and (pt[0] == nil): elif (tfFinal in pt.flags) and (pt[0] == nil):
result = false # no need, because no subtyping possible result = false # no need, because no subtyping possible
else: else:
result = true # ordinary objects are always passed by reference, result = true # ordinary objects are always passed by reference,
# otherwise casting doesn't work # otherwise casting doesn't work
of tyTuple: of tyTuple:
if retType != nil and retType.kind == tyLent:
result = true
else:
result = (getSize(conf, pt) > conf.target.floatSize*3) or (optByRef in s.options) result = (getSize(conf, pt) > conf.target.floatSize*3) or (optByRef in s.options)
else: result = false else:
result = false
# first parameter and return type is 'lent T'? --> use pass by pointer
if s.position == 0 and retType != nil and retType.kind == tyLent:
result = true
proc fillResult(conf: ConfigRef; param: PNode) = proc fillResult(conf: ConfigRef; param: PNode) =
fillLoc(param.sym.loc, locParam, param, ~"Result", fillLoc(param.sym.loc, locParam, param, ~"Result",