SERVER-72752 Add CodeFragment pretty printing of stackSize and fixups

80 files changed, 129 insertions, 114 deletions

diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val.txt
index 82d47d32133..38d7a89a268 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendLocalVal
 ==== VARIATION append code
 -- CODE:
-[0x0000-0x001d]
+[0x0000-0x001d] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushLocalVal(arg: 1);
@@ -15,7 +15,7 @@
 
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x001d]
+[0x0000-0x001d] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushLocalVal(arg: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val2.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val2.txt
index e0bd938b0aa..571465ab2d2 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val2.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val2.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendLocalVal2
 ==== VARIATION append code 1
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -20,7 +20,7 @@
 
 ==== VARIATION append code 2
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -39,7 +39,7 @@
 
 ==== VARIATION append code 3
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -58,7 +58,7 @@
 
 ==== VARIATION append code 4
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -77,7 +77,7 @@
 
 ==== VARIATION append code 5
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -96,7 +96,7 @@
 
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 5
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val_with_fixups.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val_with_fixups.txt
new file mode 100644
index 00000000000..683f8c7c68d
--- /dev/null
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_local_val_with_fixups.txt
@@ -0,0 +1,15 @@
+# Golden test output of SBECodeFragmentTest/AppendLocalValWithFixups
+==== VARIATION append local val with fixups
+-- CODE:
+[0x0000-0x0019] stackSize: 5, maxStackSize: 5
+0x0000: pushLocalVal(arg: -11);
+0x0001:   fixup: frameId: 10
+0x0005: pushLocalVal(arg: -20);
+0x0006:   fixup: frameId: 10
+0x000a: pushLocalVal(arg: 1);
+0x000b:   fixup: frameId: 10
+0x000f: pushLocalVal(arg: 2);
+0x0010:   fixup: frameId: 10
+0x0014: pushLocalVal(arg: -97);
+0x0015:   fixup: frameId: 10
+
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_frame.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_frame.txt
index 1f469a0adea..c74e85fdafa 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_frame.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_frame.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendSimpleInstruction_Binary_BothOnFrame
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x002f]
+[0x0000-0x002f] stackSize: 1, maxStackSize: 4
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -18,7 +18,7 @@
 
 ==== VARIATION append code 1
 -- CODE:
-[0x0000-0x002f]
+[0x0000-0x002f] stackSize: 1, maxStackSize: 4
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
@@ -35,7 +35,7 @@
 
 ==== VARIATION append code 2
 -- CODE:
-[0x0000-0x002f]
+[0x0000-0x002f] stackSize: 1, maxStackSize: 4
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: pushConstVal(value: Nothing);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_stack.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_stack.txt
index b589a6eca76..ad89797f15d 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_stack.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_both_on_stack.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendSimpleInstruction_Binary_BothOnStack
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0017]
+[0x0000-0x0017] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
@@ -11,7 +11,7 @@
 
 ==== VARIATION append code
 -- CODE:
-[0x0000-0x0017]
+[0x0000-0x0017] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_lhs_on_frame.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_lhs_on_frame.txt
index 522058eddc3..4cec03c3c8e 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_lhs_on_frame.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_lhs_on_frame.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendSimpleInstruction_Binary_LhsOnFrame
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 20);
@@ -16,7 +16,7 @@
 
 ==== VARIATION append code 1
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 20);
@@ -31,7 +31,7 @@
 
 ==== VARIATION append code 2
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 20);
@@ -46,7 +46,7 @@
 
 ==== VARIATION append code 3
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 20);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_rhs_on_frame.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_rhs_on_frame.txt
index 79367892753..d29402ac73a 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_rhs_on_frame.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/append_simple_instruction_binary_rhs_on_frame.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/AppendSimpleInstruction_Binary_RhsOnFrame
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 20);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 10);
@@ -16,7 +16,7 @@
 
 ==== VARIATION append code 1
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 20);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 10);
@@ -31,7 +31,7 @@
 
 ==== VARIATION append code 2
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 20);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 10);
@@ -46,7 +46,7 @@
 
 ==== VARIATION append code 3
 -- CODE:
-[0x0000-0x0029]
+[0x0000-0x0029] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 20);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: 10);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/declare_frame_not_empty_stack.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/declare_frame_not_empty_stack.txt
index d5b384b827c..1da06935028 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/declare_frame_not_empty_stack.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/declare_frame_not_empty_stack.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/DeclareFrameNotEmptyStack
 ==== VARIATION append code
 -- CODE:
