DWARF: Update .debug_loc (#2616)

Add support for that section to the YAML layer, and add
code to update it.

The updating is slightly tricky - unlike .debug_ranges, the
size of entries is not fixed. So we can't just skip entries,
as the end marker is smaller than a normal entry. Instead,
replace now-invalid segments with (1, 1) which is of size
0 and so should be ignored by the debugger (we can't use
(0, 0) as that would be an end marker, and (-1, *) is
the special base marker).

In the future we probably do want to do this in a more
sophisticated manner, completely rewriting the indexes
into the section as well. For now though this should be
enough for when binaryen does not optimize (as we
don't move/reorder anything).

Note that this doesn't update the location description
(like where on the wasm expression stack the value is).
Again, that is correct for when binaryen doesn't
optimize, but for fully optimized builds we would need
to track things (which would be hard!).

Also clean up some code that uses "Extra" instead of
"Delimiter" that was missed before, and shorten some
unnecessarily long names.

2 files changed, 216 insertions, 216 deletions

diff --git a/test/passes/fannkuch3.bin.txt b/test/passes/fannkuch3.bin.txt
index 0d5d8a859..3381168a8 100644
--- a/test/passes/fannkuch3.bin.txt
+++ b/test/passes/fannkuch3.bin.txt
@@ -2559,7 +2559,7 @@ Abbrev table for offset: 0x00000000
 0x000000b4:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000000: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000000,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value)
+                     [0x00000000,  0x00000030): DW_OP_consts +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000014c] = "maxflips")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2568,15 +2568,15 @@ Abbrev table for offset: 0x00000000
 0x000000c3:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000001d: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000007,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000052,  0x00000057): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x000000ec,  0x000000f5): DW_OP_consts +1, DW_OP_stack_value
-                     [0x00000131,  0x0000013b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000179,  0x00000186): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000275,  0x0000027e): DW_OP_consts +1, DW_OP_stack_value
-                     [0x000002ba,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000302,  0x0000030f): DW_OP_consts +0, DW_OP_stack_value)
+                     [0x00000007,  0x00000030): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000046,  0x0000004b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x000000dc,  0x000000e5): DW_OP_consts +1, DW_OP_stack_value
+                     [0x00000121,  0x0000012b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x00000169,  0x00000176): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000258,  0x00000263): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000269,  0x00000272): DW_OP_consts +1, DW_OP_stack_value
+                     [0x000002ae,  0x000002b8): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x000002f6,  0x00000303): DW_OP_consts +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000d6] = "i")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2585,7 +2585,7 @@ Abbrev table for offset: 0x00000000
 0x000000d2:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000a5: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000000e,  0x0000003c): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
+                     [0x0000000e,  0x00000030): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000dc] = "n")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2594,7 +2594,7 @@ Abbrev table for offset: 0x00000000
 0x000000e1:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000c3: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000001b,  0x0000003c): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
+                     [0x00000017,  0x00000030): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000013e] = "perm1")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2603,7 +2603,7 @@ Abbrev table for offset: 0x00000000
 0x000000f0:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000e1: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000025,  0x0000003c): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
+                     [0x0000001d,  0x00000030): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000196] = "perm")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2612,7 +2612,7 @@ Abbrev table for offset: 0x00000000
 0x000000ff:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000ff: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000002f,  0x0000003c): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                     [0x00000023,  0x00000030): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000144] = "count")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2621,8 +2621,8 @@ Abbrev table for offset: 0x00000000
 0x0000010e:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000011d: 
                      [0xffffffff,  0x00000006): 
-                     [0x000001e2,  0x000001e7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
-                     [0x0000036b,  0x00000370): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
+                     [0x000001d2,  0x000001d7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+                     [0x0000035f,  0x00000364): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000014a] = "r")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2631,12 +2631,12 @@ Abbrev table for offset: 0x00000000
 0x0000011d:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000149: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000cf,  0x000000e6): DW_OP_consts +0, DW_OP_stack_value
