summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-13 19:30:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-13 19:30:16 (GMT)
commit17954ccb7366352962568b590ee309a8514c7385 (patch)
tree223d28e29861aa195f61f081ce88a73f29f27729 /generic/tclExecute.c
parent2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb (diff)
parent5e93c534d37afbe2b39bf5344b53f1b9b6c9c344 (diff)
downloadtcl-17954ccb7366352962568b590ee309a8514c7385.zip
tcl-17954ccb7366352962568b590ee309a8514c7385.tar.gz
tcl-17954ccb7366352962568b590ee309a8514c7385.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 9185aaf..c1d6f84 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2244,8 +2244,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;
}
}