-[0x0000-0x0041]
+[0x0000-0x0041] stackSize: 1, maxStackSize: 6
 0x0000: pushConstVal(value: Nothing);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: Nothing);
@@ -24,7 +24,7 @@
 
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0041]
+[0x0000-0x0041] stackSize: 1, maxStackSize: 6
 0x0000: pushConstVal(value: Nothing);
 0x000a: pushConstVal(value: Nothing);
 0x0014: pushConstVal(value: Nothing);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump.txt
index 478cad2c143..4ae81c8a279 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/LabelJump
 ==== VARIATION append instr
 -- CODE:
-[0x0000-0x0026]
+[0x0000-0x0026] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: 10);
 0x000a: jmp(target: 0x0017);
 0x000f: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
@@ -14,7 +14,7 @@
 
 ==== VARIATION append code
 -- CODE:
-[0x0000-0x0026]
+[0x0000-0x0026] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: 10);
 0x000a: jmp(target: 0x0017);
 0x000f: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_false.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_false.txt
index b62828872b9..305ed9a36e2 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_false.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_false.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/LabelJumpFalse
 ==== VARIATION basic sanity check
 -- CODE:
-[0x0000-0x003a]
+[0x0000-0x003a] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: true);
 0x0014: jmpFalse(target: 0x0019);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_not_nothing.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_not_nothing.txt
index 005685125c5..5e54f0dcc62 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_not_nothing.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_not_nothing.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/LabelJumpNotNothing
 ==== VARIATION basic sanity check
 -- CODE:
-[0x0000-0x0043]
+[0x0000-0x0043] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: Nothing);
 0x0014: jmpNotNothing(target: 0x0042);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_nothing.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_nothing.txt
index cd3d9df108c..11244633a80 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_nothing.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_nothing.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/LabelJumpNothing
 ==== VARIATION basic sanity check
 -- CODE:
-[0x0000-0x0043]
+[0x0000-0x0043] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: true);
 0x0014: jmpNothing(target: 0x0042);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_true.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_true.txt
index 1754173b27a..b3782eabdb8 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_true.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_code_fragment_test/label_jump_true.txt
@@ -1,7 +1,7 @@
 # Golden test output of SBECodeFragmentTest/LabelJumpTrue
 ==== VARIATION basic sanity check
 -- CODE:
-[0x0000-0x003a]
+[0x0000-0x003a] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: false);
 0x0014: jmpTrue(target: 0x0019);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt
index 409121ad928..70315f3e62e 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt
@@ -3,7 +3,7 @@
 Nothing 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: Nothing);
 
 
@@ -11,7 +11,7 @@ Nothing
 null 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: null);
 
 
@@ -19,7 +19,7 @@ null
 true 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: true);
 
 
@@ -27,7 +27,7 @@ true
 123 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: 123);
 
 
@@ -35,7 +35,7 @@ true
 123ll 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: 123ll);
 
 
@@ -43,7 +43,7 @@ true
 123L 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: 123L);
 
 
@@ -51,7 +51,7 @@ true
 minKey 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: minKey);
 
 
@@ -59,7 +59,7 @@ minKey
 maxKey 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: maxKey);
 
 
@@ -67,7 +67,7 @@ maxKey
 NumberDecimal(123.000000000000) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: NumberDecimal(123.000000000000));
 
 
@@ -75,7 +75,7 @@ NumberDecimal(123.000000000000)
 "abc" 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: "abc");
 
 
@@ -83,7 +83,7 @@ NumberDecimal(123.000000000000)
 "abcdefghijklmnop" 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: "abcdefghijklmnop");
 
 
@@ -91,7 +91,7 @@ NumberDecimal(123.000000000000)
 RecordId(123) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: RecordId(123));
 
 
@@ -99,7 +99,7 @@ RecordId(123)
 ObjectId("000102030405060708090a0b") 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: ObjectId("000102030405060708090a0b"));
 
 
@@ -107,7 +107,7 @@ ObjectId("000102030405060708090a0b")
 [1, 2, 3] 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: [1, 2, 3]);
 
 
@@ -115,7 +115,7 @@ ObjectId("000102030405060708090a0b")
 [1, 2, 3] 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: [1, 2, 3]);
 
 