-                     [0x000000ec,  0x000000f5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
-                     [0x0000015a,  0x00000162): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000275,  0x0000027e): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
-                     [0x000002e3,  0x000002eb): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
+                     [0x000000c3,  0x000000d6): DW_OP_consts +0, DW_OP_stack_value
+                     [0x000000dc,  0x000000e5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
+                     [0x0000014a,  0x00000152): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x00000258,  0x00000263): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000269,  0x00000272): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
+                     [0x000002d7,  0x000002df): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000155] = "flips")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2645,8 +2645,8 @@ Abbrev table for offset: 0x00000000
 0x0000012c:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000001ab: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000e2,  0x000000e6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
-                     [0x0000026b,  0x0000026f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value)
+                     [0x000000d2,  0x000000d6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
+                     [0x0000025f,  0x00000263): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019b] = "k")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2655,10 +2655,10 @@ Abbrev table for offset: 0x00000000
 0x0000013b:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000001d7: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000fc,  0x00000100): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x00000138,  0x0000013b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x00000285,  0x00000289): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x000002c1,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                     [0x000000ec,  0x000000f0): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000128,  0x0000012b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000279,  0x0000027d): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x000002b5,  0x000002b8): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019d] = "j")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2667,10 +2667,10 @@ Abbrev table for offset: 0x00000000
 0x0000014a:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000021f: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000111,  0x0000013b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
-                     [0x0000014c,  0x00000162): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x0000029a,  0x000002c4): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
-                     [0x000002d5,  0x000002eb): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                     [0x00000101,  0x0000012b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
+                     [0x0000013c,  0x00000152): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x0000028e,  0x000002b8): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
+                     [0x000002c9,  0x000002df): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019f] = "tmp")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2842,7 +2842,7 @@ Abbrev table for offset: 0x00000000
 0x00000269:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000267: 
                      [0xffffffff,  0x0000039f): 
-                     [0x00000032,  0x00000037): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
+                     [0x00000012,  0x00000017): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000dc] = "n")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(153)
@@ -2862,28 +2862,28 @@ Abbrev table for offset: 0x00000000
 0x0000028d:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000285: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_consts +30, DW_OP_stack_value)
+                       [0x00000025,  0x0000002e): DW_OP_consts +30, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01c3 => {0x000001c3} "showmax")
 
 0x00000296:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000002a2: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_lit0, DW_OP_stack_value
-                       [0x000002f8,  0x00000314): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                       [0x00000025,  0x0000002e): DW_OP_lit0, DW_OP_stack_value
+                       [0x000002ac,  0x000002c4): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01ce => {0x000001ce} "args")
 
 0x0000029f:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000002cc: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_consts +0, DW_OP_stack_value
-                       [0x0000008e,  0x00000093): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x00000099,  0x000000c1): DW_OP_consts +0, DW_OP_stack_value
-                       [0x000000d7,  0x000000dc): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x000000f5,  0x000000f9): DW_OP_consts +0, DW_OP_stack_value
-                       [0x00000127,  0x0000012c): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x00000178,  0x00000188): DW_OP_consts +0, DW_OP_stack_value
-                       [0x000001fa,  0x0000020c): DW_OP_consts +0, DW_OP_stack_value
-                       [0x00000241,  0x00000255): DW_OP_consts +0, DW_OP_stack_value)
+                       [0x00000025,  0x0000002e): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000063,  0x00000068): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x0000006e,  0x0000008e): DW_OP_consts +0, DW_OP_stack_value
+                       [0x000000a4,  0x000000a9): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x000000c2,  0x000000c6): DW_OP_consts +0, DW_OP_stack_value
+                       [0x000000ed,  0x000000f2): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x0000013a,  0x0000014a): DW_OP_consts +0, DW_OP_stack_value
+                       [0x000001be,  0x000001cc): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000201,  0x00000215): DW_OP_consts +0, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01d9 => {0x000001d9} "i")
 
 0x000002a8:       DW_TAG_variable [27]  
@@ -2892,33 +2892,33 @@ Abbrev table for offset: 0x00000000
 0x000002ad:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000354: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000000a8,  0x000000c1): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                       [0x00000079,  0x0000008e): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01ef => {0x000001ef} "perm1")
 
 0x000002b6:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000372: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000000b2,  0x000000c1): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
