From 2865a8da13749af3807ff9ea42c079f8c6c73133 Mon Sep 17 00:00:00 2001
From: sebres <sebres@users.sourceforge.net>
Date: Thu, 16 May 2019 18:17:52 +0000
Subject: small amend to [ac566e9df84daeab] with rollback of done/continue
 optimization

---
 generic/tclCmdMZ.c | 7 +++++++
 tests/cmdMZ.test   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 6be5087..d2485ef 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -4009,6 +4009,7 @@ Tcl_TimeRateObjCmd(
 	TMRT_EV_DIRECT,	TMRT_OVERHEAD,	TMRT_CALIBRATE,	TMRT_LAST
     };
     ByteCode *codePtr = NULL;
+    int codeOptimized = 0;
 
     for (i = 1; i < objc - 1; i++) {
 	int index;
@@ -4200,6 +4201,7 @@ Tcl_TimeRateObjCmd(
 	 */
 	if (codePtr->codeStart[codePtr->numCodeBytes-1] == INST_DONE) {
 	    codePtr->codeStart[codePtr->numCodeBytes-1] = INST_CONTINUE;
+	    codeOptimized = 1;
 	}
     }
 
@@ -4487,6 +4489,11 @@ Tcl_TimeRateObjCmd(
 
   done:
     if (codePtr != NULL) {
+	if ( codeOptimized
+	  && codePtr->codeStart[codePtr->numCodeBytes-1] == INST_CONTINUE
+	) {
+	    codePtr->codeStart[codePtr->numCodeBytes-1] = INST_DONE;
+	}
 	TclReleaseByteCode(codePtr);
     }
     return result;
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index 09fff07..db72a44 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -433,6 +433,12 @@ test cmdMZ-6.10 {Tcl_TimeRateObjCmd: huge overhead cause 0us result} {
 	[expr {[lindex $m1 4] == 1000000}] \
 	[expr {[lindex $m1 6] <= 0.001}]
 } {1 1 1 1}
+test cmdMZ-6.11 {Tcl_TimeRateObjCmd: done/continue optimization rollback} {
+    set m1 {set m2 ok}
+    if 1 $m1
+    timerate $m1 1000 10
+    if 1 $m1; # if rollback is missing throws an error: invoked "continue" outside of a loop
+} ok
 
 # The tests for Tcl_WhileObjCmd are in while.test
 
-- 
cgit v0.12