Merge 8.7

1 files changed, 13 insertions, 14 deletions

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 4ee2ca0..2b1bae9 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -3547,6 +3547,19 @@ Tcl_DeleteCommandFromToken(
 	iPtr->compileEpoch++;
     }
 
+    if (!(cmdPtr->flags & CMD_REDEF_IN_PROGRESS)) {
+	/*
+	 * Delete any imports of this routine before deleting this routine itself.
+	 * See issue 688fcc7082fa.
+	 */
+	for (refPtr = cmdPtr->importRefPtr; refPtr != NULL;
+		refPtr = nextRefPtr) {
+	    nextRefPtr = refPtr->nextPtr;
+	    importCmd = (Tcl_Command) refPtr->importedCmdPtr;
+	    Tcl_DeleteCommandFromToken(interp, importCmd);
+	}
+    }
+
     if (cmdPtr->deleteProc != NULL) {
 	/*
 	 * Delete the command's client data. If this was an imported command
@@ -3567,20 +3580,6 @@ Tcl_DeleteCommandFromToken(
     }
 
     /*
-     * If this command was imported into other namespaces, then imported
-     * commands were created that refer back to this command. Delete these
-     * imported commands now.
-     */
-    if (!(cmdPtr->flags & CMD_REDEF_IN_PROGRESS)) {
-	for (refPtr = cmdPtr->importRefPtr; refPtr != NULL;
-		refPtr = nextRefPtr) {
-	    nextRefPtr = refPtr->nextPtr;
-	    importCmd = (Tcl_Command) refPtr->importedCmdPtr;
-	    Tcl_DeleteCommandFromToken(interp, importCmd);
-	}
-    }
-
-    /*
      * Don't use hPtr to delete the hash entry here, because it's possible
      * that the deletion callback renamed the command. Instead, use
      * cmdPtr->hptr, and make sure that no-one else has already deleted the