diff options
| -rw-r--r-- | compiler/injectdestructors.nim | 2 | ||||
| -rw-r--r-- | lib/core/seqs.nim | 2 | ||||
| -rw-r--r-- | lib/system.nim | 34 | ||||
| -rw-r--r-- | tests/destructor/tnewruntime_misc.nim | 8 | ||||
| -rw-r--r-- | tests/destructor/tv2_cast.nim | 3 | ||||
| -rw-r--r-- | tests/errmsgs/twrong_at_operator.nim | 4 |
6 files changed, 31 insertions, 22 deletions
diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim index 87f09da59..7c2a15ce3 100644 --- a/compiler/injectdestructors.nim +++ b/compiler/injectdestructors.nim @@ -542,8 +542,6 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode = branch = copyNode(arg[i]) branch.add pArgIfTyped(arg[i][0]) result.add branch - elif isAnalysableFieldAccess(arg, c.owner) and isLastRead(arg, c): - result = destructiveMoveVar(arg, c) else: # an object that is not temporary but passed to a 'sink' parameter # results in a copy. diff --git a/lib/core/seqs.nim b/lib/core/seqs.nim index 2892e4d8a..01839a4de 100644 --- a/lib/core/seqs.nim +++ b/lib/core/seqs.nim @@ -202,7 +202,7 @@ when false: assert i < x.len x.data[i] = y - proc `@`*[T](elems: openArray[T]): NimSeqV2[T] = + proc `@`*[T](elems: sink openArray[T]): NimSeqV2[T] = result.cap = elems.len result.len = elems.len result.data = cast[type(result.data)](alloc(result.cap * sizeof(T))) diff --git a/lib/system.nim b/lib/system.nim index 7e23b5188..09280d607 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -1794,21 +1794,25 @@ proc cmp*(x, y: string): int {.noSideEffect, procvar.} ## **Note**: The precise result values depend on the used C runtime library and ## can differ between operating systems! -proc `@`* [IDX, T](a: array[IDX, T]): seq[T] {. - magic: "ArrToSeq", noSideEffect.} - ## Turns an array into a sequence. - ## - ## This most often useful for constructing - ## sequences with the array constructor: ``@[1, 2, 3]`` has the type - ## ``seq[int]``, while ``[1, 2, 3]`` has the type ``array[0..2, int]``. - ## - ## .. code-block:: Nim - ## let - ## a = [1, 3, 5] - ## b = "foo" - ## - ## echo @a # => @[1, 3, 5] - ## echo @b # => @['f', 'o', 'o'] +when defined(nimHasDefault): + proc `@`* [IDX, T](a: sink array[IDX, T]): seq[T] {. + magic: "ArrToSeq", noSideEffect.} + ## Turns an array into a sequence. + ## + ## This most often useful for constructing + ## sequences with the array constructor: ``@[1, 2, 3]`` has the type + ## ``seq[int]``, while ``[1, 2, 3]`` has the type ``array[0..2, int]``. + ## + ## .. code-block:: Nim + ## let + ## a = [1, 3, 5] + ## b = "foo" + ## + ## echo @a # => @[1, 3, 5] + ## echo @b # => @['f', 'o', 'o'] +else: + proc `@`* [IDX, T](a: array[IDX, T]): seq[T] {. + magic: "ArrToSeq", noSideEffect.} when defined(nimHasDefault): proc default*(T: typedesc): T {.magic: "Default", noSideEffect.} diff --git a/tests/destructor/tnewruntime_misc.nim b/tests/destructor/tnewruntime_misc.nim index c5f978a98..d6c03b9b0 100644 --- a/tests/destructor/tnewruntime_misc.nim +++ b/tests/destructor/tnewruntime_misc.nim @@ -75,5 +75,13 @@ proc selfAssign = selfAssign() +# bug #11833 +type FooAt = object + +proc testWrongAt() = + var x = @[@[FooAt()]] + +testWrongAt() + let (a, d) = allocCounters() discard cprintf("%ld new: %ld\n", a - unpairedEnvAllocs() - d, allocs) diff --git a/tests/destructor/tv2_cast.nim b/tests/destructor/tv2_cast.nim index 8a4d69ef0..9c05b2ae1 100644 --- a/tests/destructor/tv2_cast.nim +++ b/tests/destructor/tv2_cast.nim @@ -2,7 +2,6 @@ discard """ cmd: '''nim c --newruntime $file''' output: '''@[1] @[116, 101, 115, 116] -test @[1953719668, 875770417]''' """ @@ -13,7 +12,7 @@ echo cast[seq[uint8]](@[1]) echo cast[seq[uint8]]("test") discard cast[string](@[116'u8, 101, 115, 116]) -echo cast[string](@[116'u8, 101, 115, 116]) +#echo cast[string](@[116'u8, 101, 115, 116, 0]) var a = cast[seq[uint32]]("test1234") a.setLen(2) echo a diff --git a/tests/errmsgs/twrong_at_operator.nim b/tests/errmsgs/twrong_at_operator.nim index 7ce077003..edf584094 100644 --- a/tests/errmsgs/twrong_at_operator.nim +++ b/tests/errmsgs/twrong_at_operator.nim @@ -8,9 +8,9 @@ proc `@`[T](a: openArray[T]): seq[T] first type mismatch at position: 1 required type for a: openarray[T] but expression '[int]' is of type: array[0..0, type int] -proc `@`[IDX, T](a: array[IDX, T]): seq[T] +proc `@`[IDX, T](a: sink array[IDX, T]): seq[T] first type mismatch at position: 1 - required type for a: array[IDX, T] + required type for a: sink array[IDX, T] but expression '[int]' is of type: array[0..0, type int] expression: @[int] |