+                       [0x0000007f,  0x0000008e): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01fa => {0x000001fa} "count")
 
 0x000002bf:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000390: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000001e6,  0x000001ed): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
-                       [0x000002b3,  0x000002ba): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                       [0x000001a8,  0x000001af): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+                       [0x00000273,  0x0000027a): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x0205 => {0x00000205} "r")
 
 0x000002c8:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000003e8: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000002d6,  0x000002e1): DW_OP_consts +0, DW_OP_stack_value
-                       [0x0000030c,  0x00000314): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
+                       [0x0000028e,  0x00000299): DW_OP_consts +0, DW_OP_stack_value
+                       [0x000002bc,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x0210 => {0x00000210} "maxflips")
 
 0x000002d1:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000413: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000002f1,  0x00000314): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                       [0x000002a5,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x021b => {0x0000021b} "flips")
 
 0x000002da:       DW_TAG_label [28]  
@@ -2933,8 +2933,8 @@ Abbrev table for offset: 0x00000000
 0x000002e8:         DW_TAG_variable [26]  
                       DW_AT_location [DW_FORM_sec_offset]	(0x000003bc: 
                          [0xffffffff,  0x0000039f): 
-                         [0x0000017f,  0x00000188): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
-                         [0x00000248,  0x00000255): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value)
+                         [0x00000141,  0x0000014a): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+                         [0x00000208,  0x00000215): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value)
                       DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x022e => {0x0000022e} "p0")
 
 0x000002f1:         NULL
@@ -3001,120 +3001,120 @@ Abbrev table for offset: 0x00000000
 .debug_loc contents:
 0x00000000: 
             [0xffffffff,  0x00000006): 
-            [0x00000000,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000000,  0x00000030): DW_OP_consts +0, DW_OP_stack_value
 
 0x0000001d: 
             [0xffffffff,  0x00000006): 
-            [0x00000007,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000052,  0x00000057): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x000000ec,  0x000000f5): DW_OP_consts +1, DW_OP_stack_value
-            [0x00000131,  0x0000013b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000179,  0x00000186): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000275,  0x0000027e): DW_OP_consts +1, DW_OP_stack_value
-            [0x000002ba,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000302,  0x0000030f): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000007,  0x00000030): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000046,  0x0000004b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x000000dc,  0x000000e5): DW_OP_consts +1, DW_OP_stack_value
+            [0x00000121,  0x0000012b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000169,  0x00000176): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000258,  0x00000263): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000269,  0x00000272): DW_OP_consts +1, DW_OP_stack_value
+            [0x000002ae,  0x000002b8): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x000002f6,  0x00000303): DW_OP_consts +0, DW_OP_stack_value
 
 0x000000a5: 
             [0xffffffff,  0x00000006): 
-            [0x0000000e,  0x0000003c): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x0000000e,  0x00000030): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
 
 0x000000c3: 
             [0xffffffff,  0x00000006): 
-            [0x0000001b,  0x0000003c): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
+            [0x00000017,  0x00000030): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
 
 0x000000e1: 
             [0xffffffff,  0x00000006): 
-            [0x00000025,  0x0000003c): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
+            [0x0000001d,  0x00000030): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
 
 0x000000ff: 
             [0xffffffff,  0x00000006): 
-            [0x0000002f,  0x0000003c): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000023,  0x00000030): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x0000011d: 
             [0xffffffff,  0x00000006): 
-            [0x000001e2,  0x000001e7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
-            [0x0000036b,  0x00000370): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x000001d2,  0x000001d7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x0000035f,  0x00000364): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
 
 0x00000149: 
             [0xffffffff,  0x00000006): 
-            [0x000000cf,  0x000000e6): DW_OP_consts +0, DW_OP_stack_value
-            [0x000000ec,  0x000000f5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
-            [0x0000015a,  0x00000162): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000275,  0x0000027e): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
-            [0x000002e3,  0x000002eb): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x000000c3,  0x000000d6): DW_OP_consts +0, DW_OP_stack_value
+            [0x000000dc,  0x000000e5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
+            [0x0000014a,  0x00000152): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000258,  0x00000263): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000269,  0x00000272): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
+            [0x000002d7,  0x000002df): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
 
 0x000001ab: 
             [0xffffffff,  0x00000006): 
