mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-04 02:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix #15035 (#15236)" (#15408)

Browse Source 
This reverts commit f8c48fc186.
This commit is contained in:
cooldome
2020-09-24 21:21:14 +01:00
committed by GitHub
parent e3b5f80a89
commit 68ec7a018b
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/injectdestructors.nim
View File

@@ -699,9 +699,8 @@ proc p(n: PNode; c: var Con; s: var Scope; mode: ProcessMode): PNode =
elif n.kind in {nkObjDownConv, nkObjUpConv}:
result = copyTree(n)
result[0] = p(n[0], c, s, sinkArg)
elif n.typ == nil or n.typ.skipTypes({tyGenericInst, tyAlias, tySink, tyVar}).kind == tyOpenArray:
# 'raise X' can be part of a 'case' expression. Deal with it here.
# openarrays require perfect forwarding
elif n.typ == nil:
# 'raise X' can be part of a 'case' expression. Deal with it here:
result = p(n, c, s, normal)
else:
# copy objects that are not temporary but passed to a 'sink' parameter

19
tests/arc/t14383.nim
View File

@@ -3,7 +3,6 @@ discard """
output: '''
hello
hello
@[4, 3, 2, 1]
@["a", "b"]
'''
"""
@@ -14,22 +13,6 @@ var val = parseMinValue()
if val.kind == minDictionary:
echo val
#------------------------------------------------------------------------------
# Issue #15035
#------------------------------------------------------------------------------
proc countRun(lst: sink openArray[int]): int =
discard
proc timSort(lst: var openArray[int]) =
let run = countRun(lst)
var a = @[4, 3, 2, 1]
timSort(a)
echo a
#------------------------------------------------------------------------------
# Issue #15238
#------------------------------------------------------------------------------
@@ -50,4 +33,4 @@ echo x
#------------------------------------------------------------------------------
import std/os
discard getFileInfo(".")
discard getFileInfo(".")