typeck: fix mistake in previous correction to thresh exec_stack_count

I am putting this in its own commit because it's kinda hard to reason about
and I wanted the change to be separate, even though it changes the same
code that previous commits changed.

Author: apoelstra

src/miniscript/mod.rs

@@ -1906,15 +1906,18 @@ mod tests {
         let ms_str = "thresh(2,pk(A),s:pk(B),s:pk(C))";
         let ms = Miniscript::<String, Segwitv0>::from_str_insane(ms_str).unwrap();
 
-        // Each pk has exec_stack_count of 1
-        // With the fix, threshold should take max(1,1,1) = 1, not sum 1+1+1 = 3
+        // Each pk has exec_stack_count of 1, plus an extra stack element for the thresh accumulator.
+        // With the fix, threshold should take max(1,1,1) + 1 = 2, not sum 1+1+1 = 3
         if let Some(sat_data) = ms.ext.sat_data {
-            assert_eq!(sat_data.max_exec_stack_count, 1);
+            assert_eq!(sat_data.max_exec_stack_count, 2);
         } else {
             panic!("Expected sat_data to be Some");
         }
 
-        // Test with a more complex threshold to make the difference more obvious
+        // Test with a more complex threshold, where the first child has a strictly higher
+        // exec_stack_count. This time, we take the maximum *without* adding +1 for the
+        // accumulator, since on the first child of `thresh` there is no accumulator yet
+        // (its initial value is the output value for the first child).
         let complex_ms_str = "thresh(1,and_b(pk(A),s:pk(B)),s:pk(C))";
         let complex_ms = Miniscript::<String, Segwitv0>::from_str_insane(complex_ms_str).unwrap();
 

src/miniscript/types/extra_props.rs

@@ -864,7 +864,13 @@ impl ExtData {
             (
                 &mut max_exec_stack_count,
                 &(|data: SatData| data.max_exec_stack_count) as &dyn Fn(_) -> usize,
-                &(|acc: usize, x: usize| cmp::max(acc, x)) as &dyn Fn(_, _) -> usize,
+                // For each fragment except the first, we have the accumulated count on the
+                // stack, which sits there during the whole child execution before
+                // being ADDed to the result at the end.
+                //
+                // We use "acc > 0" as a hacky way to check "is this the first child
+                // or not".
+                &(|acc: usize, x: usize| cmp::max(acc, x + usize::from(acc > 0))) as &dyn Fn(_, _) -> usize,
             ),
             (
                 &mut max_exec_op_count,