-            [0x000000e2,  0x000000e6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
-            [0x0000026b,  0x0000026f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value
+            [0x000000d2,  0x000000d6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
+            [0x0000025f,  0x00000263): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value
 
 0x000001d7: 
             [0xffffffff,  0x00000006): 
-            [0x000000fc,  0x00000100): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x00000138,  0x0000013b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x00000285,  0x00000289): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x000002c1,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x000000ec,  0x000000f0): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000128,  0x0000012b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000279,  0x0000027d): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x000002b5,  0x000002b8): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x0000021f: 
             [0xffffffff,  0x00000006): 
-            [0x00000111,  0x0000013b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
-            [0x0000014c,  0x00000162): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x0000029a,  0x000002c4): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
-            [0x000002d5,  0x000002eb): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000101,  0x0000012b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
+            [0x0000013c,  0x00000152): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x0000028e,  0x000002b8): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
+            [0x000002c9,  0x000002df): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x00000267: 
             [0xffffffff,  0x0000039f): 
-            [0x00000032,  0x00000037): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
+            [0x00000012,  0x00000017): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
 
 0x00000285: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_consts +30, DW_OP_stack_value
+            [0x00000025,  0x0000002e): DW_OP_consts +30, DW_OP_stack_value
 
 0x000002a2: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_lit0, DW_OP_stack_value
-            [0x000002f8,  0x00000314): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000025,  0x0000002e): DW_OP_lit0, DW_OP_stack_value
+            [0x000002ac,  0x000002c4): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x000002cc: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_consts +0, DW_OP_stack_value
-            [0x0000008e,  0x00000093): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000099,  0x000000c1): DW_OP_consts +0, DW_OP_stack_value
-            [0x000000d7,  0x000000dc): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x000000f5,  0x000000f9): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000127,  0x0000012c): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000178,  0x00000188): DW_OP_consts +0, DW_OP_stack_value
-            [0x000001fa,  0x0000020c): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000241,  0x00000255): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000025,  0x0000002e): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000063,  0x00000068): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x0000006e,  0x0000008e): DW_OP_consts +0, DW_OP_stack_value
+            [0x000000a4,  0x000000a9): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x000000c2,  0x000000c6): DW_OP_consts +0, DW_OP_stack_value
+            [0x000000ed,  0x000000f2): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x0000013a,  0x0000014a): DW_OP_consts +0, DW_OP_stack_value
+            [0x000001be,  0x000001cc): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000201,  0x00000215): DW_OP_consts +0, DW_OP_stack_value
 
 0x00000354: 
             [0xffffffff,  0x0000039f): 
-            [0x000000a8,  0x000000c1): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000079,  0x0000008e): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x00000372: 
             [0xffffffff,  0x0000039f): 
-            [0x000000b2,  0x000000c1): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
+            [0x0000007f,  0x0000008e): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
 
 0x00000390: 
             [0xffffffff,  0x0000039f): 
-            [0x000001e6,  0x000001ed): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
-            [0x000002b3,  0x000002ba): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x000001a8,  0x000001af): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000273,  0x0000027a): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x000003bc: 
             [0xffffffff,  0x0000039f): 
-            [0x0000017f,  0x00000188): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
-            [0x00000248,  0x00000255): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+            [0x00000141,  0x0000014a): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+            [0x00000208,  0x00000215): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
 
 0x000003e8: 
             [0xffffffff,  0x0000039f): 
-            [0x000002d6,  0x000002e1): DW_OP_consts +0, DW_OP_stack_value
-            [0x0000030c,  0x00000314): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x0000028e,  0x00000299): DW_OP_consts +0, DW_OP_stack_value
+            [0x000002bc,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
 
 0x00000413: 
             [0xffffffff,  0x0000039f): 
-            [0x000002f1,  0x00000314): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x000002a5,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 .debug_line contents:
 debug_line[0x00000000]
diff --git a/test/passes/fannkuch3_manyopts.bin.txt b/test/passes/fannkuch3_manyopts.bin.txt
index e8055b7e3..fccdccae9 100644
--- a/test/passes/fannkuch3_manyopts.bin.txt
+++ b/test/passes/fannkuch3_manyopts.bin.txt
@@ -2559,7 +2559,7 @@ Abbrev table for offset: 0x00000000
 0x000000b4:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000000: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000000,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000014c] = "maxflips")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2568,15 +2568,15 @@ Abbrev table for offset: 0x00000000
 0x000000c3:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000001d: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000007,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000052,  0x00000057): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x000000ec,  0x000000f5): DW_OP_consts +1, DW_OP_stack_value
