summaryrefslogtreecommitdiffstats
path: root/generic/tclCompExpr.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-12 10:35:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-12 10:35:08 (GMT)
commitec9b2fa3cb586f475d89a088b1ebefe71837dfe0 (patch)
treec01fed85ac90ec8229c758913eaa22d6d2a33849 /generic/tclCompExpr.c
parent41c48130aad33de9f00b6f0ef77b6706c3ab92a7 (diff)
parent348739729adc3e690c33831fd8acc535af539dd8 (diff)
downloadtcl-ec9b2fa3cb586f475d89a088b1ebefe71837dfe0.zip
tcl-ec9b2fa3cb586f475d89a088b1ebefe71837dfe0.tar.gz
tcl-ec9b2fa3cb586f475d89a088b1ebefe71837dfe0.tar.bz2
merge trunk (except for disabled MSVC warnings, see [48b92a6ab6])
Diffstat (limited to 'generic/tclCompExpr.c')
-rw-r--r--generic/tclCompExpr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 2062dc8..d2c4dea 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2401,6 +2401,7 @@ CompileExprTree(
(nodePtr->lexeme == AND) ? "1" : "0", 1), envPtr);
TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP,
&jumpPtr->next->next->jump);
+ TclAdjustStackDepth(-1, envPtr);
TclFixupForwardJumpToHere(envPtr, &jumpPtr->next->jump, 127);
if (TclFixupForwardJumpToHere(envPtr, &jumpPtr->jump, 127)) {
jumpPtr->next->next->jump.codeOffset += 3;