diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-06-13 14:25:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-06-13 14:25:12 (GMT) |
| commit | 3f776aa9379874671930875ff55e00f3e7567644 (patch) | |
| tree | e378dac3e887056d2ad1c01a857e14a546caa634 /generic | |
| parent | 855a348eeae253e6765ea3edf689e41d79a7c081 (diff) | |
| download | tcl-3f776aa9379874671930875ff55e00f3e7567644.zip tcl-3f776aa9379874671930875ff55e00f3e7567644.tar.gz tcl-3f776aa9379874671930875ff55e00f3e7567644.tar.bz2 | |
* generic/tclCompile.c: The value stashed in iPtr->compiledProcPtr
* generic/tclProc.c: when compiling a proc survives too long. We
* tests/execute.test: only need it there long enough for the right
TclInitCompileEnv() call to re-stash it into envPtr->procPtr. Once
that is done, the CompileEnv controls. If we let the value of
iPtr->compiledProcPtr linger, though, then any other bytecode compile
operation that takes place will also have its CompileEnv initialized
with it, and that's not correct. The value is meant to control the
compile of the proc body only, not other compile tasks that happen
along. Thanks to Carlos Tasada for discovering and reporting the
problem. [Bug 2802881].
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCompile.c | 3 | ||||
| -rw-r--r-- | generic/tclProc.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 3c7ca6e..c7b311b 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.c,v 1.146.2.6 2008/07/25 20:30:44 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.146.2.7 2009/06/13 14:25:12 dgp Exp $ */ #include "tclInt.h" @@ -870,6 +870,7 @@ TclInitCompileEnv( envPtr->source = stringPtr; envPtr->numSrcBytes = numBytes; envPtr->procPtr = iPtr->compiledProcPtr; + iPtr->compiledProcPtr = NULL; envPtr->numCommands = 0; envPtr->exceptDepth = 0; envPtr->maxExceptDepth = 0; diff --git a/generic/tclProc.c b/generic/tclProc.c index 9313154..717b8bc 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclProc.c,v 1.139.2.4 2008/10/19 19:54:22 dgp Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.139.2.5 2009/06/13 14:25:13 dgp Exp $ */ #include "tclInt.h" @@ -1891,7 +1891,6 @@ ProcCompileProc( Interp *iPtr = (Interp *) interp; int i; Tcl_CallFrame *framePtr; - Proc *saveProcPtr; ByteCode *codePtr = bodyPtr->internalRep.otherValuePtr; CompiledLocal *localPtr; @@ -1961,8 +1960,6 @@ ProcCompileProc( * appropriate class context. */ - saveProcPtr = iPtr->compiledProcPtr; - if (procPtrPtr != NULL && procPtr->refCount > 1) { Tcl_Command token; Tcl_CmdInfo info; @@ -2045,7 +2042,6 @@ ProcCompileProc( (void) tclByteCodeType.setFromAnyProc(interp, bodyPtr); iPtr->invokeCmdFramePtr = NULL; TclPopStackFrame(interp); - iPtr->compiledProcPtr = saveProcPtr; } else if (codePtr->nsEpoch != nsPtr->resolverEpoch) { /* * The resolver epoch has changed, but we only need to invalidate the |