summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5e8b1a7..56bace2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.430 2009/03/20 14:43:27 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.431 2009/03/21 03:43:53 msofer Exp $
*/
#include "tclInt.h"
@@ -1992,6 +1992,14 @@ TclExecuteByteCode(
/*NRE_ASSERT(iPtr->cmdFramePtr == bcFramePtr);*/
iPtr->cmdFramePtr = bcFramePtr->nextPtr;
+ /*
+ * If the CallFrame is marked as tailcalling, keep tailcalling
+ */
+
+ if (iPtr->varFramePtr->tailcallPtr) {
+ goto abnormalReturn;
+ }
+
if (iPtr->execEnvPtr->rewind) {
result = TCL_ERROR;
goto abnormalReturn;