@@ -123,7 +123,7 @@ ObjectId("000102030405060708090a0b")
 {"a" : 1, "b" : 2} 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000a]
+[0x0000-0x000a] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: {"a" : 1, "b" : 2});
 
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_add_decimal.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_add_decimal.txt
index 7b3b80bd9e1..38531dec4e4 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_add_decimal.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_add_decimal.txt
@@ -3,7 +3,7 @@
 (NumberDecimal(123) + fail(2, "test")) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0022]
+[0x0000-0x0022] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: NumberDecimal(123));
 0x000a: pushConstVal(value: 2ll);
 0x0014: pushConstVal(value: "test");
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_local_bind.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_local_bind.txt
index 365b40a9ac5..ef57930beea 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_local_bind.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/fail_with_local_bind.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0021]
+[0x0000-0x0021] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: NumberDecimal(123));
 0x000a: pushConstVal(value: 2ll);
 0x0014: pushConstVal(value: "test");
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/simple_fail.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/simple_fail.txt
index eeffc2d4582..e2c43f0e720 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/simple_fail.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_fail_test/simple_fail.txt
@@ -3,7 +3,7 @@
 fail(2, "test") 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 2ll);
 0x000a: pushConstVal(value: "test");
 0x0014: fail();
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_fill_empty.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_fill_empty.txt
index 0512292d2be..f54e2e44158 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_fill_empty.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_fill_empty.txt
@@ -7,7 +7,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x003b]
+[0x0000-0x003b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNotNothing(target: 0x0018);
 0x000e: pop();
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_and.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_and.txt
index 653f0ffa604..4c124e97967 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_and.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_and.txt
@@ -7,7 +7,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x004e]
+[0x0000-0x004e] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002b);
 0x000e: jmpFalse(target: 0x0021);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_not.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_not.txt
index 0040cc99722..819e17d6a5f 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_not.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_not.txt
@@ -7,7 +7,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002e]
+[0x0000-0x002e] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: logicNot(popParam: 1, offsetParam: 0);
 0x000b: jmpNothing(target: 0x002e);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_or.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_or.txt
index e667819edca..1c0c688c4b4 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_or.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/if_with_logic_or.txt
@@ -7,7 +7,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x004e]
+[0x0000-0x004e] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002b);
 0x000e: jmpTrue(target: 0x0021);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_cond.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_cond.txt
index b956397c02b..a0dd83cf031 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_cond.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_cond.txt
@@ -11,7 +11,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x004f]
+[0x0000-0x004f] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002c);
 0x000e: jmpTrue(target: 0x0022);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_else.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_else.txt
index 36aef4a19cc..2109d224b32 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_else.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_else.txt
@@ -10,7 +10,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x004e]
+[0x0000-0x004e] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x004e);
 0x000e: jmpTrue(target: 0x0044);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_then.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_then.txt
index 900f92ee9c8..e829d8d4c5a 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_then.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/nested_if_then.txt
@@ -11,7 +11,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x004e]
+[0x0000-0x004e] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x004e);
 0x000e: jmpTrue(target: 0x0022);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/simple_if.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/simple_if.txt
index 0ff0ab40bfa..d0068a24689 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/simple_if.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_if_test/simple_if.txt
@@ -7,7 +7,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002c]
+[0x0000-0x002c] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002c);
 0x000e: jmpTrue(target: 0x0022);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_op_eq.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_op_eq.txt
index f00a7a5b0f1..d3687a7c38c 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_op_eq.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_op_eq.txt
@@ -3,7 +3,7 @@
 traverseF(s1, lambda(l10.0) { (l10.0 == 3) }, Nothing) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002b]
+[0x0000-0x002b] stackSize: 1, maxStackSize: 1
 0x0000: jmp(target: 0x001c);
 0x0005: allocStack(size:1);
 0x000a: pushConstVal(value: 3);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_with_local_bind.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_with_local_bind.txt
index 50839afab8b..79b84a345a4 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_with_local_bind.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_f_with_local_bind.txt
@@ -13,7 +13,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0063]
+[0x0000-0x0063] stackSize: 1, maxStackSize: 4
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushConstVal(value: 10);
 0x0013: pushConstVal(value: 20);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_p_add_one_to_array.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_p_add_one_to_array.txt
index 91b718818f7..6a52e372a33 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_p_add_one_to_array.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_lambda_test/traverse_p_add_one_to_array.txt
@@ -3,7 +3,7 @@
 traverseP(s1, lambda(l10.0) { (l10.0 + 1) }, Nothing) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002b]
