Skip to content

Commit

Permalink
fix #15958 (#15970) [backport:1.4]
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
cooldome authored Nov 20, 2020
1 parent 07ad608 commit fcb2ec4
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
3 changes: 2 additions & 1 deletion compiler/ccgtypes.nim
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ proc ccgIntroducedPtr(conf: ConfigRef; s: PSym, retType: PType): bool =
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 = 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) =
fillLoc(param.sym.loc, locParam, param, ~"Result",
Expand Down
39 changes: 39 additions & 0 deletions tests/lent/tbasic_lent_check.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
discard """
targets: "c cpp"
output: "1"
"""

Expand All @@ -14,3 +15,41 @@ proc main =
doAssert(not compiles(passToVar(viewInto(x))))

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

0 comments on commit fcb2ec4

Please sign in to comment.