merge 8.5

generic/tclExecute.c

@@ -1257,7 +1257,9 @@ Tcl_ExprObj(
      */
 
     codePtr->refCount++;
+    iPtr->numLevels++;
     result = TclExecuteByteCode(interp, codePtr);
+    iPtr->numLevels--;
     codePtr->refCount--;
     if (codePtr->refCount <= 0) {
 	TclCleanupByteCode(codePtr);
@@ -2769,8 +2771,11 @@ TclExecuteByteCode(
 	 */
 
 	DECACHE_STACK_INFO();
+	iPtr->numLevels--;	/* Decrement here because path through
+				 * TclEvalEx will increment */
 	objResultPtr = TclPtrGetVar(interp, varPtr, arrayPtr,
 		part1Ptr, part2Ptr, TCL_LEAVE_ERR_MSG, opnd);
+	iPtr->numLevels++;
 	CACHE_STACK_INFO();
 	if (objResultPtr) {
 	    TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
@@ -3029,8 +3034,11 @@ TclExecuteByteCode(
 
     doCallPtrSetVar:
 	DECACHE_STACK_INFO();
+	iPtr->numLevels--;	/* Decrement here because path through
+				 * TclEvalEx will increment */
 	objResultPtr = TclPtrSetVar(interp, varPtr, arrayPtr,
 		part1Ptr, part2Ptr, valuePtr, storeFlags, opnd);
+	iPtr->numLevels++;
 	CACHE_STACK_INFO();
 	if (objResultPtr) {
 #ifndef TCL_COMPILE_DEBUG

generic/tclParse.c

@@ -2275,7 +2275,6 @@ TclSubstTokens(
 	case TCL_TOKEN_COMMAND: {
 	    Interp *iPtr = (Interp *) interp;
 
-	    iPtr->numLevels++;
 	    code = TclInterpReady(interp);
 	    if (code == TCL_OK) {
 		/*
@@ -2297,7 +2296,6 @@ TclSubstTokens(
 		    iPtr->evalFlags |= TCL_EVAL_FILE;
 		}
 	    }
-	    iPtr->numLevels--;
 	    appendObj = Tcl_GetObjResult(interp);
 	    break;
 	}