Merge 8.7

jan.nijtmans · jan.nijtmans · commit a3659e3cab4b · 2021-12-20T01:01:48.000Z
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
@@ -5811,7 +5811,7 @@ TEBCresume(
 		    if (((size_t) shift < CHAR_BIT*sizeof(long))
 			    && !((w1>0 ? w1 : ~w1) &
 				-(1UL<<(CHAR_BIT*sizeof(long) - 1 - shift)))) {
-			wResult = (unsigned long)w1 << shift;
+			wResult = (Tcl_WideUInt)w1 << shift;
 			goto wideResultOfArithmetic;
 		    }
 		}

Original file line number	Diff line number	Diff line change
`@@ -5811,7 +5811,7 @@ TEBCresume(`
`5811`	`5811`	`if (((size_t) shift < CHAR_BIT*sizeof(long))`
`5812`	`5812`	`&& !((w1>0 ? w1 : ~w1) &`
`5813`	`5813`	`-(1UL<<(CHAR_BIT*sizeof(long) - 1 - shift)))) {`
`5814`		`- wResult = (unsigned long)w1 << shift;`
	`5814`	`+ wResult = (Tcl_WideUInt)w1 << shift;`
`5815`	`5815`	`goto wideResultOfArithmetic;`
`5816`	`5816`	`}`
`5817`	`5817`	`}`