* fix #16185 * fix test * fix comment * fix comment * better approach * Add more tests and move sameLocation to injectdestructors * Better and more strict sameLocation * Small cleanup and preliminary spec clarification * Fix * Fix doc * Expand test Co-authored-by: Andrey R (cooldome) <ariabushenko@gmail.com>
This commit is contained in:
parent
4fc7fcb775
commit
ccb11a63fb
4 changed files with 254 additions and 63 deletions
|
|
@ -168,3 +168,50 @@ proc testRefs() =
|
|||
testRefs()
|
||||
|
||||
doAssert(dDestroyed == 2)
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Issue #16185, complex self-assingment elimination
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
type
|
||||
CpuStorage*[T] = ref CpuStorageObj[T]
|
||||
CpuStorageObj[T] = object
|
||||
size*: int
|
||||
raw_buffer*: ptr UncheckedArray[T]
|
||||
Tensor[T] = object
|
||||
buf*: CpuStorage[T]
|
||||
TestObject = object
|
||||
x: Tensor[float]
|
||||
|
||||
proc `=destroy`[T](s: var CpuStorageObj[T]) =
|
||||
if s.raw_buffer != nil:
|
||||
s.raw_buffer.deallocShared()
|
||||
s.size = 0
|
||||
s.raw_buffer = nil
|
||||
|
||||
proc `=`[T](a: var CpuStorageObj[T]; b: CpuStorageObj[T]) {.error.}
|
||||
|
||||
proc allocCpuStorage[T](s: var CpuStorage[T], size: int) =
|
||||
new(s)
|
||||
s.raw_buffer = cast[ptr UncheckedArray[T]](allocShared0(sizeof(T) * size))
|
||||
s.size = size
|
||||
|
||||
proc newTensor[T](size: int): Tensor[T] =
|
||||
allocCpuStorage(result.buf, size)
|
||||
|
||||
proc `[]`[T](t: Tensor[T], idx: int): T = t.buf.raw_buffer[idx]
|
||||
proc `[]=`[T](t: Tensor[T], idx: int, val: T) = t.buf.raw_buffer[idx] = val
|
||||
|
||||
proc toTensor[T](s: seq[T]): Tensor[T] =
|
||||
result = newTensor[T](s.len)
|
||||
for i, x in s:
|
||||
result[i] = x
|
||||
|
||||
proc main2() =
|
||||
var t: TestObject
|
||||
t.x = toTensor(@[1.0, 2, 3, 4])
|
||||
t.x = t.x
|
||||
doAssert(t.x.buf != nil) # self-assignment above should be eliminated
|
||||
|
||||
main2()
|
||||
|
|
|
|||
|
|
@ -73,6 +73,25 @@ bye
|
|||
()
|
||||
()
|
||||
()
|
||||
1
|
||||
destroy
|
||||
1
|
||||
destroy
|
||||
1
|
||||
destroy
|
||||
copy (self-assign)
|
||||
1
|
||||
destroy
|
||||
1
|
||||
destroy
|
||||
1
|
||||
destroy
|
||||
destroy
|
||||
copy
|
||||
@[(f: 2), (f: 2), (f: 3)]
|
||||
destroy
|
||||
destroy
|
||||
destroy
|
||||
'''
|
||||
"""
|
||||
|
||||
|
|
@ -556,4 +575,96 @@ let w2 = newWrapper2(1)
|
|||
echo $w2[]
|
||||
|
||||
let w3 = newWrapper2(-1)
|
||||
echo $w3[]
|
||||
echo $w3[]
|
||||
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
#self-assignments
|
||||
|
||||
# Self-assignments that are not statically determinable will get
|
||||
# turned into `=copy` calls as caseBracketExprCopy demonstrates.
|
||||
# (`=copy` handles self-assignments at runtime)
|
||||
|
||||
type
|
||||
OO = object
|
||||
f: int
|
||||
W = object
|
||||
o: OO
|
||||
|
||||
proc `=destroy`(x: var OO) =
|
||||
if x.f != 0:
|
||||
echo "destroy"
|
||||
x.f = 0
|
||||
|
||||
proc `=sink`(x: var OO, y: OO) =
|
||||
`=destroy`(x)
|
||||
echo "sink"
|
||||
x.f = y.f
|
||||
|
||||
proc `=copy`(x: var OO, y: OO) =
|
||||
if x.f != y.f:
|
||||
`=destroy`(x)
|
||||
echo "copy"
|
||||
x.f = y.f
|
||||
else:
|
||||
echo "copy (self-assign)"
|
||||
|
||||
proc caseSym =
|
||||
var o = OO(f: 1)
|
||||
o = o # NOOP
|
||||
echo o.f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseSym()
|
||||
|
||||
proc caseDotExpr =
|
||||
var w = W(o: OO(f: 1))
|
||||
w.o = w.o # NOOP
|
||||
echo w.o.f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseDotExpr()
|
||||
|
||||
proc caseBracketExpr =
|
||||
var w = [0: OO(f: 1)]
|
||||
w[0] = w[0] # NOOP
|
||||
echo w[0].f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseBracketExpr()
|
||||
|
||||
proc caseBracketExprCopy =
|
||||
var w = [0: OO(f: 1)]
|
||||
let i = 0
|
||||
w[i] = w[0] # "copy (self-assign)"
|
||||
echo w[0].f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseBracketExprCopy()
|
||||
|
||||
proc caseDotExprAddr =
|
||||
var w = W(o: OO(f: 1))
|
||||
w.o = addr(w.o)[] # NOOP
|
||||
echo w.o.f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseDotExprAddr()
|
||||
|
||||
proc caseBracketExprAddr =
|
||||
var w = [0: OO(f: 1)]
|
||||
addr(w[0])[] = addr(addr(w[0])[])[] # NOOP
|
||||
echo w[0].f # "1"
|
||||
# "destroy"
|
||||
|
||||
caseBracketExprAddr()
|
||||
|
||||
proc caseNotAConstant =
|
||||
var i = 0
|
||||
proc rand: int =
|
||||
result = i
|
||||
inc i
|
||||
var s = @[OO(f: 1), OO(f: 2), OO(f: 3)]
|
||||
s[rand()] = s[rand()] # "destroy" "copy"
|
||||
echo s # @[(f: 2), (f: 2), (f: 3)]
|
||||
|
||||
caseNotAConstant()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue