* fix #15958 * also cover openArray and VarArgs * more tests * cover even more types * cover even more types * Trigger build * Trigger build * cover sets passed as arrays
This commit is contained in:
parent
07ad608fb2
commit
fcb2ec4ed6
2 changed files with 41 additions and 1 deletions
|
|
@ -282,7 +282,8 @@ proc ccgIntroducedPtr(conf: ConfigRef; s: PSym, retType: PType): bool =
|
||||||
result = false
|
result = false
|
||||||
# first parameter and return type is 'lent T'? --> use pass by pointer
|
# first parameter and return type is 'lent T'? --> use pass by pointer
|
||||||
if s.position == 0 and retType != nil and retType.kind == tyLent:
|
if s.position == 0 and retType != nil and retType.kind == tyLent:
|
||||||
result = pt.kind != tyVar
|
result = not (pt.kind in {tyVar, tyArray, tyOpenArray, tyVarargs, tyRef, tyPtr, tyPointer} or
|
||||||
|
pt.kind == tySet and mapSetType(conf, pt) == ctArray)
|
||||||
|
|
||||||
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",
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
discard """
|
discard """
|
||||||
|
targets: "c cpp"
|
||||||
output: "1"
|
output: "1"
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
@ -14,3 +15,41 @@ proc main =
|
||||||
doAssert(not compiles(passToVar(viewInto(x))))
|
doAssert(not compiles(passToVar(viewInto(x))))
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
# issue #15958
|
||||||
|
|
||||||
|
block:
|
||||||
|
proc byLent[T](a: T): lent T = a
|
||||||
|
let a = [11,12]
|
||||||
|
let b = @[21,23]
|
||||||
|
let ss = {1, 2, 3, 5}
|
||||||
|
doAssert byLent(a) == [11,12]
|
||||||
|
doAssert byLent(a).unsafeAddr == a.unsafeAddr
|
||||||
|
doAssert byLent(b) == @[21,23]
|
||||||
|
doAssert byLent(b).unsafeAddr == b.unsafeAddr
|
||||||
|
doAssert byLent(ss) == {1, 2, 3, 5}
|
||||||
|
doAssert byLent(ss).unsafeAddr == ss.unsafeAddr
|
||||||
|
|
||||||
|
let r = new(float)
|
||||||
|
r[] = 10.0
|
||||||
|
doAssert byLent(r)[] == 10.0
|
||||||
|
|
||||||
|
let p = create(float)
|
||||||
|
p[] = 20.0
|
||||||
|
doAssert byLent(p)[] == 20.0
|
||||||
|
|
||||||
|
proc byLent2[T](a: openarray[T]): lent T = a[0]
|
||||||
|
doAssert byLent2(a) == 11
|
||||||
|
doAssert byLent2(a).unsafeAddr == a[0].unsafeAddr
|
||||||
|
doAssert byLent2(b) == 21
|
||||||
|
doAssert byLent2(b).unsafeAddr == b[0].unsafeAddr
|
||||||
|
|
||||||
|
proc byLent3[T](a: varargs[T]): lent T = a[1]
|
||||||
|
let
|
||||||
|
x = 10
|
||||||
|
y = 20
|
||||||
|
z = 30
|
||||||
|
doAssert byLent3(x, y, z) == 20
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue