Skip to content

Commit 6128ef5

Browse files
authored
fix #10964 by honoring pointer deref syntax if a reified openarray is used to get an array's length (#21925)
* fix #10964 * add test
1 parent 09f36f5 commit 6128ef5

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

compiler/ccgexprs.nim

+11-2
Original file line numberDiff line numberDiff line change
@@ -1882,8 +1882,17 @@ proc genArrayLen(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
18821882
if op == mHigh: unaryExpr(p, e, d, "($1Len_0-1)")
18831883
else: unaryExpr(p, e, d, "$1Len_0")
18841884
else:
1885-
if op == mHigh: unaryExpr(p, e, d, "($1.Field1-1)")
1886-
else: unaryExpr(p, e, d, "$1.Field1")
1885+
let isDeref = a.kind in {nkHiddenDeref, nkDerefExpr}
1886+
if op == mHigh:
1887+
if isDeref:
1888+
unaryExpr(p, e, d, "($1->Field1-1)")
1889+
else:
1890+
unaryExpr(p, e, d, "($1.Field1-1)")
1891+
else:
1892+
if isDeref:
1893+
unaryExpr(p, e, d, "$1->Field1")
1894+
else:
1895+
unaryExpr(p, e, d, "$1.Field1")
18871896
of tyCstring:
18881897
if op == mHigh: unaryExpr(p, e, d, "($1 ? (#nimCStrLen($1)-1) : -1)")
18891898
else: unaryExpr(p, e, d, "($1 ? #nimCStrLen($1) : 0)")

tests/ccgbugs/t10964.nim

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
func test*(input: var openArray[int32], start: int = 0, fin: int = input.len - 1) =
2+
discard
3+
4+
var someSeq = @[1'i32]
5+
6+
test(someSeq)

0 commit comments

Comments
 (0)