From 2f2d5349581870cceac22559969ccfdf9d55556b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 21 Mar 2015 00:31:29 +0000
Subject: [d87cb18205] Let compiled ensembles handle tailcalls properly.

---
 generic/tclExecute.c |  1 -
 tests/nre.test       | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index b9da8fc..322bd20 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -3186,7 +3186,6 @@ TEBCresume(
 	TEBC_YIELD();
 
 	TclNRAddCallback(interp, TclClearRootEnsemble, NULL,NULL,NULL,NULL);
-	TclSkipTailcall(interp);
 	return TclNREvalObjEx(interp, objPtr, TCL_EVAL_INVOKE, NULL, INT_MIN);
 
     /*
diff --git a/tests/nre.test b/tests/nre.test
index b5eb032..e512eac 100644
--- a/tests/nre.test
+++ b/tests/nre.test
@@ -151,6 +151,27 @@ test nre-4.1 {ensembles are not recursive} -setup {
     testnrelevels
 } -result {{0 2 1 1} 0}
 
+test nre-4.2 {(compiled) ensembles do not break tailcall} -setup {
+    # Fix Bug d87cb18205
+    proc b {} {
+	tailcall append result first
+    }
+    set map [namespace ensemble configure ::dict -map]
+    dict set map a b
+    namespace ensemble configure ::dict -map $map
+    proc demo {} {
+	dict a
+	append result second
+    }
+} -body {
+    demo
+} -cleanup {
+    rename demo {}
+    namespace ensemble configure ::dict -map [dict remove $map a]
+    unset map
+    rename b {}
+} -result firstsecond
+
 test nre-5.1 {[namespace eval] is not recursive} -setup {
     namespace eval ::foo {
 	setabs
-- 
cgit v0.12