mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-19 05:50:30 +00:00
revert discard in destroyer (#10840)
* revert discard in destroyer * disable test
This commit is contained in:
@@ -697,10 +697,6 @@ proc p(n: PNode; c: var Con): PNode =
|
||||
of nkNone..nkNilLit, nkTypeSection, nkProcDef, nkConverterDef, nkMethodDef,
|
||||
nkIteratorDef, nkMacroDef, nkTemplateDef, nkLambda, nkDo, nkFuncDef:
|
||||
result = n
|
||||
of nkDiscardStmt:
|
||||
result = n
|
||||
if n[0].typ != nil and hasDestructor(n[0].typ):
|
||||
result = genDestroy(c, n[0].typ, n[0])
|
||||
of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv:
|
||||
result = copyNode(n)
|
||||
# Destination type
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
discard """
|
||||
joinable: false
|
||||
target: "C"
|
||||
"""
|
||||
|
||||
type
|
||||
O = object
|
||||
|
||||
var dCalls = 0
|
||||
|
||||
proc `=destroy`(x: var O) = inc dCalls
|
||||
proc `=sink`(x: var O, y: O) = doAssert false
|
||||
|
||||
proc newO(): O = discard
|
||||
|
||||
proc main() =
|
||||
doAssert dCalls == 0
|
||||
discard newO()
|
||||
doAssert dCalls == 1
|
||||
discard newO()
|
||||
doAssert dCalls == 2
|
||||
|
||||
main()
|
||||
@@ -1,4 +1,5 @@
|
||||
discard """
|
||||
disabled: true
|
||||
cmd: '''nim c --gc:destructors $file'''
|
||||
output: '''hi
|
||||
ho
|
||||
|
||||
Reference in New Issue
Block a user