summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpooryorick <com.digitalsmarties@pooryorick.com>2020-08-10 18:05:10 (GMT)
committerpooryorick <com.digitalsmarties@pooryorick.com>2020-08-10 18:05:10 (GMT)
commite29e808f57505a56193de6e0717c7abe95755b03 (patch)
tree3a9dc4b64ea48ddec33f65474dad7bedc344dae7 /generic
parent6c0be70d2b1cc5dbfd1277556ac27ea2e39be4bb (diff)
downloadtcl-e29e808f57505a56193de6e0717c7abe95755b03.zip
tcl-e29e808f57505a56193de6e0717c7abe95755b03.tar.gz
tcl-e29e808f57505a56193de6e0717c7abe95755b03.tar.bz2
Fix for [29e8848eb976], imported alias in a deletion trace.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c3
-rw-r--r--generic/tclInt.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index fe64f18..f52ecf5 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -3268,6 +3268,7 @@ Tcl_DeleteCommandFromToken(
* TclNRExecuteByteCode looks up the command in the command hashtable).
*/
+ cmdPtr->flags |= CMD_IS_DELETED;
TclCleanupCommandMacro(cmdPtr);
return 0;
}
@@ -4331,7 +4332,7 @@ EvalObjvCore(
* Caller gave it to us.
*/
- if (!(preCmdPtr->flags & CMD_IS_DELETED)) {
+ if (!(preCmdPtr->flags & CMD_DEAD)) {
/*
* So long as it exists, use it.
*/
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 31108c7..1e90b70 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1682,6 +1682,7 @@ typedef struct Command {
#define CMD_COMPILES_EXPANDED 0x08
#define CMD_REDEF_IN_PROGRESS 0x10
#define CMD_VIA_RESOLVER 0x20
+#define CMD_DEAD 0x30
/*