summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreask <andreask>2013-05-13 16:59:34 (GMT)
committerandreask <andreask>2013-05-13 16:59:34 (GMT)
commit5e93c534d37afbe2b39bf5344b53f1b9b6c9c344 (patch)
tree998112d745eb3b4962c727f0158b1cd898f12821
parentd1756f468478c8b9e0b652ada83fcef2bd8082c0 (diff)
parent5f2257dcfce6b59348bc2baa06635167a7d6a1a6 (diff)
downloadtcl-5e93c534d37afbe2b39bf5344b53f1b9b6c9c344.zip
tcl-5e93c534d37afbe2b39bf5344b53f1b9b6c9c344.tar.gz
tcl-5e93c534d37afbe2b39bf5344b53f1b9b6c9c344.tar.bz2
Merged fix to bytecode engine problem. Details in merged revision.
-rw-r--r--generic/tclExecute.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index f994ba5..4294cd4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2331,8 +2331,9 @@ TEBCresume(
iPtr->cmdCount += TclGetUInt4AtPtr(pc+5);
if (checkInterp) {
checkInterp = 0;
- if ((codePtr->compileEpoch != iPtr->compileEpoch)
- || (codePtr->nsEpoch != iPtr->varFramePtr->nsPtr->resolverEpoch)) {
+ if (((codePtr->compileEpoch != iPtr->compileEpoch) ||
+ (codePtr->nsEpoch != iPtr->varFramePtr->nsPtr->resolverEpoch)) &&
+ !(codePtr->flags & TCL_BYTECODE_PRECOMPILED)) {
goto instStartCmdFailed;
}
}