+[0x0000-0x002b] stackSize: 1, maxStackSize: 1
 0x0000: jmp(target: 0x001c);
 0x0005: allocStack(size:1);
 0x000a: pushConstVal(value: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_both_variables.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_both_variables.txt
index bb29ec16f2f..e0f36274d0b 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_both_variables.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_both_variables.txt
@@ -9,7 +9,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0023]
+[0x0000-0x0023] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: sub(popLhs: 0, offsetLhs: 1, popRhs: 0, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_lhs_variable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_lhs_variable.txt
index d4125cdbcb3..c9a7248934b 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_lhs_variable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_lhs_variable.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001d]
+[0x0000-0x001d] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: sub(popLhs: 0, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_rhs_variable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_rhs_variable.txt
index 4eb5f0e12a2..2ac820934b9 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_rhs_variable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/binary_operator_rhs_variable.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001d]
+[0x0000-0x001d] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: sub(popLhs: 1, offsetLhs: 0, popRhs: 0, offsetRhs: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind1.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind1.txt
index ede4ae8caf7..b683633fd0e 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind1.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind1.txt
@@ -13,7 +13,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002a]
+[0x0000-0x002a] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 20);
 0x000a: pushConstVal(value: 10);
 0x0014: add(popLhs: 0, offsetLhs: 0, popRhs: 0, offsetRhs: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind2.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind2.txt
index 4baac2d4b02..1f99d520ec9 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind2.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/nested_bind2.txt
@@ -15,7 +15,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x003c]
+[0x0000-0x003c] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: add(popLhs: 0, offsetLhs: 1, popRhs: 0, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/one_variable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/one_variable.txt
index ed4205f6087..4f074637ca6 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/one_variable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/one_variable.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0017]
+[0x0000-0x0017] stackSize: 1, maxStackSize: 2
 0x0000: pushConstVal(value: 10);
 0x000a: add(popLhs: 0, offsetLhs: 0, popRhs: 0, offsetRhs: 0);
 0x0015: swap();
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/two_variables.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/two_variables.txt
index 3fc9c54a725..6196ff5152a 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/two_variables.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_local_bind_test/two_variables.txt
@@ -9,7 +9,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0023]
+[0x0000-0x0023] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: 10);
 0x000a: pushConstVal(value: 20);
 0x0014: add(popLhs: 0, offsetLhs: 1, popRhs: 0, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_numeric_test/compile.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_numeric_test/compile.txt
index 5f5ebdeaba5..c7015d2ca36 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_numeric_test/compile.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_numeric_test/compile.txt
@@ -3,7 +3,7 @@
 convert ( NumberDecimal(123), int64) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000c]
+[0x0000-0x000c] stackSize: 1, maxStackSize: 1
 0x0000: pushConstVal(value: NumberDecimal(123));
 0x000a: numConvert(tag: NumberInt64);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_mixed.txt
index 67c6216b021..291881b1d47 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_mixed.txt
@@ -3,7 +3,7 @@
 (s1 + s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: add(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt
index 1d2624ec040..ab6ed54db01 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt
@@ -3,7 +3,7 @@
 (s1 + s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: add(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_and.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_and.txt
index 2aa60a4a07f..afe935aef28 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_and.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_and.txt
@@ -3,7 +3,7 @@
 (((s1 && s2) && (s3 && s4)) && ((s5 && s6) && (s7 && s8))) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x009d]
+[0x0000-0x009d] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x009d);
 0x000e: jmpFalse(target: 0x0093);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_or.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_or.txt
index 914e85cf2ea..26aa5da97de 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_or.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/balanced_or.txt
@@ -3,7 +3,7 @@
 (((s1 || s2) || (s3 || s4)) || ((s5 || s6) || (s7 || s8))) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x009d]
+[0x0000-0x009d] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x009d);
 0x000e: jmpTrue(target: 0x0093);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_mixed.txt