-                     [0x00000131,  0x0000013b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000179,  0x00000186): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000275,  0x0000027e): DW_OP_consts +1, DW_OP_stack_value
-                     [0x000002ba,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000302,  0x0000030f): DW_OP_consts +0, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +1, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +1, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000d6] = "i")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2585,7 +2585,7 @@ Abbrev table for offset: 0x00000000
 0x000000d2:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000a5: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000000e,  0x0000003c): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000dc] = "n")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2594,7 +2594,7 @@ Abbrev table for offset: 0x00000000
 0x000000e1:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000c3: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000001b,  0x0000003c): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000013e] = "perm1")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2603,7 +2603,7 @@ Abbrev table for offset: 0x00000000
 0x000000f0:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000e1: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000025,  0x0000003c): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000196] = "perm")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2612,7 +2612,7 @@ Abbrev table for offset: 0x00000000
 0x000000ff:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000000ff: 
                      [0xffffffff,  0x00000006): 
-                     [0x0000002f,  0x0000003c): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000144] = "count")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(29)
@@ -2621,8 +2621,8 @@ Abbrev table for offset: 0x00000000
 0x0000010e:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000011d: 
                      [0xffffffff,  0x00000006): 
-                     [0x000001e2,  0x000001e7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
-                     [0x0000036b,  0x00000370): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000014a] = "r")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2631,12 +2631,12 @@ Abbrev table for offset: 0x00000000
 0x0000011d:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000149: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000cf,  0x000000e6): DW_OP_consts +0, DW_OP_stack_value
-                     [0x000000ec,  0x000000f5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
-                     [0x0000015a,  0x00000162): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                     [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-                     [0x00000275,  0x0000027e): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
-                     [0x000002e3,  0x000002eb): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000155] = "flips")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2645,8 +2645,8 @@ Abbrev table for offset: 0x00000000
 0x0000012c:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000001ab: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000e2,  0x000000e6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
-                     [0x0000026b,  0x0000026f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value)
+                     [0x000000c3,  0x000000c7): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
+                     [0x0000023b,  0x0000023f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019b] = "k")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2655,10 +2655,10 @@ Abbrev table for offset: 0x00000000
 0x0000013b:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x000001d7: 
                      [0xffffffff,  0x00000006): 
-                     [0x000000fc,  0x00000100): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x00000138,  0x0000013b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x00000285,  0x00000289): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x000002c1,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                     [0x000000db,  0x000000df): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000117,  0x0000011a): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000253,  0x00000257): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x0000028f,  0x00000292): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019d] = "j")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2667,10 +2667,10 @@ Abbrev table for offset: 0x00000000
 0x0000014a:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x0000021f: 
                      [0xffffffff,  0x00000006): 
-                     [0x00000111,  0x0000013b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
-                     [0x0000014c,  0x00000162): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-                     [0x0000029a,  0x000002c4): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
-                     [0x000002d5,  0x000002eb): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
+                     [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000019f] = "tmp")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(30)
@@ -2838,7 +2838,7 @@ Abbrev table for offset: 0x00000000
 0x00000269:     DW_TAG_variable [13]  
                   DW_AT_location [DW_FORM_sec_offset]	(0x00000267: 
                      [0xffffffff,  0x0000039f): 
-                     [0x00000032,  0x00000037): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
+                     [0xffffffdd,  0xffffffe2): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value)
                   DW_AT_name [DW_FORM_strp]	( .debug_str[0x000000dc] = "n")
                   DW_AT_decl_file [DW_FORM_data1]	("/usr/local/google/home/azakai/Dev/emscripten/tests/fannkuch.cpp")
                   DW_AT_decl_line [DW_FORM_data1]	(153)
