From fabc2a7086bb83afc2abfd6d5841f25c8387609f Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sun, 21 Apr 2019 09:57:53 +0200
Subject: revert discardable transformation (#10905)

* Revert "Properly wrap discarded statements (#10322)"

This reverts commit 15584879b91e14565156ca140eef1dc100cf34c4.

* add test for implicit discard after defer
* enable t10241 again
* make C++ tests green again
---
 tests/discard/tdiscardable.nim | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'tests/discard')

diff --git a/tests/discard/tdiscardable.nim b/tests/discard/tdiscardable.nim
index 81e17866a..032050139 100644
--- a/tests/discard/tdiscardable.nim
+++ b/tests/discard/tdiscardable.nim
@@ -3,6 +3,8 @@ output: '''
 tdiscardable
 1
 1
+something defered
+something defered
 '''
 """
 
@@ -45,3 +47,21 @@ proc foo: (proc: int) =
   return bar
 
 discard foo()
+
+# bug #10842
+
+proc myDiscardable(): int {.discardable.} =
+  discard
+
+proc main1() =
+  defer:
+    echo "something defered"
+  discard myDiscardable()
+
+proc main2() =
+  defer:
+    echo "something defered"
+  myDiscardable()
+
+main1()
+main2()
-- 
cgit 1.4.1-2-gfad0