summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2001-05-15 14:19:13 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2001-05-15 14:19:13 (GMT)
commit78889206e8a882e866563ebd0ff5e1309edb4288 (patch)
tree70a9f069004245b780b0f5791f52b78bffe4d3b1 /generic
parent1badd23371684cf0dd67714e8a78f4c7ddd6e55a (diff)
downloadtcl-78889206e8a882e866563ebd0ff5e1309edb4288.zip
tcl-78889206e8a882e866563ebd0ff5e1309edb4288.tar.gz
tcl-78889206e8a882e866563ebd0ff5e1309edb4288.tar.bz2
Patch from [Bug: 231259]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInt.h14
-rw-r--r--generic/tclNamesp.c13
2 files changed, 20 insertions, 7 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 34a995d..752395f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -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: tclInt.h,v 1.52 2001/04/27 22:11:51 kennykb Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.53 2001/05/15 14:19:13 msofer Exp $
*/
#ifndef _TCLINT
@@ -184,11 +184,13 @@ typedef struct Namespace {
* namespace has already cached a Command *
* pointer; this causes all its cached
* Command* pointers to be invalidated. */
- int resolverEpoch; /* Incremented whenever the name resolution
- * rules change for this namespace; this
- * invalidates all byte codes compiled in
- * the namespace, causing the code to be
- * recompiled under the new rules. */
+ int resolverEpoch; /* Incremented whenever (a) the name resolution
+ * rules change for this namespace or (b) a
+ * newly added command shadows a command that
+ * is compiled to bytecodes.
+ * This invalidates all byte codes compiled
+ * in the namespace, causing the code to be
+ * recompiled under the new rules.*/
Tcl_ResolveCmdProc *cmdResProc;
/* If non-null, this procedure overrides
* the usual command resolution mechanism
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 8945e52..577a139 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -19,7 +19,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNamesp.c,v 1.22 2001/04/25 09:44:49 dkf Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.23 2001/05/15 14:19:13 msofer Exp $
*/
#include "tclInt.h"
@@ -2283,6 +2283,17 @@ TclResetShadowedCmdRefs(interp, newCmdPtr)
hPtr = Tcl_FindHashEntry(&shadowNsPtr->cmdTable, cmdName);
if (hPtr != NULL) {
nsPtr->cmdRefEpoch++;
+
+ /*
+ * If the shadowed command was compiled to bytecodes, we
+ * invalidate all the bytecodes in nsPtr, to force a new
+ * compilation. We use the resolverEpoch to signal the need
+ * for a fresh compilation of every bytecode.
+ */
+
+ if ((((Command *) hPtr)->compileProc) != NULL) {
+ nsPtr->resolverEpoch++;
+ }
}
}