@@ -2858,28 +2858,28 @@ Abbrev table for offset: 0x00000000
 0x0000028d:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000285: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_consts +30, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_consts +30, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01c3 => {0x000001c3} "showmax")
 
 0x00000296:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000002a2: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_lit0, DW_OP_stack_value
-                       [0x000002f8,  0x00000314): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_lit0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01ce => {0x000001ce} "args")
 
 0x0000029f:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000002cc: 
                        [0xffffffff,  0x0000039f): 
-                       [0x0000004c,  0x00000055): DW_OP_consts +0, DW_OP_stack_value
-                       [0x0000008e,  0x00000093): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x00000099,  0x000000c1): DW_OP_consts +0, DW_OP_stack_value
-                       [0x000000d7,  0x000000dc): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x000000f5,  0x000000f9): DW_OP_consts +0, DW_OP_stack_value
-                       [0x00000127,  0x0000012c): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-                       [0x00000178,  0x00000188): DW_OP_consts +0, DW_OP_stack_value
-                       [0x000001fa,  0x0000020c): DW_OP_consts +0, DW_OP_stack_value
-                       [0x00000241,  0x00000255): DW_OP_consts +0, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x00000089,  0x0000008d): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01d9 => {0x000001d9} "i")
 
 0x000002a8:       DW_TAG_variable [27]  
@@ -2888,33 +2888,33 @@ Abbrev table for offset: 0x00000000
 0x000002ad:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000354: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000000a8,  0x000000c1): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01ef => {0x000001ef} "perm1")
 
 0x000002b6:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000372: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000000b2,  0x000000c1): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x01fa => {0x000001fa} "count")
 
 0x000002bf:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000390: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000001e6,  0x000001ed): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
-                       [0x000002b3,  0x000002ba): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x0205 => {0x00000205} "r")
 
 0x000002c8:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x000003e8: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000002d6,  0x000002e1): DW_OP_consts +0, DW_OP_stack_value
-                       [0x0000030c,  0x00000314): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x0210 => {0x00000210} "maxflips")
 
 0x000002d1:       DW_TAG_variable [26]  
                     DW_AT_location [DW_FORM_sec_offset]	(0x00000413: 
                        [0xffffffff,  0x0000039f): 
-                       [0x000002f1,  0x00000314): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
+                       [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value)
                     DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x021b => {0x0000021b} "flips")
 
 0x000002da:       DW_TAG_label [28]  
@@ -2928,8 +2928,8 @@ Abbrev table for offset: 0x00000000
 0x000002e8:         DW_TAG_variable [26]  
                       DW_AT_location [DW_FORM_sec_offset]	(0x000003bc: 
                          [0xffffffff,  0x0000039f): 
-                         [0x0000017f,  0x00000188): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
-                         [0x00000248,  0x00000255): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value)
+                         [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+                         [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value)
                       DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x022e => {0x0000022e} "p0")
 
 0x000002f1:         NULL
@@ -2996,120 +2996,120 @@ Abbrev table for offset: 0x00000000
 .debug_loc contents:
 0x00000000: 
             [0xffffffff,  0x00000006): 
-            [0x00000000,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
 
 0x0000001d: 
             [0xffffffff,  0x00000006): 
-            [0x00000007,  0x0000003c): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000052,  0x00000057): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x000000ec,  0x000000f5): DW_OP_consts +1, DW_OP_stack_value
-            [0x00000131,  0x0000013b): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000179,  0x00000186): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000275,  0x0000027e): DW_OP_consts +1, DW_OP_stack_value
-            [0x000002ba,  0x000002c4): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000302,  0x0000030f): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
 
 0x000000a5: 
             [0xffffffff,  0x00000006): 
-            [0x0000000e,  0x0000003c): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
 
 0x000000c3: 
             [0xffffffff,  0x00000006): 
-            [0x0000001b,  0x0000003c): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
 
 0x000000e1: 
             [0xffffffff,  0x00000006): 
-            [0x00000025,  0x0000003c): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
 
 0x000000ff: 
             [0xffffffff,  0x00000006): 
