From 383c80971cee93496c5317b7464021ac99711176 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Sun, 26 Nov 2017 15:16:54 +0000
Subject: [PATCH] No need to recurse now that mergeEntries doesn't do any
 pattern matching.

---
 lib/pure/asyncfutures.nim        | 3 ++-
 tests/async/tasync_traceback.nim | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/pure/asyncfutures.nim b/lib/pure/asyncfutures.nim
index 54b967f90..a122e0c41 100644
--- a/lib/pure/asyncfutures.nim
+++ b/lib/pure/asyncfutures.nim
@@ -248,9 +248,10 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
         reRaiseEnd.inc()
       assert entries[reRaiseEnd].procName.isNil
       assert entries[reRaiseEnd].line == -100 # Signifies end of re-raise block.
-      let reRaisedEntries = mergeEntries(entries[i+1 .. reRaiseEnd-1])
+      let reRaisedEntries = entries[i+1 .. reRaiseEnd-1]
 
       let (lastIndex, remainder) = diff(result, reRaisedEntries)
+      # Insert all the entries after lastIndex.
       for i in 0..<remainder.len:
         result.insert(remainder[i], lastIndex+i)
       i = reRaiseEnd+1
diff --git a/tests/async/tasync_traceback.nim b/tests/async/tasync_traceback.nim
index 525914ef3..9e4f749e5 100644
--- a/tests/async/tasync_traceback.nim
+++ b/tests/async/tasync_traceback.nim
@@ -14,7 +14,7 @@ Async traceback:
   asyncmacro.nim(34)       a_continue
   └─Resumes an async procedure
   asyncmacro.nim(0)        aIter
-  asyncfutures.nim(340)    read
+  asyncfutures.nim(341)    read
   asyncmacro.nim(34)       a_continue
   └─Resumes an async procedure
   tasync_traceback.nim(81) aIter
@@ -36,7 +36,7 @@ Async traceback:
   asyncmacro.nim(34)       foo_continue
   └─Resumes an async procedure
   asyncmacro.nim(0)        fooIter
-  asyncfutures.nim(340)    read
+  asyncfutures.nim(341)    read
   asyncmacro.nim(34)       bar_continue
   └─Resumes an async procedure
   tasync_traceback.nim(94) barIter