index 44cdcc099cc..e168373a21b 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_mixed.txt
@@ -3,7 +3,7 @@
 (s1 <=> s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: cmp3w(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt
index 9dd0277b613..29af75729da 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt
@@ -3,7 +3,7 @@
 (s1 <=> s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: cmp3w(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_string.txt
index 1fc401edbba..17addd7dac5 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_string.txt
@@ -3,7 +3,7 @@
 (s1 <=>[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_memory.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_memory.txt
index c860144fffc..0485e73754f 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_memory.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_memory.txt
@@ -3,7 +3,7 @@
 ((NumberDecimal(1) + NumberDecimal(1)) / (NumberDecimal(1) - NumberDecimal(1))) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0031]
+[0x0000-0x0031] stackSize: 1, maxStackSize: 3
 0x0000: pushConstVal(value: NumberDecimal(1));
 0x000a: pushConstVal(value: NumberDecimal(1));
 0x0014: add(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt
index 0155c6d07fe..11856a3cdff 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt
@@ -3,7 +3,7 @@
 (s1 / s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: div(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt
index 95cd520f5e6..4a37bc62741 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt
@@ -3,7 +3,7 @@
 (s1 / s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: div(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_mixed.txt
index e15b02760ae..57078c7f220 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_mixed.txt
@@ -3,7 +3,7 @@
 (s1 == s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: eq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt
index eed67bf2574..c039899fdce 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt
@@ -3,7 +3,7 @@
 (s1 == s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: eq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_string.txt
index 8c8a84b474c..18a1e0ee25f 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_string.txt
@@ -3,7 +3,7 @@
 (s1 ==[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty.txt
index 30c8feda26b..fbe02de9e0e 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty.txt
@@ -3,7 +3,7 @@
 (s1 ?: s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0018]
+[0x0000-0x0018] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNotNothing(target: 0x0018);
 0x000e: pop();
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty_with_constant.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty_with_constant.txt
index 9d23c3d7d40..9a056a63d28 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty_with_constant.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/fill_empty_with_constant.txt
@@ -4,7 +4,7 @@
 (s1 ?: Nothing) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0019]
+[0x0000-0x0019] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNotNothing(target: 0x0019);
 0x000e: pop();
@@ -32,7 +32,7 @@ RESULT: true
 (s2 ?: null) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: fillEmptyImm(k: Null);
 
@@ -58,7 +58,7 @@ RESULT: true
 (s3 ?: true) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: fillEmptyImm(k: True);
 
@@ -84,7 +84,7 @@ RESULT: true
 (s4 ?: true) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: fillEmptyImm(k: True);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_mixed.txt
index a5d9a6f475e..a12b71e26d2 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_mixed.txt
@@ -3,7 +3,7 @@
 (s1 >= s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: greaterEq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt
index 5ef6af735ae..beda9f7e61e 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt
@@ -3,7 +3,7 @@
 (s1 >= s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: greaterEq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_string.txt
index cbe934c5069..9babc6f7cc6 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_string.txt
@@ -3,7 +3,7 @@
 (s1 >=[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_mixed.txt
index a45742ee565..6fed8e5ad40 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_mixed.txt
@@ -3,7 +3,7 @@
 (s1 > s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: greater(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt
index 9158a39c221..21de0cce5da 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt
@@ -3,7 +3,7 @@
 (s1 > s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: greater(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_string.txt
index 6b29bb1e035..b88c4cc8736 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_string.txt
@@ -3,7 +3,7 @@
 (s1 >[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_mixed.txt
index e9884a5aee2..8b25ea1857c 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_mixed.txt
@@ -3,7 +3,7 @@
 (s1 <= s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: lessEq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt
index 628a8d55b44..3829e2a0da0 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt
@@ -3,7 +3,7 @@
 (s1 <= s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: lessEq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_string.txt
index 5babaa80c6b..10ad051008b 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_string.txt
@@ -3,7 +3,7 @@
 (s1 <=[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_mixed.txt
index 3d617227507..dda2093e2cc 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_mixed.txt
@@ -3,7 +3,7 @@
 (s1 < s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: less(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt
index ae25820b998..8740b717b55 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt
@@ -3,7 +3,7 @@
 (s1 < s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: less(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_string.txt
index a35a089c5df..bab92f96ebb 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_string.txt
@@ -3,7 +3,7 @@
 (s1 <[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_mixed.txt
index 745071fe431..a09b67bd3f4 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_mixed.txt
@@ -3,7 +3,7 @@
 (s1 * s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: mul(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt
index 5e2d3dc7d95..78ade31a08f 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt
@@ -3,7 +3,7 @@
 (s1 * s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: mul(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_mixed.txt
index c1aa5c134f3..bd056561a47 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_mixed.txt
@@ -3,7 +3,7 @@
 (s1 != s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: neq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt
index 52c4e4dc80a..5d081322fef 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt
@@ -3,7 +3,7 @@
 (s1 != s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: neq(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_string.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_string.txt
index f25b52ea538..a2db988ef0a 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_string.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_string.txt
@@ -3,7 +3,7 @@
 (s1 !=[s3] s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x001f]
+[0x0000-0x001f] stackSize: 1, maxStackSize: 3
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: pushAccessVal(accessor: <accessor>);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_mixed.txt
index 799febcef6a..ac680117053 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_mixed.txt
@@ -3,7 +3,7 @@
 (s1 - s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt
index 95ce1018c81..2d95622ada9 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt
@@ -3,7 +3,7 @@
 (s1 - s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0015]
+[0x0000-0x0015] stackSize: 1, maxStackSize: 2
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: pushAccessVal(accessor: <accessor>);
 0x0012: sub(popLhs: 1, offsetLhs: 0, popRhs: 1, offsetRhs: 0);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_and.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_and.txt
index 23742bf31bb..14c453886b0 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_and.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_and.txt
@@ -3,7 +3,7 @@
 (s1 && s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002b]
+[0x0000-0x002b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002b);
 0x000e: jmpFalse(target: 0x0021);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_or.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_or.txt
index 69f97ee5b86..ec061528f26 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_or.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/truth_table_or.txt
@@ -3,7 +3,7 @@
 (s1 || s2) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x002b]
+[0x0000-0x002b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: jmpNothing(target: 0x002b);
 0x000e: jmpTrue(target: 0x0021);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_bool.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_bool.txt
index b190a8bd42d..dc19cad02ed 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_bool.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_bool.txt
@@ -3,7 +3,7 @@
 !(s1) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: logicNot(popParam: 1, offsetParam: 0);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_mixed.txt
index 7df4fa4fc52..57bd5f8e8e5 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/logic_not_mixed.txt
@@ -3,7 +3,7 @@
 !(s1) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: logicNot(popParam: 1, offsetParam: 0);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_mixed.txt
index 7005c2f8548..cce3ecfc968 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_mixed.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_mixed.txt
@@ -3,7 +3,7 @@
 -(s1) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: negate(popParam: 1, offsetParam: 0);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt
index 124c1399e56..d7af4af83d1 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt
@@ -3,7 +3,7 @@
 -(s1) 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x000b]
+[0x0000-0x000b] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);
 0x0009: negate(popParam: 1, offsetParam: 0);
 
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_v_m/code_fragment_print_stable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_v_m/code_fragment_print_stable.txt
index 86480068b4c..82bdb9b9da0 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_v_m/code_fragment_print_stable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_v_m/code_fragment_print_stable.txt
@@ -1,5 +1,5 @@
 # Golden test output of SBEVM/CodeFragmentPrintStable
-[0x0000-0x0048]
+[0x0000-0x0048] stackSize: -1, maxStackSize: 0
 0x0000: fillEmptyImm(k: Null);
 0x0002: fillEmptyImm(k: False);
 0x0004: fillEmptyImm(k: True);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable.txt
index 72614a4406b..fdac855d84c 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0019]
+[0x0000-0x0019] stackSize: 1, maxStackSize: 4
 0x0000: pushConstVal(value: "abcdeghijklmnop");
 0x000a: pushLocalVal(arg: 0);
 0x000f: pushLocalVal(arg: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable_move.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable_move.txt
index baf2548aca2..ccd15ff57c5 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable_move.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/local_variable_move.txt
@@ -8,7 +8,7 @@
 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0019]
+[0x0000-0x0019] stackSize: 1, maxStackSize: 4
 0x0000: pushConstVal(value: "abcdeghijklmnop");
 0x000a: pushMoveLocalVal(arg: 0);
 0x000f: pushMoveLocalVal(arg: 1);
diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/slot_variable.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/slot_variable.txt
index 1f1204f22c9..2f9a97d9c08 100644
--- a/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/slot_variable.txt
+++ b/src/mongo/db/test_output/exec/sbe/s_b_e_variable_test/slot_variable.txt
@@ -3,7 +3,7 @@
 s1 
 
 -- COMPILED EXPRESSION:
-[0x0000-0x0009]
+[0x0000-0x0009] stackSize: 1, maxStackSize: 1
 0x0000: pushAccessVal(accessor: <accessor>);