-            [0x0000002f,  0x0000003c): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x0000011d: 
             [0xffffffff,  0x00000006): 
-            [0x000001e2,  0x000001e7): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
-            [0x0000036b,  0x00000370): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +2, DW_OP_stack_value
 
 0x00000149: 
             [0xffffffff,  0x00000006): 
-            [0x000000cf,  0x000000e6): DW_OP_consts +0, DW_OP_stack_value
-            [0x000000ec,  0x000000f5): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
-            [0x0000015a,  0x00000162): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000264,  0x0000026f): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000275,  0x0000027e): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
-            [0x000002e3,  0x000002eb): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +13, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +10, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
 
 0x000001ab: 
             [0xffffffff,  0x00000006): 
-            [0x000000e2,  0x000000e6): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
-            [0x0000026b,  0x0000026f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value
+            [0x000000c3,  0x000000c7): DW_OP_WASM_location 0x0 +12, DW_OP_stack_value
+            [0x0000023b,  0x0000023f): DW_OP_WASM_location 0x0 +16, DW_OP_stack_value
 
 0x000001d7: 
             [0xffffffff,  0x00000006): 
-            [0x000000fc,  0x00000100): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x00000138,  0x0000013b): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x00000285,  0x00000289): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x000002c1,  0x000002c4): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x000000db,  0x000000df): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000117,  0x0000011a): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000253,  0x00000257): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x0000028f,  0x00000292): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x0000021f: 
             [0xffffffff,  0x00000006): 
-            [0x00000111,  0x0000013b): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
-            [0x0000014c,  0x00000162): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
-            [0x0000029a,  0x000002c4): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
-            [0x000002d5,  0x000002eb): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +15, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +14, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x00000267: 
             [0xffffffff,  0x0000039f): 
-            [0x00000032,  0x00000037): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
+            [0xffffffdd,  0xffffffe2): DW_OP_WASM_location 0x0 +4, DW_OP_stack_value
 
 0x00000285: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_consts +30, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +30, DW_OP_stack_value
 
 0x000002a2: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_lit0, DW_OP_stack_value
-            [0x000002f8,  0x00000314): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_lit0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x000002cc: 
             [0xffffffff,  0x0000039f): 
-            [0x0000004c,  0x00000055): DW_OP_consts +0, DW_OP_stack_value
-            [0x0000008e,  0x00000093): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000099,  0x000000c1): DW_OP_consts +0, DW_OP_stack_value
-            [0x000000d7,  0x000000dc): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x000000f5,  0x000000f9): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000127,  0x0000012c): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
-            [0x00000178,  0x00000188): DW_OP_consts +0, DW_OP_stack_value
-            [0x000001fa,  0x0000020c): DW_OP_consts +0, DW_OP_stack_value
-            [0x00000241,  0x00000255): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000089,  0x0000008d): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
 
 0x00000354: 
             [0xffffffff,  0x0000039f): 
-            [0x000000a8,  0x000000c1): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 0x00000372: 
             [0xffffffff,  0x0000039f): 
-            [0x000000b2,  0x000000c1): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +5, DW_OP_stack_value
 
 0x00000390: 
             [0xffffffff,  0x0000039f): 
-            [0x000001e6,  0x000001ed): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
-            [0x000002b3,  0x000002ba): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +6, DW_OP_stack_value
 
 0x000003bc: 
             [0xffffffff,  0x0000039f): 
-            [0x0000017f,  0x00000188): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
-            [0x00000248,  0x00000255): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +8, DW_OP_stack_value
 
 0x000003e8: 
             [0xffffffff,  0x0000039f): 
-            [0x000002d6,  0x000002e1): DW_OP_consts +0, DW_OP_stack_value
-            [0x0000030c,  0x00000314): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_consts +0, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +0, DW_OP_stack_value
 
 0x00000413: 
             [0xffffffff,  0x0000039f): 
-            [0x000002f1,  0x00000314): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
+            [0x00000001,  0x00000001): DW_OP_WASM_location 0x0 +1, DW_OP_stack_value
 
 .debug_line contents:
 debug_line[0x00000000]