1239 files changed, 51338 insertions, 49390 deletions

diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
index 210e338a1..328efba2a 100644
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ b/test/s2wasm_known_binaryen_shell_test_failures.txt
@@ -1,6 +1,3 @@
-# [trap highest > memory]
-pr27260.c.s.wast
-
 # [trap final > memory]
 20010915-1.c.s.wast
 20020413-1.c.s.wast
@@ -11,7 +8,6 @@ pr27260.c.s.wast
 20050502-1.c.s.wast
 20050502-2.c.s.wast
 20070201-1.c.s.wast
-20071029-1.c.s.wast
 20071030-1.c.s.wast
 20080502-1.c.s.wast
 20100708-1.c.s.wast
@@ -28,14 +24,12 @@ multi-ix.c.s.wast
 pr37573.c.s.wast
 pr43236.c.s.wast
 pr44852.c.s.wast
-pr51877.c.s.wast
 pr51933.c.s.wast
 pr54471.c.s.wast
 pr56205.c.s.wast
 pr56866.c.s.wast
 pr56982.c.s.wast
 pr57130.c.s.wast
-pr60960.c.s.wast
 stdarg-1.c.s.wast
 stdarg-2.c.s.wast
 string-opt-17.c.s.wast
@@ -75,15 +69,12 @@ va-arg-pack-1.c.s.wast
 
 # callImport: the toolchain needs to properly use libc and a runtime. These
 # aren't binaryen's fault.
-20000815-1.c.s.wast # memset
 20000910-2.c.s.wast # strchr
 20000914-1.c.s.wast # malloc
 20011024-1.c.s.wast # strcmp
 20020406-1.c.s.wast # malloc
 20021011-1.c.s.wast # strcmp
 20031204-1.c.s.wast # strcmp
-20041126-1.c.s.wast # memcpy
-20041218-1.c.s.wast # memset
 20050218-1.c.s.wast # strlen
 20050826-1.c.s.wast # memset
 20051113-1.c.s.wast # malloc
@@ -112,13 +103,11 @@ loop-2g.c.s.wast # open
 memcpy-2.c.s.wast # memset
 memcpy-bi.c.s.wast # memcpy
 memset-1.c.s.wast # memset
-memset-2.c.s.wast # memset
 memset-3.c.s.wast # memset
 pr28982b.c.s.wast # memset
 pr33870-1.c.s.wast # memset
 pr33870.c.s.wast # memset
 pr34456.c.s.wast # qsort
-pr35472.c.s.wast # memset
 pr36038.c.s.wast # memcpy
 pr36093.c.s.wast # memset
 pr36765.c.s.wast # __builtin_malloc
@@ -131,7 +120,6 @@ pr43784.c.s.wast # memcpy
 pr47237.c.s.wast # __builtin_apply_args
 pr47337.c.s.wast # strcmp
 pr49218.c.s.wast # __fixsfti
-pr49419.c.s.wast # memset
 pr53688.c.s.wast # memset
 pr58419.c.s.wast # getpid
 pr59229.c.s.wast # memcpy
@@ -152,3 +140,12 @@ fprintf-1.c.s.wast # stdout
 fprintf-chk-1.c.s.wast # stdout
 vfprintf-1.c.s.wast # stdout
 vfprintf-chk-1.c.s.wast # stdout
+
+# Results of signed integer overflow are undefined in C, so don't care.
+# 'clang -O2' runs -instcombine pass that does these transformations:
+# > add nsw x, INT_MIN -> or x, INT_MIN
+# > add nuw x, INT_MIN -> xor x, INT_MIN
+# which makes the tests below fail.
+20040409-1.c.s.wast # abort()
+20040409-2.c.s.wast # abort()
+20040409-3.c.s.wast # abort()
diff --git a/test/torture-s/20000112-1.c.s b/test/torture-s/20000112-1.c.s
index c53ff48e8..c91f127d4 100644
--- a/test/torture-s/20000112-1.c.s
+++ b/test/torture-s/20000112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000112-1.c"
+	.file	"20000112-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000113-1.c.s b/test/torture-s/20000113-1.c.s
index a843acf0c..d3e3e6a9a 100644
--- a/test/torture-s/20000113-1.c.s
+++ b/test/torture-s/20000113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000113-1.c"
+	.file	"20000113-1.c"
 	.section	.text.foobar,"ax",@progbits
-	.hidden	foobar
+	.hidden	foobar                  # -- Begin function foobar
 	.globl	foobar
 	.type	foobar,@function
 foobar:                                 # @foobar
@@ -37,24 +37,22 @@ foobar:                                 # @foobar
 	.endfunc
 .Lfunc_end0:
 	.size	foobar, .Lfunc_end0-foobar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 1
-	i32.const	$push1=, 2
-	i32.const	$push0=, 3
-	i32.call	$drop=, foobar@FUNCTION, $pop2, $pop1, $pop0
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000121-1.c.s b/test/torture-s/20000121-1.c.s
index 713f0f65c..01bf7aba2 100644
--- a/test/torture-s/20000121-1.c.s
+++ b/test/torture-s/20000121-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000121-1.c"
+	.file	"20000121-1.c"
 	.section	.text.big,"ax",@progbits
-	.hidden	big
+	.hidden	big                     # -- Begin function big
 	.globl	big
 	.type	big,@function
 big:                                    # @big
@@ -11,9 +11,9 @@ big:                                    # @big
 	.endfunc
 .Lfunc_end0:
 	.size	big, .Lfunc_end0-big
-
+                                        # -- End function
 	.section	.text.doit,"ax",@progbits
-	.hidden	doit
+	.hidden	doit                    # -- Begin function doit
 	.globl	doit
 	.type	doit,@function
 doit:                                   # @doit
@@ -23,9 +23,9 @@ doit:                                   # @doit
 	.endfunc
 .Lfunc_end1:
 	.size	doit, .Lfunc_end1-doit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,6 +36,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000205-1.c.s b/test/torture-s/20000205-1.c.s
index 3084333d9..a9744dd7a 100644
--- a/test/torture-s/20000205-1.c.s
+++ b/test/torture-s/20000205-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000205-1.c"
+	.file	"20000205-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000217-1.c.s b/test/torture-s/20000217-1.c.s
index 95ac3e5e6..682b89c97 100644
--- a/test/torture-s/20000217-1.c.s
+++ b/test/torture-s/20000217-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000217-1.c"
+	.file	"20000217-1.c"
 	.section	.text.showbug,"ax",@progbits
-	.hidden	showbug
+	.hidden	showbug                 # -- Begin function showbug
 	.globl	showbug
 	.type	showbug,@function
 showbug:                                # @showbug
@@ -23,9 +23,9 @@ showbug:                                # @showbug
 	.endfunc
 .Lfunc_end0:
 	.size	showbug, .Lfunc_end0-showbug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000223-1.c.s b/test/torture-s/20000223-1.c.s
index 4143e192d..d63634b84 100644
--- a/test/torture-s/20000223-1.c.s
+++ b/test/torture-s/20000223-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000223-1.c"
+	.file	"20000223-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -10,7 +10,7 @@ check:                                  # @check
 	block   	
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $1
-	i32.and 	$push2=, $1, $pop1
+	i32.and 	$push2=, $pop1, $1
 	i32.ne  	$push3=, $pop2, $1
 	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %if.end
@@ -22,9 +22,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20000224-1.c.s b/test/torture-s/20000224-1.c.s
index 68ab95c0f..76cf4ccab 100644
--- a/test/torture-s/20000224-1.c.s
+++ b/test/torture-s/20000224-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000224-1.c"
+	.file	"20000224-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -50,9 +50,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,7 +65,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	loop_1                  # @loop_1
 	.type	loop_1,@object
 	.section	.data.loop_1,"aw",@progbits
@@ -94,5 +94,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000225-1.c.s b/test/torture-s/20000225-1.c.s
index 76230ce48..39b221765 100644
--- a/test/torture-s/20000225-1.c.s
+++ b/test/torture-s/20000225-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000225-1.c"
+	.file	"20000225-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000227-1.c.s b/test/torture-s/20000227-1.c.s
index 3368619b8..0ea972bd0 100644
--- a/test/torture-s/20000227-1.c.s
+++ b/test/torture-s/20000227-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000227-1.c"
+	.file	"20000227-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000313-1.c.s b/test/torture-s/20000313-1.c.s
index 81b556573..ff2f0e6ca 100644
--- a/test/torture-s/20000313-1.c.s
+++ b/test/torture-s/20000313-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000313-1.c"
+	.file	"20000313-1.c"
 	.section	.text.buggy,"ax",@progbits
-	.hidden	buggy
+	.hidden	buggy                   # -- Begin function buggy
 	.globl	buggy
 	.type	buggy,@function
 buggy:                                  # @buggy
@@ -19,9 +19,9 @@ buggy:                                  # @buggy
 	.endfunc
 .Lfunc_end0:
 	.size	buggy, .Lfunc_end0-buggy
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,6 +32,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000314-1.c.s b/test/torture-s/20000314-1.c.s
index b5f06fcda..614c0bc88 100644
--- a/test/torture-s/20000314-1.c.s
+++ b/test/torture-s/20000314-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000314-1.c"
+	.file	"20000314-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000314-2.c.s b/test/torture-s/20000314-2.c.s
index 3a80b56bc..d8bb84775 100644
--- a/test/torture-s/20000314-2.c.s
+++ b/test/torture-s/20000314-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000314-2.c"
+	.file	"20000314-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -22,7 +22,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	bigconst                # @bigconst
 	.type	bigconst,@object
 	.section	.rodata.bigconst,"a",@progbits
@@ -42,6 +42,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000314-3.c.s b/test/torture-s/20000314-3.c.s
index e26e89806..fe08c2733 100644
--- a/test/torture-s/20000314-3.c.s
+++ b/test/torture-s/20000314-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000314-3.c"
+	.file	"20000314-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000402-1.c.s b/test/torture-s/20000402-1.c.s
index 42d2ed974..34ea67d25 100644
--- a/test/torture-s/20000402-1.c.s
+++ b/test/torture-s/20000402-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000402-1.c"
+	.file	"20000402-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000403-1.c.s b/test/torture-s/20000403-1.c.s
index f65b19950..c4b2f990a 100644
--- a/test/torture-s/20000403-1.c.s
+++ b/test/torture-s/20000403-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000403-1.c"
+	.file	"20000403-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,22 +16,22 @@ main:                                   # @main
 	i32.load	$push3=, bb($pop7)
 	i32.sub 	$push4=, $pop2, $pop3
 	i32.const	$push6=, 0
-	i32.le_s	$push5=, $pop4, $pop6
+	i32.gt_s	$push5=, $pop4, $pop6
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push9=, 0
-	call    	exit@FUNCTION, $pop9
+# BB#1:                                 # %if.then
+	call    	abort@FUNCTION
 	unreachable
-.LBB0_2:                                # %if.then
+.LBB0_2:                                # %if.end
 	end_block                       # label0:
-	call    	abort@FUNCTION
+	i32.const	$push9=, 0
+	call    	exit@FUNCTION, $pop9
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.seqgt,"ax",@progbits
-	.hidden	seqgt
+	.hidden	seqgt                   # -- Begin function seqgt
 	.globl	seqgt
 	.type	seqgt,@function
 seqgt:                                  # @seqgt
@@ -46,9 +46,9 @@ seqgt:                                  # @seqgt
 	.endfunc
 .Lfunc_end1:
 	.size	seqgt, .Lfunc_end1-seqgt
-
+                                        # -- End function
 	.section	.text.seqgt2,"ax",@progbits
-	.hidden	seqgt2
+	.hidden	seqgt2                  # -- Begin function seqgt2
 	.globl	seqgt2
 	.type	seqgt2,@function
 seqgt2:                                 # @seqgt2
@@ -63,7 +63,7 @@ seqgt2:                                 # @seqgt2
 	.endfunc
 .Lfunc_end2:
 	.size	seqgt2, .Lfunc_end2-seqgt2
-
+                                        # -- End function
 	.hidden	aa                      # @aa
 	.type	aa,@object
 	.section	.data.aa,"aw",@progbits
@@ -83,6 +83,6 @@ bb:
 	.size	bb, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-1.c.s b/test/torture-s/20000412-1.c.s
index bd0a90821..b7de28539 100644
--- a/test/torture-s/20000412-1.c.s
+++ b/test/torture-s/20000412-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-1.c"
+	.file	"20000412-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -62,6 +62,6 @@ wordlist:
 	.size	wordlist, 828
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-2.c.s b/test/torture-s/20000412-2.c.s
index 1ced2f2d4..3e2937a96 100644
--- a/test/torture-s/20000412-2.c.s
+++ b/test/torture-s/20000412-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-2.c"
+	.file	"20000412-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,10 +10,10 @@ f:                                      # @f
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop3, $pop4
+	i32.sub 	$push12=, $pop2, $pop4
 	tee_local	$push11=, $2=, $pop12
 	i32.store	__stack_pointer($pop5), $pop11
 	i32.store	12($2), $0
@@ -42,9 +42,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,8 +69,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-3.c.s b/test/torture-s/20000412-3.c.s
index e528d62d3..e2dc13f73 100644
--- a/test/torture-s/20000412-3.c.s
+++ b/test/torture-s/20000412-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-3.c"
+	.file	"20000412-3.c"
 	.section	.text.z,"ax",@progbits
-	.hidden	z
+	.hidden	z                       # -- Begin function z
 	.globl	z
 	.type	z,@function
 z:                                      # @z
@@ -12,9 +12,9 @@ z:                                      # @z
 	.endfunc
 .Lfunc_end0:
 	.size	z, .Lfunc_end0-z
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,9 +26,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -53,7 +53,7 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end2:
 	.size	f, .Lfunc_end2-f
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-4.c.s b/test/torture-s/20000412-4.c.s
index 139d240b5..0e75be40b 100644
--- a/test/torture-s/20000412-4.c.s
+++ b/test/torture-s/20000412-4.c.s
@@ -1,26 +1,28 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-4.c"
+	.file	"20000412-4.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
 	block   	
 	block   	
 	i32.sub 	$push15=, $0, $2
-	tee_local	$push14=, $5=, $pop15
+	tee_local	$push14=, $6=, $pop15
 	i32.const	$push0=, 0
 	i32.const	$push13=, 0
-	i32.gt_s	$push1=, $5, $pop13
+	i32.gt_s	$push1=, $6, $pop13
 	i32.select	$push12=, $pop14, $pop0, $pop1
 	tee_local	$push11=, $5=, $pop12
-	i32.const	$push2=, 3
-	i32.ge_s	$push3=, $pop11, $pop2
+	i32.const	$push2=, 2
+	i32.gt_s	$push3=, $pop11, $pop2
 	br_if   	0, $pop3        # 0: down to label1
 # BB#1:                                 # %for.body.lr.ph
+	i32.const	$push17=, -1
+	i32.add 	$6=, $5, $pop17
 	i32.add 	$push4=, $2, $5
 	i32.const	$push16=, -1
 	i32.add 	$push5=, $pop4, $pop16
@@ -31,20 +33,20 @@ f:                                      # @f
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.add 	$push19=, $2, $3
-	tee_local	$push18=, $2=, $pop19
-	i32.const	$push17=, -1
-	i32.le_s	$push9=, $pop18, $pop17
+	i32.add 	$push20=, $2, $3
+	tee_local	$push19=, $2=, $pop20
+	i32.const	$push18=, -1
+	i32.le_s	$push9=, $pop19, $pop18
 	br_if   	2, $pop9        # 2: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $5, $pop23
-	tee_local	$push21=, $5=, $pop22
-	i32.const	$push20=, 2
-	i32.le_s	$push10=, $pop21, $pop20
+	i32.const	$push24=, 1
+	i32.add 	$push23=, $6, $pop24
+	tee_local	$push22=, $6=, $pop23
+	i32.const	$push21=, 1
+	i32.le_u	$push10=, $pop22, $pop21
 	br_if   	0, $pop10       # 0: up to label2
-.LBB0_4:                                # %for.cond6.preheader
+.LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
 	return
@@ -55,23 +57,23 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %for.cond.i.2.1
+# BB#0:                                 # %for.body.lr.ph.i
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-5.c.s b/test/torture-s/20000412-5.c.s
index 116b4bead..63633ea26 100644
--- a/test/torture-s/20000412-5.c.s
+++ b/test/torture-s/20000412-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-5.c"
+	.file	"20000412-5.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-6.c.s b/test/torture-s/20000412-6.c.s
index ef282769b..e761e0ddd 100644
--- a/test/torture-s/20000412-6.c.s
+++ b/test/torture-s/20000412-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000412-6.c"
+	.file	"20000412-6.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,9 +34,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.bug,"ax",@progbits
-	.hidden	bug
+	.hidden	bug                     # -- Begin function bug
 	.globl	bug
 	.type	bug,@function
 bug:                                    # @bug
@@ -50,24 +50,25 @@ bug:                                    # @bug
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.load16_u	$push1=, 0($1)
-	i32.sub 	$push2=, $0, $pop1
-	i32.const	$push7=, 65535
-	i32.and 	$0=, $pop2, $pop7
-	i32.const	$push6=, 2
-	i32.add 	$push5=, $1, $pop6
-	tee_local	$push4=, $1=, $pop5
-	i32.lt_u	$push3=, $pop4, $2
+	i32.const	$push9=, 65535
+	i32.and 	$push1=, $0, $pop9
+	i32.load16_u	$push2=, 0($1)
+	i32.sub 	$0=, $pop1, $pop2
+	i32.const	$push8=, 2
+	i32.add 	$push7=, $1, $pop8
+	tee_local	$push6=, $1=, $pop7
+	i32.lt_u	$push3=, $pop6, $2
 	br_if   	0, $pop3        # 0: up to label2
 .LBB1_3:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	copy_local	$push8=, $0
-                                        # fallthrough-return: $pop8
+	i32.const	$push4=, 65535
+	i32.and 	$push5=, $0, $pop4
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end1:
 	.size	bug, .Lfunc_end1-bug
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.data.buf,"aw",@progbits
@@ -82,6 +83,6 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000419-1.c.s b/test/torture-s/20000419-1.c.s
index 58262ab82..6cb3892ac 100644
--- a/test/torture-s/20000419-1.c.s
+++ b/test/torture-s/20000419-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000419-1.c"
+	.file	"20000419-1.c"
 	.section	.text.brother,"ax",@progbits
-	.hidden	brother
+	.hidden	brother                 # -- Begin function brother
 	.globl	brother
 	.type	brother,@function
 brother:                                # @brother
@@ -18,9 +18,9 @@ brother:                                # @brother
 	.endfunc
 .Lfunc_end0:
 	.size	brother, .Lfunc_end0-brother
-
+                                        # -- End function
 	.section	.text.sister,"ax",@progbits
-	.hidden	sister
+	.hidden	sister                  # -- Begin function sister
 	.globl	sister
 	.type	sister,@function
 sister:                                 # @sister
@@ -39,51 +39,22 @@ sister:                                 # @sister
 	.endfunc
 .Lfunc_end1:
 	.size	sister, .Lfunc_end1-sister
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
-	tee_local	$push14=, $0=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
-	i32.const	$push2=, 12
-	i32.add 	$push3=, $0, $pop2
+# BB#0:                                 # %sister.exit
 	i32.const	$push0=, 0
-	i32.load	$push1=, .Lmain.f+8($pop0)
-	i32.store	0($pop3), $pop1
-	i32.const	$push13=, 0
-	i64.load	$push4=, .Lmain.f($pop13):p2align=2
-	i64.store	4($0):p2align=2, $pop4
-	i32.const	$push10=, 4
-	i32.add 	$push11=, $0, $pop10
-	i32.const	$push5=, 1
-	call    	sister@FUNCTION, $pop11, $pop5, $0
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-	.type	.Lmain.f,@object        # @main.f
-	.section	.rodata..Lmain.f,"a",@progbits
-	.p2align	2
-.Lmain.f:
-	.int32	7                       # 0x7
-	.int32	8                       # 0x8
-	.int32	9                       # 0x9
-	.size	.Lmain.f, 12
-
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000422-1.c.s b/test/torture-s/20000422-1.c.s
index 8305c0dc1..d273e3d68 100644
--- a/test/torture-s/20000422-1.c.s
+++ b/test/torture-s/20000422-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000422-1.c"
+	.file	"20000422-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,7 +16,7 @@ main:                                   # @main
 	i32.const	$push15=, 1
 	i32.lt_s	$push0=, $pop16, $pop15
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %for.cond1.preheader.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push19=, -1
 	i32.add 	$1=, $0, $pop19
 	i32.const	$push1=, 2
@@ -24,7 +24,7 @@ main:                                   # @main
 	i32.const	$push3=, ops-8
 	i32.add 	$2=, $pop2, $pop3
 	i32.const	$6=, 0
-.LBB0_2:                                # %for.cond1.preheader
+.LBB0_2:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_4 Depth 2
 	loop    	                # label2:
@@ -53,7 +53,7 @@ main:                                   # @main
                                         #   in Loop: Header=BB0_4 Depth=2
 	i32.store	0($7), $4
 	i32.store	0($5), $3
-.LBB0_6:                                # %for.cond1.backedge
+.LBB0_6:                                # %for.inc
                                         #   in Loop: Header=BB0_4 Depth=2
 	end_block                       # label5:
 	i32.const	$push30=, -4
@@ -72,7 +72,7 @@ main:                                   # @main
 	tee_local	$push31=, $6=, $pop32
 	i32.lt_s	$push7=, $pop31, $0
 	br_if   	0, $pop7        # 0: up to label2
-# BB#8:                                 # %for.cond15.preheader
+# BB#8:                                 # %for.end14
 	end_loop
 	i32.const	$push34=, 1
 	i32.lt_s	$push8=, $0, $pop34
@@ -113,7 +113,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	ops                     # @ops
 	.type	ops,@object
 	.section	.data.ops,"aw",@progbits
@@ -166,6 +166,6 @@ num:
 	.size	num, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000503-1.c.s b/test/torture-s/20000503-1.c.s
index 4288dd4cd..e660c9b83 100644
--- a/test/torture-s/20000503-1.c.s
+++ b/test/torture-s/20000503-1.c.s
@@ -1,29 +1,29 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000503-1.c"
+	.file	"20000503-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, 0
 	i32.const	$push0=, -2
 	i32.add 	$push8=, $0, $pop0
 	tee_local	$push7=, $0=, $pop8
+	i32.const	$push1=, 0
 	i32.const	$push6=, 0
-	i32.lt_s	$push2=, $0, $pop6
-	i32.select	$push3=, $pop1, $pop7, $pop2
+	i32.gt_s	$push2=, $0, $pop6
+	i32.select	$push3=, $pop7, $pop1, $pop2
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $pop3, $pop4
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000511-1.c.s b/test/torture-s/20000511-1.c.s
index 7009746d8..b0938a35c 100644
--- a/test/torture-s/20000511-1.c.s
+++ b/test/torture-s/20000511-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000511-1.c"
+	.file	"20000511-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,8 +33,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000519-1.c.s b/test/torture-s/20000519-1.c.s
index 162356b93..7853140a1 100644
--- a/test/torture-s/20000519-1.c.s
+++ b/test/torture-s/20000519-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000519-1.c"
+	.file	"20000519-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -26,9 +26,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -36,10 +36,10 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push6=, $pop4, $pop5
+	i32.sub 	$push6=, $pop3, $pop5
 	i32.store	12($pop6), $1
 .LBB1_1:                                # %do.body.i
                                         # =>This Inner Loop Header: Depth=1
@@ -58,9 +58,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -68,10 +68,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push14=, $pop7, $pop8
+	i32.sub 	$push14=, $pop6, $pop8
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop9), $pop13
 	i64.const	$push0=, 12884901890
@@ -96,7 +96,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20000519-2.c.s b/test/torture-s/20000519-2.c.s
index ced39c711..46d86306c 100644
--- a/test/torture-s/20000519-2.c.s
+++ b/test/torture-s/20000519-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000519-2.c"
+	.file	"20000519-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -35,6 +35,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000523-1.c.s b/test/torture-s/20000523-1.c.s
index 17176f0b8..11ea7f3f7 100644
--- a/test/torture-s/20000523-1.c.s
+++ b/test/torture-s/20000523-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000523-1.c"
+	.file	"20000523-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000528-1.c.s b/test/torture-s/20000528-1.c.s
index 37f8318d6..9f511b9e3 100644
--- a/test/torture-s/20000528-1.c.s
+++ b/test/torture-s/20000528-1.c.s
@@ -1,25 +1,27 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000528-1.c"
+	.file	"20000528-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load16_u	$push3=, l($pop4)
-	tee_local	$push2=, $0=, $pop3
-	i32.store16	s($pop5), $pop2
+	i32.const	$push7=, 0
+	i32.const	$push6=, 0
+	i32.load	$push5=, l($pop6)
+	tee_local	$push4=, $0=, $pop5
+	i32.store16	s($pop7), $pop4
 	block   	
-	i32.const	$push0=, 65534
-	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label0
+	i32.const	$push0=, 65535
+	i32.and 	$push1=, $0, $pop0
+	i32.const	$push2=, 65534
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+	i32.const	$push8=, 0
+	call    	exit@FUNCTION, $pop8
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	l                       # @l
 	.type	l,@object
 	.section	.data.l,"aw",@progbits
@@ -48,6 +50,6 @@ s:
 	.size	s, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000603-1.c.s b/test/torture-s/20000603-1.c.s
index ca2550061..b62acfc83 100644
--- a/test/torture-s/20000603-1.c.s
+++ b/test/torture-s/20000603-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000603-1.c"
+	.file	"20000603-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,6 +30,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000605-1.c.s b/test/torture-s/20000605-1.c.s
index 516a2eb5a..5f42b6d65 100644
--- a/test/torture-s/20000605-1.c.s
+++ b/test/torture-s/20000605-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000605-1.c"
+	.file	"20000605-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,8 +31,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000605-2.c.s b/test/torture-s/20000605-2.c.s
index 75456eb4a..bea5f0f29 100644
--- a/test/torture-s/20000605-2.c.s
+++ b/test/torture-s/20000605-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000605-2.c"
+	.file	"20000605-2.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -21,7 +21,7 @@ f1:                                     # @f1
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	i32.const	$push10=, 5
-	i32.ge_s	$push2=, $3, $pop10
+	i32.ge_u	$push2=, $3, $pop10
 	br_if   	2, $pop2        # 2: down to label0
 # BB#3:                                 # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
@@ -47,9 +47,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,16 +57,16 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop3, $pop4
+	i32.sub 	$push10=, $pop2, $pop4
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop5), $pop9
-	i32.const	$push0=, 0
-	i32.store	8($0), $pop0
-	i32.const	$push1=, 1
-	i32.store	0($0), $pop1
+	i32.const	$push0=, 1
+	i32.store	0($0), $pop0
+	i32.const	$push1=, 0
+	i32.store	8($0), $pop1
 	i32.const	$push6=, 8
 	i32.add 	$push7=, $0, $pop6
 	call    	f1@FUNCTION, $pop7, $0
@@ -76,8 +76,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000605-3.c.s b/test/torture-s/20000605-3.c.s
index 05f0302a9..88dd11dad 100644
--- a/test/torture-s/20000605-3.c.s
+++ b/test/torture-s/20000605-3.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000605-3.c"
+	.file	"20000605-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %cleanup7
+# BB#0:                                 # %while.cond
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000622-1.c.s b/test/torture-s/20000622-1.c.s
index a06309307..069cfc9fd 100644
--- a/test/torture-s/20000622-1.c.s
+++ b/test/torture-s/20000622-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000622-1.c"
+	.file	"20000622-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -30,9 +30,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -44,9 +44,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -69,9 +69,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -83,8 +83,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000703-1.c.s b/test/torture-s/20000703-1.c.s
index 9285517e4..7f9871db5 100644
--- a/test/torture-s/20000703-1.c.s
+++ b/test/torture-s/20000703-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000703-1.c"
+	.file	"20000703-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,14 +21,16 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.store	20($0), $1
+	i32.store	24($0), $2
 	i32.const	$push0=, 16
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -42,23 +44,21 @@ bar:                                    # @bar
 	i32.const	$push14=, 0
 	i64.load	$push7=, .L.str.1($pop14):p2align=0
 	i64.store	0($0):p2align=0, $pop7
-	i32.const	$push8=, 19
-	i32.add 	$push9=, $0, $pop8
 	i32.const	$push13=, 0
-	i32.load8_u	$push10=, .L.str+2($pop13)
-	i32.store8	0($pop9), $pop10
+	i32.load16_u	$push8=, .L.str($pop13):p2align=0
+	i32.store16	17($0):p2align=0, $pop8
+	i32.const	$push9=, 19
+	i32.add 	$push10=, $0, $pop9
 	i32.const	$push12=, 0
-	i32.load16_u	$push11=, .L.str($pop12):p2align=0
-	i32.store16	17($0):p2align=0, $pop11
-	i32.store	20($0), $1
-	i32.store	24($0), $2
+	i32.load8_u	$push11=, .L.str+2($pop12)
+	i32.store8	0($pop10), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,7 +70,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -83,5 +83,5 @@ main:                                   # @main
 	.size	.L.str.1, 18
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-1.c.s b/test/torture-s/20000706-1.c.s
index 0f0c2b7d6..eb7f3b057 100644
--- a/test/torture-s/20000706-1.c.s
+++ b/test/torture-s/20000706-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000706-1.c"
+	.file	"20000706-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -61,9 +61,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -103,49 +103,22 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 48
-	i32.sub 	$push18=, $pop9, $pop10
-	tee_local	$push17=, $0=, $pop18
-	i32.store	__stack_pointer($pop11), $pop17
-	i64.const	$push0=, 17179869187
-	i64.store	32($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i64.const	$push16=, 17179869187
-	i64.store	0($pop2):p2align=2, $pop16
-	i32.const	$push3=, 5
-	i32.store	40($0), $pop3
-	i32.const	$push4=, 20
-	i32.add 	$push5=, $0, $pop4
-	i32.const	$push15=, 5
-	i32.store	0($pop5), $pop15
-	i64.const	$push6=, 8589934593
-	i64.store	24($0), $pop6
-	i64.const	$push14=, 8589934593
-	i64.store	4($0):p2align=2, $pop14
-	i32.const	$push12=, 4
-	i32.add 	$push13=, $0, $pop12
-	call    	foo@FUNCTION, $pop13, $0
-	i32.const	$push7=, 0
-	call    	exit@FUNCTION, $pop7
+# BB#0:                                 # %foo.exit
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-2.c.s b/test/torture-s/20000706-2.c.s
index fc7b80603..0643ea9f5 100644
--- a/test/torture-s/20000706-2.c.s
+++ b/test/torture-s/20000706-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000706-2.c"
+	.file	"20000706-2.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -61,9 +61,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -103,49 +103,22 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 48
-	i32.sub 	$push18=, $pop9, $pop10
-	tee_local	$push17=, $0=, $pop18
-	i32.store	__stack_pointer($pop11), $pop17
-	i64.const	$push0=, 17179869187
-	i64.store	32($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i64.const	$push16=, 17179869187
-	i64.store	0($pop2):p2align=2, $pop16
-	i32.const	$push3=, 5
-	i32.store	40($0), $pop3
-	i32.const	$push4=, 20
-	i32.add 	$push5=, $0, $pop4
-	i32.const	$push15=, 5
-	i32.store	0($pop5), $pop15
-	i64.const	$push6=, 8589934593
-	i64.store	24($0), $pop6
-	i64.const	$push14=, 8589934593
-	i64.store	4($0):p2align=2, $pop14
-	i32.const	$push12=, 4
-	i32.add 	$push13=, $0, $pop12
-	call    	foo@FUNCTION, $0, $pop13, $0
-	i32.const	$push7=, 0
-	call    	exit@FUNCTION, $pop7
+# BB#0:                                 # %foo.exit
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-3.c.s b/test/torture-s/20000706-3.c.s
index 1bc1ce3ef..435dfaed4 100644
--- a/test/torture-s/20000706-3.c.s
+++ b/test/torture-s/20000706-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000706-3.c"
+	.file	"20000706-3.c"
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -14,9 +14,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end0:
 	.size	baz, .Lfunc_end0-baz
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -41,9 +41,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -68,9 +68,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -85,7 +85,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -96,6 +96,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-4.c.s b/test/torture-s/20000706-4.c.s
index 139b3fd37..a38ebbf35 100644
--- a/test/torture-s/20000706-4.c.s
+++ b/test/torture-s/20000706-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000706-4.c"
+	.file	"20000706-4.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -27,9 +27,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -37,10 +37,10 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push15=, $pop6, $pop7
+	i32.sub 	$push15=, $pop5, $pop7
 	tee_local	$push14=, $2=, $pop15
 	i32.store	__stack_pointer($pop8), $pop14
 	i32.const	$push0=, 0
@@ -69,24 +69,33 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, 1
-	i32.const	$push0=, 2
-	call    	foo@FUNCTION, $pop1, $pop0
+	i32.const	$push4=, 0
 	i32.const	$push2=, 0
-	call    	exit@FUNCTION, $pop2
+	i32.load	$push1=, __stack_pointer($pop2)
+	i32.const	$push3=, 16
+	i32.sub 	$push9=, $pop1, $pop3
+	tee_local	$push8=, $0=, $pop9
+	i32.store	__stack_pointer($pop4), $pop8
+	i32.const	$push0=, 0
+	i32.const	$push5=, 12
+	i32.add 	$push6=, $0, $pop5
+	i32.store	c($pop0), $pop6
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -97,6 +106,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-5.c.s b/test/torture-s/20000706-5.c.s
index e8e8f80b7..df8477916 100644
--- a/test/torture-s/20000706-5.c.s
+++ b/test/torture-s/20000706-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000706-5.c"
+	.file	"20000706-5.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -39,9 +39,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -77,9 +77,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,33 +87,31 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push15=, $pop7, $pop8
-	tee_local	$push14=, $0=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
-	i32.const	$push0=, 3
-	i32.store	24($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push13=, 3
-	i32.store	0($pop2), $pop13
+	i32.sub 	$push13=, $pop6, $pop8
+	tee_local	$push12=, $0=, $pop13
+	i32.store	__stack_pointer($pop9), $pop12
+	i32.const	$push0=, 8
+	i32.add 	$push1=, $0, $pop0
+	i32.const	$push2=, 3
+	i32.store	0($pop1), $pop2
+	i32.const	$push11=, 3
+	i32.store	24($0), $pop11
 	i64.const	$push3=, 8589934593
-	i64.store	16($0), $pop3
-	i64.const	$push12=, 8589934593
-	i64.store	4($0):p2align=2, $pop12
-	i32.const	$push10=, 4
-	i32.add 	$push11=, $0, $pop10
+	i64.store	0($0), $pop3
+	i64.const	$push10=, 8589934593
+	i64.store	16($0), $pop10
 	i32.const	$push4=, 4
-	call    	foo@FUNCTION, $pop11, $pop4
+	call    	foo@FUNCTION, $0, $pop4
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -124,6 +122,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000707-1.c.s b/test/torture-s/20000707-1.c.s
index 34f268905..fc199b557 100644
--- a/test/torture-s/20000707-1.c.s
+++ b/test/torture-s/20000707-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000707-1.c"
+	.file	"20000707-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -42,50 +42,22 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
-	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
-	i32.const	$push2=, 12
-	i32.add 	$push3=, $0, $pop2
+# BB#0:                                 # %bar.exit
 	i32.const	$push0=, 0
-	i32.load	$push1=, .Lmain.x+8($pop0)
-	i32.store	0($pop3), $pop1
-	i32.const	$push12=, 0
-	i64.load	$push4=, .Lmain.x($pop12):p2align=2
-	i64.store	4($0):p2align=2, $pop4
-	i32.const	$push9=, 4
-	i32.add 	$push10=, $0, $pop9
-	call    	bar@FUNCTION, $pop10, $0, $0
-	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-	.type	.Lmain.x,@object        # @main.x
-	.section	.rodata..Lmain.x,"a",@progbits
-	.p2align	2
-.Lmain.x:
-	.int32	3                       # 0x3
-	.int32	4                       # 0x4
-	.int32	5                       # 0x5
-	.size	.Lmain.x, 12
-
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000715-1.c.s b/test/torture-s/20000715-1.c.s
index aef6a7dda..2572bb953 100644
--- a/test/torture-s/20000715-1.c.s
+++ b/test/torture-s/20000715-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000715-1.c"
+	.file	"20000715-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -10,9 +10,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -21,9 +21,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -32,9 +32,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -49,9 +49,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -66,9 +66,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -83,24 +83,27 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	call    	test4@FUNCTION
-	call    	test5@FUNCTION
-	call    	test6@FUNCTION
-	i32.const	$push0=, 0
-	call    	exit@FUNCTION, $pop0
+	i32.const	$push1=, 0
+	i32.const	$push0=, 3
+	i32.store	y($pop1), $pop0
+	i32.const	$push4=, 0
+	i32.const	$push3=, 3
+	i32.store	x($pop4), $pop3
+	i32.const	$push2=, 0
+	call    	exit@FUNCTION, $pop2
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -120,5 +123,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000715-2.c.s b/test/torture-s/20000715-2.c.s
index f04095c39..9fe17d804 100644
--- a/test/torture-s/20000715-2.c.s
+++ b/test/torture-s/20000715-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000715-2.c"
+	.file	"20000715-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-1.c.s b/test/torture-s/20000717-1.c.s
index 62dde8fe0..df6d9b21d 100644
--- a/test/torture-s/20000717-1.c.s
+++ b/test/torture-s/20000717-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000717-1.c"
+	.file	"20000717-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,9 +28,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -57,9 +57,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -67,30 +67,28 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
-	i32.const	$push2=, 12
+	i32.sub 	$push12=, $pop5, $pop7
+	tee_local	$push11=, $0=, $pop12
+	i32.store	__stack_pointer($pop8), $pop11
+	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
 	i32.load	$push1=, .Lmain.t+8($pop0)
 	i32.store	0($pop3), $pop1
-	i32.const	$push12=, 0
-	i64.load	$push4=, .Lmain.t($pop12):p2align=2
-	i64.store	4($0):p2align=2, $pop4
-	i32.const	$push9=, 4
-	i32.add 	$push10=, $0, $pop9
-	i32.call	$drop=, foo@FUNCTION, $pop10, $0
-	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
+	i32.const	$push10=, 0
+	i64.load	$push4=, .Lmain.t($pop10):p2align=2
+	i64.store	0($0), $pop4
+	i32.call	$drop=, foo@FUNCTION, $0, $0
+	i32.const	$push9=, 0
+	call    	exit@FUNCTION, $pop9
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lmain.t,@object        # @main.t
 	.section	.rodata..Lmain.t,"a",@progbits
 	.p2align	2
@@ -101,6 +99,6 @@ main:                                   # @main
 	.size	.Lmain.t, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-2.c.s b/test/torture-s/20000717-2.c.s
index 3c354d4a7..1dda61eda 100644
--- a/test/torture-s/20000717-2.c.s
+++ b/test/torture-s/20000717-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000717-2.c"
+	.file	"20000717-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-3.c.s b/test/torture-s/20000717-3.c.s
index b865e7aa8..1f5da6486 100644
--- a/test/torture-s/20000717-3.c.s
+++ b/test/torture-s/20000717-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000717-3.c"
+	.file	"20000717-3.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -56,6 +56,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-4.c.s b/test/torture-s/20000717-4.c.s
index 64553311b..c90535f2a 100644
--- a/test/torture-s/20000717-4.c.s
+++ b/test/torture-s/20000717-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000717-4.c"
+	.file	"20000717-4.c"
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -13,9 +13,9 @@ x:                                      # @x
 	.endfunc
 .Lfunc_end0:
 	.size	x, .Lfunc_end0-x
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -37,4 +37,4 @@ s:
 	.size	s, 100
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20000717-5.c.s b/test/torture-s/20000717-5.c.s
index f7200ea46..753bc4039 100644
--- a/test/torture-s/20000717-5.c.s
+++ b/test/torture-s/20000717-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000717-5.c"
+	.file	"20000717-5.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -44,9 +44,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -89,9 +89,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -99,33 +99,31 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push17=, $pop9, $pop10
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop11), $pop16
-	i32.const	$push2=, 12
+	i32.sub 	$push15=, $pop8, $pop10
+	tee_local	$push14=, $0=, $pop15
+	i32.store	__stack_pointer($pop11), $pop14
+	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
 	i32.load	$push1=, .Lmain.t+8($pop0)
 	i32.store	0($pop3), $pop1
-	i32.const	$push15=, 0
-	i64.load	$push4=, .Lmain.t($pop15):p2align=2
-	i64.store	4($0):p2align=2, $pop4
-	i32.const	$push12=, 4
-	i32.add 	$push13=, $0, $pop12
+	i32.const	$push13=, 0
+	i64.load	$push4=, .Lmain.t($pop13):p2align=2
+	i64.store	0($0), $pop4
 	i32.const	$push7=, 4
 	i32.const	$push6=, 5
 	i32.const	$push5=, 6
-	i32.call	$drop=, foo@FUNCTION, $pop13, $pop7, $pop6, $pop5
-	i32.const	$push14=, 0
-	call    	exit@FUNCTION, $pop14
+	i32.call	$drop=, foo@FUNCTION, $0, $pop7, $pop6, $pop5
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lmain.t,@object        # @main.t
 	.section	.rodata..Lmain.t,"a",@progbits
 	.p2align	2
@@ -136,6 +134,6 @@ main:                                   # @main
 	.size	.Lmain.t, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000722-1.c.s b/test/torture-s/20000722-1.c.s
index 1960520d3..4859c701e 100644
--- a/test/torture-s/20000722-1.c.s
+++ b/test/torture-s/20000722-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000722-1.c"
+	.file	"20000722-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -24,9 +24,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -50,8 +50,8 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20000726-1.c.s b/test/torture-s/20000726-1.c.s
index ad7cbc925..5363043fe 100644
--- a/test/torture-s/20000726-1.c.s
+++ b/test/torture-s/20000726-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000726-1.c"
+	.file	"20000726-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.adjust_xy,"ax",@progbits
-	.hidden	adjust_xy
+	.hidden	adjust_xy               # -- Begin function adjust_xy
 	.globl	adjust_xy
 	.type	adjust_xy,@function
 adjust_xy:                              # @adjust_xy
@@ -27,7 +27,7 @@ adjust_xy:                              # @adjust_xy
 	.endfunc
 .Lfunc_end1:
 	.size	adjust_xy, .Lfunc_end1-adjust_xy
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000731-1.c.s b/test/torture-s/20000731-1.c.s
index 2910f0c97..91c56c8a9 100644
--- a/test/torture-s/20000731-1.c.s
+++ b/test/torture-s/20000731-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000731-1.c"
+	.file	"20000731-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.do_sibcall,"ax",@progbits
-	.hidden	do_sibcall
+	.hidden	do_sibcall              # -- Begin function do_sibcall
 	.globl	do_sibcall
 	.type	do_sibcall,@function
 do_sibcall:                             # @do_sibcall
@@ -23,9 +23,9 @@ do_sibcall:                             # @do_sibcall
 	.endfunc
 .Lfunc_end1:
 	.size	do_sibcall, .Lfunc_end1-do_sibcall
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000731-2.c.s b/test/torture-s/20000731-2.c.s
index 8eb415648..26db9f30f 100644
--- a/test/torture-s/20000731-2.c.s
+++ b/test/torture-s/20000731-2.c.s
@@ -1,19 +1,19 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000731-2.c"
+	.file	"20000731-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-1.c.s b/test/torture-s/20000801-1.c.s
index 88f3a2a9b..5a908665c 100644
--- a/test/torture-s/20000801-1.c.s
+++ b/test/torture-s/20000801-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000801-1.c"
+	.file	"20000801-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -46,9 +46,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,10 +56,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop4, $pop5
+	i32.sub 	$push11=, $pop3, $pop5
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop6), $pop10
 	i32.const	$push9=, 0
@@ -84,8 +84,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-2.c.s b/test/torture-s/20000801-2.c.s
index 5f4306e47..8d94cb272 100644
--- a/test/torture-s/20000801-2.c.s
+++ b/test/torture-s/20000801-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000801-2.c"
+	.file	"20000801-2.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -25,9 +25,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -38,9 +38,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -51,9 +51,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,17 +61,17 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop3, $pop4
+	i32.sub 	$push11=, $pop2, $pop4
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop5), $pop10
+	i32.const	$push0=, 0
+	i32.store	8($0), $pop0
 	i32.const	$push6=, 8
 	i32.add 	$push7=, $0, $pop6
 	i32.store	12($0), $pop7
-	i32.const	$push0=, 0
-	i32.store	8($0), $pop0
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $0, $pop8
 	copy_local	$0=, $pop9
@@ -89,7 +89,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-3.c.s b/test/torture-s/20000801-3.c.s
index d8012715a..613ec8681 100644
--- a/test/torture-s/20000801-3.c.s
+++ b/test/torture-s/20000801-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000801-3.c"
+	.file	"20000801-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -36,6 +36,6 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20000801-4.c.s b/test/torture-s/20000801-4.c.s
index f9c734ae7..19b6117b1 100644
--- a/test/torture-s/20000801-4.c.s
+++ b/test/torture-s/20000801-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000801-4.c"
+	.file	"20000801-4.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -22,10 +22,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.const	$push0=, 0
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -49,5 +49,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000808-1.c.s b/test/torture-s/20000808-1.c.s
index 34f77c99f..1c4079eb0 100644
--- a/test/torture-s/20000808-1.c.s
+++ b/test/torture-s/20000808-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000808-1.c"
+	.file	"20000808-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -10,9 +10,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -79,9 +79,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -90,9 +90,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -104,8 +104,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000815-1.c.s b/test/torture-s/20000815-1.c.s
index 5f451966d..0ef524c2d 100644
--- a/test/torture-s/20000815-1.c.s
+++ b/test/torture-s/20000815-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000815-1.c"
+	.file	"20000815-1.c"
 	.section	.text.invalidate_memory,"ax",@progbits
-	.hidden	invalidate_memory
+	.hidden	invalidate_memory       # -- Begin function invalidate_memory
 	.globl	invalidate_memory
 	.type	invalidate_memory,@function
 invalidate_memory:                      # @invalidate_memory
@@ -10,10 +10,10 @@ invalidate_memory:                      # @invalidate_memory
 # BB#0:                                 # %entry
 	i32.load8_u	$push8=, 0($0)
 	tee_local	$push7=, $0=, $pop8
-	i32.const	$push0=, 4
-	i32.and 	$2=, $pop7, $pop0
-	i32.const	$push1=, 8
-	i32.and 	$1=, $0, $pop1
+	i32.const	$push1=, 4
+	i32.and 	$2=, $pop7, $pop1
+	i32.const	$push2=, 8
+	i32.and 	$1=, $0, $pop2
 	i32.const	$4=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
@@ -22,13 +22,13 @@ invalidate_memory:                      # @invalidate_memory
 	loop    	                # label1:
 	block   	
 	i32.const	$push12=, 2
-	i32.shl 	$push2=, $4, $pop12
+	i32.shl 	$push3=, $4, $pop12
 	i32.const	$push11=, table
-	i32.add 	$push3=, $pop2, $pop11
-	i32.load	$push10=, 0($pop3)
+	i32.add 	$push4=, $pop3, $pop11
+	i32.load	$push10=, 0($pop4)
 	tee_local	$push9=, $0=, $pop10
-	i32.eqz 	$push19=, $pop9
-	br_if   	0, $pop19       # 0: down to label2
+	i32.eqz 	$push17=, $pop9
+	br_if   	0, $pop17       # 0: down to label2
 .LBB0_2:                                # %for.body6
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
@@ -37,21 +37,21 @@ invalidate_memory:                      # @invalidate_memory
 	tee_local	$push13=, $3=, $pop14
 	i32.load	$0=, 4($pop13)
 	block   	
-	i32.load8_u	$push4=, 36($3)
-	i32.eqz 	$push20=, $pop4
-	br_if   	0, $pop20       # 0: down to label4
+	i32.load8_u	$push5=, 36($3)
+	i32.eqz 	$push18=, $pop5
+	br_if   	0, $pop18       # 0: down to label4
 # BB#3:                                 # %land.lhs.true
                                         #   in Loop: Header=BB0_2 Depth=2
 	br_if   	4, $1           # 4: down to label0
 # BB#4:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.eqz 	$push21=, $2
-	br_if   	0, $pop21       # 0: down to label4
+	i32.eqz 	$push19=, $2
+	br_if   	0, $pop19       # 0: down to label4
 # BB#5:                                 # %land.lhs.true10
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.load8_u	$push5=, 37($3)
-	br_if   	4, $pop5        # 4: down to label0
-.LBB0_6:                                # %for.cond5.backedge
+	i32.load8_u	$push6=, 37($3)
+	br_if   	4, $pop6        # 4: down to label0
+.LBB0_6:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label4:
 	br_if   	0, $0           # 0: up to label3
@@ -59,25 +59,25 @@ invalidate_memory:                      # @invalidate_memory
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
 	end_block                       # label2:
-	i32.const	$push18=, 1
-	i32.add 	$push17=, $4, $pop18
-	tee_local	$push16=, $4=, $pop17
-	i32.const	$push15=, 31
-	i32.lt_s	$push6=, $pop16, $pop15
-	br_if   	0, $pop6        # 0: up to label1
+	i32.const	$push16=, 30
+	i32.lt_u	$0=, $4, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$push0=, $4, $pop15
+	copy_local	$4=, $pop0
+	br_if   	0, $0           # 0: up to label1
 # BB#8:                                 # %for.end16
 	end_loop
 	return
 .LBB0_9:                                # %if.then
 	end_block                       # label0:
-	call    	remove_from_table@FUNCTION, $0, $0
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	invalidate_memory, .Lfunc_end0-invalidate_memory
-
+                                        # -- End function
 	.section	.text.cse_rtx_addr_varies_p,"ax",@progbits
-	.hidden	cse_rtx_addr_varies_p
+	.hidden	cse_rtx_addr_varies_p   # -- Begin function cse_rtx_addr_varies_p
 	.globl	cse_rtx_addr_varies_p
 	.type	cse_rtx_addr_varies_p,@function
 cse_rtx_addr_varies_p:                  # @cse_rtx_addr_varies_p
@@ -89,9 +89,9 @@ cse_rtx_addr_varies_p:                  # @cse_rtx_addr_varies_p
 	.endfunc
 .Lfunc_end1:
 	.size	cse_rtx_addr_varies_p, .Lfunc_end1-cse_rtx_addr_varies_p
-
+                                        # -- End function
 	.section	.text.remove_from_table,"ax",@progbits
-	.hidden	remove_from_table
+	.hidden	remove_from_table       # -- Begin function remove_from_table
 	.globl	remove_from_table
 	.type	remove_from_table,@function
 remove_from_table:                      # @remove_from_table
@@ -102,41 +102,54 @@ remove_from_table:                      # @remove_from_table
 	.endfunc
 .Lfunc_end2:
 	.size	remove_from_table, .Lfunc_end2-remove_from_table
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 48
-	i32.sub 	$push26=, $pop8, $pop9
-	tee_local	$push25=, $3=, $pop26
-	i32.store	__stack_pointer($pop10), $pop25
-	i32.const	$1=, 0
-	i32.const	$push14=, 8
-	i32.add 	$push15=, $3, $pop14
-	i32.const	$push24=, 0
+	i32.const	$push18=, 0
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 48
+	i32.sub 	$push35=, $pop15, $pop17
+	tee_local	$push34=, $3=, $pop35
+	i32.store	__stack_pointer($pop18), $pop34
 	i32.const	$push0=, 40
-	i32.call	$drop=, memset@FUNCTION, $pop15, $pop24, $pop0
-	i32.const	$push23=, 0
-	i32.const	$push16=, 8
-	i32.add 	$push17=, $3, $pop16
-	i32.store	table($pop23), $pop17
-	i32.const	$push22=, 1
-	i32.store8	44($3), $pop22
+	i32.add 	$push1=, $3, $pop0
+	i64.const	$push2=, 0
+	i64.store	0($pop1), $pop2
+	i32.const	$push3=, 32
+	i32.add 	$push4=, $3, $pop3
+	i64.const	$push33=, 0
+	i64.store	0($pop4), $pop33
+	i32.const	$push5=, 24
+	i32.add 	$push6=, $3, $pop5
+	i64.const	$push32=, 0
+	i64.store	0($pop6), $pop32
+	i32.const	$push7=, 16
+	i32.add 	$push8=, $3, $pop7
+	i64.const	$push31=, 0
+	i64.store	0($pop8), $pop31
+	i64.const	$push30=, 0
+	i64.store	8($3), $pop30
+	i32.const	$1=, 0
+	i32.const	$push29=, 0
+	i32.const	$push22=, 8
+	i32.add 	$push23=, $3, $pop22
+	i32.store	table($pop29), $pop23
+	i32.const	$push28=, 1
+	i32.store8	44($3), $pop28
 	block   	
 	block   	
-	i32.const	$push18=, 8
-	i32.add 	$push19=, $3, $pop18
-	copy_local	$push21=, $pop19
-	tee_local	$push20=, $2=, $pop21
-	br_if   	0, $pop20       # 0: down to label6
+	i32.const	$push24=, 8
+	i32.add 	$push25=, $3, $pop24
+	copy_local	$push27=, $pop25
+	tee_local	$push26=, $2=, $pop27
+	br_if   	0, $pop26       # 0: down to label6
 # BB#1:
 	i32.const	$4=, 4
 	br      	1               # 1: down to label5
@@ -158,80 +171,83 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	br_table 	$4, 1, 2, 6, 3, 4, 5, 0, 0 # 1: down to label18
-                                        # 2: down to label17
-                                        # 6: down to label13
-                                        # 3: down to label16
-                                        # 4: down to label15
-                                        # 5: down to label14
-                                        # 0: down to label19
-.LBB3_4:                                # %for.inc15.i.for.body.i_crit_edge
+	block   	
+	br_table 	$4, 2, 3, 6, 4, 0, 5, 1, 1 # 2: down to label18
+                                        # 3: down to label17
+                                        # 6: down to label14
+                                        # 4: down to label16
+                                        # 0: down to label20
+                                        # 5: down to label15
+                                        # 1: down to label19
+.LBB3_4:                                # %for.inc15.i
                                         #   in Loop: Header=BB3_3 Depth=1
-	end_block                       # label19:
-	i32.const	$push30=, 2
-	i32.shl 	$push5=, $1, $pop30
-	i32.const	$push29=, table
-	i32.add 	$push6=, $pop5, $pop29
-	i32.load	$push28=, 0($pop6)
-	tee_local	$push27=, $2=, $pop28
-	i32.eqz 	$push35=, $pop27
-	br_if   	8, $pop35       # 8: down to label10
+	end_block                       # label20:
+	i32.const	$push36=, 29
+	i32.gt_u	$push11=, $1, $pop36
+	br_if   	11, $pop11      # 11: down to label8
 # BB#5:                                 #   in Loop: Header=BB3_3 Depth=1
+	i32.const	$4=, 6
+	br      	12              # 12: up to label7
+.LBB3_6:                                # %for.inc15.i.for.body.i_crit_edge
+                                        #   in Loop: Header=BB3_3 Depth=1
+	end_block                       # label19:
+	i32.const	$push43=, 1
+	i32.add 	$push42=, $1, $pop43
+	tee_local	$push41=, $1=, $pop42
+	i32.const	$push40=, 2
+	i32.shl 	$push13=, $pop41, $pop40
+	i32.const	$push39=, table
+	i32.add 	$push14=, $pop13, $pop39
+	i32.load	$push38=, 0($pop14)
+	tee_local	$push37=, $2=, $pop38
+	i32.eqz 	$push44=, $pop37
+	br_if   	8, $pop44       # 8: down to label10
+# BB#7:                                 #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 0
 	br      	11              # 11: up to label7
-.LBB3_6:                                # %for.body6.i
+.LBB3_8:                                # %for.body6.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label18:
 	i32.load	$0=, 4($2)
-	i32.load8_u	$push1=, 36($2)
-	i32.eqz 	$push36=, $pop1
-	br_if   	5, $pop36       # 5: down to label12
-# BB#7:                                 #   in Loop: Header=BB3_3 Depth=1
+	i32.load8_u	$push9=, 36($2)
+	i32.eqz 	$push45=, $pop9
+	br_if   	4, $pop45       # 4: down to label13
+# BB#9:                                 #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 1
 	br      	10              # 10: up to label7
-.LBB3_8:                                # %land.lhs.true10.i
+.LBB3_10:                               # %land.lhs.true10.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label17:
-	i32.load8_u	$push2=, 37($2)
-	br_if   	7, $pop2        # 7: down to label9
-# BB#9:                                 #   in Loop: Header=BB3_3 Depth=1
+	i32.load8_u	$push10=, 37($2)
+	br_if   	7, $pop10       # 7: down to label9
+# BB#11:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 3
 	br      	9               # 9: up to label7
-.LBB3_10:                               # %for.cond5.backedge.i
+.LBB3_12:                               # %for.inc.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label16:
 	copy_local	$2=, $0
 	br_if   	4, $0           # 4: down to label11
-# BB#11:                                #   in Loop: Header=BB3_3 Depth=1
-	i32.const	$4=, 4
-	br      	8               # 8: up to label7
-.LBB3_12:                               # %for.inc15.i
-                                        #   in Loop: Header=BB3_3 Depth=1
+	br      	3               # 3: down to label12
+.LBB3_13:                               # %invalidate_memory.exit
 	end_block                       # label15:
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $1, $pop34
-	tee_local	$push32=, $1=, $pop33
-	i32.const	$push31=, 30
-	i32.le_s	$push3=, $pop32, $pop31
-	br_if   	6, $pop3        # 6: down to label8
-# BB#13:                                #   in Loop: Header=BB3_3 Depth=1
-	i32.const	$4=, 5
-	br      	7               # 7: up to label7
-.LBB3_14:                               # %invalidate_memory.exit
+	i32.const	$push21=, 0
+	i32.const	$push19=, 48
+	i32.add 	$push20=, $3, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
+	i32.const	$push12=, 0
+	return  	$pop12
+.LBB3_14:                               # %if.then.i
 	end_block                       # label14:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 48
-	i32.add 	$push12=, $3, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
-	i32.const	$push4=, 0
-	return  	$pop4
-.LBB3_15:                               # %if.then.i
-	end_block                       # label13:
-	call    	remove_from_table@FUNCTION, $2, $2
+	call    	abort@FUNCTION
 	unreachable
+.LBB3_15:                               #   in Loop: Header=BB3_3 Depth=1
+	end_block                       # label13:
+	i32.const	$4=, 3
+	br      	5               # 5: up to label7
 .LBB3_16:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label12:
-	i32.const	$4=, 3
+	i32.const	$4=, 4
 	br      	4               # 4: up to label7
 .LBB3_17:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label11:
@@ -247,14 +263,14 @@ main:                                   # @main
 	br      	1               # 1: up to label7
 .LBB3_20:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label8:
-	i32.const	$4=, 6
+	i32.const	$4=, 5
 	br      	0               # 0: up to label7
 .LBB3_21:
 	end_loop
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	table,@object           # @table
 	.section	.bss.table,"aw",@nobits
 	.p2align	4
@@ -263,5 +279,5 @@ table:
 	.size	table, 128
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20000818-1.c.s b/test/torture-s/20000818-1.c.s
index 13f9b8365..29081034f 100644
--- a/test/torture-s/20000818-1.c.s
+++ b/test/torture-s/20000818-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000818-1.c"
+	.file	"20000818-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.yylex,"ax",@progbits
-	.hidden	yylex
+	.hidden	yylex                   # -- Begin function yylex
 	.globl	yylex
 	.type	yylex,@function
 yylex:                                  # @yylex
@@ -26,7 +26,7 @@ yylex:                                  # @yylex
 	.endfunc
 .Lfunc_end1:
 	.size	yylex, .Lfunc_end1-yylex
-
+                                        # -- End function
 	.hidden	temporary_obstack       # @temporary_obstack
 	.type	temporary_obstack,@object
 	.section	.bss.temporary_obstack,"aw",@nobits
@@ -37,5 +37,5 @@ temporary_obstack:
 	.size	temporary_obstack, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000819-1.c.s b/test/torture-s/20000819-1.c.s
index 85444a956..da5d55986 100644
--- a/test/torture-s/20000819-1.c.s
+++ b/test/torture-s/20000819-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000819-1.c"
+	.file	"20000819-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,7 +15,7 @@ foo:                                    # @foo
 	i32.const	$push8=, 0
 	i32.gt_s	$push1=, $pop9, $pop8
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push2=, 2
 	i32.shl 	$push3=, $1, $pop2
 	i32.add 	$1=, $0, $pop3
@@ -45,9 +45,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -73,6 +73,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20000910-1.c.s b/test/torture-s/20000910-1.c.s
index 164c0315e..9827741ba 100644
--- a/test/torture-s/20000910-1.c.s
+++ b/test/torture-s/20000910-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000910-1.c"
+	.file	"20000910-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -37,9 +37,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -57,8 +57,8 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end3:
 	.size	baz, .Lfunc_end3-baz
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20000910-2.c.s b/test/torture-s/20000910-2.c.s
index 07b1ca9d7..508daa06a 100644
--- a/test/torture-s/20000910-2.c.s
+++ b/test/torture-s/20000910-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000910-2.c"
+	.file	"20000910-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -60,7 +60,7 @@ list:
 	.size	list, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
 	.functype	strchr, i32, i32, i32
diff --git a/test/torture-s/20000914-1.c.s b/test/torture-s/20000914-1.c.s
index fbea458eb..c94cbf138 100644
--- a/test/torture-s/20000914-1.c.s
+++ b/test/torture-s/20000914-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000914-1.c"
+	.file	"20000914-1.c"
 	.section	.text.blah,"ax",@progbits
-	.hidden	blah
+	.hidden	blah                    # -- Begin function blah
 	.globl	blah
 	.type	blah,@function
 blah:                                   # @blah
@@ -13,9 +13,9 @@ blah:                                   # @blah
 	.endfunc
 .Lfunc_end0:
 	.size	blah, .Lfunc_end0-blah
-
+                                        # -- End function
 	.section	.text.convert_like_real,"ax",@progbits
-	.hidden	convert_like_real
+	.hidden	convert_like_real       # -- Begin function convert_like_real
 	.globl	convert_like_real
 	.type	convert_like_real,@function
 convert_like_real:                      # @convert_like_real
@@ -36,9 +36,9 @@ convert_like_real:                      # @convert_like_real
 	.endfunc
 .Lfunc_end1:
 	.size	convert_like_real, .Lfunc_end1-convert_like_real
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,9 +57,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	malloc, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000917-1.c.s b/test/torture-s/20000917-1.c.s
index 37d6038b6..0bc20e578 100644
--- a/test/torture-s/20000917-1.c.s
+++ b/test/torture-s/20000917-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20000917-1.c"
+	.file	"20000917-1.c"
 	.section	.text.one,"ax",@progbits
-	.hidden	one
+	.hidden	one                     # -- Begin function one
 	.globl	one
 	.type	one,@function
 one:                                    # @one
@@ -15,9 +15,9 @@ one:                                    # @one
 	.endfunc
 .Lfunc_end0:
 	.size	one, .Lfunc_end0-one
-
+                                        # -- End function
 	.section	.text.zero,"ax",@progbits
-	.hidden	zero
+	.hidden	zero                    # -- Begin function zero
 	.globl	zero
 	.type	zero,@function
 zero:                                   # @zero
@@ -31,9 +31,9 @@ zero:                                   # @zero
 	.endfunc
 .Lfunc_end1:
 	.size	zero, .Lfunc_end1-zero
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001009-1.c.s b/test/torture-s/20001009-1.c.s
index 2de256acf..f9c31b38e 100644
--- a/test/torture-s/20001009-1.c.s
+++ b/test/torture-s/20001009-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001009-1.c"
+	.file	"20001009-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -32,4 +32,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20001009-2.c.s b/test/torture-s/20001009-2.c.s
index 52ff01ebb..6d765403b 100644
--- a/test/torture-s/20001009-2.c.s
+++ b/test/torture-s/20001009-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001009-2.c"
+	.file	"20001009-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -36,9 +36,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -84,4 +84,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20001011-1.c.s b/test/torture-s/20001011-1.c.s
index 6b7037133..46e013363 100644
--- a/test/torture-s/20001011-1.c.s
+++ b/test/torture-s/20001011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001011-1.c"
+	.file	"20001011-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20001013-1.c.s b/test/torture-s/20001013-1.c.s
index 5cea122f4..810082bdd 100644
--- a/test/torture-s/20001013-1.c.s
+++ b/test/torture-s/20001013-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001013-1.c"
+	.file	"20001013-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -27,9 +27,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -55,7 +55,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	z                       # @z
 	.type	z,@object
 	.section	.data.z,"aw",@progbits
@@ -67,6 +67,6 @@ z:
 	.size	z, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001017-1.c.s b/test/torture-s/20001017-1.c.s
index 0f6763c75..62c4ce71e 100644
--- a/test/torture-s/20001017-1.c.s
+++ b/test/torture-s/20001017-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001017-1.c"
+	.file	"20001017-1.c"
 	.section	.text.bug,"ax",@progbits
-	.hidden	bug
+	.hidden	bug                     # -- Begin function bug
 	.globl	bug
 	.type	bug,@function
 bug:                                    # @bug
@@ -19,9 +19,9 @@ bug:                                    # @bug
 	.endfunc
 .Lfunc_end0:
 	.size	bug, .Lfunc_end0-bug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20001017-2.c.s b/test/torture-s/20001017-2.c.s
index 4147bfaf4..7cb94bf68 100644
--- a/test/torture-s/20001017-2.c.s
+++ b/test/torture-s/20001017-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001017-2.c"
+	.file	"20001017-2.c"
 	.section	.text.fn_4parms,"ax",@progbits
-	.hidden	fn_4parms
+	.hidden	fn_4parms               # -- Begin function fn_4parms
 	.globl	fn_4parms
 	.type	fn_4parms,@function
 fn_4parms:                              # @fn_4parms
@@ -31,9 +31,9 @@ fn_4parms:                              # @fn_4parms
 	.endfunc
 .Lfunc_end0:
 	.size	fn_4parms, .Lfunc_end0-fn_4parms
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20001024-1.c.s b/test/torture-s/20001024-1.c.s
index 063b068ef..989f348b7 100644
--- a/test/torture-s/20001024-1.c.s
+++ b/test/torture-s/20001024-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001024-1.c"
+	.file	"20001024-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -35,9 +35,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -46,9 +46,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,8 +60,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001026-1.c.s b/test/torture-s/20001026-1.c.s
index 44a588019..52d373288 100644
--- a/test/torture-s/20001026-1.c.s
+++ b/test/torture-s/20001026-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001026-1.c"
+	.file	"20001026-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20001027-1.c.s b/test/torture-s/20001027-1.c.s
index 0a1c3b998..b8cda8a74 100644
--- a/test/torture-s/20001027-1.c.s
+++ b/test/torture-s/20001027-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001027-1.c"
+	.file	"20001027-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -51,6 +51,6 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001031-1.c.s b/test/torture-s/20001031-1.c.s
index 5acb353dc..69e5e7ae2 100644
--- a/test/torture-s/20001031-1.c.s
+++ b/test/torture-s/20001031-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001031-1.c"
+	.file	"20001031-1.c"
 	.section	.text.t1,"ax",@progbits
-	.hidden	t1
+	.hidden	t1                      # -- Begin function t1
 	.globl	t1
 	.type	t1,@function
 t1:                                     # @t1
@@ -20,9 +20,9 @@ t1:                                     # @t1
 	.endfunc
 .Lfunc_end0:
 	.size	t1, .Lfunc_end0-t1
-
+                                        # -- End function
 	.section	.text.t2,"ax",@progbits
-	.hidden	t2
+	.hidden	t2                      # -- Begin function t2
 	.globl	t2
 	.type	t2,@function
 t2:                                     # @t2
@@ -33,9 +33,9 @@ t2:                                     # @t2
 	.endfunc
 .Lfunc_end1:
 	.size	t2, .Lfunc_end1-t2
-
+                                        # -- End function
 	.section	.text.t3,"ax",@progbits
-	.hidden	t3
+	.hidden	t3                      # -- Begin function t3
 	.globl	t3
 	.type	t3,@function
 t3:                                     # @t3
@@ -54,9 +54,9 @@ t3:                                     # @t3
 	.endfunc
 .Lfunc_end2:
 	.size	t3, .Lfunc_end2-t3
-
+                                        # -- End function
 	.section	.text.t4,"ax",@progbits
-	.hidden	t4
+	.hidden	t4                      # -- Begin function t4
 	.globl	t4
 	.type	t4,@function
 t4:                                     # @t4
@@ -67,9 +67,9 @@ t4:                                     # @t4
 	.endfunc
 .Lfunc_end3:
 	.size	t4, .Lfunc_end3-t4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -81,8 +81,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001101.c.s b/test/torture-s/20001101.c.s
index 64760f4f2..d4610e8c5 100644
--- a/test/torture-s/20001101.c.s
+++ b/test/torture-s/20001101.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001101.c"
+	.file	"20001101.c"
 	.section	.text.dummy,"ax",@progbits
-	.hidden	dummy
+	.hidden	dummy                   # -- Begin function dummy
 	.globl	dummy
 	.type	dummy,@function
 dummy:                                  # @dummy
@@ -17,9 +17,9 @@ dummy:                                  # @dummy
 	.endfunc
 .Lfunc_end0:
 	.size	dummy, .Lfunc_end0-dummy
-
+                                        # -- End function
 	.section	.text.bogus,"ax",@progbits
-	.hidden	bogus
+	.hidden	bogus                   # -- Begin function bogus
 	.globl	bogus
 	.type	bogus,@function
 bogus:                                  # @bogus
@@ -42,9 +42,9 @@ bogus:                                  # @bogus
 	.endfunc
 .Lfunc_end1:
 	.size	bogus, .Lfunc_end1-bogus
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,8 +56,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001108-1.c.s b/test/torture-s/20001108-1.c.s
index 4671e8cd8..3cc913cde 100644
--- a/test/torture-s/20001108-1.c.s
+++ b/test/torture-s/20001108-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001108-1.c"
+	.file	"20001108-1.c"
 	.section	.text.signed_poly,"ax",@progbits
-	.hidden	signed_poly
+	.hidden	signed_poly             # -- Begin function signed_poly
 	.globl	signed_poly
 	.type	signed_poly,@function
 signed_poly:                            # @signed_poly
@@ -19,27 +19,27 @@ signed_poly:                            # @signed_poly
 	.endfunc
 .Lfunc_end0:
 	.size	signed_poly, .Lfunc_end0-signed_poly
-
+                                        # -- End function
 	.section	.text.unsigned_poly,"ax",@progbits
-	.hidden	unsigned_poly
+	.hidden	unsigned_poly           # -- Begin function unsigned_poly
 	.globl	unsigned_poly
 	.type	unsigned_poly,@function
 unsigned_poly:                          # @unsigned_poly
 	.param  	i64, i32
 	.result 	i64
 # BB#0:                                 # %entry
-	i64.extend_u/i32	$push2=, $1
 	i64.const	$push0=, 4294967295
 	i64.and 	$push1=, $0, $pop0
-	i64.mul 	$push3=, $pop2, $pop1
+	i64.extend_u/i32	$push2=, $1
+	i64.mul 	$push3=, $pop1, $pop2
 	i64.add 	$push4=, $pop3, $0
                                         # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	unsigned_poly, .Lfunc_end1-unsigned_poly
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001111-1.c.s b/test/torture-s/20001111-1.c.s
index e07c473dc..79ce24376 100644
--- a/test/torture-s/20001111-1.c.s
+++ b/test/torture-s/20001111-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001111-1.c"
+	.file	"20001111-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -29,9 +29,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	next_buffer,@object     # @next_buffer
 	.section	.bss.next_buffer,"aw",@nobits
 	.p2align	2
@@ -65,6 +65,6 @@ next_buffer:
 	.size	next_buffer, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001112-1.c.s b/test/torture-s/20001112-1.c.s
index 1a111b4c0..7fc9cb5da 100644
--- a/test/torture-s/20001112-1.c.s
+++ b/test/torture-s/20001112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001112-1.c"
+	.file	"20001112-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001121-1.c.s b/test/torture-s/20001121-1.c.s
index b1f7d3fba..56a5ee01b 100644
--- a/test/torture-s/20001121-1.c.s
+++ b/test/torture-s/20001121-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001121-1.c"
+	.file	"20001121-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -26,9 +26,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.bss.d,"aw",@nobits
@@ -51,5 +51,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001124-1.c.s b/test/torture-s/20001124-1.c.s
index cbb1c6a4d..6bd6b6cc5 100644
--- a/test/torture-s/20001124-1.c.s
+++ b/test/torture-s/20001124-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001124-1.c"
+	.file	"20001124-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -11,25 +11,72 @@ main:                                   # @main
 	i32.const	$push1=, 0
 	i32.const	$push0=, 9
 	i32.store8	s+4($pop1), $pop0
-	i32.const	$push10=, 0
-	i32.const	$push2=, 512
-	i32.store	s($pop10), $pop2
 	i32.const	$push9=, 0
-	i64.const	$push3=, 2048
-	i64.store	i($pop9), $pop3
+	i32.const	$push2=, 512
+	i32.store	s($pop9), $pop2
 	i32.const	$push8=, 0
-	i32.const	$push4=, s
-	i32.store	i+8($pop8), $pop4
+	i64.const	$push3=, 2048
+	i64.store	i($pop8), $pop3
 	i32.const	$push7=, 0
-	i64.const	$push5=, 0
-	i64.store	f($pop7), $pop5
+	i32.const	$push4=, s
+	i32.store	i+8($pop7), $pop4
 	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+	i64.const	$push5=, 0
+	i64.store	f($pop6), $pop5
+	call    	do_isofs_readdir@FUNCTION
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
+	.section	.text.do_isofs_readdir,"ax",@progbits
+	.type	do_isofs_readdir,@function # -- Begin function do_isofs_readdir
+do_isofs_readdir:                       # @do_isofs_readdir
+	.local  	i64
+# BB#0:                                 # %entry
+	block   	
+	i32.const	$push9=, 0
+	i64.load	$push8=, f($pop9)
+	tee_local	$push7=, $0=, $pop8
+	i32.const	$push6=, 0
+	i64.load	$push0=, i($pop6)
+	i64.lt_s	$push1=, $pop7, $pop0
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %cleanup
+	return
+.LBB1_2:                                # %if.then12
+	end_block                       # label0:
+	i32.const	$push10=, 0
+	i32.load	$push2=, i+8($pop10)
+	i64.load8_u	$push3=, 4($pop2)
+	i64.shr_s	$push4=, $0, $pop3
+	i32.wrap/i64	$push5=, $pop4
+	call    	isofs_bread@FUNCTION, $pop5
+	unreachable
+	.endfunc
+.Lfunc_end1:
+	.size	do_isofs_readdir, .Lfunc_end1-do_isofs_readdir
+                                        # -- End function
+	.section	.text.isofs_bread,"ax",@progbits
+	.type	isofs_bread,@function   # -- Begin function isofs_bread
+isofs_bread:                            # @isofs_bread
+	.param  	i32
+# BB#0:                                 # %entry
+	block   	
+	br_if   	0, $0           # 0: down to label1
+# BB#1:                                 # %if.end
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
+	unreachable
+.LBB2_2:                                # %if.then
+	end_block                       # label1:
+	call    	abort@FUNCTION
+	unreachable
+	.endfunc
+.Lfunc_end2:
+	.size	isofs_bread, .Lfunc_end2-isofs_bread
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -58,5 +105,6 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001130-1.c.s b/test/torture-s/20001130-1.c.s
index e47e2c82a..821cf79d3 100644
--- a/test/torture-s/20001130-1.c.s
+++ b/test/torture-s/20001130-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001130-1.c"
+	.file	"20001130-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20001130-2.c.s b/test/torture-s/20001130-2.c.s
index b9696b765..e2f88b40c 100644
--- a/test/torture-s/20001130-2.c.s
+++ b/test/torture-s/20001130-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001130-2.c"
+	.file	"20001130-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001203-1.c.s b/test/torture-s/20001203-1.c.s
index 158023ec2..10db8b704 100644
--- a/test/torture-s/20001203-1.c.s
+++ b/test/torture-s/20001203-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001203-1.c"
+	.file	"20001203-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001203-2.c.s b/test/torture-s/20001203-2.c.s
index 7f6bf3253..c6d17882f 100644
--- a/test/torture-s/20001203-2.c.s
+++ b/test/torture-s/20001203-2.c.s
@@ -1,18 +1,18 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001203-2.c"
+	.file	"20001203-2.c"
 	.section	.text.create_array_type,"ax",@progbits
-	.hidden	create_array_type
+	.hidden	create_array_type       # -- Begin function create_array_type
 	.globl	create_array_type
 	.type	create_array_type,@function
 create_array_type:                      # @create_array_type
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	block   	
 	block   	
-	i32.eqz 	$push52=, $0
-	br_if   	0, $pop52       # 0: down to label1
+	i32.eqz 	$push51=, $0
+	br_if   	0, $pop51       # 0: down to label1
 # BB#1:                                 # %if.end
 	i32.const	$push0=, 1
 	i32.store16	8($0), $pop0
@@ -21,74 +21,72 @@ create_array_type:                      # @create_array_type
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.store	0($0), $pop3
 	block   	
-	i32.load	$push27=, 4($0)
-	tee_local	$push26=, $1=, $pop27
-	i32.eqz 	$push53=, $pop26
-	br_if   	0, $pop53       # 0: down to label2
+	i32.load	$push28=, 4($0)
+	tee_local	$push27=, $1=, $pop28
+	i32.eqz 	$push52=, $pop27
+	br_if   	0, $pop52       # 0: down to label2
 # BB#2:                                 # %cond.true
 	i32.const	$push4=, 20
 	i32.add 	$push5=, $1, $pop4
-	i32.load	$push34=, 0($pop5)
-	tee_local	$push33=, $2=, $pop34
-	i32.const	$push32=, 16
-	i32.add 	$push31=, $1, $pop32
-	tee_local	$push30=, $4=, $pop31
-	i32.load	$push29=, 0($pop30)
-	tee_local	$push28=, $3=, $pop29
-	i32.sub 	$push6=, $pop33, $pop28
+	i32.load	$push35=, 0($pop5)
+	tee_local	$push34=, $2=, $pop35
+	i32.const	$push33=, 16
+	i32.add 	$push32=, $1, $pop33
+	tee_local	$push31=, $4=, $pop32
+	i32.load	$push30=, 0($pop31)
+	tee_local	$push29=, $3=, $pop30
+	i32.sub 	$push6=, $pop34, $pop29
 	i32.const	$push7=, 15
 	i32.le_s	$push8=, $pop6, $pop7
 	br_if   	2, $pop8        # 2: down to label0
 # BB#3:                                 # %if.end9
-	i32.const	$push41=, 16
-	i32.add 	$push40=, $3, $pop41
-	tee_local	$push39=, $3=, $pop40
-	i32.store	0($4), $pop39
+	i32.const	$push42=, 16
+	i32.add 	$push41=, $3, $pop42
+	tee_local	$push40=, $3=, $pop41
+	i32.store	0($4), $pop40
 	block   	
 	i32.const	$push9=, 12
-	i32.add 	$push38=, $1, $pop9
-	tee_local	$push37=, $4=, $pop38
-	i32.load	$push36=, 0($pop37)
-	tee_local	$push35=, $7=, $pop36
-	i32.ne  	$push10=, $3, $pop35
+	i32.add 	$push39=, $1, $pop9
+	tee_local	$push38=, $4=, $pop39
+	i32.load	$push37=, 0($pop38)
+	tee_local	$push36=, $6=, $pop37
+	i32.ne  	$push10=, $3, $pop36
 	br_if   	0, $pop10       # 0: down to label3
-# BB#4:                                 # %if.then16
+# BB#4:                                 # %if.then14
 	i32.const	$push11=, 28
 	i32.add 	$push12=, $1, $pop11
 	i32.const	$push13=, 1
 	i32.store	0($pop12), $pop13
-.LBB0_5:                                # %if.end17
+.LBB0_5:                                # %if.end15
 	end_block                       # label3:
-	i32.const	$push19=, 16
-	i32.add 	$push51=, $1, $pop19
-	tee_local	$push50=, $6=, $pop51
+	i32.const	$push24=, 16
+	i32.add 	$push25=, $1, $pop24
 	i32.const	$push14=, 24
 	i32.add 	$push15=, $1, $pop14
-	i32.load	$push49=, 0($pop15)
-	tee_local	$push48=, $5=, $pop49
-	i32.add 	$push18=, $pop48, $3
+	i32.load	$push50=, 0($pop15)
+	tee_local	$push49=, $5=, $pop50
+	i32.add 	$push18=, $pop49, $3
 	i32.const	$push16=, -1
 	i32.xor 	$push17=, $5, $pop16
-	i32.and 	$push47=, $pop18, $pop17
-	tee_local	$push46=, $3=, $pop47
-	i32.store	0($pop50), $pop46
-	i32.const	$push20=, 8
-	i32.add 	$push21=, $1, $pop20
-	i32.load	$push45=, 0($pop21)
-	tee_local	$push44=, $1=, $pop45
-	i32.sub 	$push22=, $3, $pop44
-	i32.sub 	$push23=, $2, $1
-	i32.gt_s	$push24=, $pop22, $pop23
-	i32.select	$push43=, $2, $3, $pop24
-	tee_local	$push42=, $1=, $pop43
-	i32.store	0($6), $pop42
+	i32.and 	$push48=, $pop18, $pop17
+	tee_local	$push47=, $3=, $pop48
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $1, $pop19
+	i32.load	$push46=, 0($pop20)
+	tee_local	$push45=, $1=, $pop46
+	i32.sub 	$push21=, $3, $pop45
+	i32.sub 	$push22=, $2, $1
+	i32.gt_s	$push23=, $pop21, $pop22
+	i32.select	$push44=, $2, $pop47, $pop23
+	tee_local	$push43=, $1=, $pop44
+	i32.store	0($pop25), $pop43
 	i32.store	0($4), $1
-	i32.store	12($0), $7
+	i32.store	12($0), $6
 	return  	$0
 .LBB0_6:
 	end_block                       # label2:
-	i32.const	$push25=, 0
-	i32.store	12($0), $pop25
+	i32.const	$push26=, 0
+	i32.store	12($0), $pop26
 	return  	$0
 .LBB0_7:                                # %if.then
 	end_block                       # label1:
@@ -96,14 +94,14 @@ create_array_type:                      # @create_array_type
 	unreachable
 .LBB0_8:                                # %if.then8
 	end_block                       # label0:
-	call    	_obstack_newchunk@FUNCTION, $0, $0
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	create_array_type, .Lfunc_end0-create_array_type
-
+                                        # -- End function
 	.section	.text.alloc_type,"ax",@progbits
-	.hidden	alloc_type
+	.hidden	alloc_type              # -- Begin function alloc_type
 	.globl	alloc_type
 	.type	alloc_type,@function
 alloc_type:                             # @alloc_type
@@ -114,9 +112,9 @@ alloc_type:                             # @alloc_type
 	.endfunc
 .Lfunc_end1:
 	.size	alloc_type, .Lfunc_end1-alloc_type
-
+                                        # -- End function
 	.section	.text.get_discrete_bounds,"ax",@progbits
-	.hidden	get_discrete_bounds
+	.hidden	get_discrete_bounds     # -- Begin function get_discrete_bounds
 	.globl	get_discrete_bounds
 	.type	get_discrete_bounds,@function
 get_discrete_bounds:                    # @get_discrete_bounds
@@ -130,9 +128,9 @@ get_discrete_bounds:                    # @get_discrete_bounds
 	.endfunc
 .Lfunc_end2:
 	.size	get_discrete_bounds, .Lfunc_end2-get_discrete_bounds
-
+                                        # -- End function
 	.section	.text._obstack_newchunk,"ax",@progbits
-	.hidden	_obstack_newchunk
+	.hidden	_obstack_newchunk       # -- Begin function _obstack_newchunk
 	.globl	_obstack_newchunk
 	.type	_obstack_newchunk,@function
 _obstack_newchunk:                      # @_obstack_newchunk
@@ -143,9 +141,9 @@ _obstack_newchunk:                      # @_obstack_newchunk
 	.endfunc
 .Lfunc_end3:
 	.size	_obstack_newchunk, .Lfunc_end3-_obstack_newchunk
-
+                                        # -- End function
 	.section	.text.xmalloc,"ax",@progbits
-	.hidden	xmalloc
+	.hidden	xmalloc                 # -- Begin function xmalloc
 	.globl	xmalloc
 	.type	xmalloc,@function
 xmalloc:                                # @xmalloc
@@ -157,9 +155,9 @@ xmalloc:                                # @xmalloc
 	.endfunc
 .Lfunc_end4:
 	.size	xmalloc, .Lfunc_end4-xmalloc
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -171,8 +169,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001221-1.c.s b/test/torture-s/20001221-1.c.s
index e976cb152..cf283cb09 100644
--- a/test/torture-s/20001221-1.c.s
+++ b/test/torture-s/20001221-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001221-1.c"
+	.file	"20001221-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001228-1.c.s b/test/torture-s/20001228-1.c.s
index 6dee315e3..712307386 100644
--- a/test/torture-s/20001228-1.c.s
+++ b/test/torture-s/20001228-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001228-1.c"
+	.file	"20001228-1.c"
 	.section	.text.foo1,"ax",@progbits
-	.hidden	foo1
+	.hidden	foo1                    # -- Begin function foo1
 	.globl	foo1
 	.type	foo1,@function
 foo1:                                   # @foo1
@@ -12,19 +12,19 @@ foo1:                                   # @foo1
 	.endfunc
 .Lfunc_end0:
 	.size	foo1, .Lfunc_end0-foo1
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.hidden	foo2
+	.hidden	foo2                    # -- Begin function foo2
 	.globl	foo2
 	.type	foo2,@function
 foo2:                                   # @foo2
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push6=, $pop3, $pop4
+	i32.sub 	$push6=, $pop2, $pop4
 	tee_local	$push5=, $0=, $pop6
 	i32.const	$push0=, 1
 	i32.store	12($pop5), $pop0
@@ -33,9 +33,9 @@ foo2:                                   # @foo2
 	.endfunc
 .Lfunc_end1:
 	.size	foo2, .Lfunc_end1-foo2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,10 +43,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop5, $pop6
+	i32.sub 	$push10=, $pop4, $pop6
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop7), $pop9
 	i32.const	$push0=, 1
@@ -67,8 +67,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001229-1.c.s b/test/torture-s/20001229-1.c.s
index d03c9912d..839aa660e 100644
--- a/test/torture-s/20001229-1.c.s
+++ b/test/torture-s/20001229-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20001229-1.c"
+	.file	"20001229-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.showinfo,"ax",@progbits
-	.hidden	showinfo
+	.hidden	showinfo                # -- Begin function showinfo
 	.globl	showinfo
 	.type	showinfo,@function
 showinfo:                               # @showinfo
@@ -22,9 +22,9 @@ showinfo:                               # @showinfo
 	.endfunc
 .Lfunc_end1:
 	.size	showinfo, .Lfunc_end1-showinfo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010106-1.c.s b/test/torture-s/20010106-1.c.s
index ac55528d8..3cc558c70 100644
--- a/test/torture-s/20010106-1.c.s
+++ b/test/torture-s/20010106-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010106-1.c"
+	.file	"20010106-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -18,7 +18,7 @@ f:                                      # @f
 # BB#1:                                 # %switch.lookup
 	i32.const	$push9=, 2
 	i32.shl 	$push2=, $0, $pop9
-	i32.const	$push3=, .Lswitch.table
+	i32.const	$push3=, .Lswitch.table.f
 	i32.add 	$push4=, $pop2, $pop3
 	i32.load	$push5=, 0($pop4)
 	return  	$pop5
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,11 +43,11 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+                                        # -- End function
+	.type	.Lswitch.table.f,@object # @switch.table.f
+	.section	.rodata..Lswitch.table.f,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.f:
 	.int32	33                      # 0x21
 	.int32	0                       # 0x0
 	.int32	7                       # 0x7
@@ -55,9 +55,9 @@ main:                                   # @main
 	.int32	3                       # 0x3
 	.int32	15                      # 0xf
 	.int32	9                       # 0x9
-	.size	.Lswitch.table, 28
+	.size	.Lswitch.table.f, 28
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010114-1.c.s b/test/torture-s/20010114-1.c.s
index b0c2c6446..74d502720 100644
--- a/test/torture-s/20010114-1.c.s
+++ b/test/torture-s/20010114-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010114-1.c"
+	.file	"20010114-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010116-1.c.s b/test/torture-s/20010116-1.c.s
index be612f18b..fd210a0b1 100644
--- a/test/torture-s/20010116-1.c.s
+++ b/test/torture-s/20010116-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010116-1.c"
+	.file	"20010116-1.c"
 	.section	.text.find,"ax",@progbits
-	.hidden	find
+	.hidden	find                    # -- Begin function find
 	.globl	find
 	.type	find,@function
 find:                                   # @find
@@ -27,9 +27,9 @@ find:                                   # @find
 	.endfunc
 .Lfunc_end0:
 	.size	find, .Lfunc_end0-find
-
+                                        # -- End function
 	.section	.text.ok,"ax",@progbits
-	.hidden	ok
+	.hidden	ok                      # -- Begin function ok
 	.globl	ok
 	.type	ok,@function
 ok:                                     # @ok
@@ -50,31 +50,22 @@ ok:                                     # @ok
 	.endfunc
 .Lfunc_end1:
 	.size	ok, .Lfunc_end1-ok
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
-	i32.const	$push4=, 48
-	i32.sub 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop5), $pop6
-	i32.const	$push0=, 48
-	i32.add 	$push1=, $0, $pop0
-	call    	find@FUNCTION, $0, $pop1
+	i32.const	$push0=, 1
+	call    	ok@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010118-1.c.s b/test/torture-s/20010118-1.c.s
index 9786fed32..5c6d74d98 100644
--- a/test/torture-s/20010118-1.c.s
+++ b/test/torture-s/20010118-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010118-1.c"
+	.file	"20010118-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -60,9 +60,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010119-1.c.s b/test/torture-s/20010119-1.c.s
index 2bb606f9e..945268cd8 100644
--- a/test/torture-s/20010119-1.c.s
+++ b/test/torture-s/20010119-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010119-1.c"
+	.file	"20010119-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -11,9 +11,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -23,9 +23,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010123-1.c.s b/test/torture-s/20010123-1.c.s
index 17a659f98..96e7b7548 100644
--- a/test/torture-s/20010123-1.c.s
+++ b/test/torture-s/20010123-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010123-1.c"
+	.file	"20010123-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010129-1.c.s b/test/torture-s/20010129-1.c.s
index 158ba6a3f..ba1dd8f74 100644
--- a/test/torture-s/20010129-1.c.s
+++ b/test/torture-s/20010129-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010129-1.c"
+	.file	"20010129-1.c"
 	.section	.text.baz1,"ax",@progbits
-	.hidden	baz1
+	.hidden	baz1                    # -- Begin function baz1
 	.globl	baz1
 	.type	baz1,@function
 baz1:                                   # @baz1
@@ -21,9 +21,9 @@ baz1:                                   # @baz1
 	.endfunc
 .Lfunc_end0:
 	.size	baz1, .Lfunc_end0-baz1
-
+                                        # -- End function
 	.section	.text.baz2,"ax",@progbits
-	.hidden	baz2
+	.hidden	baz2                    # -- Begin function baz2
 	.globl	baz2
 	.type	baz2,@function
 baz2:                                   # @baz2
@@ -35,9 +35,9 @@ baz2:                                   # @baz2
 	.endfunc
 .Lfunc_end1:
 	.size	baz2, .Lfunc_end1-baz2
-
+                                        # -- End function
 	.section	.text.baz3,"ax",@progbits
-	.hidden	baz3
+	.hidden	baz3                    # -- Begin function baz3
 	.globl	baz3
 	.type	baz3,@function
 baz3:                                   # @baz3
@@ -57,9 +57,9 @@ baz3:                                   # @baz3
 	.endfunc
 .Lfunc_end2:
 	.size	baz3, .Lfunc_end2-baz3
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -166,9 +166,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end3:
 	.size	foo, .Lfunc_end3-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -176,10 +176,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push12=, $pop4, $pop5
+	i32.sub 	$push12=, $pop3, $pop5
 	tee_local	$push11=, $0=, $pop12
 	i32.store	__stack_pointer($pop6), $pop11
 	i32.const	$push0=, 0
@@ -197,7 +197,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.type	baz1.l,@object          # @baz1.l
 	.section	.bss.baz1.l,"aw",@nobits
 	.p2align	2
@@ -215,6 +215,6 @@ bar:
 	.size	bar, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010206-1.c.s b/test/torture-s/20010206-1.c.s
index 40cc93e7e..c6760a744 100644
--- a/test/torture-s/20010206-1.c.s
+++ b/test/torture-s/20010206-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010206-1.c"
+	.file	"20010206-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010221-1.c.s b/test/torture-s/20010221-1.c.s
index 3b4e56944..85f6e2cca 100644
--- a/test/torture-s/20010221-1.c.s
+++ b/test/torture-s/20010221-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010221-1.c"
+	.file	"20010221-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.data.n,"aw",@progbits
@@ -54,6 +54,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010222-1.c.s b/test/torture-s/20010222-1.c.s
index bba74eb84..c3dd64d35 100644
--- a/test/torture-s/20010222-1.c.s
+++ b/test/torture-s/20010222-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010222-1.c"
+	.file	"20010222-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -43,6 +43,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010224-1.c.s b/test/torture-s/20010224-1.c.s
index c4d54ee4f..45b303ef9 100644
--- a/test/torture-s/20010224-1.c.s
+++ b/test/torture-s/20010224-1.c.s
@@ -1,57 +1,54 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010224-1.c"
+	.file	"20010224-1.c"
 	.section	.text.ba_compute_psd,"ax",@progbits
-	.hidden	ba_compute_psd
+	.hidden	ba_compute_psd          # -- Begin function ba_compute_psd
 	.globl	ba_compute_psd
 	.type	ba_compute_psd,@function
 ba_compute_psd:                         # @ba_compute_psd
 	.param  	i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push23=, 1
-	i32.shl 	$push22=, $0, $pop23
-	tee_local	$push21=, $4=, $pop22
+	i32.const	$push22=, 1
+	i32.shl 	$push21=, $0, $pop22
+	tee_local	$push20=, $2=, $pop21
 	i32.const	$push1=, masktab
-	i32.add 	$push2=, $pop21, $pop1
+	i32.add 	$push2=, $pop20, $pop1
 	i32.load16_s	$push3=, 0($pop2)
-	i32.const	$push20=, 1
-	i32.shl 	$push4=, $pop3, $pop20
+	i32.const	$push19=, 1
+	i32.shl 	$push4=, $pop3, $pop19
 	i32.const	$push5=, bndpsd
-	i32.add 	$push19=, $pop4, $pop5
-	tee_local	$push18=, $1=, $pop19
-	i32.const	$push17=, psd
-	i32.add 	$push6=, $4, $pop17
-	i32.load16_u	$push16=, 0($pop6)
+	i32.add 	$push18=, $pop4, $pop5
+	tee_local	$push17=, $1=, $pop18
+	i32.const	$push6=, psd
+	i32.add 	$push7=, $2, $pop6
+	i32.load16_u	$push16=, 0($pop7)
 	tee_local	$push15=, $4=, $pop16
-	i32.store16	0($pop18), $pop15
+	i32.store16	0($pop17), $pop15
 	block   	
-	i32.const	$push14=, 1
-	i32.add 	$push13=, $0, $pop14
-	tee_local	$push12=, $2=, $pop13
-	i32.const	$push11=, 3
-	i32.gt_s	$push7=, $pop12, $pop11
-	br_if   	0, $pop7        # 0: down to label0
+	i32.const	$push14=, 2
+	i32.gt_s	$push8=, $0, $pop14
+	br_if   	0, $pop8        # 0: down to label0
 # BB#1:                                 # %for.body.preheader
-	i32.const	$push26=, 3
-	i32.sub 	$3=, $pop26, $0
-	i32.const	$push25=, 1
-	i32.shl 	$push8=, $2, $pop25
-	i32.const	$push24=, psd
-	i32.add 	$0=, $pop8, $pop24
+	i32.const	$push9=, -1
+	i32.add 	$3=, $0, $pop9
+	i32.const	$push10=, psd+2
+	i32.add 	$0=, $2, $pop10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.load16_u	$push10=, 0($0)
-	i32.const	$push31=, 65535
-	i32.and 	$push9=, $4, $pop31
-	i32.add 	$4=, $pop10, $pop9
-	i32.const	$push30=, 2
-	i32.add 	$push0=, $0, $pop30
+	i32.load16_u	$push12=, 0($0)
+	i32.const	$push28=, 65535
+	i32.and 	$push11=, $4, $pop28
+	i32.add 	$4=, $pop12, $pop11
+	i32.const	$push27=, 2
+	i32.add 	$push0=, $0, $pop27
 	copy_local	$0=, $pop0
-	i32.const	$push29=, -1
-	i32.add 	$push28=, $3, $pop29
-	tee_local	$push27=, $3=, $pop28
-	br_if   	0, $pop27       # 0: up to label1
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $3, $pop26
+	tee_local	$push24=, $3=, $pop25
+	i32.const	$push23=, 2
+	i32.lt_s	$push13=, $pop24, $pop23
+	br_if   	0, $pop13       # 0: up to label1
 # BB#3:                                 # %for.cond.for.end_crit_edge
 	end_loop
 	i32.store16	0($1), $4
@@ -61,9 +58,9 @@ ba_compute_psd:                         # @ba_compute_psd
 	.endfunc
 .Lfunc_end0:
 	.size	ba_compute_psd, .Lfunc_end0-ba_compute_psd
-
+                                        # -- End function
 	.section	.text.logadd,"ax",@progbits
-	.hidden	logadd
+	.hidden	logadd                  # -- Begin function logadd
 	.globl	logadd
 	.type	logadd,@function
 logadd:                                 # @logadd
@@ -81,9 +78,9 @@ logadd:                                 # @logadd
 	.endfunc
 .Lfunc_end1:
 	.size	logadd, .Lfunc_end1-logadd
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -96,16 +93,16 @@ main:                                   # @main
 	i32.const	$push3=, bndpsd
 	i32.add 	$push4=, $pop2, $pop3
 	i32.const	$push19=, 0
-	i32.load16_u	$push10=, psd+6($pop19)
+	i32.load16_u	$push6=, psd+2($pop19)
 	i32.const	$push18=, 0
-	i32.load16_u	$push8=, psd+4($pop18)
+	i32.load16_u	$push5=, psd($pop18)
+	i32.add 	$push7=, $pop6, $pop5
 	i32.const	$push17=, 0
-	i32.load16_u	$push6=, psd+2($pop17)
+	i32.load16_u	$push8=, psd+4($pop17)
+	i32.add 	$push9=, $pop7, $pop8
 	i32.const	$push16=, 0
-	i32.load16_u	$push5=, psd($pop16)
-	i32.add 	$push7=, $pop6, $pop5
-	i32.add 	$push9=, $pop8, $pop7
-	i32.add 	$push11=, $pop10, $pop9
+	i32.load16_u	$push10=, psd+6($pop16)
+	i32.add 	$push11=, $pop9, $pop10
 	i32.store16	0($pop4), $pop11
 	block   	
 	i32.const	$push15=, 0
@@ -123,7 +120,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	masktab                 # @masktab
 	.type	masktab,@object
 	.section	.data.masktab,"aw",@progbits
@@ -167,5 +164,5 @@ bndpsd:
 	.size	bndpsd, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20010325-1.c.s b/test/torture-s/20010325-1.c.s
index 4aa74b680..b5362c476 100644
--- a/test/torture-s/20010325-1.c.s
+++ b/test/torture-s/20010325-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010325-1.c"
+	.file	"20010325-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010329-1.c.s b/test/torture-s/20010329-1.c.s
index 27d97f0d4..c31299427 100644
--- a/test/torture-s/20010329-1.c.s
+++ b/test/torture-s/20010329-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010329-1.c"
+	.file	"20010329-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010403-1.c.s b/test/torture-s/20010403-1.c.s
index 2412a20bd..c745ff759 100644
--- a/test/torture-s/20010403-1.c.s
+++ b/test/torture-s/20010403-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010403-1.c"
+	.file	"20010403-1.c"
 	.section	.text.a,"ax",@progbits
-	.hidden	a
+	.hidden	a                       # -- Begin function a
 	.globl	a
 	.type	a,@function
 a:                                      # @a
@@ -11,9 +11,9 @@ a:                                      # @a
 	.endfunc
 .Lfunc_end0:
 	.size	a, .Lfunc_end0-a
-
+                                        # -- End function
 	.section	.text.b,"ax",@progbits
-	.hidden	b
+	.hidden	b                       # -- Begin function b
 	.globl	b
 	.type	b,@function
 b:                                      # @b
@@ -27,9 +27,9 @@ b:                                      # @b
 	.endfunc
 .Lfunc_end1:
 	.size	b, .Lfunc_end1-b
-
+                                        # -- End function
 	.section	.text.c,"ax",@progbits
-	.hidden	c
+	.hidden	c                       # -- Begin function c
 	.globl	c
 	.type	c,@function
 c:                                      # @c
@@ -47,9 +47,9 @@ c:                                      # @c
 	.endfunc
 .Lfunc_end2:
 	.size	c, .Lfunc_end2-c
-
+                                        # -- End function
 	.section	.text.d,"ax",@progbits
-	.hidden	d
+	.hidden	d                       # -- Begin function d
 	.globl	d
 	.type	d,@function
 d:                                      # @d
@@ -59,9 +59,9 @@ d:                                      # @d
 	.endfunc
 .Lfunc_end3:
 	.size	d, .Lfunc_end3-d
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	e                       # @e
 	.type	e,@object
 	.section	.bss.e,"aw",@nobits
@@ -84,6 +84,6 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010409-1.c.s b/test/torture-s/20010409-1.c.s
index 76f971fe2..affee1d16 100644
--- a/test/torture-s/20010409-1.c.s
+++ b/test/torture-s/20010409-1.c.s
@@ -1,25 +1,25 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010409-1.c"
+	.file	"20010409-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.load8_s	$push2=, 4($1)
 	i32.const	$push0=, 25
 	i32.mul 	$push1=, $2, $pop0
-	i32.add 	$push3=, $pop2, $pop1
+	i32.load8_s	$push2=, 4($1)
+	i32.add 	$push3=, $pop1, $pop2
 	i32.store	c($pop4), $pop3
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -39,31 +39,31 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, .L.str
-	i32.const	$push0=, 200
-	call    	foo@FUNCTION, $2, $pop1, $pop0
-	i32.const	$push2=, 0
-	i32.const	$push4=, 65536
+	i32.const	$push1=, 0
+	i32.const	$push0=, 5000
+	i32.store	c($pop1), $pop0
 	i32.const	$push6=, 0
-	i32.load	$push3=, b($pop6)
-	i32.select	$push5=, $pop2, $pop4, $pop3
+	i32.load	$push2=, b($pop6)
+	i32.eqz 	$push3=, $pop2
+	i32.const	$push4=, 16
+	i32.shl 	$push5=, $pop3, $pop4
 	i32.call	$drop=, bar@FUNCTION, $2, $pop5, $2, $2, $2
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	test, .Lfunc_end2-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,22 +74,22 @@ main:                                   # @main
 	i32.const	$push0=, a
 	i32.store	d($pop1), $pop0
 	i32.const	$push10=, 0
+	i32.const	$push2=, 5000
+	i32.store	c($pop10), $pop2
 	i32.const	$push9=, 0
-	i32.store	d+4($pop10), $pop9
-	i32.const	$push3=, .L.str
-	i32.const	$push2=, 200
-	call    	foo@FUNCTION, $0, $pop3, $pop2
 	i32.const	$push8=, 0
-	i32.const	$push5=, 65536
+	i32.store	d+4($pop9), $pop8
 	i32.const	$push7=, 0
-	i32.load	$push4=, b($pop7)
-	i32.select	$push6=, $pop8, $pop5, $pop4
+	i32.load	$push3=, b($pop7)
+	i32.eqz 	$push4=, $pop3
+	i32.const	$push5=, 16
+	i32.shl 	$push6=, $pop4, $pop5
 	i32.call	$drop=, bar@FUNCTION, $0, $pop6, $0, $0, $0
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -117,12 +117,6 @@ d:
 	.skip	8
 	.size	d, 8
 
-	.type	.L.str,@object          # @.str
-	.section	.rodata.str1.1,"aMS",@progbits,1
-.L.str:
-	.asciz	"test"
-	.size	.L.str, 5
-
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -133,6 +127,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010422-1.c.s b/test/torture-s/20010422-1.c.s
index 85006859a..b7bbfd5a4 100644
--- a/test/torture-s/20010422-1.c.s
+++ b/test/torture-s/20010422-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010422-1.c"
+	.file	"20010422-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010518-1.c.s b/test/torture-s/20010518-1.c.s
index 03d8b4b10..c18250eda 100644
--- a/test/torture-s/20010518-1.c.s
+++ b/test/torture-s/20010518-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010518-1.c"
+	.file	"20010518-1.c"
 	.section	.text.add,"ax",@progbits
-	.hidden	add
+	.hidden	add                     # -- Begin function add
 	.globl	add
 	.type	add,@function
 add:                                    # @add
@@ -24,9 +24,9 @@ add:                                    # @add
 	.endfunc
 .Lfunc_end0:
 	.size	add, .Lfunc_end0-add
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010518-2.c.s b/test/torture-s/20010518-2.c.s
index d77869987..c967a2769 100644
--- a/test/torture-s/20010518-2.c.s
+++ b/test/torture-s/20010518-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010518-2.c"
+	.file	"20010518-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,36 +9,36 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push29=, 0
-	i32.const	$push26=, 0
-	i32.load	$push27=, __stack_pointer($pop26)
+	i32.const	$push27=, 0
+	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 48
-	i32.sub 	$push35=, $pop27, $pop28
+	i32.sub 	$push35=, $pop26, $pop28
 	tee_local	$push34=, $0=, $pop35
 	i32.store	__stack_pointer($pop29), $pop34
-	i32.const	$push0=, 1
-	i32.store16	28($0), $pop0
 	i32.const	$push33=, 2
 	i32.store	24($0), $pop33
-	i32.const	$push1=, 3
-	i32.store16	22($0), $pop1
-	i32.const	$push2=, 4
-	i32.store16	20($0), $pop2
-	i32.const	$push3=, 0
-	i32.store	16($0), $pop3
-	i32.const	$push32=, 0
-	i32.store8	15($0), $pop32
-	i32.const	$push31=, 0
-	i32.store8	14($0), $pop31
-	i32.load16_u	$push4=, 28($0)
-	i32.store16	46($0), $pop4
-	i32.load	$push5=, 24($0)
-	i32.store	40($0), $pop5
-	i32.load16_u	$push6=, 22($0)
-	i32.store16	38($0), $pop6
+	i32.const	$push0=, 1
+	i32.store16	28($0), $pop0
+	i32.load16_u	$push1=, 28($0)
+	i32.store16	46($0), $pop1
+	i32.const	$push2=, 3
+	i32.store16	22($0), $pop2
+	i32.load	$push3=, 24($0)
+	i32.store	40($0), $pop3
+	i32.const	$push4=, 4
+	i32.store16	20($0), $pop4
+	i32.load16_u	$push5=, 22($0)
+	i32.store16	38($0), $pop5
+	i32.const	$push6=, 0
+	i32.store	16($0), $pop6
 	i32.load16_u	$push7=, 20($0)
 	i32.store16	36($0), $pop7
+	i32.const	$push32=, 0
+	i32.store8	15($0), $pop32
 	i32.load	$push8=, 16($0)
 	i32.store	32($0), $pop8
+	i32.const	$push31=, 0
+	i32.store8	14($0), $pop31
 	i32.load8_u	$push9=, 15($0)
 	i32.store8	31($0), $pop9
 	i32.load8_u	$push10=, 14($0)
@@ -81,8 +81,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010520-1.c.s b/test/torture-s/20010520-1.c.s
index e2874c6b5..6a2dc61ed 100644
--- a/test/torture-s/20010520-1.c.s
+++ b/test/torture-s/20010520-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010520-1.c"
+	.file	"20010520-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010604-1.c.s b/test/torture-s/20010604-1.c.s
index 3d35dbb89..14c074356 100644
--- a/test/torture-s/20010604-1.c.s
+++ b/test/torture-s/20010604-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010604-1.c"
+	.file	"20010604-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,25 +9,22 @@ f:                                      # @f
 	.result 	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push6=, 1
-	i32.ne  	$push3=, $6, $pop6
-	br_if   	0, $pop3        # 0: down to label0
+	i32.const	$push0=, 1
+	i32.ne  	$push1=, $6, $pop0
+	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %entry
-	i32.const	$push7=, 1
-	i32.xor 	$push0=, $3, $pop7
-	br_if   	0, $pop0        # 0: down to label0
+	i32.eqz 	$push4=, $3
+	br_if   	0, $pop4        # 0: down to label0
 # BB#2:                                 # %entry
-	i32.const	$push8=, 1
-	i32.xor 	$push1=, $4, $pop8
-	br_if   	0, $pop1        # 0: down to label0
+	i32.eqz 	$push5=, $4
+	br_if   	0, $pop5        # 0: down to label0
 # BB#3:                                 # %entry
-	i32.const	$push9=, 1
-	i32.xor 	$push2=, $5, $pop9
-	br_if   	0, $pop2        # 0: down to label0
+	i32.eqz 	$push6=, $5
+	br_if   	0, $pop6        # 0: down to label0
 # BB#4:                                 # %if.end
-	i32.add 	$push4=, $1, $0
-	i32.add 	$push5=, $pop4, $2
-	return  	$pop5
+	i32.add 	$push2=, $1, $0
+	i32.add 	$push3=, $pop2, $2
+	return  	$pop3
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -35,9 +32,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,8 +46,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010605-2.c.s b/test/torture-s/20010605-2.c.s
index 6aaa06341..57a48c912 100644
--- a/test/torture-s/20010605-2.c.s
+++ b/test/torture-s/20010605-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010605-2.c"
+	.file	"20010605-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -40,9 +40,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -67,9 +67,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -102,8 +102,8 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end3:
 	.size	baz, .Lfunc_end3-baz
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20010711-1.c.s b/test/torture-s/20010711-1.c.s
index 852d59e8a..ecd032be8 100644
--- a/test/torture-s/20010711-1.c.s
+++ b/test/torture-s/20010711-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010711-1.c"
+	.file	"20010711-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,7 +25,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010717-1.c.s b/test/torture-s/20010717-1.c.s
index 74c41bb57..881f9eb93 100644
--- a/test/torture-s/20010717-1.c.s
+++ b/test/torture-s/20010717-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010717-1.c"
+	.file	"20010717-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20010723-1.c.s b/test/torture-s/20010723-1.c.s
index 1cfe62f92..051500deb 100644
--- a/test/torture-s/20010723-1.c.s
+++ b/test/torture-s/20010723-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010723-1.c"
+	.file	"20010723-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -12,9 +12,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010904-1.c.s b/test/torture-s/20010904-1.c.s
index f831b277c..64552ff79 100644
--- a/test/torture-s/20010904-1.c.s
+++ b/test/torture-s/20010904-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010904-1.c"
+	.file	"20010904-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	y                       # @y
 	.type	y,@object
 	.section	.bss.y,"aw",@nobits
@@ -24,5 +24,5 @@ y:
 	.size	y, 2112
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010904-2.c.s b/test/torture-s/20010904-2.c.s
index 5c7ddf37d..93e1a211f 100644
--- a/test/torture-s/20010904-2.c.s
+++ b/test/torture-s/20010904-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010904-2.c"
+	.file	"20010904-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	y                       # @y
 	.type	y,@object
 	.section	.bss.y,"aw",@nobits
@@ -24,5 +24,5 @@ y:
 	.size	y, 2112
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010910-1.c.s b/test/torture-s/20010910-1.c.s
index 3c04052a5..969c8868b 100644
--- a/test/torture-s/20010910-1.c.s
+++ b/test/torture-s/20010910-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010910-1.c"
+	.file	"20010910-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20010915-1.c.s b/test/torture-s/20010915-1.c.s
index 4334ccf0c..22a9eb038 100644
--- a/test/torture-s/20010915-1.c.s
+++ b/test/torture-s/20010915-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010915-1.c"
+	.file	"20010915-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,10 +10,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push21=, $pop12, $pop13
+	i32.sub 	$push21=, $pop11, $pop13
 	tee_local	$push20=, $2=, $pop21
 	i32.store	__stack_pointer($pop14), $pop20
 	i32.const	$push2=, 16
@@ -52,9 +52,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -63,16 +63,15 @@ x:                                      # @x
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	block   	
-	block   	
 	i32.const	$push0=, 3
 	i32.lt_s	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label2
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %entry
 	i32.const	$push2=, 0
 	i32.load	$push32=, o($pop2)
 	tee_local	$push31=, $4=, $pop32
 	i32.ge_s	$push3=, $pop31, $0
-	br_if   	0, $pop3        # 0: down to label2
+	br_if   	0, $pop3        # 0: down to label1
 # BB#2:                                 # %land.lhs.true2
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $4, $pop4
@@ -81,12 +80,11 @@ x:                                      # @x
 	i32.load	$push34=, 0($pop35)
 	tee_local	$push33=, $5=, $pop34
 	i32.eqz 	$push69=, $pop33
-	br_if   	0, $pop69       # 0: down to label2
+	br_if   	0, $pop69       # 0: down to label1
 # BB#3:                                 # %if.then
-	block   	
 	i32.const	$push6=, .L.str
 	i32.call	$push7=, strcmp@FUNCTION, $5, $pop6
-	br_if   	0, $pop7        # 0: down to label3
+	br_if   	0, $pop7        # 0: down to label1
 # BB#4:                                 # %lor.lhs.false.i
 	i32.const	$push8=, 0
 	i32.const	$push39=, 0
@@ -97,11 +95,11 @@ x:                                      # @x
 	i32.store	check($pop8), $pop10
 	i32.const	$push11=, 2
 	i32.ge_s	$push12=, $3, $pop11
-	br_if   	0, $pop12       # 0: down to label3
+	br_if   	0, $pop12       # 0: down to label1
 # BB#5:                                 # %s.exit
 	i32.const	$push13=, .L.str
 	i32.call	$push14=, strcmp@FUNCTION, $5, $pop13
-	br_if   	0, $pop14       # 0: down to label3
+	br_if   	0, $pop14       # 0: down to label1
 # BB#6:                                 # %lor.lhs.false.i45
 	i32.const	$push41=, 0
 	i32.const	$push15=, 2
@@ -109,7 +107,7 @@ x:                                      # @x
 	i32.store	check($pop41), $pop16
 	i32.const	$push40=, 1
 	i32.ge_s	$push17=, $3, $pop40
-	br_if   	0, $pop17       # 0: down to label3
+	br_if   	0, $pop17       # 0: down to label1
 # BB#7:                                 # %s.exit48
 	i32.const	$push44=, 0
 	i32.const	$push43=, 0
@@ -118,18 +116,17 @@ x:                                      # @x
 	i32.const	$push42=, 1
 	i32.add 	$push18=, $5, $pop42
 	i32.eq  	$push20=, $pop19, $pop18
-	br_if   	2, $pop20       # 2: down to label1
-# BB#8:                                 # %while.cond.preheader
+	br_if   	0, $pop20       # 0: down to label1
+# BB#8:                                 # %if.end19
 	i32.const	$push48=, 0
 	i32.const	$push47=, 1
 	i32.add 	$push46=, $4, $pop47
 	tee_local	$push45=, $5=, $pop46
 	i32.store	o($pop48), $pop45
 	block   	
-	block   	
 	i32.ge_s	$push21=, $5, $0
-	br_if   	0, $pop21       # 0: down to label5
-# BB#9:                                 # %while.body.preheader
+	br_if   	0, $pop21       # 0: down to label2
+# BB#9:                                 # %while.body.lr.ph
 	i32.const	$push22=, 2
 	i32.shl 	$push23=, $5, $pop22
 	i32.add 	$3=, $1, $pop23
@@ -137,18 +134,18 @@ x:                                      # @x
 	i32.load8_u	$4=, r.c.0($pop49)
 .LBB1_10:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label6:
+	loop    	                # label3:
 	i32.load	$push52=, 0($3)
 	tee_local	$push51=, $1=, $pop52
 	i32.load8_u	$push25=, 0($pop51)
 	i32.const	$push50=, 255
 	i32.and 	$push24=, $4, $pop50
 	i32.ne  	$push26=, $pop25, $pop24
-	br_if   	2, $pop26       # 2: down to label4
+	br_if   	2, $pop26       # 2: down to label1
 # BB#11:                                # %lor.lhs.false.i50
                                         #   in Loop: Header=BB1_10 Depth=1
 	i32.load8_u	$push27=, 1($1)
-	br_if   	2, $pop27       # 2: down to label4
+	br_if   	2, $pop27       # 2: down to label1
 # BB#12:                                # %lor.lhs.false.i50
                                         #   in Loop: Header=BB1_10 Depth=1
 	i32.const	$push56=, 0
@@ -156,7 +153,7 @@ x:                                      # @x
 	tee_local	$push54=, $1=, $pop55
 	i32.const	$push53=, 4
 	i32.ge_s	$push28=, $pop54, $pop53
-	br_if   	2, $pop28       # 2: down to label4
+	br_if   	2, $pop28       # 2: down to label1
 # BB#13:                                # %r.exit
                                         #   in Loop: Header=BB1_10 Depth=1
 	i32.const	$push67=, 0
@@ -176,34 +173,22 @@ x:                                      # @x
 	i32.const	$push57=, 4
 	i32.add 	$3=, $3, $pop57
 	i32.lt_s	$push30=, $5, $0
-	br_if   	0, $pop30       # 0: up to label6
+	br_if   	0, $pop30       # 0: up to label3
 .LBB1_14:                               # %cleanup
 	end_loop
-	end_block                       # label5:
+	end_block                       # label2:
 	i32.const	$push68=, 0
 	return  	$pop68
-.LBB1_15:                               # %if.then.i51
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_16:                               # %if.then.i46
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_17:                               # %if.else
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_18:                               # %if.then15
+.LBB1_15:                               # %if.then.i
 	end_block                       # label1:
-	i32.call	$drop=, m@FUNCTION, $5
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	x, .Lfunc_end1-x
-
+                                        # -- End function
 	.section	.text.s,"ax",@progbits
-	.hidden	s
+	.hidden	s                       # -- Begin function s
 	.globl	s
 	.type	s,@function
 s:                                      # @s
@@ -214,7 +199,7 @@ s:                                      # @s
 	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label7
+	br_if   	0, $pop1        # 0: down to label4
 # BB#1:                                 # %lor.lhs.false
 	i32.const	$push10=, 0
 	i32.const	$push9=, 0
@@ -225,7 +210,7 @@ s:                                      # @s
 	i32.store	check($pop10), $pop2
 	i32.const	$push3=, 2
 	i32.ge_s	$push4=, $2, $pop3
-	br_if   	0, $pop4        # 0: down to label7
+	br_if   	0, $pop4        # 0: down to label4
 # BB#2:                                 # %if.end
 	i32.const	$push12=, 1
 	i32.add 	$push5=, $0, $pop12
@@ -233,15 +218,15 @@ s:                                      # @s
 	i32.const	$push11=, 0
 	return  	$pop11
 .LBB2_3:                                # %if.then
-	end_block                       # label7:
+	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	s, .Lfunc_end2-s
-
+                                        # -- End function
 	.section	.text.m,"ax",@progbits
-	.hidden	m
+	.hidden	m                       # -- Begin function m
 	.globl	m
 	.type	m,@function
 m:                                      # @m
@@ -253,9 +238,9 @@ m:                                      # @m
 	.endfunc
 .Lfunc_end3:
 	.size	m, .Lfunc_end3-m
-
+                                        # -- End function
 	.section	.text.r,"ax",@progbits
-	.hidden	r
+	.hidden	r                       # -- Begin function r
 	.globl	r
 	.type	r,@function
 r:                                      # @r
@@ -269,17 +254,17 @@ r:                                      # @r
 	i32.const	$push9=, 0
 	i32.load8_u	$push0=, r.c.0($pop9)
 	i32.ne  	$push1=, $pop10, $pop0
-	br_if   	0, $pop1        # 0: down to label8
+	br_if   	0, $pop1        # 0: down to label5
 # BB#1:                                 # %lor.lhs.false
 	i32.load8_u	$push2=, 1($0)
-	br_if   	0, $pop2        # 0: down to label8
+	br_if   	0, $pop2        # 0: down to label5
 # BB#2:                                 # %lor.lhs.false
 	i32.const	$push14=, 0
 	i32.load	$push13=, r.cnt($pop14)
 	tee_local	$push12=, $0=, $pop13
 	i32.const	$push3=, 4
 	i32.ge_s	$push4=, $pop12, $pop3
-	br_if   	0, $pop4        # 0: down to label8
+	br_if   	0, $pop4        # 0: down to label5
 # BB#3:                                 # %if.end
 	i32.const	$push7=, 0
 	i32.const	$push5=, 1
@@ -292,13 +277,13 @@ r:                                      # @r
 	i32.const	$push15=, 1
 	return  	$pop15
 .LBB4_4:                                # %if.then
-	end_block                       # label8:
+	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	r, .Lfunc_end4-r
-
+                                        # -- End function
 	.hidden	check                   # @check
 	.type	check,@object
 	.section	.bss.check,"aw",@nobits
@@ -386,7 +371,7 @@ r.c.0:
 	.size	r.c.0, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20010924-1.c.s b/test/torture-s/20010924-1.c.s
index b227dea12..96a6bd9ee 100644
--- a/test/torture-s/20010924-1.c.s
+++ b/test/torture-s/20010924-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010924-1.c"
+	.file	"20010924-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,14 +87,14 @@ main:                                   # @main
 # BB#13:                                # %if.end63
 	i32.const	$push50=, 0
 	return  	$pop50
-.LBB0_14:                               # %if.then62
+.LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -140,5 +140,5 @@ a4:
 	.size	a4, 3
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20010925-1.c.s b/test/torture-s/20010925-1.c.s
index 59c512a28..1c790764c 100644
--- a/test/torture-s/20010925-1.c.s
+++ b/test/torture-s/20010925-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20010925-1.c"
+	.file	"20010925-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -21,9 +21,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -44,7 +44,7 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.hidden	dst                     # @dst
 	.type	dst,@object
 	.section	.bss.dst,"aw",@nobits
@@ -64,5 +64,5 @@ src:
 	.size	src, 40
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011008-3.c.s b/test/torture-s/20011008-3.c.s
index b92582d61..012515e50 100644
--- a/test/torture-s/20011008-3.c.s
+++ b/test/torture-s/20011008-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011008-3.c"
+	.file	"20011008-3.c"
 	.section	.text.log_compare,"ax",@progbits
-	.hidden	log_compare
+	.hidden	log_compare             # -- Begin function log_compare
 	.globl	log_compare
 	.type	log_compare,@function
 log_compare:                            # @log_compare
@@ -13,9 +13,9 @@ log_compare:                            # @log_compare
 	.endfunc
 .Lfunc_end0:
 	.size	log_compare, .Lfunc_end0-log_compare
-
+                                        # -- End function
 	.section	.text.__db_txnlist_lsnadd,"ax",@progbits
-	.hidden	__db_txnlist_lsnadd
+	.hidden	__db_txnlist_lsnadd     # -- Begin function __db_txnlist_lsnadd
 	.globl	__db_txnlist_lsnadd
 	.type	__db_txnlist_lsnadd,@function
 __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
@@ -100,9 +100,9 @@ __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
 	.endfunc
 .Lfunc_end1:
 	.size	__db_txnlist_lsnadd, .Lfunc_end1-__db_txnlist_lsnadd
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -114,7 +114,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011019-1.c.s b/test/torture-s/20011019-1.c.s
index cb8095931..de2f0b69f 100644
--- a/test/torture-s/20011019-1.c.s
+++ b/test/torture-s/20011019-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011019-1.c"
+	.file	"20011019-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	y                       # @y
 	.type	y,@object
 	.section	.bss.y,"aw",@nobits
@@ -54,5 +54,5 @@ x:
 	.size	x, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011024-1.c.s b/test/torture-s/20011024-1.c.s
index 824ff5ea6..83a602cfe 100644
--- a/test/torture-s/20011024-1.c.s
+++ b/test/torture-s/20011024-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011024-1.c"
+	.file	"20011024-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -55,6 +55,6 @@ buf:
 	.size	.L.str.1, 9
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20011109-1.c.s b/test/torture-s/20011109-1.c.s
index a3c2d1863..3cf75fa12 100644
--- a/test/torture-s/20011109-1.c.s
+++ b/test/torture-s/20011109-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011109-1.c"
+	.file	"20011109-1.c"
 	.section	.text.fail1,"ax",@progbits
-	.hidden	fail1
+	.hidden	fail1                   # -- Begin function fail1
 	.globl	fail1
 	.type	fail1,@function
 fail1:                                  # @fail1
@@ -11,9 +11,9 @@ fail1:                                  # @fail1
 	.endfunc
 .Lfunc_end0:
 	.size	fail1, .Lfunc_end0-fail1
-
+                                        # -- End function
 	.section	.text.fail2,"ax",@progbits
-	.hidden	fail2
+	.hidden	fail2                   # -- Begin function fail2
 	.globl	fail2
 	.type	fail2,@function
 fail2:                                  # @fail2
@@ -23,9 +23,9 @@ fail2:                                  # @fail2
 	.endfunc
 .Lfunc_end1:
 	.size	fail2, .Lfunc_end1-fail2
-
+                                        # -- End function
 	.section	.text.fail3,"ax",@progbits
-	.hidden	fail3
+	.hidden	fail3                   # -- Begin function fail3
 	.globl	fail3
 	.type	fail3,@function
 fail3:                                  # @fail3
@@ -35,9 +35,9 @@ fail3:                                  # @fail3
 	.endfunc
 .Lfunc_end2:
 	.size	fail3, .Lfunc_end2-fail3
-
+                                        # -- End function
 	.section	.text.fail4,"ax",@progbits
-	.hidden	fail4
+	.hidden	fail4                   # -- Begin function fail4
 	.globl	fail4
 	.type	fail4,@function
 fail4:                                  # @fail4
@@ -47,9 +47,9 @@ fail4:                                  # @fail4
 	.endfunc
 .Lfunc_end3:
 	.size	fail4, .Lfunc_end3-fail4
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -58,18 +58,18 @@ foo:                                    # @foo
 	block   	
 	block   	
 	block   	
+	block   	
 	i32.const	$push0=, 6
 	i32.add 	$push4=, $0, $pop0
 	tee_local	$push3=, $0=, $pop4
 	i32.const	$push1=, 11
 	i32.gt_u	$push2=, $pop3, $pop1
-	br_if   	0, $pop2        # 0: down to label2
+	br_if   	0, $pop2        # 0: down to label3
 # BB#1:                                 # %entry
 	block   	
 	block   	
-	block   	
-	br_table 	$0, 2, 3, 3, 3, 3, 3, 4, 0, 5, 1, 1, 1, 2 # 2: down to label3
-                                        # 3: down to label2
+	br_table 	$0, 3, 2, 2, 2, 2, 2, 4, 0, 5, 1, 1, 1, 3 # 3: down to label2
+                                        # 2: down to label3
                                         # 4: down to label1
                                         # 0: down to label5
                                         # 5: down to label0
@@ -81,13 +81,13 @@ foo:                                    # @foo
 	end_block                       # label4:
 	call    	fail3@FUNCTION
 	unreachable
-.LBB4_4:                                # %sw.bb
+.LBB4_4:                                # %sw.default
 	end_block                       # label3:
-	call    	fail1@FUNCTION
+	call    	fail4@FUNCTION
 	unreachable
-.LBB4_5:                                # %sw.default
+.LBB4_5:                                # %sw.bb
 	end_block                       # label2:
-	call    	fail4@FUNCTION
+	call    	fail1@FUNCTION
 	unreachable
 .LBB4_6:                                # %sw.bb1
 	end_block                       # label1:
@@ -100,9 +100,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end4:
 	.size	foo, .Lfunc_end4-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -114,8 +114,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011109-2.c.s b/test/torture-s/20011109-2.c.s
index f22bf2fe6..ca5bf77bf 100644
--- a/test/torture-s/20011109-2.c.s
+++ b/test/torture-s/20011109-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011109-2.c"
+	.file	"20011109-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011113-1.c.s b/test/torture-s/20011113-1.c.s
index b04975b8b..4801efd7b 100644
--- a/test/torture-s/20011113-1.c.s
+++ b/test/torture-s/20011113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011113-1.c"
+	.file	"20011113-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -39,9 +39,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -73,9 +73,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -113,9 +113,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -131,7 +131,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.data.t,"aw",@progbits
@@ -149,6 +149,6 @@ t:
 	.size	t, 20
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011114-1.c.s b/test/torture-s/20011114-1.c.s
index de426c0c0..4ca246c37 100644
--- a/test/torture-s/20011114-1.c.s
+++ b/test/torture-s/20011114-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011114-1.c"
+	.file	"20011114-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011115-1.c.s b/test/torture-s/20011115-1.c.s
index 9a0013bf7..f52addda5 100644
--- a/test/torture-s/20011115-1.c.s
+++ b/test/torture-s/20011115-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011115-1.c"
+	.file	"20011115-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011121-1.c.s b/test/torture-s/20011121-1.c.s
index 875950851..860e47e74 100644
--- a/test/torture-s/20011121-1.c.s
+++ b/test/torture-s/20011121-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011121-1.c"
+	.file	"20011121-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s1                      # @s1
 	.type	s1,@object
 	.section	.bss.s1,"aw",@nobits
@@ -24,5 +24,5 @@ s1:
 	.size	s1, 76
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011126-1.c.s b/test/torture-s/20011126-1.c.s
index 32bbde525..4190cdd2c 100644
--- a/test/torture-s/20011126-1.c.s
+++ b/test/torture-s/20011126-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011126-1.c"
+	.file	"20011126-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -34,5 +34,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20011126-2.c.s b/test/torture-s/20011126-2.c.s
index 9c6136851..fc5da685b 100644
--- a/test/torture-s/20011126-2.c.s
+++ b/test/torture-s/20011126-2.c.s
@@ -1,138 +1,123 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011126-2.c"
+	.file	"20011126-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$5=, .L.str
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push16=, $pop12, $pop13
+	i32.sub 	$push16=, $pop11, $pop13
 	i32.const	$push14=, 12
 	i32.add 	$push15=, $pop16, $pop14
-	copy_local	$0=, $pop15
-.LBB0_1:                                # %while.body.outer.outer.i
+	copy_local	$6=, $pop15
+.LBB0_1:                                # %while.body.i.outer
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
                                         #       Child Loop BB0_4 Depth 3
                                         #     Child Loop BB0_9 Depth 2
-	block   	
-	loop    	                # label1:
-	i32.load8_u	$push19=, 0($5)
-	tee_local	$push18=, $1=, $pop19
-	copy_local	$6=, $pop18
-.LBB0_2:                                # %while.body.outer.i
+	loop    	                # label0:
+	i32.load8_u	$0=, 0($5)
+.LBB0_2:                                # %while.body.i
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB0_4 Depth 3
 	block   	
-	loop    	                # label3:
-	i32.const	$push21=, 255
-	i32.and 	$push0=, $6, $pop21
-	i32.const	$push20=, 97
-	i32.ne  	$push1=, $pop0, $pop20
-	br_if   	1, $pop1        # 1: down to label2
+	loop    	                # label2:
+	i32.const	$push19=, 255
+	i32.and 	$push0=, $0, $pop19
+	i32.const	$push18=, 97
+	i32.ne  	$push1=, $pop0, $pop18
+	br_if   	0, $pop1        # 0: up to label2
 # BB#3:                                 # %while.cond2.i.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$6=, 0
 	copy_local	$7=, $5
 .LBB0_4:                                # %while.cond2.i
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label4:
-	copy_local	$push32=, $6
-	tee_local	$push31=, $8=, $pop32
-	i32.const	$push30=, 1
-	i32.add 	$6=, $pop31, $pop30
-	copy_local	$push29=, $7
-	tee_local	$push28=, $2=, $pop29
-	i32.const	$push27=, 1
-	i32.add 	$push26=, $pop28, $pop27
-	tee_local	$push25=, $7=, $pop26
-	i32.load8_u	$push24=, 0($pop25)
-	tee_local	$push23=, $4=, $pop24
-	i32.const	$push22=, 120
-	i32.eq  	$push2=, $pop23, $pop22
-	br_if   	0, $pop2        # 0: up to label4
+	loop    	                # label3:
+	i32.load8_u	$4=, 1($7)
+	i32.const	$push23=, 1
+	i32.add 	$push22=, $7, $pop23
+	tee_local	$push21=, $1=, $pop22
+	copy_local	$7=, $pop21
+	i32.const	$push20=, 120
+	i32.eq  	$push2=, $4, $pop20
+	br_if   	0, $pop2        # 0: up to label3
 # BB#5:                                 # %while.cond2.i
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push33=, 98
-	i32.eq  	$push3=, $4, $pop33
-	br_if   	3, $pop3        # 3: down to label0
-# BB#6:                                 # %while.cond11.preheader.i
+	i32.const	$push24=, 98
+	i32.eq  	$push3=, $4, $pop24
+	br_if   	1, $pop3        # 1: down to label1
+# BB#6:                                 # %if.end.i
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$6=, 97
-	i32.ge_u	$push5=, $5, $7
-	br_if   	0, $pop5        # 0: up to label3
-# BB#7:                                 # %while.body14.preheader.i
+	i32.ge_u	$push5=, $5, $1
+	br_if   	0, $pop5        # 0: up to label2
+# BB#7:                                 # %while.body14.lr.ph.i
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.store8	0($0), $1
-	i32.const	$push35=, 1
-	i32.add 	$6=, $5, $pop35
-	i32.const	$push34=, 0
-	i32.sub 	$3=, $pop34, $5
-	i32.gt_u	$push6=, $5, $2
-	i32.select	$push7=, $5, $2, $pop6
-	i32.add 	$1=, $0, $pop7
+	i32.const	$push30=, 97
+	i32.store8	0($6), $pop30
+	i32.const	$push29=, -1
+	i32.add 	$push28=, $1, $pop29
+	tee_local	$push27=, $0=, $pop28
+	i32.gt_u	$push6=, $5, $0
+	i32.select	$push7=, $5, $pop27, $pop6
+	i32.add 	$2=, $6, $pop7
+	i32.const	$push26=, 1
+	i32.add 	$7=, $5, $pop26
+	i32.const	$push25=, 0
+	i32.sub 	$3=, $pop25, $5
 	block   	
 	block   	
-	i32.ge_u	$push8=, $5, $2
-	br_if   	0, $pop8        # 0: down to label6
+	i32.ge_u	$push8=, $5, $0
+	br_if   	0, $pop8        # 0: down to label5
 # BB#8:                                 # %while.body14.while.body14_crit_edge.i.preheader
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push36=, 1
-	i32.add 	$4=, $0, $pop36
+	i32.const	$push31=, 1
+	i32.add 	$4=, $6, $pop31
 .LBB0_9:                                # %while.body14.while.body14_crit_edge.i
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label7:
-	i32.load8_u	$push9=, 0($6)
+	loop    	                # label6:
+	i32.load8_u	$push9=, 0($7)
 	i32.store8	0($4), $pop9
-	i32.const	$push41=, 1
-	i32.add 	$4=, $4, $pop41
-	i32.const	$push40=, 1
-	i32.add 	$6=, $6, $pop40
-	i32.const	$push39=, -1
-	i32.add 	$push38=, $8, $pop39
-	tee_local	$push37=, $8=, $pop38
-	br_if   	0, $pop37       # 0: up to label7
-# BB#10:                                #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push35=, 1
+	i32.add 	$4=, $4, $pop35
+	i32.lt_u	$1=, $7, $0
+	i32.const	$push34=, 1
+	i32.add 	$push33=, $7, $pop34
+	tee_local	$push32=, $5=, $pop33
+	copy_local	$7=, $pop32
+	br_if   	0, $1           # 0: up to label6
+	br      	2               # 2: down to label4
+.LBB0_10:                               #   in Loop: Header=BB0_1 Depth=1
 	end_loop
+	end_block                       # label5:
 	copy_local	$5=, $7
-	br      	1               # 1: down to label5
-.LBB0_11:                               #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label6:
-	copy_local	$5=, $6
-.LBB0_12:                               # %while.body.outer.loopexit.i
+.LBB0_11:                               # %if.end18.loopexit.i
                                         #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label5:
-	i32.add 	$push10=, $1, $3
+	end_block                       # label4:
+	i32.add 	$push10=, $2, $3
 	i32.const	$push17=, 1
-	i32.add 	$0=, $pop10, $pop17
-	br      	1               # 1: up to label1
-.LBB0_13:                               # %while.body.i
-                                        # =>This Inner Loop Header: Depth=1
-	end_block                       # label2:
+	i32.add 	$6=, $pop10, $pop17
+	br      	1               # 1: up to label0
+.LBB0_12:                               # %test.exit
+	end_block                       # label1:
 	end_loop
-	loop    	                # label8:
-	br      	0               # 0: up to label8
-.LBB0_14:                               # %test.exit
-	end_loop
-	end_block                       # label0:
 	i32.const	$push4=, 0
                                         # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -140,4 +125,4 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20011128-1.c.s b/test/torture-s/20011128-1.c.s
index 9ce961c73..8d830845b 100644
--- a/test/torture-s/20011128-1.c.s
+++ b/test/torture-s/20011128-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011128-1.c"
+	.file	"20011128-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011217-1.c.s b/test/torture-s/20011217-1.c.s
index d3b9eb730..8098dfb04 100644
--- a/test/torture-s/20011217-1.c.s
+++ b/test/torture-s/20011217-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011217-1.c"
+	.file	"20011217-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011219-1.c.s b/test/torture-s/20011219-1.c.s
index e7e3fbc15..91c1804fa 100644
--- a/test/torture-s/20011219-1.c.s
+++ b/test/torture-s/20011219-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011219-1.c"
+	.file	"20011219-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -11,9 +11,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -37,9 +37,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011223-1.c.s b/test/torture-s/20011223-1.c.s
index ee526e8a8..f8bf2d19e 100644
--- a/test/torture-s/20011223-1.c.s
+++ b/test/torture-s/20011223-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20011223-1.c"
+	.file	"20011223-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020103-1.c.s b/test/torture-s/20020103-1.c.s
index 039a3ee99..189b962b4 100644
--- a/test/torture-s/20020103-1.c.s
+++ b/test/torture-s/20020103-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020103-1.c"
+	.file	"20020103-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -29,9 +29,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020107-1.c.s b/test/torture-s/20020107-1.c.s
index 399ef722a..b912c20d5 100644
--- a/test/torture-s/20020107-1.c.s
+++ b/test/torture-s/20020107-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020107-1.c"
+	.file	"20020107-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,26 +28,38 @@ main:                                   # @main
 	i32.const	$0=, buf
 	#APP
 	#NO_APP
-	block   	
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push0=, buf
 	i32.sub 	$push3=, $pop2, $pop0
 	i32.const	$push6=, 1
-	i32.ne  	$push4=, $pop3, $pop6
-	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %bar.exit
+	i32.eq  	$push4=, $pop3, $pop6
+	call    	bar@FUNCTION, $pop4
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
 	unreachable
-.LBB1_2:                                # %if.then.i
+	.endfunc
+.Lfunc_end1:
+	.size	main, .Lfunc_end1-main
+                                        # -- End function
+	.section	.text.bar,"ax",@progbits
+	.type	bar,@function           # -- Begin function bar
+bar:                                    # @bar
+	.param  	i32
+# BB#0:                                 # %entry
+	block   	
+	i32.eqz 	$push0=, $0
+	br_if   	0, $pop0        # 0: down to label0
+# BB#1:                                 # %if.end
+	return
+.LBB2_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
-.Lfunc_end1:
-	.size	main, .Lfunc_end1-main
-
+.Lfunc_end2:
+	.size	bar, .Lfunc_end2-bar
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -57,6 +69,6 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20020108-1.c.s b/test/torture-s/20020108-1.c.s
index a8a1d7a56..9943994c6 100644
--- a/test/torture-s/20020108-1.c.s
+++ b/test/torture-s/20020108-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020108-1.c"
+	.file	"20020108-1.c"
 	.section	.text.ashift_qi_0,"ax",@progbits
-	.hidden	ashift_qi_0
+	.hidden	ashift_qi_0             # -- Begin function ashift_qi_0
 	.globl	ashift_qi_0
 	.type	ashift_qi_0,@function
 ashift_qi_0:                            # @ashift_qi_0
@@ -13,9 +13,9 @@ ashift_qi_0:                            # @ashift_qi_0
 	.endfunc
 .Lfunc_end0:
 	.size	ashift_qi_0, .Lfunc_end0-ashift_qi_0
-
+                                        # -- End function
 	.section	.text.ashift_qi_1,"ax",@progbits
-	.hidden	ashift_qi_1
+	.hidden	ashift_qi_1             # -- Begin function ashift_qi_1
 	.globl	ashift_qi_1
 	.type	ashift_qi_1,@function
 ashift_qi_1:                            # @ashift_qi_1
@@ -30,9 +30,9 @@ ashift_qi_1:                            # @ashift_qi_1
 	.endfunc
 .Lfunc_end1:
 	.size	ashift_qi_1, .Lfunc_end1-ashift_qi_1
-
+                                        # -- End function
 	.section	.text.ashift_qi_2,"ax",@progbits
-	.hidden	ashift_qi_2
+	.hidden	ashift_qi_2             # -- Begin function ashift_qi_2
 	.globl	ashift_qi_2
 	.type	ashift_qi_2,@function
 ashift_qi_2:                            # @ashift_qi_2
@@ -47,9 +47,9 @@ ashift_qi_2:                            # @ashift_qi_2
 	.endfunc
 .Lfunc_end2:
 	.size	ashift_qi_2, .Lfunc_end2-ashift_qi_2
-
+                                        # -- End function
 	.section	.text.ashift_qi_3,"ax",@progbits
-	.hidden	ashift_qi_3
+	.hidden	ashift_qi_3             # -- Begin function ashift_qi_3
 	.globl	ashift_qi_3
 	.type	ashift_qi_3,@function
 ashift_qi_3:                            # @ashift_qi_3
@@ -64,9 +64,9 @@ ashift_qi_3:                            # @ashift_qi_3
 	.endfunc
 .Lfunc_end3:
 	.size	ashift_qi_3, .Lfunc_end3-ashift_qi_3
-
+                                        # -- End function
 	.section	.text.ashift_qi_4,"ax",@progbits
-	.hidden	ashift_qi_4
+	.hidden	ashift_qi_4             # -- Begin function ashift_qi_4
 	.globl	ashift_qi_4
 	.type	ashift_qi_4,@function
 ashift_qi_4:                            # @ashift_qi_4
@@ -81,9 +81,9 @@ ashift_qi_4:                            # @ashift_qi_4
 	.endfunc
 .Lfunc_end4:
 	.size	ashift_qi_4, .Lfunc_end4-ashift_qi_4
-
+                                        # -- End function
 	.section	.text.ashift_qi_5,"ax",@progbits
-	.hidden	ashift_qi_5
+	.hidden	ashift_qi_5             # -- Begin function ashift_qi_5
 	.globl	ashift_qi_5
 	.type	ashift_qi_5,@function
 ashift_qi_5:                            # @ashift_qi_5
@@ -98,9 +98,9 @@ ashift_qi_5:                            # @ashift_qi_5
 	.endfunc
 .Lfunc_end5:
 	.size	ashift_qi_5, .Lfunc_end5-ashift_qi_5
-
+                                        # -- End function
 	.section	.text.ashift_qi_6,"ax",@progbits
-	.hidden	ashift_qi_6
+	.hidden	ashift_qi_6             # -- Begin function ashift_qi_6
 	.globl	ashift_qi_6
 	.type	ashift_qi_6,@function
 ashift_qi_6:                            # @ashift_qi_6
@@ -115,9 +115,9 @@ ashift_qi_6:                            # @ashift_qi_6
 	.endfunc
 .Lfunc_end6:
 	.size	ashift_qi_6, .Lfunc_end6-ashift_qi_6
-
+                                        # -- End function
 	.section	.text.ashift_qi_7,"ax",@progbits
-	.hidden	ashift_qi_7
+	.hidden	ashift_qi_7             # -- Begin function ashift_qi_7
 	.globl	ashift_qi_7
 	.type	ashift_qi_7,@function
 ashift_qi_7:                            # @ashift_qi_7
@@ -132,9 +132,9 @@ ashift_qi_7:                            # @ashift_qi_7
 	.endfunc
 .Lfunc_end7:
 	.size	ashift_qi_7, .Lfunc_end7-ashift_qi_7
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_0,"ax",@progbits
-	.hidden	lshiftrt_qi_0
+	.hidden	lshiftrt_qi_0           # -- Begin function lshiftrt_qi_0
 	.globl	lshiftrt_qi_0
 	.type	lshiftrt_qi_0,@function
 lshiftrt_qi_0:                          # @lshiftrt_qi_0
@@ -146,9 +146,9 @@ lshiftrt_qi_0:                          # @lshiftrt_qi_0
 	.endfunc
 .Lfunc_end8:
 	.size	lshiftrt_qi_0, .Lfunc_end8-lshiftrt_qi_0
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_1,"ax",@progbits
-	.hidden	lshiftrt_qi_1
+	.hidden	lshiftrt_qi_1           # -- Begin function lshiftrt_qi_1
 	.globl	lshiftrt_qi_1
 	.type	lshiftrt_qi_1,@function
 lshiftrt_qi_1:                          # @lshiftrt_qi_1
@@ -161,9 +161,9 @@ lshiftrt_qi_1:                          # @lshiftrt_qi_1
 	.endfunc
 .Lfunc_end9:
 	.size	lshiftrt_qi_1, .Lfunc_end9-lshiftrt_qi_1
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_2,"ax",@progbits
-	.hidden	lshiftrt_qi_2
+	.hidden	lshiftrt_qi_2           # -- Begin function lshiftrt_qi_2
 	.globl	lshiftrt_qi_2
 	.type	lshiftrt_qi_2,@function
 lshiftrt_qi_2:                          # @lshiftrt_qi_2
@@ -176,9 +176,9 @@ lshiftrt_qi_2:                          # @lshiftrt_qi_2
 	.endfunc
 .Lfunc_end10:
 	.size	lshiftrt_qi_2, .Lfunc_end10-lshiftrt_qi_2
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_3,"ax",@progbits
-	.hidden	lshiftrt_qi_3
+	.hidden	lshiftrt_qi_3           # -- Begin function lshiftrt_qi_3
 	.globl	lshiftrt_qi_3
 	.type	lshiftrt_qi_3,@function
 lshiftrt_qi_3:                          # @lshiftrt_qi_3
@@ -191,9 +191,9 @@ lshiftrt_qi_3:                          # @lshiftrt_qi_3
 	.endfunc
 .Lfunc_end11:
 	.size	lshiftrt_qi_3, .Lfunc_end11-lshiftrt_qi_3
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_4,"ax",@progbits
-	.hidden	lshiftrt_qi_4
+	.hidden	lshiftrt_qi_4           # -- Begin function lshiftrt_qi_4
 	.globl	lshiftrt_qi_4
 	.type	lshiftrt_qi_4,@function
 lshiftrt_qi_4:                          # @lshiftrt_qi_4
@@ -206,9 +206,9 @@ lshiftrt_qi_4:                          # @lshiftrt_qi_4
 	.endfunc
 .Lfunc_end12:
 	.size	lshiftrt_qi_4, .Lfunc_end12-lshiftrt_qi_4
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_5,"ax",@progbits
-	.hidden	lshiftrt_qi_5
+	.hidden	lshiftrt_qi_5           # -- Begin function lshiftrt_qi_5
 	.globl	lshiftrt_qi_5
 	.type	lshiftrt_qi_5,@function
 lshiftrt_qi_5:                          # @lshiftrt_qi_5
@@ -221,9 +221,9 @@ lshiftrt_qi_5:                          # @lshiftrt_qi_5
 	.endfunc
 .Lfunc_end13:
 	.size	lshiftrt_qi_5, .Lfunc_end13-lshiftrt_qi_5
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_6,"ax",@progbits
-	.hidden	lshiftrt_qi_6
+	.hidden	lshiftrt_qi_6           # -- Begin function lshiftrt_qi_6
 	.globl	lshiftrt_qi_6
 	.type	lshiftrt_qi_6,@function
 lshiftrt_qi_6:                          # @lshiftrt_qi_6
@@ -236,9 +236,9 @@ lshiftrt_qi_6:                          # @lshiftrt_qi_6
 	.endfunc
 .Lfunc_end14:
 	.size	lshiftrt_qi_6, .Lfunc_end14-lshiftrt_qi_6
-
+                                        # -- End function
 	.section	.text.lshiftrt_qi_7,"ax",@progbits
-	.hidden	lshiftrt_qi_7
+	.hidden	lshiftrt_qi_7           # -- Begin function lshiftrt_qi_7
 	.globl	lshiftrt_qi_7
 	.type	lshiftrt_qi_7,@function
 lshiftrt_qi_7:                          # @lshiftrt_qi_7
@@ -251,9 +251,9 @@ lshiftrt_qi_7:                          # @lshiftrt_qi_7
 	.endfunc
 .Lfunc_end15:
 	.size	lshiftrt_qi_7, .Lfunc_end15-lshiftrt_qi_7
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_0,"ax",@progbits
-	.hidden	ashiftrt_qi_0
+	.hidden	ashiftrt_qi_0           # -- Begin function ashiftrt_qi_0
 	.globl	ashiftrt_qi_0
 	.type	ashiftrt_qi_0,@function
 ashiftrt_qi_0:                          # @ashiftrt_qi_0
@@ -265,9 +265,9 @@ ashiftrt_qi_0:                          # @ashiftrt_qi_0
 	.endfunc
 .Lfunc_end16:
 	.size	ashiftrt_qi_0, .Lfunc_end16-ashiftrt_qi_0
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_1,"ax",@progbits
-	.hidden	ashiftrt_qi_1
+	.hidden	ashiftrt_qi_1           # -- Begin function ashiftrt_qi_1
 	.globl	ashiftrt_qi_1
 	.type	ashiftrt_qi_1,@function
 ashiftrt_qi_1:                          # @ashiftrt_qi_1
@@ -280,9 +280,9 @@ ashiftrt_qi_1:                          # @ashiftrt_qi_1
 	.endfunc
 .Lfunc_end17:
 	.size	ashiftrt_qi_1, .Lfunc_end17-ashiftrt_qi_1
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_2,"ax",@progbits
-	.hidden	ashiftrt_qi_2
+	.hidden	ashiftrt_qi_2           # -- Begin function ashiftrt_qi_2
 	.globl	ashiftrt_qi_2
 	.type	ashiftrt_qi_2,@function
 ashiftrt_qi_2:                          # @ashiftrt_qi_2
@@ -295,9 +295,9 @@ ashiftrt_qi_2:                          # @ashiftrt_qi_2
 	.endfunc
 .Lfunc_end18:
 	.size	ashiftrt_qi_2, .Lfunc_end18-ashiftrt_qi_2
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_3,"ax",@progbits
-	.hidden	ashiftrt_qi_3
+	.hidden	ashiftrt_qi_3           # -- Begin function ashiftrt_qi_3
 	.globl	ashiftrt_qi_3
 	.type	ashiftrt_qi_3,@function
 ashiftrt_qi_3:                          # @ashiftrt_qi_3
@@ -310,9 +310,9 @@ ashiftrt_qi_3:                          # @ashiftrt_qi_3
 	.endfunc
 .Lfunc_end19:
 	.size	ashiftrt_qi_3, .Lfunc_end19-ashiftrt_qi_3
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_4,"ax",@progbits
-	.hidden	ashiftrt_qi_4
+	.hidden	ashiftrt_qi_4           # -- Begin function ashiftrt_qi_4
 	.globl	ashiftrt_qi_4
 	.type	ashiftrt_qi_4,@function
 ashiftrt_qi_4:                          # @ashiftrt_qi_4
@@ -325,9 +325,9 @@ ashiftrt_qi_4:                          # @ashiftrt_qi_4
 	.endfunc
 .Lfunc_end20:
 	.size	ashiftrt_qi_4, .Lfunc_end20-ashiftrt_qi_4
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_5,"ax",@progbits
-	.hidden	ashiftrt_qi_5
+	.hidden	ashiftrt_qi_5           # -- Begin function ashiftrt_qi_5
 	.globl	ashiftrt_qi_5
 	.type	ashiftrt_qi_5,@function
 ashiftrt_qi_5:                          # @ashiftrt_qi_5
@@ -340,9 +340,9 @@ ashiftrt_qi_5:                          # @ashiftrt_qi_5
 	.endfunc
 .Lfunc_end21:
 	.size	ashiftrt_qi_5, .Lfunc_end21-ashiftrt_qi_5
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_6,"ax",@progbits
-	.hidden	ashiftrt_qi_6
+	.hidden	ashiftrt_qi_6           # -- Begin function ashiftrt_qi_6
 	.globl	ashiftrt_qi_6
 	.type	ashiftrt_qi_6,@function
 ashiftrt_qi_6:                          # @ashiftrt_qi_6
@@ -355,9 +355,9 @@ ashiftrt_qi_6:                          # @ashiftrt_qi_6
 	.endfunc
 .Lfunc_end22:
 	.size	ashiftrt_qi_6, .Lfunc_end22-ashiftrt_qi_6
-
+                                        # -- End function
 	.section	.text.ashiftrt_qi_7,"ax",@progbits
-	.hidden	ashiftrt_qi_7
+	.hidden	ashiftrt_qi_7           # -- Begin function ashiftrt_qi_7
 	.globl	ashiftrt_qi_7
 	.type	ashiftrt_qi_7,@function
 ashiftrt_qi_7:                          # @ashiftrt_qi_7
@@ -370,9 +370,9 @@ ashiftrt_qi_7:                          # @ashiftrt_qi_7
 	.endfunc
 .Lfunc_end23:
 	.size	ashiftrt_qi_7, .Lfunc_end23-ashiftrt_qi_7
-
+                                        # -- End function
 	.section	.text.ashift_hi_0,"ax",@progbits
-	.hidden	ashift_hi_0
+	.hidden	ashift_hi_0             # -- Begin function ashift_hi_0
 	.globl	ashift_hi_0
 	.type	ashift_hi_0,@function
 ashift_hi_0:                            # @ashift_hi_0
@@ -384,9 +384,9 @@ ashift_hi_0:                            # @ashift_hi_0
 	.endfunc
 .Lfunc_end24:
 	.size	ashift_hi_0, .Lfunc_end24-ashift_hi_0
-
+                                        # -- End function
 	.section	.text.ashift_hi_1,"ax",@progbits
-	.hidden	ashift_hi_1
+	.hidden	ashift_hi_1             # -- Begin function ashift_hi_1
 	.globl	ashift_hi_1
 	.type	ashift_hi_1,@function
 ashift_hi_1:                            # @ashift_hi_1
@@ -401,9 +401,9 @@ ashift_hi_1:                            # @ashift_hi_1
 	.endfunc
 .Lfunc_end25:
 	.size	ashift_hi_1, .Lfunc_end25-ashift_hi_1
-
+                                        # -- End function
 	.section	.text.ashift_hi_2,"ax",@progbits
-	.hidden	ashift_hi_2
+	.hidden	ashift_hi_2             # -- Begin function ashift_hi_2
 	.globl	ashift_hi_2
 	.type	ashift_hi_2,@function
 ashift_hi_2:                            # @ashift_hi_2
@@ -418,9 +418,9 @@ ashift_hi_2:                            # @ashift_hi_2
 	.endfunc
 .Lfunc_end26:
 	.size	ashift_hi_2, .Lfunc_end26-ashift_hi_2
-
+                                        # -- End function
 	.section	.text.ashift_hi_3,"ax",@progbits
-	.hidden	ashift_hi_3
+	.hidden	ashift_hi_3             # -- Begin function ashift_hi_3
 	.globl	ashift_hi_3
 	.type	ashift_hi_3,@function
 ashift_hi_3:                            # @ashift_hi_3
@@ -435,9 +435,9 @@ ashift_hi_3:                            # @ashift_hi_3
 	.endfunc
 .Lfunc_end27:
 	.size	ashift_hi_3, .Lfunc_end27-ashift_hi_3
-
+                                        # -- End function
 	.section	.text.ashift_hi_4,"ax",@progbits
-	.hidden	ashift_hi_4
+	.hidden	ashift_hi_4             # -- Begin function ashift_hi_4
 	.globl	ashift_hi_4
 	.type	ashift_hi_4,@function
 ashift_hi_4:                            # @ashift_hi_4
@@ -452,9 +452,9 @@ ashift_hi_4:                            # @ashift_hi_4
 	.endfunc
 .Lfunc_end28:
 	.size	ashift_hi_4, .Lfunc_end28-ashift_hi_4
-
+                                        # -- End function
 	.section	.text.ashift_hi_5,"ax",@progbits
-	.hidden	ashift_hi_5
+	.hidden	ashift_hi_5             # -- Begin function ashift_hi_5
 	.globl	ashift_hi_5
 	.type	ashift_hi_5,@function
 ashift_hi_5:                            # @ashift_hi_5
@@ -469,9 +469,9 @@ ashift_hi_5:                            # @ashift_hi_5
 	.endfunc
 .Lfunc_end29:
 	.size	ashift_hi_5, .Lfunc_end29-ashift_hi_5
-
+                                        # -- End function
 	.section	.text.ashift_hi_6,"ax",@progbits
-	.hidden	ashift_hi_6
+	.hidden	ashift_hi_6             # -- Begin function ashift_hi_6
 	.globl	ashift_hi_6
 	.type	ashift_hi_6,@function
 ashift_hi_6:                            # @ashift_hi_6
@@ -486,9 +486,9 @@ ashift_hi_6:                            # @ashift_hi_6
 	.endfunc
 .Lfunc_end30:
 	.size	ashift_hi_6, .Lfunc_end30-ashift_hi_6
-
+                                        # -- End function
 	.section	.text.ashift_hi_7,"ax",@progbits
-	.hidden	ashift_hi_7
+	.hidden	ashift_hi_7             # -- Begin function ashift_hi_7
 	.globl	ashift_hi_7
 	.type	ashift_hi_7,@function
 ashift_hi_7:                            # @ashift_hi_7
@@ -503,9 +503,9 @@ ashift_hi_7:                            # @ashift_hi_7
 	.endfunc
 .Lfunc_end31:
 	.size	ashift_hi_7, .Lfunc_end31-ashift_hi_7
-
+                                        # -- End function
 	.section	.text.ashift_hi_8,"ax",@progbits
-	.hidden	ashift_hi_8
+	.hidden	ashift_hi_8             # -- Begin function ashift_hi_8
 	.globl	ashift_hi_8
 	.type	ashift_hi_8,@function
 ashift_hi_8:                            # @ashift_hi_8
@@ -520,9 +520,9 @@ ashift_hi_8:                            # @ashift_hi_8
 	.endfunc
 .Lfunc_end32:
 	.size	ashift_hi_8, .Lfunc_end32-ashift_hi_8
-
+                                        # -- End function
 	.section	.text.ashift_hi_9,"ax",@progbits
-	.hidden	ashift_hi_9
+	.hidden	ashift_hi_9             # -- Begin function ashift_hi_9
 	.globl	ashift_hi_9
 	.type	ashift_hi_9,@function
 ashift_hi_9:                            # @ashift_hi_9
@@ -537,9 +537,9 @@ ashift_hi_9:                            # @ashift_hi_9
 	.endfunc
 .Lfunc_end33:
 	.size	ashift_hi_9, .Lfunc_end33-ashift_hi_9
-
+                                        # -- End function
 	.section	.text.ashift_hi_10,"ax",@progbits
-	.hidden	ashift_hi_10
+	.hidden	ashift_hi_10            # -- Begin function ashift_hi_10
 	.globl	ashift_hi_10
 	.type	ashift_hi_10,@function
 ashift_hi_10:                           # @ashift_hi_10
@@ -554,9 +554,9 @@ ashift_hi_10:                           # @ashift_hi_10
 	.endfunc
 .Lfunc_end34:
 	.size	ashift_hi_10, .Lfunc_end34-ashift_hi_10
-
+                                        # -- End function
 	.section	.text.ashift_hi_11,"ax",@progbits
-	.hidden	ashift_hi_11
+	.hidden	ashift_hi_11            # -- Begin function ashift_hi_11
 	.globl	ashift_hi_11
 	.type	ashift_hi_11,@function
 ashift_hi_11:                           # @ashift_hi_11
@@ -571,9 +571,9 @@ ashift_hi_11:                           # @ashift_hi_11
 	.endfunc
 .Lfunc_end35:
 	.size	ashift_hi_11, .Lfunc_end35-ashift_hi_11
-
+                                        # -- End function
 	.section	.text.ashift_hi_12,"ax",@progbits
-	.hidden	ashift_hi_12
+	.hidden	ashift_hi_12            # -- Begin function ashift_hi_12
 	.globl	ashift_hi_12
 	.type	ashift_hi_12,@function
 ashift_hi_12:                           # @ashift_hi_12
@@ -588,9 +588,9 @@ ashift_hi_12:                           # @ashift_hi_12
 	.endfunc
 .Lfunc_end36:
 	.size	ashift_hi_12, .Lfunc_end36-ashift_hi_12
-
+                                        # -- End function
 	.section	.text.ashift_hi_13,"ax",@progbits
-	.hidden	ashift_hi_13
+	.hidden	ashift_hi_13            # -- Begin function ashift_hi_13
 	.globl	ashift_hi_13
 	.type	ashift_hi_13,@function
 ashift_hi_13:                           # @ashift_hi_13
@@ -605,9 +605,9 @@ ashift_hi_13:                           # @ashift_hi_13
 	.endfunc
 .Lfunc_end37:
 	.size	ashift_hi_13, .Lfunc_end37-ashift_hi_13
-
+                                        # -- End function
 	.section	.text.ashift_hi_14,"ax",@progbits
-	.hidden	ashift_hi_14
+	.hidden	ashift_hi_14            # -- Begin function ashift_hi_14
 	.globl	ashift_hi_14
 	.type	ashift_hi_14,@function
 ashift_hi_14:                           # @ashift_hi_14
@@ -622,9 +622,9 @@ ashift_hi_14:                           # @ashift_hi_14
 	.endfunc
 .Lfunc_end38:
 	.size	ashift_hi_14, .Lfunc_end38-ashift_hi_14
-
+                                        # -- End function
 	.section	.text.ashift_hi_15,"ax",@progbits
-	.hidden	ashift_hi_15
+	.hidden	ashift_hi_15            # -- Begin function ashift_hi_15
 	.globl	ashift_hi_15
 	.type	ashift_hi_15,@function
 ashift_hi_15:                           # @ashift_hi_15
@@ -639,9 +639,9 @@ ashift_hi_15:                           # @ashift_hi_15
 	.endfunc
 .Lfunc_end39:
 	.size	ashift_hi_15, .Lfunc_end39-ashift_hi_15
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_0,"ax",@progbits
-	.hidden	lshiftrt_hi_0
+	.hidden	lshiftrt_hi_0           # -- Begin function lshiftrt_hi_0
 	.globl	lshiftrt_hi_0
 	.type	lshiftrt_hi_0,@function
 lshiftrt_hi_0:                          # @lshiftrt_hi_0
@@ -653,9 +653,9 @@ lshiftrt_hi_0:                          # @lshiftrt_hi_0
 	.endfunc
 .Lfunc_end40:
 	.size	lshiftrt_hi_0, .Lfunc_end40-lshiftrt_hi_0
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_1,"ax",@progbits
-	.hidden	lshiftrt_hi_1
+	.hidden	lshiftrt_hi_1           # -- Begin function lshiftrt_hi_1
 	.globl	lshiftrt_hi_1
 	.type	lshiftrt_hi_1,@function
 lshiftrt_hi_1:                          # @lshiftrt_hi_1
@@ -668,9 +668,9 @@ lshiftrt_hi_1:                          # @lshiftrt_hi_1
 	.endfunc
 .Lfunc_end41:
 	.size	lshiftrt_hi_1, .Lfunc_end41-lshiftrt_hi_1
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_2,"ax",@progbits
-	.hidden	lshiftrt_hi_2
+	.hidden	lshiftrt_hi_2           # -- Begin function lshiftrt_hi_2
 	.globl	lshiftrt_hi_2
 	.type	lshiftrt_hi_2,@function
 lshiftrt_hi_2:                          # @lshiftrt_hi_2
@@ -683,9 +683,9 @@ lshiftrt_hi_2:                          # @lshiftrt_hi_2
 	.endfunc
 .Lfunc_end42:
 	.size	lshiftrt_hi_2, .Lfunc_end42-lshiftrt_hi_2
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_3,"ax",@progbits
-	.hidden	lshiftrt_hi_3
+	.hidden	lshiftrt_hi_3           # -- Begin function lshiftrt_hi_3
 	.globl	lshiftrt_hi_3
 	.type	lshiftrt_hi_3,@function
 lshiftrt_hi_3:                          # @lshiftrt_hi_3
@@ -698,9 +698,9 @@ lshiftrt_hi_3:                          # @lshiftrt_hi_3
 	.endfunc
 .Lfunc_end43:
 	.size	lshiftrt_hi_3, .Lfunc_end43-lshiftrt_hi_3
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_4,"ax",@progbits
-	.hidden	lshiftrt_hi_4
+	.hidden	lshiftrt_hi_4           # -- Begin function lshiftrt_hi_4
 	.globl	lshiftrt_hi_4
 	.type	lshiftrt_hi_4,@function
 lshiftrt_hi_4:                          # @lshiftrt_hi_4
@@ -713,9 +713,9 @@ lshiftrt_hi_4:                          # @lshiftrt_hi_4
 	.endfunc
 .Lfunc_end44:
 	.size	lshiftrt_hi_4, .Lfunc_end44-lshiftrt_hi_4
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_5,"ax",@progbits
-	.hidden	lshiftrt_hi_5
+	.hidden	lshiftrt_hi_5           # -- Begin function lshiftrt_hi_5
 	.globl	lshiftrt_hi_5
 	.type	lshiftrt_hi_5,@function
 lshiftrt_hi_5:                          # @lshiftrt_hi_5
@@ -728,9 +728,9 @@ lshiftrt_hi_5:                          # @lshiftrt_hi_5
 	.endfunc
 .Lfunc_end45:
 	.size	lshiftrt_hi_5, .Lfunc_end45-lshiftrt_hi_5
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_6,"ax",@progbits
-	.hidden	lshiftrt_hi_6
+	.hidden	lshiftrt_hi_6           # -- Begin function lshiftrt_hi_6
 	.globl	lshiftrt_hi_6
 	.type	lshiftrt_hi_6,@function
 lshiftrt_hi_6:                          # @lshiftrt_hi_6
@@ -743,9 +743,9 @@ lshiftrt_hi_6:                          # @lshiftrt_hi_6
 	.endfunc
 .Lfunc_end46:
 	.size	lshiftrt_hi_6, .Lfunc_end46-lshiftrt_hi_6
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_7,"ax",@progbits
-	.hidden	lshiftrt_hi_7
+	.hidden	lshiftrt_hi_7           # -- Begin function lshiftrt_hi_7
 	.globl	lshiftrt_hi_7
 	.type	lshiftrt_hi_7,@function
 lshiftrt_hi_7:                          # @lshiftrt_hi_7
@@ -758,9 +758,9 @@ lshiftrt_hi_7:                          # @lshiftrt_hi_7
 	.endfunc
 .Lfunc_end47:
 	.size	lshiftrt_hi_7, .Lfunc_end47-lshiftrt_hi_7
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_8,"ax",@progbits
-	.hidden	lshiftrt_hi_8
+	.hidden	lshiftrt_hi_8           # -- Begin function lshiftrt_hi_8
 	.globl	lshiftrt_hi_8
 	.type	lshiftrt_hi_8,@function
 lshiftrt_hi_8:                          # @lshiftrt_hi_8
@@ -773,9 +773,9 @@ lshiftrt_hi_8:                          # @lshiftrt_hi_8
 	.endfunc
 .Lfunc_end48:
 	.size	lshiftrt_hi_8, .Lfunc_end48-lshiftrt_hi_8
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_9,"ax",@progbits
-	.hidden	lshiftrt_hi_9
+	.hidden	lshiftrt_hi_9           # -- Begin function lshiftrt_hi_9
 	.globl	lshiftrt_hi_9
 	.type	lshiftrt_hi_9,@function
 lshiftrt_hi_9:                          # @lshiftrt_hi_9
@@ -788,9 +788,9 @@ lshiftrt_hi_9:                          # @lshiftrt_hi_9
 	.endfunc
 .Lfunc_end49:
 	.size	lshiftrt_hi_9, .Lfunc_end49-lshiftrt_hi_9
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_10,"ax",@progbits
-	.hidden	lshiftrt_hi_10
+	.hidden	lshiftrt_hi_10          # -- Begin function lshiftrt_hi_10
 	.globl	lshiftrt_hi_10
 	.type	lshiftrt_hi_10,@function
 lshiftrt_hi_10:                         # @lshiftrt_hi_10
@@ -803,9 +803,9 @@ lshiftrt_hi_10:                         # @lshiftrt_hi_10
 	.endfunc
 .Lfunc_end50:
 	.size	lshiftrt_hi_10, .Lfunc_end50-lshiftrt_hi_10
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_11,"ax",@progbits
-	.hidden	lshiftrt_hi_11
+	.hidden	lshiftrt_hi_11          # -- Begin function lshiftrt_hi_11
 	.globl	lshiftrt_hi_11
 	.type	lshiftrt_hi_11,@function
 lshiftrt_hi_11:                         # @lshiftrt_hi_11
@@ -818,9 +818,9 @@ lshiftrt_hi_11:                         # @lshiftrt_hi_11
 	.endfunc
 .Lfunc_end51:
 	.size	lshiftrt_hi_11, .Lfunc_end51-lshiftrt_hi_11
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_12,"ax",@progbits
-	.hidden	lshiftrt_hi_12
+	.hidden	lshiftrt_hi_12          # -- Begin function lshiftrt_hi_12
 	.globl	lshiftrt_hi_12
 	.type	lshiftrt_hi_12,@function
 lshiftrt_hi_12:                         # @lshiftrt_hi_12
@@ -833,9 +833,9 @@ lshiftrt_hi_12:                         # @lshiftrt_hi_12
 	.endfunc
 .Lfunc_end52:
 	.size	lshiftrt_hi_12, .Lfunc_end52-lshiftrt_hi_12
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_13,"ax",@progbits
-	.hidden	lshiftrt_hi_13
+	.hidden	lshiftrt_hi_13          # -- Begin function lshiftrt_hi_13
 	.globl	lshiftrt_hi_13
 	.type	lshiftrt_hi_13,@function
 lshiftrt_hi_13:                         # @lshiftrt_hi_13
@@ -848,9 +848,9 @@ lshiftrt_hi_13:                         # @lshiftrt_hi_13
 	.endfunc
 .Lfunc_end53:
 	.size	lshiftrt_hi_13, .Lfunc_end53-lshiftrt_hi_13
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_14,"ax",@progbits
-	.hidden	lshiftrt_hi_14
+	.hidden	lshiftrt_hi_14          # -- Begin function lshiftrt_hi_14
 	.globl	lshiftrt_hi_14
 	.type	lshiftrt_hi_14,@function
 lshiftrt_hi_14:                         # @lshiftrt_hi_14
@@ -863,9 +863,9 @@ lshiftrt_hi_14:                         # @lshiftrt_hi_14
 	.endfunc
 .Lfunc_end54:
 	.size	lshiftrt_hi_14, .Lfunc_end54-lshiftrt_hi_14
-
+                                        # -- End function
 	.section	.text.lshiftrt_hi_15,"ax",@progbits
-	.hidden	lshiftrt_hi_15
+	.hidden	lshiftrt_hi_15          # -- Begin function lshiftrt_hi_15
 	.globl	lshiftrt_hi_15
 	.type	lshiftrt_hi_15,@function
 lshiftrt_hi_15:                         # @lshiftrt_hi_15
@@ -878,9 +878,9 @@ lshiftrt_hi_15:                         # @lshiftrt_hi_15
 	.endfunc
 .Lfunc_end55:
 	.size	lshiftrt_hi_15, .Lfunc_end55-lshiftrt_hi_15
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_0,"ax",@progbits
-	.hidden	ashiftrt_hi_0
+	.hidden	ashiftrt_hi_0           # -- Begin function ashiftrt_hi_0
 	.globl	ashiftrt_hi_0
 	.type	ashiftrt_hi_0,@function
 ashiftrt_hi_0:                          # @ashiftrt_hi_0
@@ -892,9 +892,9 @@ ashiftrt_hi_0:                          # @ashiftrt_hi_0
 	.endfunc
 .Lfunc_end56:
 	.size	ashiftrt_hi_0, .Lfunc_end56-ashiftrt_hi_0
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_1,"ax",@progbits
-	.hidden	ashiftrt_hi_1
+	.hidden	ashiftrt_hi_1           # -- Begin function ashiftrt_hi_1
 	.globl	ashiftrt_hi_1
 	.type	ashiftrt_hi_1,@function
 ashiftrt_hi_1:                          # @ashiftrt_hi_1
@@ -907,9 +907,9 @@ ashiftrt_hi_1:                          # @ashiftrt_hi_1
 	.endfunc
 .Lfunc_end57:
 	.size	ashiftrt_hi_1, .Lfunc_end57-ashiftrt_hi_1
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_2,"ax",@progbits
-	.hidden	ashiftrt_hi_2
+	.hidden	ashiftrt_hi_2           # -- Begin function ashiftrt_hi_2
 	.globl	ashiftrt_hi_2
 	.type	ashiftrt_hi_2,@function
 ashiftrt_hi_2:                          # @ashiftrt_hi_2
@@ -922,9 +922,9 @@ ashiftrt_hi_2:                          # @ashiftrt_hi_2
 	.endfunc
 .Lfunc_end58:
 	.size	ashiftrt_hi_2, .Lfunc_end58-ashiftrt_hi_2
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_3,"ax",@progbits
-	.hidden	ashiftrt_hi_3
+	.hidden	ashiftrt_hi_3           # -- Begin function ashiftrt_hi_3
 	.globl	ashiftrt_hi_3
 	.type	ashiftrt_hi_3,@function
 ashiftrt_hi_3:                          # @ashiftrt_hi_3
@@ -937,9 +937,9 @@ ashiftrt_hi_3:                          # @ashiftrt_hi_3
 	.endfunc
 .Lfunc_end59:
 	.size	ashiftrt_hi_3, .Lfunc_end59-ashiftrt_hi_3
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_4,"ax",@progbits
-	.hidden	ashiftrt_hi_4
+	.hidden	ashiftrt_hi_4           # -- Begin function ashiftrt_hi_4
 	.globl	ashiftrt_hi_4
 	.type	ashiftrt_hi_4,@function
 ashiftrt_hi_4:                          # @ashiftrt_hi_4
@@ -952,9 +952,9 @@ ashiftrt_hi_4:                          # @ashiftrt_hi_4
 	.endfunc
 .Lfunc_end60:
 	.size	ashiftrt_hi_4, .Lfunc_end60-ashiftrt_hi_4
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_5,"ax",@progbits
-	.hidden	ashiftrt_hi_5
+	.hidden	ashiftrt_hi_5           # -- Begin function ashiftrt_hi_5
 	.globl	ashiftrt_hi_5
 	.type	ashiftrt_hi_5,@function
 ashiftrt_hi_5:                          # @ashiftrt_hi_5
@@ -967,9 +967,9 @@ ashiftrt_hi_5:                          # @ashiftrt_hi_5
 	.endfunc
 .Lfunc_end61:
 	.size	ashiftrt_hi_5, .Lfunc_end61-ashiftrt_hi_5
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_6,"ax",@progbits
-	.hidden	ashiftrt_hi_6
+	.hidden	ashiftrt_hi_6           # -- Begin function ashiftrt_hi_6
 	.globl	ashiftrt_hi_6
 	.type	ashiftrt_hi_6,@function
 ashiftrt_hi_6:                          # @ashiftrt_hi_6
@@ -982,9 +982,9 @@ ashiftrt_hi_6:                          # @ashiftrt_hi_6
 	.endfunc
 .Lfunc_end62:
 	.size	ashiftrt_hi_6, .Lfunc_end62-ashiftrt_hi_6
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_7,"ax",@progbits
-	.hidden	ashiftrt_hi_7
+	.hidden	ashiftrt_hi_7           # -- Begin function ashiftrt_hi_7
 	.globl	ashiftrt_hi_7
 	.type	ashiftrt_hi_7,@function
 ashiftrt_hi_7:                          # @ashiftrt_hi_7
@@ -997,9 +997,9 @@ ashiftrt_hi_7:                          # @ashiftrt_hi_7
 	.endfunc
 .Lfunc_end63:
 	.size	ashiftrt_hi_7, .Lfunc_end63-ashiftrt_hi_7
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_8,"ax",@progbits
-	.hidden	ashiftrt_hi_8
+	.hidden	ashiftrt_hi_8           # -- Begin function ashiftrt_hi_8
 	.globl	ashiftrt_hi_8
 	.type	ashiftrt_hi_8,@function
 ashiftrt_hi_8:                          # @ashiftrt_hi_8
@@ -1012,9 +1012,9 @@ ashiftrt_hi_8:                          # @ashiftrt_hi_8
 	.endfunc
 .Lfunc_end64:
 	.size	ashiftrt_hi_8, .Lfunc_end64-ashiftrt_hi_8
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_9,"ax",@progbits
-	.hidden	ashiftrt_hi_9
+	.hidden	ashiftrt_hi_9           # -- Begin function ashiftrt_hi_9
 	.globl	ashiftrt_hi_9
 	.type	ashiftrt_hi_9,@function
 ashiftrt_hi_9:                          # @ashiftrt_hi_9
@@ -1027,9 +1027,9 @@ ashiftrt_hi_9:                          # @ashiftrt_hi_9
 	.endfunc
 .Lfunc_end65:
 	.size	ashiftrt_hi_9, .Lfunc_end65-ashiftrt_hi_9
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_10,"ax",@progbits
-	.hidden	ashiftrt_hi_10
+	.hidden	ashiftrt_hi_10          # -- Begin function ashiftrt_hi_10
 	.globl	ashiftrt_hi_10
 	.type	ashiftrt_hi_10,@function
 ashiftrt_hi_10:                         # @ashiftrt_hi_10
@@ -1042,9 +1042,9 @@ ashiftrt_hi_10:                         # @ashiftrt_hi_10
 	.endfunc
 .Lfunc_end66:
 	.size	ashiftrt_hi_10, .Lfunc_end66-ashiftrt_hi_10
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_11,"ax",@progbits
-	.hidden	ashiftrt_hi_11
+	.hidden	ashiftrt_hi_11          # -- Begin function ashiftrt_hi_11
 	.globl	ashiftrt_hi_11
 	.type	ashiftrt_hi_11,@function
 ashiftrt_hi_11:                         # @ashiftrt_hi_11
@@ -1057,9 +1057,9 @@ ashiftrt_hi_11:                         # @ashiftrt_hi_11
 	.endfunc
 .Lfunc_end67:
 	.size	ashiftrt_hi_11, .Lfunc_end67-ashiftrt_hi_11
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_12,"ax",@progbits
-	.hidden	ashiftrt_hi_12
+	.hidden	ashiftrt_hi_12          # -- Begin function ashiftrt_hi_12
 	.globl	ashiftrt_hi_12
 	.type	ashiftrt_hi_12,@function
 ashiftrt_hi_12:                         # @ashiftrt_hi_12
@@ -1072,9 +1072,9 @@ ashiftrt_hi_12:                         # @ashiftrt_hi_12
 	.endfunc
 .Lfunc_end68:
 	.size	ashiftrt_hi_12, .Lfunc_end68-ashiftrt_hi_12
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_13,"ax",@progbits
-	.hidden	ashiftrt_hi_13
+	.hidden	ashiftrt_hi_13          # -- Begin function ashiftrt_hi_13
 	.globl	ashiftrt_hi_13
 	.type	ashiftrt_hi_13,@function
 ashiftrt_hi_13:                         # @ashiftrt_hi_13
@@ -1087,9 +1087,9 @@ ashiftrt_hi_13:                         # @ashiftrt_hi_13
 	.endfunc
 .Lfunc_end69:
 	.size	ashiftrt_hi_13, .Lfunc_end69-ashiftrt_hi_13
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_14,"ax",@progbits
-	.hidden	ashiftrt_hi_14
+	.hidden	ashiftrt_hi_14          # -- Begin function ashiftrt_hi_14
 	.globl	ashiftrt_hi_14
 	.type	ashiftrt_hi_14,@function
 ashiftrt_hi_14:                         # @ashiftrt_hi_14
@@ -1102,9 +1102,9 @@ ashiftrt_hi_14:                         # @ashiftrt_hi_14
 	.endfunc
 .Lfunc_end70:
 	.size	ashiftrt_hi_14, .Lfunc_end70-ashiftrt_hi_14
-
+                                        # -- End function
 	.section	.text.ashiftrt_hi_15,"ax",@progbits
-	.hidden	ashiftrt_hi_15
+	.hidden	ashiftrt_hi_15          # -- Begin function ashiftrt_hi_15
 	.globl	ashiftrt_hi_15
 	.type	ashiftrt_hi_15,@function
 ashiftrt_hi_15:                         # @ashiftrt_hi_15
@@ -1117,9 +1117,9 @@ ashiftrt_hi_15:                         # @ashiftrt_hi_15
 	.endfunc
 .Lfunc_end71:
 	.size	ashiftrt_hi_15, .Lfunc_end71-ashiftrt_hi_15
-
+                                        # -- End function
 	.section	.text.ashift_si_0,"ax",@progbits
-	.hidden	ashift_si_0
+	.hidden	ashift_si_0             # -- Begin function ashift_si_0
 	.globl	ashift_si_0
 	.type	ashift_si_0,@function
 ashift_si_0:                            # @ashift_si_0
@@ -1131,9 +1131,9 @@ ashift_si_0:                            # @ashift_si_0
 	.endfunc
 .Lfunc_end72:
 	.size	ashift_si_0, .Lfunc_end72-ashift_si_0
-
+                                        # -- End function
 	.section	.text.ashift_si_1,"ax",@progbits
-	.hidden	ashift_si_1
+	.hidden	ashift_si_1             # -- Begin function ashift_si_1
 	.globl	ashift_si_1
 	.type	ashift_si_1,@function
 ashift_si_1:                            # @ashift_si_1
@@ -1146,9 +1146,9 @@ ashift_si_1:                            # @ashift_si_1
 	.endfunc
 .Lfunc_end73:
 	.size	ashift_si_1, .Lfunc_end73-ashift_si_1
-
+                                        # -- End function
 	.section	.text.ashift_si_2,"ax",@progbits
-	.hidden	ashift_si_2
+	.hidden	ashift_si_2             # -- Begin function ashift_si_2
 	.globl	ashift_si_2
 	.type	ashift_si_2,@function
 ashift_si_2:                            # @ashift_si_2
@@ -1161,9 +1161,9 @@ ashift_si_2:                            # @ashift_si_2
 	.endfunc
 .Lfunc_end74:
 	.size	ashift_si_2, .Lfunc_end74-ashift_si_2
-
+                                        # -- End function
 	.section	.text.ashift_si_3,"ax",@progbits
-	.hidden	ashift_si_3
+	.hidden	ashift_si_3             # -- Begin function ashift_si_3
 	.globl	ashift_si_3
 	.type	ashift_si_3,@function
 ashift_si_3:                            # @ashift_si_3
@@ -1176,9 +1176,9 @@ ashift_si_3:                            # @ashift_si_3
 	.endfunc
 .Lfunc_end75:
 	.size	ashift_si_3, .Lfunc_end75-ashift_si_3
-
+                                        # -- End function
 	.section	.text.ashift_si_4,"ax",@progbits
-	.hidden	ashift_si_4
+	.hidden	ashift_si_4             # -- Begin function ashift_si_4
 	.globl	ashift_si_4
 	.type	ashift_si_4,@function
 ashift_si_4:                            # @ashift_si_4
@@ -1191,9 +1191,9 @@ ashift_si_4:                            # @ashift_si_4
 	.endfunc
 .Lfunc_end76:
 	.size	ashift_si_4, .Lfunc_end76-ashift_si_4
-
+                                        # -- End function
 	.section	.text.ashift_si_5,"ax",@progbits
-	.hidden	ashift_si_5
+	.hidden	ashift_si_5             # -- Begin function ashift_si_5
 	.globl	ashift_si_5
 	.type	ashift_si_5,@function
 ashift_si_5:                            # @ashift_si_5
@@ -1206,9 +1206,9 @@ ashift_si_5:                            # @ashift_si_5
 	.endfunc
 .Lfunc_end77:
 	.size	ashift_si_5, .Lfunc_end77-ashift_si_5
-
+                                        # -- End function
 	.section	.text.ashift_si_6,"ax",@progbits
-	.hidden	ashift_si_6
+	.hidden	ashift_si_6             # -- Begin function ashift_si_6
 	.globl	ashift_si_6
 	.type	ashift_si_6,@function
 ashift_si_6:                            # @ashift_si_6
@@ -1221,9 +1221,9 @@ ashift_si_6:                            # @ashift_si_6
 	.endfunc
 .Lfunc_end78:
 	.size	ashift_si_6, .Lfunc_end78-ashift_si_6
-
+                                        # -- End function
 	.section	.text.ashift_si_7,"ax",@progbits
-	.hidden	ashift_si_7
+	.hidden	ashift_si_7             # -- Begin function ashift_si_7
 	.globl	ashift_si_7
 	.type	ashift_si_7,@function
 ashift_si_7:                            # @ashift_si_7
@@ -1236,9 +1236,9 @@ ashift_si_7:                            # @ashift_si_7
 	.endfunc
 .Lfunc_end79:
 	.size	ashift_si_7, .Lfunc_end79-ashift_si_7
-
+                                        # -- End function
 	.section	.text.ashift_si_8,"ax",@progbits
-	.hidden	ashift_si_8
+	.hidden	ashift_si_8             # -- Begin function ashift_si_8
 	.globl	ashift_si_8
 	.type	ashift_si_8,@function
 ashift_si_8:                            # @ashift_si_8
@@ -1251,9 +1251,9 @@ ashift_si_8:                            # @ashift_si_8
 	.endfunc
 .Lfunc_end80:
 	.size	ashift_si_8, .Lfunc_end80-ashift_si_8
-
+                                        # -- End function
 	.section	.text.ashift_si_9,"ax",@progbits
-	.hidden	ashift_si_9
+	.hidden	ashift_si_9             # -- Begin function ashift_si_9
 	.globl	ashift_si_9
 	.type	ashift_si_9,@function
 ashift_si_9:                            # @ashift_si_9
@@ -1266,9 +1266,9 @@ ashift_si_9:                            # @ashift_si_9
 	.endfunc
 .Lfunc_end81:
 	.size	ashift_si_9, .Lfunc_end81-ashift_si_9
-
+                                        # -- End function
 	.section	.text.ashift_si_10,"ax",@progbits
-	.hidden	ashift_si_10
+	.hidden	ashift_si_10            # -- Begin function ashift_si_10
 	.globl	ashift_si_10
 	.type	ashift_si_10,@function
 ashift_si_10:                           # @ashift_si_10
@@ -1281,9 +1281,9 @@ ashift_si_10:                           # @ashift_si_10
 	.endfunc
 .Lfunc_end82:
 	.size	ashift_si_10, .Lfunc_end82-ashift_si_10
-
+                                        # -- End function
 	.section	.text.ashift_si_11,"ax",@progbits
-	.hidden	ashift_si_11
+	.hidden	ashift_si_11            # -- Begin function ashift_si_11
 	.globl	ashift_si_11
 	.type	ashift_si_11,@function
 ashift_si_11:                           # @ashift_si_11
@@ -1296,9 +1296,9 @@ ashift_si_11:                           # @ashift_si_11
 	.endfunc
 .Lfunc_end83:
 	.size	ashift_si_11, .Lfunc_end83-ashift_si_11
-
+                                        # -- End function
 	.section	.text.ashift_si_12,"ax",@progbits
-	.hidden	ashift_si_12
+	.hidden	ashift_si_12            # -- Begin function ashift_si_12
 	.globl	ashift_si_12
 	.type	ashift_si_12,@function
 ashift_si_12:                           # @ashift_si_12
@@ -1311,9 +1311,9 @@ ashift_si_12:                           # @ashift_si_12
 	.endfunc
 .Lfunc_end84:
 	.size	ashift_si_12, .Lfunc_end84-ashift_si_12
-
+                                        # -- End function
 	.section	.text.ashift_si_13,"ax",@progbits
-	.hidden	ashift_si_13
+	.hidden	ashift_si_13            # -- Begin function ashift_si_13
 	.globl	ashift_si_13
 	.type	ashift_si_13,@function
 ashift_si_13:                           # @ashift_si_13
@@ -1326,9 +1326,9 @@ ashift_si_13:                           # @ashift_si_13
 	.endfunc
 .Lfunc_end85:
 	.size	ashift_si_13, .Lfunc_end85-ashift_si_13
-
+                                        # -- End function
 	.section	.text.ashift_si_14,"ax",@progbits
-	.hidden	ashift_si_14
+	.hidden	ashift_si_14            # -- Begin function ashift_si_14
 	.globl	ashift_si_14
 	.type	ashift_si_14,@function
 ashift_si_14:                           # @ashift_si_14
@@ -1341,9 +1341,9 @@ ashift_si_14:                           # @ashift_si_14
 	.endfunc
 .Lfunc_end86:
 	.size	ashift_si_14, .Lfunc_end86-ashift_si_14
-
+                                        # -- End function
 	.section	.text.ashift_si_15,"ax",@progbits
-	.hidden	ashift_si_15
+	.hidden	ashift_si_15            # -- Begin function ashift_si_15
 	.globl	ashift_si_15
 	.type	ashift_si_15,@function
 ashift_si_15:                           # @ashift_si_15
@@ -1356,9 +1356,9 @@ ashift_si_15:                           # @ashift_si_15
 	.endfunc
 .Lfunc_end87:
 	.size	ashift_si_15, .Lfunc_end87-ashift_si_15
-
+                                        # -- End function
 	.section	.text.ashift_si_16,"ax",@progbits
-	.hidden	ashift_si_16
+	.hidden	ashift_si_16            # -- Begin function ashift_si_16
 	.globl	ashift_si_16
 	.type	ashift_si_16,@function
 ashift_si_16:                           # @ashift_si_16
@@ -1371,9 +1371,9 @@ ashift_si_16:                           # @ashift_si_16
 	.endfunc
 .Lfunc_end88:
 	.size	ashift_si_16, .Lfunc_end88-ashift_si_16
-
+                                        # -- End function
 	.section	.text.ashift_si_17,"ax",@progbits
-	.hidden	ashift_si_17
+	.hidden	ashift_si_17            # -- Begin function ashift_si_17
 	.globl	ashift_si_17
 	.type	ashift_si_17,@function
 ashift_si_17:                           # @ashift_si_17
@@ -1386,9 +1386,9 @@ ashift_si_17:                           # @ashift_si_17
 	.endfunc
 .Lfunc_end89:
 	.size	ashift_si_17, .Lfunc_end89-ashift_si_17
-
+                                        # -- End function
 	.section	.text.ashift_si_18,"ax",@progbits
-	.hidden	ashift_si_18
+	.hidden	ashift_si_18            # -- Begin function ashift_si_18
 	.globl	ashift_si_18
 	.type	ashift_si_18,@function
 ashift_si_18:                           # @ashift_si_18
@@ -1401,9 +1401,9 @@ ashift_si_18:                           # @ashift_si_18
 	.endfunc
 .Lfunc_end90:
 	.size	ashift_si_18, .Lfunc_end90-ashift_si_18
-
+                                        # -- End function
 	.section	.text.ashift_si_19,"ax",@progbits
-	.hidden	ashift_si_19
+	.hidden	ashift_si_19            # -- Begin function ashift_si_19
 	.globl	ashift_si_19
 	.type	ashift_si_19,@function
 ashift_si_19:                           # @ashift_si_19
@@ -1416,9 +1416,9 @@ ashift_si_19:                           # @ashift_si_19
 	.endfunc
 .Lfunc_end91:
 	.size	ashift_si_19, .Lfunc_end91-ashift_si_19
-
+                                        # -- End function
 	.section	.text.ashift_si_20,"ax",@progbits
-	.hidden	ashift_si_20
+	.hidden	ashift_si_20            # -- Begin function ashift_si_20
 	.globl	ashift_si_20
 	.type	ashift_si_20,@function
 ashift_si_20:                           # @ashift_si_20
@@ -1431,9 +1431,9 @@ ashift_si_20:                           # @ashift_si_20
 	.endfunc
 .Lfunc_end92:
 	.size	ashift_si_20, .Lfunc_end92-ashift_si_20
-
+                                        # -- End function
 	.section	.text.ashift_si_21,"ax",@progbits
-	.hidden	ashift_si_21
+	.hidden	ashift_si_21            # -- Begin function ashift_si_21
 	.globl	ashift_si_21
 	.type	ashift_si_21,@function
 ashift_si_21:                           # @ashift_si_21
@@ -1446,9 +1446,9 @@ ashift_si_21:                           # @ashift_si_21
 	.endfunc
 .Lfunc_end93:
 	.size	ashift_si_21, .Lfunc_end93-ashift_si_21
-
+                                        # -- End function
 	.section	.text.ashift_si_22,"ax",@progbits
-	.hidden	ashift_si_22
+	.hidden	ashift_si_22            # -- Begin function ashift_si_22
 	.globl	ashift_si_22
 	.type	ashift_si_22,@function
 ashift_si_22:                           # @ashift_si_22
@@ -1461,9 +1461,9 @@ ashift_si_22:                           # @ashift_si_22
 	.endfunc
 .Lfunc_end94:
 	.size	ashift_si_22, .Lfunc_end94-ashift_si_22
-
+                                        # -- End function
 	.section	.text.ashift_si_23,"ax",@progbits
-	.hidden	ashift_si_23
+	.hidden	ashift_si_23            # -- Begin function ashift_si_23
 	.globl	ashift_si_23
 	.type	ashift_si_23,@function
 ashift_si_23:                           # @ashift_si_23
@@ -1476,9 +1476,9 @@ ashift_si_23:                           # @ashift_si_23
 	.endfunc
 .Lfunc_end95:
 	.size	ashift_si_23, .Lfunc_end95-ashift_si_23
-
+                                        # -- End function
 	.section	.text.ashift_si_24,"ax",@progbits
-	.hidden	ashift_si_24
+	.hidden	ashift_si_24            # -- Begin function ashift_si_24
 	.globl	ashift_si_24
 	.type	ashift_si_24,@function
 ashift_si_24:                           # @ashift_si_24
@@ -1491,9 +1491,9 @@ ashift_si_24:                           # @ashift_si_24
 	.endfunc
 .Lfunc_end96:
 	.size	ashift_si_24, .Lfunc_end96-ashift_si_24
-
+                                        # -- End function
 	.section	.text.ashift_si_25,"ax",@progbits
-	.hidden	ashift_si_25
+	.hidden	ashift_si_25            # -- Begin function ashift_si_25
 	.globl	ashift_si_25
 	.type	ashift_si_25,@function
 ashift_si_25:                           # @ashift_si_25
@@ -1506,9 +1506,9 @@ ashift_si_25:                           # @ashift_si_25
 	.endfunc
 .Lfunc_end97:
 	.size	ashift_si_25, .Lfunc_end97-ashift_si_25
-
+                                        # -- End function
 	.section	.text.ashift_si_26,"ax",@progbits
-	.hidden	ashift_si_26
+	.hidden	ashift_si_26            # -- Begin function ashift_si_26
 	.globl	ashift_si_26
 	.type	ashift_si_26,@function
 ashift_si_26:                           # @ashift_si_26
@@ -1521,9 +1521,9 @@ ashift_si_26:                           # @ashift_si_26
 	.endfunc
 .Lfunc_end98:
 	.size	ashift_si_26, .Lfunc_end98-ashift_si_26
-
+                                        # -- End function
 	.section	.text.ashift_si_27,"ax",@progbits
-	.hidden	ashift_si_27
+	.hidden	ashift_si_27            # -- Begin function ashift_si_27
 	.globl	ashift_si_27
 	.type	ashift_si_27,@function
 ashift_si_27:                           # @ashift_si_27
@@ -1536,9 +1536,9 @@ ashift_si_27:                           # @ashift_si_27
 	.endfunc
 .Lfunc_end99:
 	.size	ashift_si_27, .Lfunc_end99-ashift_si_27
-
+                                        # -- End function
 	.section	.text.ashift_si_28,"ax",@progbits
-	.hidden	ashift_si_28
+	.hidden	ashift_si_28            # -- Begin function ashift_si_28
 	.globl	ashift_si_28
 	.type	ashift_si_28,@function
 ashift_si_28:                           # @ashift_si_28
@@ -1551,9 +1551,9 @@ ashift_si_28:                           # @ashift_si_28
 	.endfunc
 .Lfunc_end100:
 	.size	ashift_si_28, .Lfunc_end100-ashift_si_28
-
+                                        # -- End function
 	.section	.text.ashift_si_29,"ax",@progbits
-	.hidden	ashift_si_29
+	.hidden	ashift_si_29            # -- Begin function ashift_si_29
 	.globl	ashift_si_29
 	.type	ashift_si_29,@function
 ashift_si_29:                           # @ashift_si_29
@@ -1566,9 +1566,9 @@ ashift_si_29:                           # @ashift_si_29
 	.endfunc
 .Lfunc_end101:
 	.size	ashift_si_29, .Lfunc_end101-ashift_si_29
-
+                                        # -- End function
 	.section	.text.ashift_si_30,"ax",@progbits
-	.hidden	ashift_si_30
+	.hidden	ashift_si_30            # -- Begin function ashift_si_30
 	.globl	ashift_si_30
 	.type	ashift_si_30,@function
 ashift_si_30:                           # @ashift_si_30
@@ -1581,9 +1581,9 @@ ashift_si_30:                           # @ashift_si_30
 	.endfunc
 .Lfunc_end102:
 	.size	ashift_si_30, .Lfunc_end102-ashift_si_30
-
+                                        # -- End function
 	.section	.text.ashift_si_31,"ax",@progbits
-	.hidden	ashift_si_31
+	.hidden	ashift_si_31            # -- Begin function ashift_si_31
 	.globl	ashift_si_31
 	.type	ashift_si_31,@function
 ashift_si_31:                           # @ashift_si_31
@@ -1596,9 +1596,9 @@ ashift_si_31:                           # @ashift_si_31
 	.endfunc
 .Lfunc_end103:
 	.size	ashift_si_31, .Lfunc_end103-ashift_si_31
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_0,"ax",@progbits
-	.hidden	lshiftrt_si_0
+	.hidden	lshiftrt_si_0           # -- Begin function lshiftrt_si_0
 	.globl	lshiftrt_si_0
 	.type	lshiftrt_si_0,@function
 lshiftrt_si_0:                          # @lshiftrt_si_0
@@ -1610,9 +1610,9 @@ lshiftrt_si_0:                          # @lshiftrt_si_0
 	.endfunc
 .Lfunc_end104:
 	.size	lshiftrt_si_0, .Lfunc_end104-lshiftrt_si_0
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_1,"ax",@progbits
-	.hidden	lshiftrt_si_1
+	.hidden	lshiftrt_si_1           # -- Begin function lshiftrt_si_1
 	.globl	lshiftrt_si_1
 	.type	lshiftrt_si_1,@function
 lshiftrt_si_1:                          # @lshiftrt_si_1
@@ -1625,9 +1625,9 @@ lshiftrt_si_1:                          # @lshiftrt_si_1
 	.endfunc
 .Lfunc_end105:
 	.size	lshiftrt_si_1, .Lfunc_end105-lshiftrt_si_1
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_2,"ax",@progbits
-	.hidden	lshiftrt_si_2
+	.hidden	lshiftrt_si_2           # -- Begin function lshiftrt_si_2
 	.globl	lshiftrt_si_2
 	.type	lshiftrt_si_2,@function
 lshiftrt_si_2:                          # @lshiftrt_si_2
@@ -1640,9 +1640,9 @@ lshiftrt_si_2:                          # @lshiftrt_si_2
 	.endfunc
 .Lfunc_end106:
 	.size	lshiftrt_si_2, .Lfunc_end106-lshiftrt_si_2
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_3,"ax",@progbits
-	.hidden	lshiftrt_si_3
+	.hidden	lshiftrt_si_3           # -- Begin function lshiftrt_si_3
 	.globl	lshiftrt_si_3
 	.type	lshiftrt_si_3,@function
 lshiftrt_si_3:                          # @lshiftrt_si_3
@@ -1655,9 +1655,9 @@ lshiftrt_si_3:                          # @lshiftrt_si_3
 	.endfunc
 .Lfunc_end107:
 	.size	lshiftrt_si_3, .Lfunc_end107-lshiftrt_si_3
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_4,"ax",@progbits
-	.hidden	lshiftrt_si_4
+	.hidden	lshiftrt_si_4           # -- Begin function lshiftrt_si_4
 	.globl	lshiftrt_si_4
 	.type	lshiftrt_si_4,@function
 lshiftrt_si_4:                          # @lshiftrt_si_4
@@ -1670,9 +1670,9 @@ lshiftrt_si_4:                          # @lshiftrt_si_4
 	.endfunc
 .Lfunc_end108:
 	.size	lshiftrt_si_4, .Lfunc_end108-lshiftrt_si_4
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_5,"ax",@progbits
-	.hidden	lshiftrt_si_5
+	.hidden	lshiftrt_si_5           # -- Begin function lshiftrt_si_5
 	.globl	lshiftrt_si_5
 	.type	lshiftrt_si_5,@function
 lshiftrt_si_5:                          # @lshiftrt_si_5
@@ -1685,9 +1685,9 @@ lshiftrt_si_5:                          # @lshiftrt_si_5
 	.endfunc
 .Lfunc_end109:
 	.size	lshiftrt_si_5, .Lfunc_end109-lshiftrt_si_5
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_6,"ax",@progbits
-	.hidden	lshiftrt_si_6
+	.hidden	lshiftrt_si_6           # -- Begin function lshiftrt_si_6
 	.globl	lshiftrt_si_6
 	.type	lshiftrt_si_6,@function
 lshiftrt_si_6:                          # @lshiftrt_si_6
@@ -1700,9 +1700,9 @@ lshiftrt_si_6:                          # @lshiftrt_si_6
 	.endfunc
 .Lfunc_end110:
 	.size	lshiftrt_si_6, .Lfunc_end110-lshiftrt_si_6
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_7,"ax",@progbits
-	.hidden	lshiftrt_si_7
+	.hidden	lshiftrt_si_7           # -- Begin function lshiftrt_si_7
 	.globl	lshiftrt_si_7
 	.type	lshiftrt_si_7,@function
 lshiftrt_si_7:                          # @lshiftrt_si_7
@@ -1715,9 +1715,9 @@ lshiftrt_si_7:                          # @lshiftrt_si_7
 	.endfunc
 .Lfunc_end111:
 	.size	lshiftrt_si_7, .Lfunc_end111-lshiftrt_si_7
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_8,"ax",@progbits
-	.hidden	lshiftrt_si_8
+	.hidden	lshiftrt_si_8           # -- Begin function lshiftrt_si_8
 	.globl	lshiftrt_si_8
 	.type	lshiftrt_si_8,@function
 lshiftrt_si_8:                          # @lshiftrt_si_8
@@ -1730,9 +1730,9 @@ lshiftrt_si_8:                          # @lshiftrt_si_8
 	.endfunc
 .Lfunc_end112:
 	.size	lshiftrt_si_8, .Lfunc_end112-lshiftrt_si_8
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_9,"ax",@progbits
-	.hidden	lshiftrt_si_9
+	.hidden	lshiftrt_si_9           # -- Begin function lshiftrt_si_9
 	.globl	lshiftrt_si_9
 	.type	lshiftrt_si_9,@function
 lshiftrt_si_9:                          # @lshiftrt_si_9
@@ -1745,9 +1745,9 @@ lshiftrt_si_9:                          # @lshiftrt_si_9
 	.endfunc
 .Lfunc_end113:
 	.size	lshiftrt_si_9, .Lfunc_end113-lshiftrt_si_9
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_10,"ax",@progbits
-	.hidden	lshiftrt_si_10
+	.hidden	lshiftrt_si_10          # -- Begin function lshiftrt_si_10
 	.globl	lshiftrt_si_10
 	.type	lshiftrt_si_10,@function
 lshiftrt_si_10:                         # @lshiftrt_si_10
@@ -1760,9 +1760,9 @@ lshiftrt_si_10:                         # @lshiftrt_si_10
 	.endfunc
 .Lfunc_end114:
 	.size	lshiftrt_si_10, .Lfunc_end114-lshiftrt_si_10
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_11,"ax",@progbits
-	.hidden	lshiftrt_si_11
+	.hidden	lshiftrt_si_11          # -- Begin function lshiftrt_si_11
 	.globl	lshiftrt_si_11
 	.type	lshiftrt_si_11,@function
 lshiftrt_si_11:                         # @lshiftrt_si_11
@@ -1775,9 +1775,9 @@ lshiftrt_si_11:                         # @lshiftrt_si_11
 	.endfunc
 .Lfunc_end115:
 	.size	lshiftrt_si_11, .Lfunc_end115-lshiftrt_si_11
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_12,"ax",@progbits
-	.hidden	lshiftrt_si_12
+	.hidden	lshiftrt_si_12          # -- Begin function lshiftrt_si_12
 	.globl	lshiftrt_si_12
 	.type	lshiftrt_si_12,@function
 lshiftrt_si_12:                         # @lshiftrt_si_12
@@ -1790,9 +1790,9 @@ lshiftrt_si_12:                         # @lshiftrt_si_12
 	.endfunc
 .Lfunc_end116:
 	.size	lshiftrt_si_12, .Lfunc_end116-lshiftrt_si_12
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_13,"ax",@progbits
-	.hidden	lshiftrt_si_13
+	.hidden	lshiftrt_si_13          # -- Begin function lshiftrt_si_13
 	.globl	lshiftrt_si_13
 	.type	lshiftrt_si_13,@function
 lshiftrt_si_13:                         # @lshiftrt_si_13
@@ -1805,9 +1805,9 @@ lshiftrt_si_13:                         # @lshiftrt_si_13
 	.endfunc
 .Lfunc_end117:
 	.size	lshiftrt_si_13, .Lfunc_end117-lshiftrt_si_13
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_14,"ax",@progbits
-	.hidden	lshiftrt_si_14
+	.hidden	lshiftrt_si_14          # -- Begin function lshiftrt_si_14
 	.globl	lshiftrt_si_14
 	.type	lshiftrt_si_14,@function
 lshiftrt_si_14:                         # @lshiftrt_si_14
@@ -1820,9 +1820,9 @@ lshiftrt_si_14:                         # @lshiftrt_si_14
 	.endfunc
 .Lfunc_end118:
 	.size	lshiftrt_si_14, .Lfunc_end118-lshiftrt_si_14
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_15,"ax",@progbits
-	.hidden	lshiftrt_si_15
+	.hidden	lshiftrt_si_15          # -- Begin function lshiftrt_si_15
 	.globl	lshiftrt_si_15
 	.type	lshiftrt_si_15,@function
 lshiftrt_si_15:                         # @lshiftrt_si_15
@@ -1835,9 +1835,9 @@ lshiftrt_si_15:                         # @lshiftrt_si_15
 	.endfunc
 .Lfunc_end119:
 	.size	lshiftrt_si_15, .Lfunc_end119-lshiftrt_si_15
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_16,"ax",@progbits
-	.hidden	lshiftrt_si_16
+	.hidden	lshiftrt_si_16          # -- Begin function lshiftrt_si_16
 	.globl	lshiftrt_si_16
 	.type	lshiftrt_si_16,@function
 lshiftrt_si_16:                         # @lshiftrt_si_16
@@ -1850,9 +1850,9 @@ lshiftrt_si_16:                         # @lshiftrt_si_16
 	.endfunc
 .Lfunc_end120:
 	.size	lshiftrt_si_16, .Lfunc_end120-lshiftrt_si_16
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_17,"ax",@progbits
-	.hidden	lshiftrt_si_17
+	.hidden	lshiftrt_si_17          # -- Begin function lshiftrt_si_17
 	.globl	lshiftrt_si_17
 	.type	lshiftrt_si_17,@function
 lshiftrt_si_17:                         # @lshiftrt_si_17
@@ -1865,9 +1865,9 @@ lshiftrt_si_17:                         # @lshiftrt_si_17
 	.endfunc
 .Lfunc_end121:
 	.size	lshiftrt_si_17, .Lfunc_end121-lshiftrt_si_17
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_18,"ax",@progbits
-	.hidden	lshiftrt_si_18
+	.hidden	lshiftrt_si_18          # -- Begin function lshiftrt_si_18
 	.globl	lshiftrt_si_18
 	.type	lshiftrt_si_18,@function
 lshiftrt_si_18:                         # @lshiftrt_si_18
@@ -1880,9 +1880,9 @@ lshiftrt_si_18:                         # @lshiftrt_si_18
 	.endfunc
 .Lfunc_end122:
 	.size	lshiftrt_si_18, .Lfunc_end122-lshiftrt_si_18
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_19,"ax",@progbits
-	.hidden	lshiftrt_si_19
+	.hidden	lshiftrt_si_19          # -- Begin function lshiftrt_si_19
 	.globl	lshiftrt_si_19
 	.type	lshiftrt_si_19,@function
 lshiftrt_si_19:                         # @lshiftrt_si_19
@@ -1895,9 +1895,9 @@ lshiftrt_si_19:                         # @lshiftrt_si_19
 	.endfunc
 .Lfunc_end123:
 	.size	lshiftrt_si_19, .Lfunc_end123-lshiftrt_si_19
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_20,"ax",@progbits
-	.hidden	lshiftrt_si_20
+	.hidden	lshiftrt_si_20          # -- Begin function lshiftrt_si_20
 	.globl	lshiftrt_si_20
 	.type	lshiftrt_si_20,@function
 lshiftrt_si_20:                         # @lshiftrt_si_20
@@ -1910,9 +1910,9 @@ lshiftrt_si_20:                         # @lshiftrt_si_20
 	.endfunc
 .Lfunc_end124:
 	.size	lshiftrt_si_20, .Lfunc_end124-lshiftrt_si_20
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_21,"ax",@progbits
-	.hidden	lshiftrt_si_21
+	.hidden	lshiftrt_si_21          # -- Begin function lshiftrt_si_21
 	.globl	lshiftrt_si_21
 	.type	lshiftrt_si_21,@function
 lshiftrt_si_21:                         # @lshiftrt_si_21
@@ -1925,9 +1925,9 @@ lshiftrt_si_21:                         # @lshiftrt_si_21
 	.endfunc
 .Lfunc_end125:
 	.size	lshiftrt_si_21, .Lfunc_end125-lshiftrt_si_21
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_22,"ax",@progbits
-	.hidden	lshiftrt_si_22
+	.hidden	lshiftrt_si_22          # -- Begin function lshiftrt_si_22
 	.globl	lshiftrt_si_22
 	.type	lshiftrt_si_22,@function
 lshiftrt_si_22:                         # @lshiftrt_si_22
@@ -1940,9 +1940,9 @@ lshiftrt_si_22:                         # @lshiftrt_si_22
 	.endfunc
 .Lfunc_end126:
 	.size	lshiftrt_si_22, .Lfunc_end126-lshiftrt_si_22
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_23,"ax",@progbits
-	.hidden	lshiftrt_si_23
+	.hidden	lshiftrt_si_23          # -- Begin function lshiftrt_si_23
 	.globl	lshiftrt_si_23
 	.type	lshiftrt_si_23,@function
 lshiftrt_si_23:                         # @lshiftrt_si_23
@@ -1955,9 +1955,9 @@ lshiftrt_si_23:                         # @lshiftrt_si_23
 	.endfunc
 .Lfunc_end127:
 	.size	lshiftrt_si_23, .Lfunc_end127-lshiftrt_si_23
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_24,"ax",@progbits
-	.hidden	lshiftrt_si_24
+	.hidden	lshiftrt_si_24          # -- Begin function lshiftrt_si_24
 	.globl	lshiftrt_si_24
 	.type	lshiftrt_si_24,@function
 lshiftrt_si_24:                         # @lshiftrt_si_24
@@ -1970,9 +1970,9 @@ lshiftrt_si_24:                         # @lshiftrt_si_24
 	.endfunc
 .Lfunc_end128:
 	.size	lshiftrt_si_24, .Lfunc_end128-lshiftrt_si_24
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_25,"ax",@progbits
-	.hidden	lshiftrt_si_25
+	.hidden	lshiftrt_si_25          # -- Begin function lshiftrt_si_25
 	.globl	lshiftrt_si_25
 	.type	lshiftrt_si_25,@function
 lshiftrt_si_25:                         # @lshiftrt_si_25
@@ -1985,9 +1985,9 @@ lshiftrt_si_25:                         # @lshiftrt_si_25
 	.endfunc
 .Lfunc_end129:
 	.size	lshiftrt_si_25, .Lfunc_end129-lshiftrt_si_25
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_26,"ax",@progbits
-	.hidden	lshiftrt_si_26
+	.hidden	lshiftrt_si_26          # -- Begin function lshiftrt_si_26
 	.globl	lshiftrt_si_26
 	.type	lshiftrt_si_26,@function
 lshiftrt_si_26:                         # @lshiftrt_si_26
@@ -2000,9 +2000,9 @@ lshiftrt_si_26:                         # @lshiftrt_si_26
 	.endfunc
 .Lfunc_end130:
 	.size	lshiftrt_si_26, .Lfunc_end130-lshiftrt_si_26
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_27,"ax",@progbits
-	.hidden	lshiftrt_si_27
+	.hidden	lshiftrt_si_27          # -- Begin function lshiftrt_si_27
 	.globl	lshiftrt_si_27
 	.type	lshiftrt_si_27,@function
 lshiftrt_si_27:                         # @lshiftrt_si_27
@@ -2015,9 +2015,9 @@ lshiftrt_si_27:                         # @lshiftrt_si_27
 	.endfunc
 .Lfunc_end131:
 	.size	lshiftrt_si_27, .Lfunc_end131-lshiftrt_si_27
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_28,"ax",@progbits
-	.hidden	lshiftrt_si_28
+	.hidden	lshiftrt_si_28          # -- Begin function lshiftrt_si_28
 	.globl	lshiftrt_si_28
 	.type	lshiftrt_si_28,@function
 lshiftrt_si_28:                         # @lshiftrt_si_28
@@ -2030,9 +2030,9 @@ lshiftrt_si_28:                         # @lshiftrt_si_28
 	.endfunc
 .Lfunc_end132:
 	.size	lshiftrt_si_28, .Lfunc_end132-lshiftrt_si_28
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_29,"ax",@progbits
-	.hidden	lshiftrt_si_29
+	.hidden	lshiftrt_si_29          # -- Begin function lshiftrt_si_29
 	.globl	lshiftrt_si_29
 	.type	lshiftrt_si_29,@function
 lshiftrt_si_29:                         # @lshiftrt_si_29
@@ -2045,9 +2045,9 @@ lshiftrt_si_29:                         # @lshiftrt_si_29
 	.endfunc
 .Lfunc_end133:
 	.size	lshiftrt_si_29, .Lfunc_end133-lshiftrt_si_29
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_30,"ax",@progbits
-	.hidden	lshiftrt_si_30
+	.hidden	lshiftrt_si_30          # -- Begin function lshiftrt_si_30
 	.globl	lshiftrt_si_30
 	.type	lshiftrt_si_30,@function
 lshiftrt_si_30:                         # @lshiftrt_si_30
@@ -2060,9 +2060,9 @@ lshiftrt_si_30:                         # @lshiftrt_si_30
 	.endfunc
 .Lfunc_end134:
 	.size	lshiftrt_si_30, .Lfunc_end134-lshiftrt_si_30
-
+                                        # -- End function
 	.section	.text.lshiftrt_si_31,"ax",@progbits
-	.hidden	lshiftrt_si_31
+	.hidden	lshiftrt_si_31          # -- Begin function lshiftrt_si_31
 	.globl	lshiftrt_si_31
 	.type	lshiftrt_si_31,@function
 lshiftrt_si_31:                         # @lshiftrt_si_31
@@ -2075,9 +2075,9 @@ lshiftrt_si_31:                         # @lshiftrt_si_31
 	.endfunc
 .Lfunc_end135:
 	.size	lshiftrt_si_31, .Lfunc_end135-lshiftrt_si_31
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_0,"ax",@progbits
-	.hidden	ashiftrt_si_0
+	.hidden	ashiftrt_si_0           # -- Begin function ashiftrt_si_0
 	.globl	ashiftrt_si_0
 	.type	ashiftrt_si_0,@function
 ashiftrt_si_0:                          # @ashiftrt_si_0
@@ -2089,9 +2089,9 @@ ashiftrt_si_0:                          # @ashiftrt_si_0
 	.endfunc
 .Lfunc_end136:
 	.size	ashiftrt_si_0, .Lfunc_end136-ashiftrt_si_0
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_1,"ax",@progbits
-	.hidden	ashiftrt_si_1
+	.hidden	ashiftrt_si_1           # -- Begin function ashiftrt_si_1
 	.globl	ashiftrt_si_1
 	.type	ashiftrt_si_1,@function
 ashiftrt_si_1:                          # @ashiftrt_si_1
@@ -2104,9 +2104,9 @@ ashiftrt_si_1:                          # @ashiftrt_si_1
 	.endfunc
 .Lfunc_end137:
 	.size	ashiftrt_si_1, .Lfunc_end137-ashiftrt_si_1
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_2,"ax",@progbits
-	.hidden	ashiftrt_si_2
+	.hidden	ashiftrt_si_2           # -- Begin function ashiftrt_si_2
 	.globl	ashiftrt_si_2
 	.type	ashiftrt_si_2,@function
 ashiftrt_si_2:                          # @ashiftrt_si_2
@@ -2119,9 +2119,9 @@ ashiftrt_si_2:                          # @ashiftrt_si_2
 	.endfunc
 .Lfunc_end138:
 	.size	ashiftrt_si_2, .Lfunc_end138-ashiftrt_si_2
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_3,"ax",@progbits
-	.hidden	ashiftrt_si_3
+	.hidden	ashiftrt_si_3           # -- Begin function ashiftrt_si_3
 	.globl	ashiftrt_si_3
 	.type	ashiftrt_si_3,@function
 ashiftrt_si_3:                          # @ashiftrt_si_3
@@ -2134,9 +2134,9 @@ ashiftrt_si_3:                          # @ashiftrt_si_3
 	.endfunc
 .Lfunc_end139:
 	.size	ashiftrt_si_3, .Lfunc_end139-ashiftrt_si_3
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_4,"ax",@progbits
-	.hidden	ashiftrt_si_4
+	.hidden	ashiftrt_si_4           # -- Begin function ashiftrt_si_4
 	.globl	ashiftrt_si_4
 	.type	ashiftrt_si_4,@function
 ashiftrt_si_4:                          # @ashiftrt_si_4
@@ -2149,9 +2149,9 @@ ashiftrt_si_4:                          # @ashiftrt_si_4
 	.endfunc
 .Lfunc_end140:
 	.size	ashiftrt_si_4, .Lfunc_end140-ashiftrt_si_4
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_5,"ax",@progbits
-	.hidden	ashiftrt_si_5
+	.hidden	ashiftrt_si_5           # -- Begin function ashiftrt_si_5
 	.globl	ashiftrt_si_5
 	.type	ashiftrt_si_5,@function
 ashiftrt_si_5:                          # @ashiftrt_si_5
@@ -2164,9 +2164,9 @@ ashiftrt_si_5:                          # @ashiftrt_si_5
 	.endfunc
 .Lfunc_end141:
 	.size	ashiftrt_si_5, .Lfunc_end141-ashiftrt_si_5
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_6,"ax",@progbits
-	.hidden	ashiftrt_si_6
+	.hidden	ashiftrt_si_6           # -- Begin function ashiftrt_si_6
 	.globl	ashiftrt_si_6
 	.type	ashiftrt_si_6,@function
 ashiftrt_si_6:                          # @ashiftrt_si_6
@@ -2179,9 +2179,9 @@ ashiftrt_si_6:                          # @ashiftrt_si_6
 	.endfunc
 .Lfunc_end142:
 	.size	ashiftrt_si_6, .Lfunc_end142-ashiftrt_si_6
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_7,"ax",@progbits
-	.hidden	ashiftrt_si_7
+	.hidden	ashiftrt_si_7           # -- Begin function ashiftrt_si_7
 	.globl	ashiftrt_si_7
 	.type	ashiftrt_si_7,@function
 ashiftrt_si_7:                          # @ashiftrt_si_7
@@ -2194,9 +2194,9 @@ ashiftrt_si_7:                          # @ashiftrt_si_7
 	.endfunc
 .Lfunc_end143:
 	.size	ashiftrt_si_7, .Lfunc_end143-ashiftrt_si_7
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_8,"ax",@progbits
-	.hidden	ashiftrt_si_8
+	.hidden	ashiftrt_si_8           # -- Begin function ashiftrt_si_8
 	.globl	ashiftrt_si_8
 	.type	ashiftrt_si_8,@function
 ashiftrt_si_8:                          # @ashiftrt_si_8
@@ -2209,9 +2209,9 @@ ashiftrt_si_8:                          # @ashiftrt_si_8
 	.endfunc
 .Lfunc_end144:
 	.size	ashiftrt_si_8, .Lfunc_end144-ashiftrt_si_8
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_9,"ax",@progbits
-	.hidden	ashiftrt_si_9
+	.hidden	ashiftrt_si_9           # -- Begin function ashiftrt_si_9
 	.globl	ashiftrt_si_9
 	.type	ashiftrt_si_9,@function
 ashiftrt_si_9:                          # @ashiftrt_si_9
@@ -2224,9 +2224,9 @@ ashiftrt_si_9:                          # @ashiftrt_si_9
 	.endfunc
 .Lfunc_end145:
 	.size	ashiftrt_si_9, .Lfunc_end145-ashiftrt_si_9
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_10,"ax",@progbits
-	.hidden	ashiftrt_si_10
+	.hidden	ashiftrt_si_10          # -- Begin function ashiftrt_si_10
 	.globl	ashiftrt_si_10
 	.type	ashiftrt_si_10,@function
 ashiftrt_si_10:                         # @ashiftrt_si_10
@@ -2239,9 +2239,9 @@ ashiftrt_si_10:                         # @ashiftrt_si_10
 	.endfunc
 .Lfunc_end146:
 	.size	ashiftrt_si_10, .Lfunc_end146-ashiftrt_si_10
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_11,"ax",@progbits
-	.hidden	ashiftrt_si_11
+	.hidden	ashiftrt_si_11          # -- Begin function ashiftrt_si_11
 	.globl	ashiftrt_si_11
 	.type	ashiftrt_si_11,@function
 ashiftrt_si_11:                         # @ashiftrt_si_11
@@ -2254,9 +2254,9 @@ ashiftrt_si_11:                         # @ashiftrt_si_11
 	.endfunc
 .Lfunc_end147:
 	.size	ashiftrt_si_11, .Lfunc_end147-ashiftrt_si_11
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_12,"ax",@progbits
-	.hidden	ashiftrt_si_12
+	.hidden	ashiftrt_si_12          # -- Begin function ashiftrt_si_12
 	.globl	ashiftrt_si_12
 	.type	ashiftrt_si_12,@function
 ashiftrt_si_12:                         # @ashiftrt_si_12
@@ -2269,9 +2269,9 @@ ashiftrt_si_12:                         # @ashiftrt_si_12
 	.endfunc
 .Lfunc_end148:
 	.size	ashiftrt_si_12, .Lfunc_end148-ashiftrt_si_12
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_13,"ax",@progbits
-	.hidden	ashiftrt_si_13
+	.hidden	ashiftrt_si_13          # -- Begin function ashiftrt_si_13
 	.globl	ashiftrt_si_13
 	.type	ashiftrt_si_13,@function
 ashiftrt_si_13:                         # @ashiftrt_si_13
@@ -2284,9 +2284,9 @@ ashiftrt_si_13:                         # @ashiftrt_si_13
 	.endfunc
 .Lfunc_end149:
 	.size	ashiftrt_si_13, .Lfunc_end149-ashiftrt_si_13
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_14,"ax",@progbits
-	.hidden	ashiftrt_si_14
+	.hidden	ashiftrt_si_14          # -- Begin function ashiftrt_si_14
 	.globl	ashiftrt_si_14
 	.type	ashiftrt_si_14,@function
 ashiftrt_si_14:                         # @ashiftrt_si_14
@@ -2299,9 +2299,9 @@ ashiftrt_si_14:                         # @ashiftrt_si_14
 	.endfunc
 .Lfunc_end150:
 	.size	ashiftrt_si_14, .Lfunc_end150-ashiftrt_si_14
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_15,"ax",@progbits
-	.hidden	ashiftrt_si_15
+	.hidden	ashiftrt_si_15          # -- Begin function ashiftrt_si_15
 	.globl	ashiftrt_si_15
 	.type	ashiftrt_si_15,@function
 ashiftrt_si_15:                         # @ashiftrt_si_15
@@ -2314,9 +2314,9 @@ ashiftrt_si_15:                         # @ashiftrt_si_15
 	.endfunc
 .Lfunc_end151:
 	.size	ashiftrt_si_15, .Lfunc_end151-ashiftrt_si_15
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_16,"ax",@progbits
-	.hidden	ashiftrt_si_16
+	.hidden	ashiftrt_si_16          # -- Begin function ashiftrt_si_16
 	.globl	ashiftrt_si_16
 	.type	ashiftrt_si_16,@function
 ashiftrt_si_16:                         # @ashiftrt_si_16
@@ -2329,9 +2329,9 @@ ashiftrt_si_16:                         # @ashiftrt_si_16
 	.endfunc
 .Lfunc_end152:
 	.size	ashiftrt_si_16, .Lfunc_end152-ashiftrt_si_16
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_17,"ax",@progbits
-	.hidden	ashiftrt_si_17
+	.hidden	ashiftrt_si_17          # -- Begin function ashiftrt_si_17
 	.globl	ashiftrt_si_17
 	.type	ashiftrt_si_17,@function
 ashiftrt_si_17:                         # @ashiftrt_si_17
@@ -2344,9 +2344,9 @@ ashiftrt_si_17:                         # @ashiftrt_si_17
 	.endfunc
 .Lfunc_end153:
 	.size	ashiftrt_si_17, .Lfunc_end153-ashiftrt_si_17
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_18,"ax",@progbits
-	.hidden	ashiftrt_si_18
+	.hidden	ashiftrt_si_18          # -- Begin function ashiftrt_si_18
 	.globl	ashiftrt_si_18
 	.type	ashiftrt_si_18,@function
 ashiftrt_si_18:                         # @ashiftrt_si_18
@@ -2359,9 +2359,9 @@ ashiftrt_si_18:                         # @ashiftrt_si_18
 	.endfunc
 .Lfunc_end154:
 	.size	ashiftrt_si_18, .Lfunc_end154-ashiftrt_si_18
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_19,"ax",@progbits
-	.hidden	ashiftrt_si_19
+	.hidden	ashiftrt_si_19          # -- Begin function ashiftrt_si_19
 	.globl	ashiftrt_si_19
 	.type	ashiftrt_si_19,@function
 ashiftrt_si_19:                         # @ashiftrt_si_19
@@ -2374,9 +2374,9 @@ ashiftrt_si_19:                         # @ashiftrt_si_19
 	.endfunc
 .Lfunc_end155:
 	.size	ashiftrt_si_19, .Lfunc_end155-ashiftrt_si_19
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_20,"ax",@progbits
-	.hidden	ashiftrt_si_20
+	.hidden	ashiftrt_si_20          # -- Begin function ashiftrt_si_20
 	.globl	ashiftrt_si_20
 	.type	ashiftrt_si_20,@function
 ashiftrt_si_20:                         # @ashiftrt_si_20
@@ -2389,9 +2389,9 @@ ashiftrt_si_20:                         # @ashiftrt_si_20
 	.endfunc
 .Lfunc_end156:
 	.size	ashiftrt_si_20, .Lfunc_end156-ashiftrt_si_20
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_21,"ax",@progbits
-	.hidden	ashiftrt_si_21
+	.hidden	ashiftrt_si_21          # -- Begin function ashiftrt_si_21
 	.globl	ashiftrt_si_21
 	.type	ashiftrt_si_21,@function
 ashiftrt_si_21:                         # @ashiftrt_si_21
@@ -2404,9 +2404,9 @@ ashiftrt_si_21:                         # @ashiftrt_si_21
 	.endfunc
 .Lfunc_end157:
 	.size	ashiftrt_si_21, .Lfunc_end157-ashiftrt_si_21
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_22,"ax",@progbits
-	.hidden	ashiftrt_si_22
+	.hidden	ashiftrt_si_22          # -- Begin function ashiftrt_si_22
 	.globl	ashiftrt_si_22
 	.type	ashiftrt_si_22,@function
 ashiftrt_si_22:                         # @ashiftrt_si_22
@@ -2419,9 +2419,9 @@ ashiftrt_si_22:                         # @ashiftrt_si_22
 	.endfunc
 .Lfunc_end158:
 	.size	ashiftrt_si_22, .Lfunc_end158-ashiftrt_si_22
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_23,"ax",@progbits
-	.hidden	ashiftrt_si_23
+	.hidden	ashiftrt_si_23          # -- Begin function ashiftrt_si_23
 	.globl	ashiftrt_si_23
 	.type	ashiftrt_si_23,@function
 ashiftrt_si_23:                         # @ashiftrt_si_23
@@ -2434,9 +2434,9 @@ ashiftrt_si_23:                         # @ashiftrt_si_23
 	.endfunc
 .Lfunc_end159:
 	.size	ashiftrt_si_23, .Lfunc_end159-ashiftrt_si_23
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_24,"ax",@progbits
-	.hidden	ashiftrt_si_24
+	.hidden	ashiftrt_si_24          # -- Begin function ashiftrt_si_24
 	.globl	ashiftrt_si_24
 	.type	ashiftrt_si_24,@function
 ashiftrt_si_24:                         # @ashiftrt_si_24
@@ -2449,9 +2449,9 @@ ashiftrt_si_24:                         # @ashiftrt_si_24
 	.endfunc
 .Lfunc_end160:
 	.size	ashiftrt_si_24, .Lfunc_end160-ashiftrt_si_24
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_25,"ax",@progbits
-	.hidden	ashiftrt_si_25
+	.hidden	ashiftrt_si_25          # -- Begin function ashiftrt_si_25
 	.globl	ashiftrt_si_25
 	.type	ashiftrt_si_25,@function
 ashiftrt_si_25:                         # @ashiftrt_si_25
@@ -2464,9 +2464,9 @@ ashiftrt_si_25:                         # @ashiftrt_si_25
 	.endfunc
 .Lfunc_end161:
 	.size	ashiftrt_si_25, .Lfunc_end161-ashiftrt_si_25
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_26,"ax",@progbits
-	.hidden	ashiftrt_si_26
+	.hidden	ashiftrt_si_26          # -- Begin function ashiftrt_si_26
 	.globl	ashiftrt_si_26
 	.type	ashiftrt_si_26,@function
 ashiftrt_si_26:                         # @ashiftrt_si_26
@@ -2479,9 +2479,9 @@ ashiftrt_si_26:                         # @ashiftrt_si_26
 	.endfunc
 .Lfunc_end162:
 	.size	ashiftrt_si_26, .Lfunc_end162-ashiftrt_si_26
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_27,"ax",@progbits
-	.hidden	ashiftrt_si_27
+	.hidden	ashiftrt_si_27          # -- Begin function ashiftrt_si_27
 	.globl	ashiftrt_si_27
 	.type	ashiftrt_si_27,@function
 ashiftrt_si_27:                         # @ashiftrt_si_27
@@ -2494,9 +2494,9 @@ ashiftrt_si_27:                         # @ashiftrt_si_27
 	.endfunc
 .Lfunc_end163:
 	.size	ashiftrt_si_27, .Lfunc_end163-ashiftrt_si_27
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_28,"ax",@progbits
-	.hidden	ashiftrt_si_28
+	.hidden	ashiftrt_si_28          # -- Begin function ashiftrt_si_28
 	.globl	ashiftrt_si_28
 	.type	ashiftrt_si_28,@function
 ashiftrt_si_28:                         # @ashiftrt_si_28
@@ -2509,9 +2509,9 @@ ashiftrt_si_28:                         # @ashiftrt_si_28
 	.endfunc
 .Lfunc_end164:
 	.size	ashiftrt_si_28, .Lfunc_end164-ashiftrt_si_28
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_29,"ax",@progbits
-	.hidden	ashiftrt_si_29
+	.hidden	ashiftrt_si_29          # -- Begin function ashiftrt_si_29
 	.globl	ashiftrt_si_29
 	.type	ashiftrt_si_29,@function
 ashiftrt_si_29:                         # @ashiftrt_si_29
@@ -2524,9 +2524,9 @@ ashiftrt_si_29:                         # @ashiftrt_si_29
 	.endfunc
 .Lfunc_end165:
 	.size	ashiftrt_si_29, .Lfunc_end165-ashiftrt_si_29
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_30,"ax",@progbits
-	.hidden	ashiftrt_si_30
+	.hidden	ashiftrt_si_30          # -- Begin function ashiftrt_si_30
 	.globl	ashiftrt_si_30
 	.type	ashiftrt_si_30,@function
 ashiftrt_si_30:                         # @ashiftrt_si_30
@@ -2539,9 +2539,9 @@ ashiftrt_si_30:                         # @ashiftrt_si_30
 	.endfunc
 .Lfunc_end166:
 	.size	ashiftrt_si_30, .Lfunc_end166-ashiftrt_si_30
-
+                                        # -- End function
 	.section	.text.ashiftrt_si_31,"ax",@progbits
-	.hidden	ashiftrt_si_31
+	.hidden	ashiftrt_si_31          # -- Begin function ashiftrt_si_31
 	.globl	ashiftrt_si_31
 	.type	ashiftrt_si_31,@function
 ashiftrt_si_31:                         # @ashiftrt_si_31
@@ -2554,9 +2554,9 @@ ashiftrt_si_31:                         # @ashiftrt_si_31
 	.endfunc
 .Lfunc_end167:
 	.size	ashiftrt_si_31, .Lfunc_end167-ashiftrt_si_31
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -2568,7 +2568,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end168:
 	.size	main, .Lfunc_end168-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020118-1.c.s b/test/torture-s/20020118-1.c.s
index dec9d60a5..02238627d 100644
--- a/test/torture-s/20020118-1.c.s
+++ b/test/torture-s/20020118-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020118-1.c"
+	.file	"20020118-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -53,9 +53,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -67,7 +67,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	q                       # @q
 	.type	q,@object
 	.section	.bss.q,"aw",@nobits
@@ -87,5 +87,5 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020127-1.c.s b/test/torture-s/20020127-1.c.s
index 33fd95bcd..aad28fa2e 100644
--- a/test/torture-s/20020127-1.c.s
+++ b/test/torture-s/20020127-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020127-1.c"
+	.file	"20020127-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020129-1.c.s b/test/torture-s/20020129-1.c.s
index 2436efdbd..a473f8bc4 100644
--- a/test/torture-s/20020129-1.c.s
+++ b/test/torture-s/20020129-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020129-1.c"
+	.file	"20020129-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -66,43 +66,40 @@ foo:                                    # @foo
 	i32.const	$push18=, -1
 	i32.store	0($pop12), $pop18
 	return
-.LBB0_8:                                # %if.then26
+.LBB0_8:                                # %if.then6
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push1=, 0
-	i32.const	$push0=, 145
-	i32.store	y+12($pop1), $pop0
-	i32.const	$push10=, 0
-	i32.const	$push2=, 6
-	i32.store	y($pop10), $pop2
-	i32.const	$push9=, 0
-	i32.const	$push3=, 2448
-	i32.store	y+16($pop9), $pop3
+	i32.const	$push0=, 6
+	i32.store	y($pop1), $pop0
 	i32.const	$push8=, 0
-	i32.const	$push4=, -1
-	i32.store	x+12($pop8), $pop4
-	i32.const	$push6=, x
-	i32.const	$push5=, y
-	call    	foo@FUNCTION, $pop6, $pop5
+	i64.const	$push2=, 10514079940753
+	i64.store	y+12($pop8):p2align=2, $pop2
 	i32.const	$push7=, 0
-	call    	exit@FUNCTION, $pop7
+	i32.const	$push3=, -1
+	i32.store	x+12($pop7), $pop3
+	i32.const	$push5=, x
+	i32.const	$push4=, y
+	call    	foo@FUNCTION, $pop5, $pop4
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	y                       # @y
 	.type	y,@object
 	.section	.bss.y,"aw",@nobits
@@ -122,6 +119,6 @@ x:
 	.size	x, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020201-1.c.s b/test/torture-s/20020201-1.c.s
index 5489ed32d..528ea45de 100644
--- a/test/torture-s/20020201-1.c.s
+++ b/test/torture-s/20020201-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020201-1.c"
+	.file	"20020201-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,99 +10,91 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	block   	
 	i32.const	$push0=, 0
-	i32.load8_u	$push43=, cx($pop0)
-	tee_local	$push42=, $0=, $pop43
+	i32.load8_u	$push38=, cx($pop0)
+	tee_local	$push37=, $0=, $pop38
 	i32.const	$push1=, -6
-	i32.add 	$push2=, $pop42, $pop1
-	i32.const	$push41=, 255
-	i32.and 	$push3=, $pop2, $pop41
-	i32.const	$push40=, 6
-	i32.ge_u	$push4=, $pop3, $pop40
-	br_if   	0, $pop4        # 0: down to label0
+	i32.add 	$push2=, $pop37, $pop1
+	i32.const	$push36=, 6
+	i32.ge_u	$push3=, $pop2, $pop36
+	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push45=, 255
-	i32.and 	$push5=, $0, $pop45
-	i32.const	$push44=, 6
-	i32.rem_u	$push6=, $pop5, $pop44
-	i32.const	$push7=, 1
-	i32.ne  	$push8=, $pop6, $pop7
-	br_if   	0, $pop8        # 0: down to label0
+	i32.const	$push39=, 6
+	i32.rem_u	$push4=, $0, $pop39
+	i32.const	$push5=, 1
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	0, $pop6        # 0: down to label0
 # BB#2:                                 # %if.end10
-	i32.const	$push9=, 0
-	i32.load16_u	$push49=, sx($pop9)
-	tee_local	$push48=, $0=, $pop49
-	i32.const	$push10=, -12
-	i32.add 	$push11=, $pop48, $pop10
-	i32.const	$push47=, 65535
-	i32.and 	$push12=, $pop11, $pop47
-	i32.const	$push46=, 6
-	i32.ge_u	$push13=, $pop12, $pop46
-	br_if   	0, $pop13       # 0: down to label0
+	i32.const	$push7=, 0
+	i32.load16_u	$push42=, sx($pop7)
+	tee_local	$push41=, $0=, $pop42
+	i32.const	$push8=, -12
+	i32.add 	$push9=, $pop41, $pop8
+	i32.const	$push40=, 6
+	i32.ge_u	$push10=, $pop9, $pop40
+	br_if   	0, $pop10       # 0: down to label0
 # BB#3:                                 # %if.end18
-	i32.const	$push51=, 65535
-	i32.and 	$push14=, $0, $pop51
-	i32.const	$push50=, 6
-	i32.rem_u	$push15=, $pop14, $pop50
-	i32.const	$push16=, 2
-	i32.ne  	$push17=, $pop15, $pop16
-	br_if   	0, $pop17       # 0: down to label0
+	i32.const	$push43=, 6
+	i32.rem_u	$push11=, $0, $pop43
+	i32.const	$push12=, 2
+	i32.ne  	$push13=, $pop11, $pop12
+	br_if   	0, $pop13       # 0: down to label0
 # BB#4:                                 # %if.end26
-	i32.const	$push18=, 0
-	i32.load	$push54=, ix($pop18)
-	tee_local	$push53=, $0=, $pop54
-	i32.const	$push19=, -18
-	i32.add 	$push20=, $pop53, $pop19
-	i32.const	$push52=, 6
-	i32.ge_u	$push21=, $pop20, $pop52
-	br_if   	0, $pop21       # 0: down to label0
+	i32.const	$push14=, 0
+	i32.load	$push46=, ix($pop14)
+	tee_local	$push45=, $0=, $pop46
+	i32.const	$push15=, -18
+	i32.add 	$push16=, $pop45, $pop15
+	i32.const	$push44=, 6
+	i32.ge_u	$push17=, $pop16, $pop44
+	br_if   	0, $pop17       # 0: down to label0
 # BB#5:                                 # %if.end31
-	i32.const	$push55=, 6
-	i32.rem_u	$push22=, $0, $pop55
-	i32.const	$push23=, 3
-	i32.ne  	$push24=, $pop22, $pop23
-	br_if   	0, $pop24       # 0: down to label0
+	i32.const	$push47=, 6
+	i32.rem_u	$push18=, $0, $pop47
+	i32.const	$push19=, 3
+	i32.ne  	$push20=, $pop18, $pop19
+	br_if   	0, $pop20       # 0: down to label0
 # BB#6:                                 # %if.end36
-	i32.const	$push25=, 0
-	i32.load	$push58=, lx($pop25)
-	tee_local	$push57=, $0=, $pop58
-	i32.const	$push26=, -24
-	i32.add 	$push27=, $pop57, $pop26
-	i32.const	$push56=, 6
-	i32.ge_u	$push28=, $pop27, $pop56
-	br_if   	0, $pop28       # 0: down to label0
+	i32.const	$push21=, 0
+	i32.load	$push50=, lx($pop21)
+	tee_local	$push49=, $0=, $pop50
+	i32.const	$push22=, -24
+	i32.add 	$push23=, $pop49, $pop22
+	i32.const	$push48=, 6
+	i32.ge_u	$push24=, $pop23, $pop48
+	br_if   	0, $pop24       # 0: down to label0
 # BB#7:                                 # %if.end41
-	i32.const	$push59=, 6
-	i32.rem_u	$push29=, $0, $pop59
-	i32.const	$push30=, 4
-	i32.ne  	$push31=, $pop29, $pop30
-	br_if   	0, $pop31       # 0: down to label0
+	i32.const	$push51=, 6
+	i32.rem_u	$push25=, $0, $pop51
+	i32.const	$push26=, 4
+	i32.ne  	$push27=, $pop25, $pop26
+	br_if   	0, $pop27       # 0: down to label0
 # BB#8:                                 # %if.end46
-	i32.const	$push32=, 0
-	i64.load	$push62=, Lx($pop32)
-	tee_local	$push61=, $1=, $pop62
-	i64.const	$push33=, -30
-	i64.add 	$push34=, $pop61, $pop33
-	i64.const	$push60=, 6
-	i64.ge_u	$push35=, $pop34, $pop60
-	br_if   	0, $pop35       # 0: down to label0
+	i32.const	$push28=, 0
+	i64.load	$push54=, Lx($pop28)
+	tee_local	$push53=, $1=, $pop54
+	i64.const	$push29=, -30
+	i64.add 	$push30=, $pop53, $pop29
+	i64.const	$push52=, 6
+	i64.ge_u	$push31=, $pop30, $pop52
+	br_if   	0, $pop31       # 0: down to label0
 # BB#9:                                 # %if.end51
-	i64.const	$push63=, 6
-	i64.rem_u	$push36=, $1, $pop63
-	i64.const	$push37=, 5
-	i64.ne  	$push38=, $pop36, $pop37
-	br_if   	0, $pop38       # 0: down to label0
+	i64.const	$push55=, 6
+	i64.rem_u	$push32=, $1, $pop55
+	i64.const	$push33=, 5
+	i64.ne  	$push34=, $pop32, $pop33
+	br_if   	0, $pop34       # 0: down to label0
 # BB#10:                                # %if.end56
-	i32.const	$push39=, 0
-	call    	exit@FUNCTION, $pop39
+	i32.const	$push35=, 0
+	call    	exit@FUNCTION, $pop35
 	unreachable
-.LBB0_11:                               # %if.then55
+.LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	cx                      # @cx
 	.type	cx,@object
 	.section	.data.cx,"aw",@progbits
@@ -148,6 +140,6 @@ Lx:
 	.size	Lx, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020206-1.c.s b/test/torture-s/20020206-1.c.s
index 248d88a99..e6e63490f 100644
--- a/test/torture-s/20020206-1.c.s
+++ b/test/torture-s/20020206-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020206-1.c"
+	.file	"20020206-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -15,9 +15,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -47,9 +47,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,10 +57,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i32.const	$push0=, 31
@@ -74,8 +74,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020206-2.c.s b/test/torture-s/20020206-2.c.s
index 9633f920b..77d8bef1b 100644
--- a/test/torture-s/20020206-2.c.s
+++ b/test/torture-s/20020206-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020206-2.c"
+	.file	"20020206-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,23 +22,23 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %foo.exit.1
+# BB#0:                                 # %for.cond.1
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020213-1.c.s b/test/torture-s/20020213-1.c.s
index 75e7f239c..ab70c7e8f 100644
--- a/test/torture-s/20020213-1.c.s
+++ b/test/torture-s/20020213-1.c.s
@@ -1,27 +1,28 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020213-1.c"
+	.file	"20020213-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push3=, 2241
-	i32.const	$push10=, 0
-	i32.load	$push1=, b($pop10)
-	i32.const	$push2=, -1
-	i32.add 	$push9=, $pop1, $pop2
-	tee_local	$push8=, $0=, $pop9
+	i32.const	$push12=, 0
+	i32.load	$push11=, b($pop12)
+	tee_local	$push10=, $0=, $pop11
+	i32.const	$push1=, -1
+	i32.add 	$push9=, $pop10, $pop1
+	tee_local	$push8=, $1=, $pop9
+	i32.const	$push2=, 2241
 	i32.const	$push7=, 2241
-	i32.gt_s	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	i32.select	$push4=, $pop3, $pop8, $pop5
+	i32.lt_s	$push3=, $1, $pop7
+	i32.select	$push4=, $pop8, $pop2, $pop3
 	i32.store	a+4($pop0), $pop4
 	block   	
-	i32.eqz 	$push11=, $0
-	br_if   	0, $pop11       # 0: down to label0
+	i32.const	$push5=, 2242
+	i32.le_s	$push6=, $0, $pop5
+	br_if   	0, $pop6        # 0: down to label0
 # BB#1:                                 # %if.end
 	return
 .LBB0_2:                                # %if.then
@@ -31,9 +32,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -45,9 +46,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -64,7 +65,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -84,5 +85,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20020215-1.c.s b/test/torture-s/20020215-1.c.s
index 055ef3cd2..e12c43455 100644
--- a/test/torture-s/20020215-1.c.s
+++ b/test/torture-s/20020215-1.c.s
@@ -1,35 +1,31 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020215-1.c"
+	.file	"20020215-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
 # BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
-	i32.store	0($0), $pop0
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push11=, 8
-	i32.add 	$push3=, $1, $pop11
-	i32.load	$push4=, 0($pop3)
-	i32.store	0($pop2), $pop4
-	i32.const	$push5=, 4
-	i32.add 	$push6=, $0, $pop5
-	i32.load	$push7=, 4($1)
-	i32.const	$push8=, 1
-	i32.add 	$push10=, $pop7, $pop8
-	tee_local	$push9=, $0=, $pop10
-	i32.store	0($pop6), $pop9
-	i32.store	4($1), $0
+	i32.load	$push0=, 4($1)
+	i32.const	$push1=, 1
+	i32.add 	$push2=, $pop0, $pop1
+	i32.store	4($1), $pop2
+	i32.const	$push3=, 8
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push8=, 8
+	i32.add 	$push5=, $1, $pop8
+	i32.load	$push6=, 0($pop5)
+	i32.store	0($pop4), $pop6
+	i64.load	$push7=, 0($1):p2align=2
+	i64.store	0($0):p2align=2, $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020216-1.c.s b/test/torture-s/20020216-1.c.s
index 40c0adab5..42e37181c 100644
--- a/test/torture-s/20020216-1.c.s
+++ b/test/torture-s/20020216-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020216-1.c"
+	.file	"20020216-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -54,6 +54,6 @@ c:
 	.size	c, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020219-1.c.s b/test/torture-s/20020219-1.c.s
index a15f61dcf..f33a8b8c2 100644
--- a/test/torture-s/20020219-1.c.s
+++ b/test/torture-s/20020219-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020219-1.c"
+	.file	"20020219-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020225-1.c.s b/test/torture-s/20020225-1.c.s
index 1af327654..63f5da613 100644
--- a/test/torture-s/20020225-1.c.s
+++ b/test/torture-s/20020225-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020225-1.c"
+	.file	"20020225-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020225-2.c.s b/test/torture-s/20020225-2.c.s
index ace2b29d2..3d24c36e3 100644
--- a/test/torture-s/20020225-2.c.s
+++ b/test/torture-s/20020225-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020225-2.c"
+	.file	"20020225-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020226-1.c.s b/test/torture-s/20020226-1.c.s
index f9485e7e6..6ced74add 100644
--- a/test/torture-s/20020226-1.c.s
+++ b/test/torture-s/20020226-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020226-1.c"
+	.file	"20020226-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -193,14 +193,14 @@ main:                                   # @main
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
 	unreachable
-.LBB0_22:                               # %if.then187
+.LBB0_22:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	uc                      # @uc
 	.type	uc,@object
 	.section	.data.uc,"aw",@progbits
@@ -264,6 +264,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020227-1.c.s b/test/torture-s/20020227-1.c.s
index c3aba7edb..87d486911 100644
--- a/test/torture-s/20020227-1.c.s
+++ b/test/torture-s/20020227-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020227-1.c"
+	.file	"20020227-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -24,9 +24,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -58,8 +58,8 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end2:
 	.size	f2, .Lfunc_end2-f2
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20020307-1.c.s b/test/torture-s/20020307-1.c.s
index 371be9386..7dd1ae2c9 100644
--- a/test/torture-s/20020307-1.c.s
+++ b/test/torture-s/20020307-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020307-1.c"
+	.file	"20020307-1.c"
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -11,7 +11,7 @@ f3:                                     # @f3
 	i32.const	$push0=, 6
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push3=, 6
-	i32.ge_u	$push2=, $pop1, $pop3
+	i32.eq  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.end
 	return
@@ -22,9 +22,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end0:
 	.size	f3, .Lfunc_end0-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -45,9 +45,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end1:
 	.size	f4, .Lfunc_end1-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -68,9 +68,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end2:
 	.size	f5, .Lfunc_end2-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -91,9 +91,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end3:
 	.size	f6, .Lfunc_end3-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -114,9 +114,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end4:
 	.size	f7, .Lfunc_end4-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -137,9 +137,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end5:
 	.size	f8, .Lfunc_end5-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
@@ -160,9 +160,9 @@ f9:                                     # @f9
 	.endfunc
 .Lfunc_end6:
 	.size	f9, .Lfunc_end6-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
@@ -183,9 +183,9 @@ f10:                                    # @f10
 	.endfunc
 .Lfunc_end7:
 	.size	f10, .Lfunc_end7-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
@@ -206,9 +206,9 @@ f11:                                    # @f11
 	.endfunc
 .Lfunc_end8:
 	.size	f11, .Lfunc_end8-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
@@ -229,9 +229,9 @@ f12:                                    # @f12
 	.endfunc
 .Lfunc_end9:
 	.size	f12, .Lfunc_end9-f12
-
+                                        # -- End function
 	.section	.text.f13,"ax",@progbits
-	.hidden	f13
+	.hidden	f13                     # -- Begin function f13
 	.globl	f13
 	.type	f13,@function
 f13:                                    # @f13
@@ -252,9 +252,9 @@ f13:                                    # @f13
 	.endfunc
 .Lfunc_end10:
 	.size	f13, .Lfunc_end10-f13
-
+                                        # -- End function
 	.section	.text.f14,"ax",@progbits
-	.hidden	f14
+	.hidden	f14                     # -- Begin function f14
 	.globl	f14
 	.type	f14,@function
 f14:                                    # @f14
@@ -275,9 +275,9 @@ f14:                                    # @f14
 	.endfunc
 .Lfunc_end11:
 	.size	f14, .Lfunc_end11-f14
-
+                                        # -- End function
 	.section	.text.f15,"ax",@progbits
-	.hidden	f15
+	.hidden	f15                     # -- Begin function f15
 	.globl	f15
 	.type	f15,@function
 f15:                                    # @f15
@@ -298,9 +298,9 @@ f15:                                    # @f15
 	.endfunc
 .Lfunc_end12:
 	.size	f15, .Lfunc_end12-f15
-
+                                        # -- End function
 	.section	.text.f16,"ax",@progbits
-	.hidden	f16
+	.hidden	f16                     # -- Begin function f16
 	.globl	f16
 	.type	f16,@function
 f16:                                    # @f16
@@ -321,9 +321,9 @@ f16:                                    # @f16
 	.endfunc
 .Lfunc_end13:
 	.size	f16, .Lfunc_end13-f16
-
+                                        # -- End function
 	.section	.text.f17,"ax",@progbits
-	.hidden	f17
+	.hidden	f17                     # -- Begin function f17
 	.globl	f17
 	.type	f17,@function
 f17:                                    # @f17
@@ -344,9 +344,9 @@ f17:                                    # @f17
 	.endfunc
 .Lfunc_end14:
 	.size	f17, .Lfunc_end14-f17
-
+                                        # -- End function
 	.section	.text.f18,"ax",@progbits
-	.hidden	f18
+	.hidden	f18                     # -- Begin function f18
 	.globl	f18
 	.type	f18,@function
 f18:                                    # @f18
@@ -367,9 +367,9 @@ f18:                                    # @f18
 	.endfunc
 .Lfunc_end15:
 	.size	f18, .Lfunc_end15-f18
-
+                                        # -- End function
 	.section	.text.f19,"ax",@progbits
-	.hidden	f19
+	.hidden	f19                     # -- Begin function f19
 	.globl	f19
 	.type	f19,@function
 f19:                                    # @f19
@@ -390,9 +390,9 @@ f19:                                    # @f19
 	.endfunc
 .Lfunc_end16:
 	.size	f19, .Lfunc_end16-f19
-
+                                        # -- End function
 	.section	.text.f20,"ax",@progbits
-	.hidden	f20
+	.hidden	f20                     # -- Begin function f20
 	.globl	f20
 	.type	f20,@function
 f20:                                    # @f20
@@ -413,9 +413,9 @@ f20:                                    # @f20
 	.endfunc
 .Lfunc_end17:
 	.size	f20, .Lfunc_end17-f20
-
+                                        # -- End function
 	.section	.text.f21,"ax",@progbits
-	.hidden	f21
+	.hidden	f21                     # -- Begin function f21
 	.globl	f21
 	.type	f21,@function
 f21:                                    # @f21
@@ -436,9 +436,9 @@ f21:                                    # @f21
 	.endfunc
 .Lfunc_end18:
 	.size	f21, .Lfunc_end18-f21
-
+                                        # -- End function
 	.section	.text.f22,"ax",@progbits
-	.hidden	f22
+	.hidden	f22                     # -- Begin function f22
 	.globl	f22
 	.type	f22,@function
 f22:                                    # @f22
@@ -459,9 +459,9 @@ f22:                                    # @f22
 	.endfunc
 .Lfunc_end19:
 	.size	f22, .Lfunc_end19-f22
-
+                                        # -- End function
 	.section	.text.f23,"ax",@progbits
-	.hidden	f23
+	.hidden	f23                     # -- Begin function f23
 	.globl	f23
 	.type	f23,@function
 f23:                                    # @f23
@@ -482,9 +482,9 @@ f23:                                    # @f23
 	.endfunc
 .Lfunc_end20:
 	.size	f23, .Lfunc_end20-f23
-
+                                        # -- End function
 	.section	.text.f24,"ax",@progbits
-	.hidden	f24
+	.hidden	f24                     # -- Begin function f24
 	.globl	f24
 	.type	f24,@function
 f24:                                    # @f24
@@ -505,9 +505,9 @@ f24:                                    # @f24
 	.endfunc
 .Lfunc_end21:
 	.size	f24, .Lfunc_end21-f24
-
+                                        # -- End function
 	.section	.text.f25,"ax",@progbits
-	.hidden	f25
+	.hidden	f25                     # -- Begin function f25
 	.globl	f25
 	.type	f25,@function
 f25:                                    # @f25
@@ -528,9 +528,9 @@ f25:                                    # @f25
 	.endfunc
 .Lfunc_end22:
 	.size	f25, .Lfunc_end22-f25
-
+                                        # -- End function
 	.section	.text.f26,"ax",@progbits
-	.hidden	f26
+	.hidden	f26                     # -- Begin function f26
 	.globl	f26
 	.type	f26,@function
 f26:                                    # @f26
@@ -551,9 +551,9 @@ f26:                                    # @f26
 	.endfunc
 .Lfunc_end23:
 	.size	f26, .Lfunc_end23-f26
-
+                                        # -- End function
 	.section	.text.f27,"ax",@progbits
-	.hidden	f27
+	.hidden	f27                     # -- Begin function f27
 	.globl	f27
 	.type	f27,@function
 f27:                                    # @f27
@@ -574,9 +574,9 @@ f27:                                    # @f27
 	.endfunc
 .Lfunc_end24:
 	.size	f27, .Lfunc_end24-f27
-
+                                        # -- End function
 	.section	.text.f28,"ax",@progbits
-	.hidden	f28
+	.hidden	f28                     # -- Begin function f28
 	.globl	f28
 	.type	f28,@function
 f28:                                    # @f28
@@ -597,9 +597,9 @@ f28:                                    # @f28
 	.endfunc
 .Lfunc_end25:
 	.size	f28, .Lfunc_end25-f28
-
+                                        # -- End function
 	.section	.text.f29,"ax",@progbits
-	.hidden	f29
+	.hidden	f29                     # -- Begin function f29
 	.globl	f29
 	.type	f29,@function
 f29:                                    # @f29
@@ -620,9 +620,9 @@ f29:                                    # @f29
 	.endfunc
 .Lfunc_end26:
 	.size	f29, .Lfunc_end26-f29
-
+                                        # -- End function
 	.section	.text.f30,"ax",@progbits
-	.hidden	f30
+	.hidden	f30                     # -- Begin function f30
 	.globl	f30
 	.type	f30,@function
 f30:                                    # @f30
@@ -643,9 +643,9 @@ f30:                                    # @f30
 	.endfunc
 .Lfunc_end27:
 	.size	f30, .Lfunc_end27-f30
-
+                                        # -- End function
 	.section	.text.f31,"ax",@progbits
-	.hidden	f31
+	.hidden	f31                     # -- Begin function f31
 	.globl	f31
 	.type	f31,@function
 f31:                                    # @f31
@@ -666,9 +666,9 @@ f31:                                    # @f31
 	.endfunc
 .Lfunc_end28:
 	.size	f31, .Lfunc_end28-f31
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -680,8 +680,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end29:
 	.size	main, .Lfunc_end29-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020314-1.c.s b/test/torture-s/20020314-1.c.s
index 82c336601..b038d0b21 100644
--- a/test/torture-s/20020314-1.c.s
+++ b/test/torture-s/20020314-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020314-1.c"
+	.file	"20020314-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -11,9 +11,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -29,9 +29,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020320-1.c.s b/test/torture-s/20020320-1.c.s
index 33383a117..41ee35ea6 100644
--- a/test/torture-s/20020320-1.c.s
+++ b/test/torture-s/20020320-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020320-1.c"
+	.file	"20020320-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020321-1.c.s b/test/torture-s/20020321-1.c.s
index a4cff1521..5cf581c00 100644
--- a/test/torture-s/20020321-1.c.s
+++ b/test/torture-s/20020321-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020321-1.c"
+	.file	"20020321-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -13,9 +13,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,9 +27,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,6 +40,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020328-1.c.s b/test/torture-s/20020328-1.c.s
index 542b49235..0e0e3d545 100644
--- a/test/torture-s/20020328-1.c.s
+++ b/test/torture-s/20020328-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020328-1.c"
+	.file	"20020328-1.c"
 	.section	.text.func,"ax",@progbits
-	.hidden	func
+	.hidden	func                    # -- Begin function func
 	.globl	func
 	.type	func,@function
 func:                                   # @func
@@ -13,9 +13,9 @@ func:                                   # @func
 	.endfunc
 .Lfunc_end0:
 	.size	func, .Lfunc_end0-func
-
+                                        # -- End function
 	.section	.text.testit,"ax",@progbits
-	.hidden	testit
+	.hidden	testit                  # -- Begin function testit
 	.globl	testit
 	.type	testit,@function
 testit:                                 # @testit
@@ -34,9 +34,9 @@ testit:                                 # @testit
 	.endfunc
 .Lfunc_end1:
 	.size	testit, .Lfunc_end1-testit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -59,6 +59,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020402-1.c.s b/test/torture-s/20020402-1.c.s
index 5f1f15abc..dd2666444 100644
--- a/test/torture-s/20020402-1.c.s
+++ b/test/torture-s/20020402-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020402-1.c"
+	.file	"20020402-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020402-2.c.s b/test/torture-s/20020402-2.c.s
index 28d2b6707..fb3357d2d 100644
--- a/test/torture-s/20020402-2.c.s
+++ b/test/torture-s/20020402-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020402-2.c"
+	.file	"20020402-2.c"
 	.section	.text.InitCache,"ax",@progbits
-	.hidden	InitCache
+	.hidden	InitCache               # -- Begin function InitCache
 	.globl	InitCache
 	.type	InitCache,@function
 InitCache:                              # @InitCache
@@ -9,24 +9,21 @@ InitCache:                              # @InitCache
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	i32.store	MyPte+4($pop0), $0
-	i32.const	$push76=, 0
-	i32.const	$push1=, 5
-	i32.store	MyPte+12($pop76), $pop1
-	i32.const	$push75=, 0
-	i32.const	$push2=, MyPte+16
-	i32.store	Local1($pop75), $pop2
 	i32.const	$push74=, 0
-	i32.const	$push3=, MyPte+20
-	i32.store	Local2($pop74), $pop3
+	i64.const	$push1=, 21474836480
+	i64.store	MyPte+8($pop74):p2align=2, $pop1
 	i32.const	$push73=, 0
-	i32.const	$push4=, MyPte+24
-	i32.store	Local3($pop73), $pop4
+	i32.const	$push2=, MyPte+16
+	i32.store	Local1($pop73), $pop2
 	i32.const	$push72=, 0
-	i32.const	$push5=, MyPte+28
-	i32.store	RDbf1($pop72), $pop5
+	i32.const	$push3=, MyPte+20
+	i32.store	Local2($pop72), $pop3
 	i32.const	$push71=, 0
+	i32.const	$push4=, MyPte+24
+	i32.store	Local3($pop71), $pop4
 	i32.const	$push70=, 0
-	i32.store	MyPte+8($pop71), $pop70
+	i32.const	$push5=, MyPte+28
+	i32.store	RDbf1($pop70), $pop5
 	i32.const	$push69=, 0
 	i32.const	$push6=, MyPte+32
 	i32.store	RDbf2($pop69), $pop6
@@ -64,11 +61,11 @@ InitCache:                              # @InitCache
 	i32.const	$push17=, MyPte+188
 	i32.store	Workspace+8($pop58), $pop17
 	i32.const	$push57=, 0
-	i32.const	$push18=, MyPte+192
-	i32.store	Workspace+12($pop57), $pop18
+	i32.const	$push18=, MyPte+196
+	i32.store	Workspace+16($pop57), $pop18
 	i32.const	$push56=, 0
-	i32.const	$push19=, MyPte+196
-	i32.store	Workspace+16($pop56), $pop19
+	i32.const	$push19=, MyPte+192
+	i32.store	Workspace+12($pop56), $pop19
 	i32.const	$push55=, 0
 	i32.const	$push20=, MyPte+200
 	i32.store	Workspace+20($pop55), $pop20
@@ -127,9 +124,9 @@ InitCache:                              # @InitCache
 	.endfunc
 .Lfunc_end0:
 	.size	InitCache, .Lfunc_end0-InitCache
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -191,11 +188,11 @@ main:                                   # @main
 	i32.const	$push18=, MyPte+188
 	i32.store	Workspace+8($pop60), $pop18
 	i32.const	$push59=, 0
-	i32.const	$push19=, MyPte+192
-	i32.store	Workspace+12($pop59), $pop19
+	i32.const	$push19=, MyPte+196
+	i32.store	Workspace+16($pop59), $pop19
 	i32.const	$push58=, 0
-	i32.const	$push20=, MyPte+196
-	i32.store	Workspace+16($pop58), $pop20
+	i32.const	$push20=, MyPte+192
+	i32.store	Workspace+12($pop58), $pop20
 	i32.const	$push57=, 0
 	i32.const	$push21=, MyPte+200
 	i32.store	Workspace+20($pop57), $pop21
@@ -255,7 +252,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	Local1                  # @Local1
 	.type	Local1,@object
 	.section	.bss.Local1,"aw",@nobits
@@ -491,4 +488,4 @@ MyPte:
 	.size	MyPte, 392
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020402-3.c.s b/test/torture-s/20020402-3.c.s
index 3b712a52e..5d211f59a 100644
--- a/test/torture-s/20020402-3.c.s
+++ b/test/torture-s/20020402-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020402-3.c"
+	.file	"20020402-3.c"
 	.section	.text.blockvector_for_pc_sect,"ax",@progbits
-	.hidden	blockvector_for_pc_sect
+	.hidden	blockvector_for_pc_sect # -- Begin function blockvector_for_pc_sect
 	.globl	blockvector_for_pc_sect
 	.type	blockvector_for_pc_sect,@function
 blockvector_for_pc_sect:                # @blockvector_for_pc_sect
@@ -9,95 +9,96 @@ blockvector_for_pc_sect:                # @blockvector_for_pc_sect
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$6=, 0
+	i32.const	$7=, 0
 	block   	
 	block   	
-	i32.load	$push23=, 0($1)
-	tee_local	$push22=, $7=, $pop23
-	i32.load	$push21=, 0($pop22)
-	tee_local	$push20=, $1=, $pop21
-	i32.const	$push19=, 2
-	i32.lt_s	$push0=, $pop20, $pop19
+	i32.load	$push21=, 0($1)
+	tee_local	$push20=, $2=, $pop21
+	i32.load	$push19=, 0($pop20)
+	tee_local	$push18=, $1=, $pop19
+	i32.const	$push17=, 2
+	i32.lt_s	$push0=, $pop18, $pop17
 	br_if   	0, $pop0        # 0: down to label1
 # BB#1:                                 # %while.body.preheader
-	i32.const	$6=, 0
-	copy_local	$5=, $1
+	i32.const	$7=, 0
+	copy_local	$6=, $1
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push36=, 1
-	i32.add 	$push1=, $1, $pop36
-	i32.const	$push35=, 1
-	i32.shr_s	$push34=, $pop1, $pop35
-	tee_local	$push33=, $2=, $pop34
-	i32.add 	$push32=, $pop33, $6
-	tee_local	$push31=, $1=, $pop32
-	i32.sub 	$3=, $5, $pop31
-	i32.const	$push30=, 2
-	i32.shl 	$push2=, $1, $pop30
-	i32.add 	$push3=, $7, $pop2
-	i32.const	$push29=, 4
-	i32.add 	$push4=, $pop3, $pop29
+	i32.const	$push34=, 1
+	i32.add 	$push1=, $1, $pop34
+	i32.const	$push33=, 1
+	i32.shr_s	$push32=, $pop1, $pop33
+	tee_local	$push31=, $3=, $pop32
+	i32.add 	$push30=, $pop31, $7
+	tee_local	$push29=, $1=, $pop30
+	i32.sub 	$4=, $6, $pop29
+	i32.const	$push28=, 2
+	i32.shl 	$push2=, $1, $pop28
+	i32.add 	$push3=, $2, $pop2
+	i32.const	$push27=, 4
+	i32.add 	$push4=, $pop3, $pop27
 	i32.load	$push5=, 0($pop4)
 	i64.load	$push6=, 0($pop5)
-	i64.gt_u	$push28=, $pop6, $0
-	tee_local	$push27=, $4=, $pop28
-	i32.select	$5=, $1, $5, $pop27
-	i32.select	$6=, $6, $1, $4
-	i32.select	$push26=, $2, $3, $4
-	tee_local	$push25=, $1=, $pop26
-	i32.const	$push24=, 1
-	i32.gt_s	$push7=, $pop25, $pop24
+	i64.gt_u	$push26=, $pop6, $0
+	tee_local	$push25=, $5=, $pop26
+	i32.select	$6=, $1, $6, $pop25
+	i32.select	$7=, $7, $1, $5
+	i32.select	$push24=, $3, $4, $5
+	tee_local	$push23=, $1=, $pop24
+	i32.const	$push22=, 1
+	i32.gt_s	$push7=, $pop23, $pop22
 	br_if   	0, $pop7        # 0: up to label2
-# BB#3:                                 # %while.cond8.preheader
+# BB#3:                                 # %while.end
 	end_loop
-	i32.const	$push8=, -1
-	i32.le_s	$push9=, $6, $pop8
-	br_if   	1, $pop9        # 1: down to label0
+	i32.const	$1=, 0
+	i32.const	$push35=, 0
+	i32.lt_s	$push8=, $7, $pop35
+	br_if   	1, $pop8        # 1: down to label0
 .LBB0_4:                                # %while.body10.preheader
 	end_block                       # label1:
-	i32.const	$push38=, 1
-	i32.add 	$5=, $6, $pop38
-	i32.const	$push37=, 2
-	i32.shl 	$push10=, $6, $pop37
-	i32.add 	$push11=, $7, $pop10
-	i32.const	$push12=, 4
-	i32.add 	$1=, $pop11, $pop12
+	i32.const	$push37=, 1
+	i32.add 	$6=, $7, $pop37
+	i32.const	$push36=, 2
+	i32.shl 	$push9=, $7, $pop36
+	i32.add 	$push10=, $2, $pop9
+	i32.const	$push11=, 4
+	i32.add 	$1=, $pop10, $pop11
 .LBB0_5:                                # %while.body10
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	i32.load	$push13=, 0($1)
-	i64.load	$push14=, 8($pop13)
-	i64.gt_u	$push15=, $pop14, $0
-	br_if   	1, $pop15       # 1: down to label3
+	i32.load	$push12=, 0($1)
+	i64.load	$push13=, 8($pop12)
+	i64.gt_u	$push14=, $pop13, $0
+	br_if   	1, $pop14       # 1: down to label3
 # BB#6:                                 # %while.cond8
                                         #   in Loop: Header=BB0_5 Depth=1
-	i32.const	$push43=, -4
-	i32.add 	$1=, $1, $pop43
-	i32.const	$push42=, -1
-	i32.add 	$push41=, $5, $pop42
-	tee_local	$push40=, $5=, $pop41
-	i32.const	$push39=, 1
-	i32.ge_s	$push16=, $pop40, $pop39
-	br_if   	0, $pop16       # 0: up to label4
+	i32.const	$push42=, -4
+	i32.add 	$1=, $1, $pop42
+	i32.const	$push41=, -1
+	i32.add 	$push40=, $6, $pop41
+	tee_local	$push39=, $6=, $pop40
+	i32.const	$push38=, 1
+	i32.ge_s	$push15=, $pop39, $pop38
+	br_if   	0, $pop15       # 0: up to label4
 # BB#7:
 	end_loop
-	i32.const	$push17=, 0
-	return  	$pop17
-.LBB0_8:                                # %cleanup
+	i32.const	$push16=, 0
+	return  	$pop16
+.LBB0_8:
 	end_block                       # label3:
-	return  	$7
-.LBB0_9:
+	copy_local	$1=, $2
+.LBB0_9:                                # %cleanup
 	end_block                       # label0:
-	i32.const	$push18=, 0
-                                        # fallthrough-return: $pop18
+	copy_local	$push43=, $1
+                                        # fallthrough-return: $pop43
 	.endfunc
 .Lfunc_end0:
 	.size	blockvector_for_pc_sect, .Lfunc_end0-blockvector_for_pc_sect
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -108,6 +109,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020404-1.c.s b/test/torture-s/20020404-1.c.s
index 4960460c4..26344bb7d 100644
--- a/test/torture-s/20020404-1.c.s
+++ b/test/torture-s/20020404-1.c.s
@@ -1,34 +1,44 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020404-1.c"
+	.file	"20020404-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
+	call    	dump_bfd_file@FUNCTION
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
+	unreachable
+	.endfunc
+.Lfunc_end0:
+	.size	main, .Lfunc_end0-main
+                                        # -- End function
+	.section	.text.dump_bfd_file,"ax",@progbits
+	.type	dump_bfd_file,@function # -- Begin function dump_bfd_file
+dump_bfd_file:                          # @dump_bfd_file
+# BB#0:                                 # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 3735928559
 	i64.store	bfd_make_section_anyway.foo_section+8($pop1), $pop0
-	i32.const	$push11=, 0
-	i64.const	$push10=, 3735928559
-	i64.store	bfd_make_section_anyway.foo_section+16($pop11), $pop10
-	i32.const	$push9=, 0
-	i64.const	$push2=, 0
-	i64.store	bfd_make_section_anyway.foo_section+24($pop9), $pop2
+	i32.const	$push10=, 0
+	i64.const	$push9=, 3735928559
+	i64.store	bfd_make_section_anyway.foo_section+16($pop10), $pop9
 	i32.const	$push8=, 0
+	i64.const	$push2=, 0
+	i64.store	bfd_make_section_anyway.foo_section+24($pop8), $pop2
 	i32.const	$push7=, 0
-	i32.load8_u	$push3=, bfd_make_section_anyway.foo_section($pop7)
+	i32.const	$push6=, 0
+	i32.load8_u	$push3=, bfd_make_section_anyway.foo_section($pop6)
 	i32.const	$push4=, 1
 	i32.or  	$push5=, $pop3, $pop4
-	i32.store8	bfd_make_section_anyway.foo_section($pop8), $pop5
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
-	unreachable
+	i32.store8	bfd_make_section_anyway.foo_section($pop7), $pop5
+                                        # fallthrough-return
 	.endfunc
-.Lfunc_end0:
-	.size	main, .Lfunc_end0-main
-
+.Lfunc_end1:
+	.size	dump_bfd_file, .Lfunc_end1-dump_bfd_file
+                                        # -- End function
 	.type	bfd_make_section_anyway.foo_section,@object # @bfd_make_section_anyway.foo_section
 	.section	.bss.bfd_make_section_anyway.foo_section,"aw",@nobits
 	.p2align	3
@@ -37,5 +47,5 @@ bfd_make_section_anyway.foo_section:
 	.size	bfd_make_section_anyway.foo_section, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020406-1.c.s b/test/torture-s/20020406-1.c.s
index 1bb1189a1..ffae922b7 100644
--- a/test/torture-s/20020406-1.c.s
+++ b/test/torture-s/20020406-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020406-1.c"
+	.file	"20020406-1.c"
 	.section	.text.FFmul,"ax",@progbits
-	.hidden	FFmul
+	.hidden	FFmul                   # -- Begin function FFmul
 	.globl	FFmul
 	.type	FFmul,@function
 FFmul:                                  # @FFmul
@@ -13,9 +13,9 @@ FFmul:                                  # @FFmul
 	.endfunc
 .Lfunc_end0:
 	.size	FFmul, .Lfunc_end0-FFmul
-
+                                        # -- End function
 	.section	.text.DUPFFdeg,"ax",@progbits
-	.hidden	DUPFFdeg
+	.hidden	DUPFFdeg                # -- Begin function DUPFFdeg
 	.globl	DUPFFdeg
 	.type	DUPFFdeg,@function
 DUPFFdeg:                               # @DUPFFdeg
@@ -27,9 +27,9 @@ DUPFFdeg:                               # @DUPFFdeg
 	.endfunc
 .Lfunc_end1:
 	.size	DUPFFdeg, .Lfunc_end1-DUPFFdeg
-
+                                        # -- End function
 	.section	.text.DUPFFnew,"ax",@progbits
-	.hidden	DUPFFnew
+	.hidden	DUPFFnew                # -- Begin function DUPFFnew
 	.globl	DUPFFnew
 	.type	DUPFFnew,@function
 DUPFFnew:                               # @DUPFFnew
@@ -64,9 +64,9 @@ DUPFFnew:                               # @DUPFFnew
 	.endfunc
 .Lfunc_end2:
 	.size	DUPFFnew, .Lfunc_end2-DUPFFnew
-
+                                        # -- End function
 	.section	.text.DUPFFfree,"ax",@progbits
-	.hidden	DUPFFfree
+	.hidden	DUPFFfree               # -- Begin function DUPFFfree
 	.globl	DUPFFfree
 	.type	DUPFFfree,@function
 DUPFFfree:                              # @DUPFFfree
@@ -76,9 +76,9 @@ DUPFFfree:                              # @DUPFFfree
 	.endfunc
 .Lfunc_end3:
 	.size	DUPFFfree, .Lfunc_end3-DUPFFfree
-
+                                        # -- End function
 	.section	.text.DUPFFswap,"ax",@progbits
-	.hidden	DUPFFswap
+	.hidden	DUPFFswap               # -- Begin function DUPFFswap
 	.globl	DUPFFswap
 	.type	DUPFFswap,@function
 DUPFFswap:                              # @DUPFFswap
@@ -88,9 +88,9 @@ DUPFFswap:                              # @DUPFFswap
 	.endfunc
 .Lfunc_end4:
 	.size	DUPFFswap, .Lfunc_end4-DUPFFswap
-
+                                        # -- End function
 	.section	.text.DUPFFcopy,"ax",@progbits
-	.hidden	DUPFFcopy
+	.hidden	DUPFFcopy               # -- Begin function DUPFFcopy
 	.globl	DUPFFcopy
 	.type	DUPFFcopy,@function
 DUPFFcopy:                              # @DUPFFcopy
@@ -102,9 +102,9 @@ DUPFFcopy:                              # @DUPFFcopy
 	.endfunc
 .Lfunc_end5:
 	.size	DUPFFcopy, .Lfunc_end5-DUPFFcopy
-
+                                        # -- End function
 	.section	.text.DUPFFshift_add,"ax",@progbits
-	.hidden	DUPFFshift_add
+	.hidden	DUPFFshift_add          # -- Begin function DUPFFshift_add
 	.globl	DUPFFshift_add
 	.type	DUPFFshift_add,@function
 DUPFFshift_add:                         # @DUPFFshift_add
@@ -114,9 +114,9 @@ DUPFFshift_add:                         # @DUPFFshift_add
 	.endfunc
 .Lfunc_end6:
 	.size	DUPFFshift_add, .Lfunc_end6-DUPFFshift_add
-
+                                        # -- End function
 	.section	.text.DUPFFexgcd,"ax",@progbits
-	.hidden	DUPFFexgcd
+	.hidden	DUPFFexgcd              # -- Begin function DUPFFexgcd
 	.globl	DUPFFexgcd
 	.type	DUPFFexgcd,@function
 DUPFFexgcd:                             # @DUPFFexgcd
@@ -125,10 +125,10 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push25=, $pop18, $pop19
+	i32.sub 	$push25=, $pop17, $pop19
 	tee_local	$push24=, $8=, $pop25
 	i32.store	__stack_pointer($pop20), $pop24
 	i32.load	$6=, 4($3)
@@ -168,7 +168,7 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	i32.load	$push7=, 0($pop6)
 	i32.eqz 	$push43=, $pop7
 	br_if   	0, $pop43       # 0: down to label3
-# BB#5:                                 # %DUPFFnew.exit167
+# BB#5:                                 # %DUPFFnew.exit
 	i32.const	$push8=, 12
 	i32.call	$push41=, malloc@FUNCTION, $pop8
 	tee_local	$push40=, $6=, $pop41
@@ -197,12 +197,12 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	i32.const	$push31=, 1
 	i32.lt_s	$push15=, $pop32, $pop31
 	br_if   	0, $pop15       # 0: down to label4
-# BB#6:                                 # %while.cond40.preheader.lr.ph
+# BB#6:                                 # %while.body.lr.ph
 	i32.const	$push42=, 4
 	i32.add 	$push16=, $3, $pop42
 	i32.load	$push0=, 0($pop16)
 	i32.lt_s	$3=, $pop0, $5
-.LBB7_7:                                # %while.cond40.preheader
+.LBB7_7:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
 	br_if   	0, $3           # 0: up to label5
@@ -230,22 +230,22 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	.endfunc
 .Lfunc_end7:
 	.size	DUPFFexgcd, .Lfunc_end7-DUPFFexgcd
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
-	i32.const	$push11=, 16
-	i32.sub 	$push33=, $pop10, $pop11
+	i32.const	$push13=, 0
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
+	i32.const	$push12=, 16
+	i32.sub 	$push33=, $pop10, $pop12
 	tee_local	$push32=, $3=, $pop33
-	i32.store	__stack_pointer($pop12), $pop32
+	i32.store	__stack_pointer($pop13), $pop32
 	i32.const	$push0=, 12
 	i32.call	$push31=, malloc@FUNCTION, $pop0
 	tee_local	$push30=, $0=, $pop31
@@ -270,27 +270,25 @@ main:                                   # @main
 	i32.store	8($2), $pop21
 	i64.const	$push6=, 8589934594
 	i64.store	0($1):p2align=2, $pop6
-	i32.load	$2=, 4($0)
-	i32.const	$push20=, 2
-	i32.store	4($3), $pop20
-	i32.store	0($3), $2
-	i32.const	$push7=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop7, $3
-	i32.const	$push16=, 12
-	i32.add 	$push17=, $3, $pop16
-	i32.const	$push18=, 8
-	i32.add 	$push19=, $3, $pop18
-	i32.call	$drop=, DUPFFexgcd@FUNCTION, $pop17, $pop19, $0, $1
-	i32.const	$push15=, 0
-	i32.const	$push13=, 16
-	i32.add 	$push14=, $3, $pop13
-	i32.store	__stack_pointer($pop15), $pop14
-	i32.const	$push8=, 0
-                                        # fallthrough-return: $pop8
+	i64.const	$push7=, 8589934593
+	i64.store	0($3), $pop7
+	i32.const	$push8=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop8, $3
+	i32.const	$push17=, 12
+	i32.add 	$push18=, $3, $pop17
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $3, $pop19
+	i32.call	$drop=, DUPFFexgcd@FUNCTION, $pop18, $pop20, $0, $1
+	i32.const	$push16=, 0
+	i32.const	$push14=, 16
+	i32.add 	$push15=, $3, $pop14
+	i32.store	__stack_pointer($pop16), $pop15
+	i32.const	$push9=, 0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -303,7 +301,7 @@ main:                                   # @main
 	.size	.L.str.1, 41
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	calloc, i32, i32, i32
 	.functype	printf, i32, i32
diff --git a/test/torture-s/20020411-1.c.s b/test/torture-s/20020411-1.c.s
index e491cd84f..1e48f4b1f 100644
--- a/test/torture-s/20020411-1.c.s
+++ b/test/torture-s/20020411-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020411-1.c"
+	.file	"20020411-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020413-1.c.s b/test/torture-s/20020413-1.c.s
index cf345f7c0..69d8dd1b4 100644
--- a/test/torture-s/20020413-1.c.s
+++ b/test/torture-s/20020413-1.c.s
@@ -1,249 +1,145 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020413-1.c"
+	.file	"20020413-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i64, i64, i32
-	.local  	i32, i32, i32
+	.local  	i64, i64, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push83=, 0
-	i32.const	$push80=, 0
-	i32.load	$push81=, __stack_pointer($pop80)
-	i32.const	$push82=, 16
-	i32.sub 	$push101=, $pop81, $pop82
-	tee_local	$push100=, $5=, $pop101
-	i32.store	__stack_pointer($pop83), $pop100
-	i64.const	$push99=, 0
+	i32.const	$push24=, 0
+	i32.const	$push22=, 0
+	i32.load	$push21=, __stack_pointer($pop22)
+	i32.const	$push23=, 48
+	i32.sub 	$push46=, $pop21, $pop23
+	tee_local	$push45=, $7=, $pop46
+	i32.store	__stack_pointer($pop24), $pop45
+	i32.const	$push28=, 32
+	i32.add 	$push29=, $7, $pop28
+	i64.const	$push44=, 0
 	i64.const	$push0=, -9223372036854775808
-	call    	__subtf3@FUNCTION, $5, $pop99, $pop0, $0, $1
-	i64.const	$push98=, 0
-	i64.const	$push97=, 0
-	i32.call	$3=, __lttf2@FUNCTION, $0, $1, $pop98, $pop97
-	i32.const	$4=, 0
+	call    	__subtf3@FUNCTION, $pop29, $pop44, $pop0, $0, $1
+	i64.const	$push43=, 0
+	i64.const	$push42=, 0
+	i32.call	$5=, __lttf2@FUNCTION, $0, $1, $pop43, $pop42
+	i32.const	$6=, 0
 	block   	
 	block   	
 	block   	
-	i64.load	$push4=, 0($5)
-	i32.const	$push96=, 0
-	i32.lt_s	$push95=, $3, $pop96
-	tee_local	$push94=, $3=, $pop95
-	i64.select	$push93=, $pop4, $0, $pop94
-	tee_local	$push92=, $0=, $pop93
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $5, $pop1
+	i64.load	$push4=, 32($7)
+	i32.const	$push41=, 0
+	i32.lt_s	$push40=, $5, $pop41
+	tee_local	$push39=, $5=, $pop40
+	i64.select	$push38=, $pop4, $0, $pop39
+	tee_local	$push37=, $3=, $pop38
+	i32.const	$push1=, 40
+	i32.add 	$push2=, $7, $pop1
 	i64.load	$push3=, 0($pop2)
-	i64.select	$push91=, $pop3, $1, $3
-	tee_local	$push90=, $1=, $pop91
-	i64.const	$push89=, 0
-	i64.const	$push88=, 4611404543450677248
-	i32.call	$push5=, __getf2@FUNCTION, $pop92, $pop90, $pop89, $pop88
-	i32.const	$push87=, 0
-	i32.ge_s	$push6=, $pop5, $pop87
+	i64.select	$push36=, $pop3, $1, $5
+	tee_local	$push35=, $4=, $pop36
+	i64.const	$push34=, 0
+	i64.const	$push33=, 4611404543450677248
+	i32.call	$push5=, __getf2@FUNCTION, $pop37, $pop35, $pop34, $pop33
+	i32.const	$push32=, 0
+	i32.ge_s	$push6=, $pop5, $pop32
 	br_if   	0, $pop6        # 0: down to label2
 # BB#1:                                 # %if.else
-	i64.const	$push103=, 0
-	i64.const	$push102=, 0
-	i32.call	$push42=, __eqtf2@FUNCTION, $0, $1, $pop103, $pop102
-	i32.eqz 	$push142=, $pop42
-	br_if   	1, $pop142      # 1: down to label1
+	i64.const	$push48=, 0
+	i64.const	$push47=, 0
+	i32.call	$push13=, __eqtf2@FUNCTION, $3, $4, $pop48, $pop47
+	i32.eqz 	$push70=, $pop13
+	br_if   	1, $pop70       # 1: down to label1
 # BB#2:                                 # %if.else
-	i64.const	$push104=, 0
-	i64.const	$push43=, 4611404543450677248
-	i32.call	$push44=, __lttf2@FUNCTION, $0, $1, $pop104, $pop43
-	i32.const	$push45=, -1
-	i32.gt_s	$push46=, $pop44, $pop45
-	br_if   	1, $pop46       # 1: down to label1
-# BB#3:                                 # %while.body12
-	i32.const	$4=, 1
-	i64.const	$push105=, 0
-	i64.const	$push47=, 4611123068473966592
-	i32.call	$push48=, __lttf2@FUNCTION, $0, $1, $pop105, $pop47
-	i32.const	$push49=, 0
-	i32.ge_s	$push50=, $pop48, $pop49
-	br_if   	1, $pop50       # 1: down to label1
-# BB#4:                                 # %while.body12.1
-	i32.const	$4=, 2
-	i64.const	$push107=, 0
-	i64.const	$push51=, 4610841593497255936
-	i32.call	$push52=, __lttf2@FUNCTION, $0, $1, $pop107, $pop51
-	i32.const	$push106=, -1
-	i32.gt_s	$push53=, $pop52, $pop106
-	br_if   	1, $pop53       # 1: down to label1
-# BB#5:                                 # %while.body12.2
-	i32.const	$4=, 3
-	i64.const	$push109=, 0
-	i64.const	$push54=, 4610560118520545280
-	i32.call	$push55=, __lttf2@FUNCTION, $0, $1, $pop109, $pop54
-	i32.const	$push108=, -1
-	i32.gt_s	$push56=, $pop55, $pop108
-	br_if   	1, $pop56       # 1: down to label1
-# BB#6:                                 # %while.body12.3
-	i32.const	$4=, 4
-	i64.const	$push111=, 0
-	i64.const	$push57=, 4610278643543834624
-	i32.call	$push58=, __lttf2@FUNCTION, $0, $1, $pop111, $pop57
-	i32.const	$push110=, -1
-	i32.gt_s	$push59=, $pop58, $pop110
-	br_if   	1, $pop59       # 1: down to label1
-# BB#7:                                 # %while.body12.4
-	i32.const	$4=, 5
-	i64.const	$push113=, 0
-	i64.const	$push60=, 4609997168567123968
-	i32.call	$push61=, __lttf2@FUNCTION, $0, $1, $pop113, $pop60
-	i32.const	$push112=, -1
-	i32.gt_s	$push62=, $pop61, $pop112
-	br_if   	1, $pop62       # 1: down to label1
-# BB#8:                                 # %while.body12.5
-	i32.const	$4=, 6
-	i64.const	$push115=, 0
-	i64.const	$push63=, 4609715693590413312
-	i32.call	$push64=, __lttf2@FUNCTION, $0, $1, $pop115, $pop63
-	i32.const	$push114=, -1
-	i32.gt_s	$push65=, $pop64, $pop114
-	br_if   	1, $pop65       # 1: down to label1
-# BB#9:                                 # %while.body12.6
-	i32.const	$4=, 7
-	i64.const	$push117=, 0
-	i64.const	$push66=, 4609434218613702656
-	i32.call	$push67=, __lttf2@FUNCTION, $0, $1, $pop117, $pop66
-	i32.const	$push116=, -1
-	i32.gt_s	$push68=, $pop67, $pop116
-	br_if   	1, $pop68       # 1: down to label1
-# BB#10:                                # %while.body12.7
-	i32.const	$4=, 8
-	i64.const	$push119=, 0
-	i64.const	$push69=, 4609152743636992000
-	i32.call	$push70=, __lttf2@FUNCTION, $0, $1, $pop119, $pop69
-	i32.const	$push118=, -1
-	i32.gt_s	$push71=, $pop70, $pop118
-	br_if   	1, $pop71       # 1: down to label1
-# BB#11:                                # %while.body12.8
-	i32.const	$4=, 9
-	i64.const	$push121=, 0
-	i64.const	$push72=, 4608871268660281344
-	i32.call	$push73=, __lttf2@FUNCTION, $0, $1, $pop121, $pop72
-	i32.const	$push120=, -1
-	i32.gt_s	$push74=, $pop73, $pop120
-	br_if   	1, $pop74       # 1: down to label1
-# BB#12:                                # %while.body12.9
-	i32.const	$4=, 10
-	i64.const	$push76=, 0
-	i64.const	$push75=, 4608589793683570688
-	i32.call	$push77=, __lttf2@FUNCTION, $0, $1, $pop76, $pop75
-	i32.const	$push78=, -1
-	i32.gt_s	$push79=, $pop77, $pop78
-	br_if   	1, $pop79       # 1: down to label1
-# BB#13:                                # %while.body12.10
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_14:                               # %while.cond.preheader
+	i64.const	$0=, 4611404543450677248
+	i64.const	$push50=, 0
+	i64.const	$push49=, 4611404543450677248
+	i32.call	$push14=, __lttf2@FUNCTION, $3, $4, $pop50, $pop49
+	i32.const	$push15=, -1
+	i32.gt_s	$push16=, $pop14, $pop15
+	br_if   	1, $pop16       # 1: down to label1
+# BB#3:                                 # %while.body11.preheader
+	i32.const	$push18=, 8
+	i32.add 	$5=, $7, $pop18
+	i32.const	$6=, 0
+	i64.const	$1=, 0
+.LBB0_4:                                # %while.body11
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label3:
+	i32.const	$push51=, 10
+	i32.ge_u	$push17=, $6, $pop51
+	br_if   	3, $pop17       # 3: down to label0
+# BB#5:                                 # %if.end15
+                                        #   in Loop: Header=BB0_4 Depth=1
+	i64.const	$push59=, 0
+	i64.const	$push58=, 4611123068473966592
+	call    	__multf3@FUNCTION, $7, $1, $0, $pop59, $pop58
+	i32.const	$push57=, 1
+	i32.add 	$6=, $6, $pop57
+	i64.load	$push56=, 0($7)
+	tee_local	$push55=, $1=, $pop56
+	i64.load	$push54=, 0($5)
+	tee_local	$push53=, $0=, $pop54
+	i32.call	$push19=, __lttf2@FUNCTION, $3, $4, $pop55, $pop53
+	i32.const	$push52=, 0
+	i32.lt_s	$push20=, $pop19, $pop52
+	br_if   	0, $pop20       # 0: up to label3
+	br      	2               # 2: down to label1
+.LBB0_6:                                # %if.then2
+	end_loop
 	end_block                       # label2:
-	i64.const	$push123=, 0
-	i64.const	$push122=, 4611404543450677248
-	i32.call	$push7=, __gttf2@FUNCTION, $0, $1, $pop123, $pop122
-	i32.const	$push8=, 1
-	i32.lt_s	$push9=, $pop7, $pop8
-	br_if   	0, $pop9        # 0: down to label1
-# BB#15:                                # %while.body
-	i32.const	$4=, 1
-	i64.const	$push124=, 0
-	i64.const	$push10=, 4611686018427387904
-	i32.call	$push11=, __gttf2@FUNCTION, $0, $1, $pop124, $pop10
-	i32.const	$push12=, 0
-	i32.le_s	$push13=, $pop11, $pop12
-	br_if   	0, $pop13       # 0: down to label1
-# BB#16:                                # %while.body.1
-	i32.const	$4=, 2
-	i64.const	$push126=, 0
-	i64.const	$push14=, 4611967493404098560
-	i32.call	$push15=, __gttf2@FUNCTION, $0, $1, $pop126, $pop14
-	i32.const	$push125=, 1
-	i32.lt_s	$push16=, $pop15, $pop125
-	br_if   	0, $pop16       # 0: down to label1
-# BB#17:                                # %while.body.2
-	i32.const	$4=, 3
-	i64.const	$push128=, 0
-	i64.const	$push17=, 4612248968380809216
-	i32.call	$push18=, __gttf2@FUNCTION, $0, $1, $pop128, $pop17
-	i32.const	$push127=, 1
-	i32.lt_s	$push19=, $pop18, $pop127
-	br_if   	0, $pop19       # 0: down to label1
-# BB#18:                                # %while.body.3
-	i32.const	$4=, 4
-	i64.const	$push130=, 0
-	i64.const	$push20=, 4612530443357519872
-	i32.call	$push21=, __gttf2@FUNCTION, $0, $1, $pop130, $pop20
-	i32.const	$push129=, 1
-	i32.lt_s	$push22=, $pop21, $pop129
-	br_if   	0, $pop22       # 0: down to label1
-# BB#19:                                # %while.body.4
-	i32.const	$4=, 5
-	i64.const	$push132=, 0
-	i64.const	$push23=, 4612811918334230528
-	i32.call	$push24=, __gttf2@FUNCTION, $0, $1, $pop132, $pop23
-	i32.const	$push131=, 1
-	i32.lt_s	$push25=, $pop24, $pop131
-	br_if   	0, $pop25       # 0: down to label1
-# BB#20:                                # %while.body.5
-	i32.const	$4=, 6
-	i64.const	$push134=, 0
-	i64.const	$push26=, 4613093393310941184
-	i32.call	$push27=, __gttf2@FUNCTION, $0, $1, $pop134, $pop26
-	i32.const	$push133=, 1
-	i32.lt_s	$push28=, $pop27, $pop133
-	br_if   	0, $pop28       # 0: down to label1
-# BB#21:                                # %while.body.6
-	i32.const	$4=, 7
-	i64.const	$push136=, 0
-	i64.const	$push29=, 4613374868287651840
-	i32.call	$push30=, __gttf2@FUNCTION, $0, $1, $pop136, $pop29
-	i32.const	$push135=, 1
-	i32.lt_s	$push31=, $pop30, $pop135
-	br_if   	0, $pop31       # 0: down to label1
-# BB#22:                                # %while.body.7
-	i32.const	$4=, 8
-	i64.const	$push138=, 0
-	i64.const	$push32=, 4613656343264362496
-	i32.call	$push33=, __gttf2@FUNCTION, $0, $1, $pop138, $pop32
-	i32.const	$push137=, 1
-	i32.lt_s	$push34=, $pop33, $pop137
-	br_if   	0, $pop34       # 0: down to label1
-# BB#23:                                # %while.body.8
-	i32.const	$4=, 9
-	i64.const	$push140=, 0
-	i64.const	$push35=, 4613937818241073152
-	i32.call	$push36=, __gttf2@FUNCTION, $0, $1, $pop140, $pop35
-	i32.const	$push139=, 1
-	i32.lt_s	$push37=, $pop36, $pop139
-	br_if   	0, $pop37       # 0: down to label1
-# BB#24:                                # %while.body.9
-	i32.const	$4=, 10
-	i64.const	$push141=, 0
-	i64.const	$push38=, 4614219293217783808
-	i32.call	$push39=, __gttf2@FUNCTION, $0, $1, $pop141, $pop38
-	i32.const	$push40=, 1
-	i32.ge_s	$push41=, $pop39, $pop40
-	br_if   	1, $pop41       # 1: down to label0
-.LBB0_25:                               # %if.end19
+	i64.const	$push62=, 0
+	i64.const	$push61=, 4611404543450677248
+	i32.call	$push7=, __gttf2@FUNCTION, $3, $4, $pop62, $pop61
+	i32.const	$push60=, 1
+	i32.lt_s	$push8=, $pop7, $pop60
+	br_if   	0, $pop8        # 0: down to label1
+# BB#7:                                 # %while.body.preheader
+	i64.const	$0=, 4611404543450677248
+	i64.const	$1=, 0
+	i32.const	$push10=, 24
+	i32.add 	$5=, $7, $pop10
+	i32.const	$6=, 0
+.LBB0_8:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label4:
+	i32.const	$push63=, 10
+	i32.ge_u	$push9=, $6, $pop63
+	br_if   	2, $pop9        # 2: down to label0
+# BB#9:                                 # %if.end6
+                                        #   in Loop: Header=BB0_8 Depth=1
+	i32.const	$push30=, 16
+	i32.add 	$push31=, $7, $pop30
+	call    	__addtf3@FUNCTION, $pop31, $1, $0, $1, $0
+	i32.const	$push69=, 1
+	i32.add 	$6=, $6, $pop69
+	i64.load	$push68=, 16($7)
+	tee_local	$push67=, $1=, $pop68
+	i64.load	$push66=, 0($5)
+	tee_local	$push65=, $0=, $pop66
+	i32.call	$push11=, __lttf2@FUNCTION, $pop67, $pop65, $3, $4
+	i32.const	$push64=, 0
+	i32.lt_s	$push12=, $pop11, $pop64
+	br_if   	0, $pop12       # 0: up to label4
+.LBB0_10:                               # %if.end18
+	end_loop
 	end_block                       # label1:
-	i32.store	0($2), $4
-	i32.const	$push86=, 0
-	i32.const	$push84=, 16
-	i32.add 	$push85=, $5, $pop84
-	i32.store	__stack_pointer($pop86), $pop85
+	i32.store	0($2), $6
+	i32.const	$push27=, 0
+	i32.const	$push25=, 48
+	i32.add 	$push26=, $7, $pop25
+	i32.store	__stack_pointer($pop27), $pop26
 	return
-.LBB0_26:                               # %while.body.10
+.LBB0_11:                               # %if.then5
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -251,10 +147,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push22=, $pop7, $pop8
+	i32.sub 	$push22=, $pop6, $pop8
 	tee_local	$push21=, $0=, $pop22
 	i32.store	__stack_pointer($pop9), $pop21
 	i64.const	$push1=, 0
@@ -283,8 +179,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020418-1.c.s b/test/torture-s/20020418-1.c.s
index 993f8f68b..3b4ce2e36 100644
--- a/test/torture-s/20020418-1.c.s
+++ b/test/torture-s/20020418-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020418-1.c"
+	.file	"20020418-1.c"
 	.section	.text.gcc_crash,"ax",@progbits
-	.hidden	gcc_crash
+	.hidden	gcc_crash               # -- Begin function gcc_crash
 	.globl	gcc_crash
 	.type	gcc_crash,@function
 gcc_crash:                              # @gcc_crash
@@ -11,10 +11,10 @@ gcc_crash:                              # @gcc_crash
 	block   	
 	i32.load	$push4=, 0($0)
 	tee_local	$push3=, $2=, $pop4
-	i32.const	$push0=, 52
-	i32.lt_s	$push1=, $pop3, $pop0
+	i32.const	$push0=, 51
+	i32.le_s	$push1=, $pop3, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:
+# BB#1:                                 # %if.end
 	i32.const	$push2=, 60
 	i32.gt_s	$1=, $2, $pop2
 .LBB0_2:                                # %top
@@ -34,34 +34,21 @@ gcc_crash:                              # @gcc_crash
 	.endfunc
 .Lfunc_end0:
 	.size	gcc_crash, .Lfunc_end0-gcc_crash
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
-	i32.const	$push4=, 16
-	i32.sub 	$push9=, $pop3, $pop4
-	tee_local	$push8=, $0=, $pop9
-	i32.store	__stack_pointer($pop5), $pop8
-	i32.const	$push0=, 53
-	i32.store	8($0), $pop0
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $0, $pop6
-	call    	gcc_crash@FUNCTION, $pop7
-	i32.const	$push1=, 0
-	call    	exit@FUNCTION, $pop1
+# BB#0:                                 # %gcc_crash.exit
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020423-1.c.s b/test/torture-s/20020423-1.c.s
index ea378589c..f488535f4 100644
--- a/test/torture-s/20020423-1.c.s
+++ b/test/torture-s/20020423-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020423-1.c"
+	.file	"20020423-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020503-1.c.s b/test/torture-s/20020503-1.c.s
index 32d86c343..ecbeafaad 100644
--- a/test/torture-s/20020503-1.c.s
+++ b/test/torture-s/20020503-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020503-1.c"
+	.file	"20020503-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020506-1.c.s b/test/torture-s/20020506-1.c.s
index 4df37b351..43ab1cdc2 100644
--- a/test/torture-s/20020506-1.c.s
+++ b/test/torture-s/20020506-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020506-1.c"
+	.file	"20020506-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,28 +14,24 @@ test1:                                  # @test1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label1
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_2:                                # %if.else
 	end_block                       # label2:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label0
-.LBB0_4:                                # %if.end45
+	br_if   	1, $1           # 1: down to label0
+.LBB0_3:                                # %if.then2
 	end_block                       # label1:
-	return
-.LBB0_5:                                # %if.then4
-	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
+.LBB0_4:                                # %if.end45
+	end_block                       # label0:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -52,28 +48,24 @@ test2:                                  # @test2
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label5
 # BB#1:                                 # %if.then
-	i32.eqz 	$push6=, $1
-	br_if   	1, $pop6        # 1: down to label4
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label4
+	br      	2               # 2: down to label3
+.LBB1_2:                                # %if.else
 	end_block                       # label5:
-	i32.eqz 	$push7=, $1
-	br_if   	1, $pop7        # 1: down to label3
-.LBB1_4:                                # %if.end45
+	br_if   	1, $1           # 1: down to label3
+.LBB1_3:                                # %if.then2
 	end_block                       # label4:
-	return
-.LBB1_5:                                # %if.then4
-	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
+.LBB1_4:                                # %if.end45
+	end_block                       # label3:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -86,28 +78,24 @@ test3:                                  # @test3
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label8
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label7
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label7
+	br      	2               # 2: down to label6
+.LBB2_2:                                # %if.else
 	end_block                       # label8:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label6
-.LBB2_4:                                # %if.end45
+	br_if   	1, $1           # 1: down to label6
+.LBB2_3:                                # %if.then2
 	end_block                       # label7:
-	return
-.LBB2_5:                                # %if.then4
-	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
+.LBB2_4:                                # %if.end45
+	end_block                       # label6:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -124,28 +112,24 @@ test4:                                  # @test4
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label11
 # BB#1:                                 # %if.then
-	i32.eqz 	$push6=, $1
-	br_if   	1, $pop6        # 1: down to label10
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB3_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label10
+	br      	2               # 2: down to label9
+.LBB3_2:                                # %if.else
 	end_block                       # label11:
-	i32.eqz 	$push7=, $1
-	br_if   	1, $pop7        # 1: down to label9
-.LBB3_4:                                # %if.end45
+	br_if   	1, $1           # 1: down to label9
+.LBB3_3:                                # %if.then2
 	end_block                       # label10:
-	return
-.LBB3_5:                                # %if.then4
-	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
+.LBB3_4:                                # %if.end45
+	end_block                       # label9:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -158,28 +142,24 @@ test5:                                  # @test5
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label14
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label13
-# BB#2:                                 # %if.then1
-	call    	abort@FUNCTION
-	unreachable
-.LBB4_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label13
+	br      	2               # 2: down to label12
+.LBB4_2:                                # %if.else
 	end_block                       # label14:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label12
-.LBB4_4:                                # %if.end38
+	br_if   	1, $1           # 1: down to label12
+.LBB4_3:                                # %if.then1
 	end_block                       # label13:
-	return
-.LBB4_5:                                # %if.then3
-	end_block                       # label12:
 	call    	abort@FUNCTION
 	unreachable
+.LBB4_4:                                # %if.end38
+	end_block                       # label12:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -192,28 +172,24 @@ test6:                                  # @test6
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label17
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label16
-# BB#2:                                 # %if.then1
-	call    	abort@FUNCTION
-	unreachable
-.LBB5_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label16
+	br      	2               # 2: down to label15
+.LBB5_2:                                # %if.else
 	end_block                       # label17:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label15
-.LBB5_4:                                # %if.end38
+	br_if   	1, $1           # 1: down to label15
+.LBB5_3:                                # %if.then1
 	end_block                       # label16:
-	return
-.LBB5_5:                                # %if.then3
-	end_block                       # label15:
 	call    	abort@FUNCTION
 	unreachable
+.LBB5_4:                                # %if.end38
+	end_block                       # label15:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -226,28 +202,24 @@ test7:                                  # @test7
 	i64.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label20
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label19
-# BB#2:                                 # %if.then1
-	call    	abort@FUNCTION
-	unreachable
-.LBB6_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label19
+	br      	2               # 2: down to label18
+.LBB6_2:                                # %if.else
 	end_block                       # label20:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label18
-.LBB6_4:                                # %if.end38
+	br_if   	1, $1           # 1: down to label18
+.LBB6_3:                                # %if.then1
 	end_block                       # label19:
-	return
-.LBB6_5:                                # %if.then3
-	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
+.LBB6_4:                                # %if.end38
+	end_block                       # label18:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end6:
 	.size	test7, .Lfunc_end6-test7
-
+                                        # -- End function
 	.section	.text.test8,"ax",@progbits
-	.hidden	test8
+	.hidden	test8                   # -- Begin function test8
 	.globl	test8
 	.type	test8,@function
 test8:                                  # @test8
@@ -260,28 +232,24 @@ test8:                                  # @test8
 	i64.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label23
 # BB#1:                                 # %if.then
-	i32.eqz 	$push2=, $1
-	br_if   	1, $pop2        # 1: down to label22
-# BB#2:                                 # %if.then1
-	call    	abort@FUNCTION
-	unreachable
-.LBB7_3:                                # %if.else
+	br_if   	1, $1           # 1: down to label22
+	br      	2               # 2: down to label21
+.LBB7_2:                                # %if.else
 	end_block                       # label23:
-	i32.eqz 	$push3=, $1
-	br_if   	1, $pop3        # 1: down to label21
-.LBB7_4:                                # %if.end38
+	br_if   	1, $1           # 1: down to label21
+.LBB7_3:                                # %if.then1
 	end_block                       # label22:
-	return
-.LBB7_5:                                # %if.then3
-	end_block                       # label21:
 	call    	abort@FUNCTION
 	unreachable
+.LBB7_4:                                # %if.end38
+	end_block                       # label21:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end7:
 	.size	test8, .Lfunc_end7-test8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -292,7 +260,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20020508-1.c.s b/test/torture-s/20020508-1.c.s
index 5be4f747b..b1e0be21f 100644
--- a/test/torture-s/20020508-1.c.s
+++ b/test/torture-s/20020508-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020508-1.c"
+	.file	"20020508-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -193,14 +193,14 @@ main:                                   # @main
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
 	unreachable
-.LBB0_22:                               # %if.then187
+.LBB0_22:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	uc                      # @uc
 	.type	uc,@object
 	.section	.data.uc,"aw",@progbits
@@ -264,6 +264,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020508-2.c.s b/test/torture-s/20020508-2.c.s
index 964782a8e..9558988e6 100644
--- a/test/torture-s/20020508-2.c.s
+++ b/test/torture-s/20020508-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020508-2.c"
+	.file	"20020508-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -219,14 +219,14 @@ main:                                   # @main
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
-.LBB0_22:                               # %if.then187
+.LBB0_22:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -290,6 +290,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020508-3.c.s b/test/torture-s/20020508-3.c.s
index f8e6e391a..267828845 100644
--- a/test/torture-s/20020508-3.c.s
+++ b/test/torture-s/20020508-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020508-3.c"
+	.file	"20020508-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -219,14 +219,14 @@ main:                                   # @main
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
-.LBB0_22:                               # %if.then187
+.LBB0_22:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -290,6 +290,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020510-1.c.s b/test/torture-s/20020510-1.c.s
index c1e330717..a93b3399a 100644
--- a/test/torture-s/20020510-1.c.s
+++ b/test/torture-s/20020510-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020510-1.c"
+	.file	"20020510-1.c"
 	.section	.text.testc,"ax",@progbits
-	.hidden	testc
+	.hidden	testc                   # -- Begin function testc
 	.globl	testc
 	.type	testc,@function
 testc:                                  # @testc
@@ -18,26 +18,26 @@ testc:                                  # @testc
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label2
 # BB#1:                                 # %if.then
-	br_if   	1, $1           # 1: down to label1
-# BB#2:                                 # %if.then5
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_3:                                # %if.else
+	i32.eqz 	$push6=, $1
+	br_if   	1, $pop6        # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_2:                                # %if.else
 	end_block                       # label2:
-	br_if   	1, $1           # 1: down to label0
-.LBB0_4:                                # %if.end9
+	i32.eqz 	$push7=, $1
+	br_if   	1, $pop7        # 1: down to label0
+.LBB0_3:                                # %if.then5
 	end_block                       # label1:
-	return
-.LBB0_5:                                # %if.then7
-	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
+.LBB0_4:                                # %if.end9
+	end_block                       # label0:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	testc, .Lfunc_end0-testc
-
+                                        # -- End function
 	.section	.text.tests,"ax",@progbits
-	.hidden	tests
+	.hidden	tests                   # -- Begin function tests
 	.globl	tests
 	.type	tests,@function
 tests:                                  # @tests
@@ -54,26 +54,26 @@ tests:                                  # @tests
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label5
 # BB#1:                                 # %if.then
-	br_if   	1, $1           # 1: down to label4
-# BB#2:                                 # %if.then5
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_3:                                # %if.else
+	i32.eqz 	$push6=, $1
+	br_if   	1, $pop6        # 1: down to label4
+	br      	2               # 2: down to label3
+.LBB1_2:                                # %if.else
 	end_block                       # label5:
-	br_if   	1, $1           # 1: down to label3
-.LBB1_4:                                # %if.end9
+	i32.eqz 	$push7=, $1
+	br_if   	1, $pop7        # 1: down to label3
+.LBB1_3:                                # %if.then5
 	end_block                       # label4:
-	return
-.LBB1_5:                                # %if.then7
-	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
+.LBB1_4:                                # %if.end9
+	end_block                       # label3:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	tests, .Lfunc_end1-tests
-
+                                        # -- End function
 	.section	.text.testi,"ax",@progbits
-	.hidden	testi
+	.hidden	testi                   # -- Begin function testi
 	.globl	testi
 	.type	testi,@function
 testi:                                  # @testi
@@ -86,26 +86,26 @@ testi:                                  # @testi
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label8
 # BB#1:                                 # %if.then
-	br_if   	1, $1           # 1: down to label7
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_3:                                # %if.else
+	i32.eqz 	$push2=, $1
+	br_if   	1, $pop2        # 1: down to label7
+	br      	2               # 2: down to label6
+.LBB2_2:                                # %if.else
 	end_block                       # label8:
-	br_if   	1, $1           # 1: down to label6
-.LBB2_4:                                # %if.end6
+	i32.eqz 	$push3=, $1
+	br_if   	1, $pop3        # 1: down to label6
+.LBB2_3:                                # %if.then2
 	end_block                       # label7:
-	return
-.LBB2_5:                                # %if.then4
-	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
+.LBB2_4:                                # %if.end6
+	end_block                       # label6:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	testi, .Lfunc_end2-testi
-
+                                        # -- End function
 	.section	.text.testl,"ax",@progbits
-	.hidden	testl
+	.hidden	testl                   # -- Begin function testl
 	.globl	testl
 	.type	testl,@function
 testl:                                  # @testl
@@ -118,26 +118,26 @@ testl:                                  # @testl
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label11
 # BB#1:                                 # %if.then
-	br_if   	1, $1           # 1: down to label10
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB3_3:                                # %if.else
+	i32.eqz 	$push2=, $1
+	br_if   	1, $pop2        # 1: down to label10
+	br      	2               # 2: down to label9
+.LBB3_2:                                # %if.else
 	end_block                       # label11:
-	br_if   	1, $1           # 1: down to label9
-.LBB3_4:                                # %if.end6
+	i32.eqz 	$push3=, $1
+	br_if   	1, $pop3        # 1: down to label9
+.LBB3_3:                                # %if.then2
 	end_block                       # label10:
-	return
-.LBB3_5:                                # %if.then4
-	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
+.LBB3_4:                                # %if.end6
+	end_block                       # label9:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end3:
 	.size	testl, .Lfunc_end3-testl
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -148,7 +148,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20020529-1.c.s b/test/torture-s/20020529-1.c.s
index eb347c815..3b65e0ebd 100644
--- a/test/torture-s/20020529-1.c.s
+++ b/test/torture-s/20020529-1.c.s
@@ -1,87 +1,98 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020529-1.c"
+	.file	"20020529-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 8
-	i32.add 	$5=, $0, $pop3
-	block   	
 	i32.const	$push15=, 0
-	i32.load	$push14=, f1.beenhere($pop15)
-	tee_local	$push13=, $4=, $pop14
-	i32.const	$push12=, 2
-	i32.ge_s	$push0=, $pop13, $pop12
-	br_if   	0, $pop0        # 0: down to label0
-.LBB0_1:                                # %f1.exit
-                                        # =>This Inner Loop Header: Depth=1
+	i32.const	$push14=, 0
+	i32.load	$push13=, f1.beenhere($pop14)
+	tee_local	$push12=, $7=, $pop13
+	i32.const	$push11=, 1
+	i32.add 	$push10=, $pop12, $pop11
+	tee_local	$push9=, $6=, $pop10
+	i32.store	f1.beenhere($pop15), $pop9
 	block   	
-	loop    	                # label2:
-	i32.const	$push19=, 1
-	i32.eq  	$push2=, $4, $pop19
-	br_if   	1, $pop2        # 1: down to label1
-# BB#2:                                 # %if.end
-                                        #   in Loop: Header=BB0_1 Depth=1
 	block   	
-	i32.const	$push20=, 1
-	i32.add 	$4=, $4, $pop20
 	block   	
-	br_if   	0, $1           # 0: down to label4
-# BB#3:                                 # %if.end3
-                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push8=, 1
+	i32.gt_s	$push0=, $7, $pop8
+	br_if   	0, $pop0        # 0: down to label2
+# BB#1:                                 # %f1.exit.lr.ph.lr.ph
+	i32.const	$push3=, 8
+	i32.add 	$5=, $0, $pop3
+.LBB0_2:                                # %f1.exit
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label3:
+	copy_local	$4=, $6
+	i32.const	$push16=, 1
+	i32.eq  	$push1=, $7, $pop16
+	br_if   	2, $pop1        # 2: down to label1
+# BB#3:                                 # %if.end
+                                        #   in Loop: Header=BB0_2 Depth=1
+	block   	
+	i32.eqz 	$push29=, $1
+	br_if   	0, $pop29       # 0: down to label4
+# BB#4:                                 # %for.cond
+                                        #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push21=, 0
-	i32.store	f1.beenhere($pop21), $4
+	i32.const	$push20=, 1
+	i32.add 	$push19=, $4, $pop20
+	tee_local	$push18=, $6=, $pop19
+	i32.store	f1.beenhere($pop21), $pop18
+	copy_local	$7=, $4
+	i32.const	$push17=, 2
+	i32.lt_s	$push2=, $4, $pop17
+	br_if   	1, $pop2        # 1: up to label3
+	br      	2               # 2: down to label2
+.LBB0_5:                                # %if.end3
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label4:
 	i32.store16	0($5), $3
 	i32.load	$push4=, 0($0)
-	br_if   	1, $pop4        # 1: down to label3
-# BB#4:                                 # %if.end8
-                                        #   in Loop: Header=BB0_1 Depth=1
-	br_if   	1, $2           # 1: down to label3
-# BB#5:                                 # %for.cond.outer.backedge
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push17=, 16
-	i32.shl 	$push5=, $3, $pop17
-	i32.const	$push16=, 16
-	i32.shr_s	$3=, $pop5, $pop16
-.LBB0_6:                                # %for.cond
-                                        #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label4:
-	i32.const	$push18=, 2
-	i32.ge_s	$push1=, $4, $pop18
-	br_if   	3, $pop1        # 3: down to label0
-	br      	1               # 1: up to label2
-.LBB0_7:                                # %if.then10
-	end_block                       # label3:
+	br_if   	3, $pop4        # 3: down to label0
+# BB#6:                                 # %if.end8
+                                        #   in Loop: Header=BB0_2 Depth=1
+	br_if   	3, $2           # 3: down to label0
+# BB#7:                                 # %sw.epilog
+                                        #   in Loop: Header=BB0_2 Depth=1
+	i32.const	$push28=, 0
+	i32.const	$push27=, 1
+	i32.add 	$push26=, $4, $pop27
+	tee_local	$push25=, $6=, $pop26
+	i32.store	f1.beenhere($pop28), $pop25
+	i32.const	$push24=, 16
+	i32.shl 	$push5=, $3, $pop24
+	i32.const	$push23=, 16
+	i32.shr_s	$3=, $pop5, $pop23
+	copy_local	$7=, $4
+	i32.const	$push22=, 1
+	i32.le_s	$push6=, $4, $pop22
+	br_if   	0, $pop6        # 0: up to label3
+.LBB0_8:                                # %if.then.i
 	end_loop
-	call    	f2@FUNCTION
+	end_block                       # label2:
+	call    	abort@FUNCTION
 	unreachable
-.LBB0_8:                                # %if.then
+.LBB0_9:                                # %if.then
 	end_block                       # label1:
-	i32.const	$push8=, 0
-	i32.const	$push6=, 1
-	i32.add 	$push7=, $4, $pop6
-	i32.store	f1.beenhere($pop8), $pop7
-	i32.const	$push22=, 0
-	return  	$pop22
-.LBB0_9:                                # %if.then.i
+	i32.const	$push7=, 0
+	return  	$pop7
+.LBB0_10:                               # %if.then7
 	end_block                       # label0:
-	i32.const	$push11=, 0
-	i32.const	$push9=, 1
-	i32.add 	$push10=, $4, $pop9
-	i32.store	f1.beenhere($pop11), $pop10
-	call    	abort@FUNCTION
+	call    	f2@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -111,9 +122,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -123,9 +134,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end2:
 	.size	f2, .Lfunc_end2-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -133,85 +144,73 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push19=, $pop11, $pop12
-	tee_local	$push18=, $0=, $pop19
-	i32.store	__stack_pointer($pop13), $pop18
-	i32.const	$2=, 23
-	i32.const	$push17=, 23
-	i32.store16	8($0), $pop17
+	i32.sub 	$push22=, $pop10, $pop12
+	tee_local	$push21=, $0=, $pop22
+	i32.store	__stack_pointer($pop13), $pop21
+	i32.const	$push0=, 0
+	i32.const	$push20=, 0
+	i32.load	$push19=, f1.beenhere($pop20)
+	tee_local	$push18=, $1=, $pop19
+	i32.const	$push17=, 1
+	i32.add 	$push1=, $pop18, $pop17
+	i32.store	f1.beenhere($pop0), $pop1
 	i32.const	$push16=, 0
 	i32.store	0($0), $pop16
-	i32.const	$push15=, 0
-	i32.load	$1=, f1.beenhere($pop15)
+	i32.const	$2=, 23
+	i32.const	$push15=, 23
+	i32.store16	8($0), $pop15
 	i32.store	4($0), $0
 	block   	
-	block   	
 	i32.const	$push14=, 1
-	i32.gt_s	$push0=, $1, $pop14
-	br_if   	0, $pop0        # 0: down to label7
-# BB#1:                                 # %f1.exit.i.preheader
-	i32.const	$push2=, 8
-	i32.add 	$0=, $0, $pop2
-.LBB3_2:                                # %f1.exit.i
+	i32.gt_s	$push2=, $1, $pop14
+	br_if   	0, $pop2        # 0: down to label6
+# BB#1:                                 # %f1.exit.lr.ph.i.preheader
+	i32.const	$push5=, 8
+	i32.add 	$0=, $0, $pop5
+.LBB3_2:                                # %f1.exit.lr.ph.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label9:
-	i32.const	$push20=, 1
-	i32.eq  	$push1=, $1, $pop20
-	br_if   	1, $pop1        # 1: down to label8
-# BB#3:                                 # %if.end.i
+	loop    	                # label8:
+	i32.const	$push23=, 1
+	i32.eq  	$push3=, $1, $pop23
+	br_if   	1, $pop3        # 1: down to label7
+# BB#3:                                 # %if.end8.i
                                         #   in Loop: Header=BB3_2 Depth=1
 	i32.const	$2=, 0
-	i32.const	$push25=, 0
-	i32.store16	0($0), $pop25
+	i32.const	$push30=, 0
+	i32.const	$push29=, 2
+	i32.add 	$push4=, $1, $pop29
+	i32.store	f1.beenhere($pop30), $pop4
+	i32.const	$push28=, 0
+	i32.store16	0($0), $pop28
+	i32.const	$push27=, 1
+	i32.add 	$push26=, $1, $pop27
+	tee_local	$push25=, $1=, $pop26
 	i32.const	$push24=, 1
-	i32.add 	$push23=, $1, $pop24
-	tee_local	$push22=, $1=, $pop23
-	i32.const	$push21=, 1
-	i32.le_s	$push3=, $pop22, $pop21
-	br_if   	0, $pop3        # 0: up to label9
-# BB#4:                                 # %if.then.i.i.loopexit
-	end_loop
-	i32.const	$push4=, 0
-	i32.store	f1.beenhere($pop4), $1
-	i32.const	$push5=, 1
-	i32.add 	$1=, $1, $pop5
+	i32.le_s	$push6=, $pop25, $pop24
+	br_if   	0, $pop6        # 0: up to label8
 	br      	2               # 2: down to label6
-.LBB3_5:                                # %foo.exit
-	end_block                       # label8:
-	i32.const	$push27=, 0
-	i32.const	$push6=, 1
-	i32.add 	$push7=, $1, $pop6
-	i32.store	f1.beenhere($pop27), $pop7
-	block   	
-	i32.const	$push8=, 65535
-	i32.and 	$push9=, $2, $pop8
-	br_if   	0, $pop9        # 0: down to label10
-# BB#6:                                 # %if.end
-	i32.const	$push28=, 0
-	call    	exit@FUNCTION, $pop28
-	unreachable
-.LBB3_7:                                # %if.then
-	end_block                       # label10:
-	call    	abort@FUNCTION
-	unreachable
-.LBB3_8:
+.LBB3_4:                                # %foo.exit
+	end_loop
 	end_block                       # label7:
-	i32.const	$push29=, 1
-	i32.add 	$1=, $1, $pop29
-.LBB3_9:                                # %if.then.i.i
+	i32.const	$push7=, 65535
+	i32.and 	$push8=, $2, $pop7
+	br_if   	0, $pop8        # 0: down to label6
+# BB#5:                                 # %if.end
+	i32.const	$push9=, 0
+	call    	exit@FUNCTION, $pop9
+	unreachable
+.LBB3_6:                                # %if.then.i.i
 	end_block                       # label6:
-	i32.const	$push26=, 0
-	i32.store	f1.beenhere($pop26), $1
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	f1.beenhere,@object     # @f1.beenhere
 	.section	.bss.f1.beenhere,"aw",@nobits
 	.p2align	2
@@ -220,6 +219,6 @@ f1.beenhere:
 	.size	f1.beenhere, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020611-1.c.s b/test/torture-s/20020611-1.c.s
index ec7951dec..8e7e6101e 100644
--- a/test/torture-s/20020611-1.c.s
+++ b/test/torture-s/20020611-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020611-1.c"
+	.file	"20020611-1.c"
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -20,9 +20,9 @@ x:                                      # @x
 	.endfunc
 .Lfunc_end0:
 	.size	x, .Lfunc_end0-x
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.data.n,"aw",@progbits
@@ -81,6 +81,6 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020614-1.c.s b/test/torture-s/20020614-1.c.s
index 3b45a15d7..079f3aa0a 100644
--- a/test/torture-s/20020614-1.c.s
+++ b/test/torture-s/20020614-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020614-1.c"
+	.file	"20020614-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020615-1.c.s b/test/torture-s/20020615-1.c.s
index dea56c383..49053f749 100644
--- a/test/torture-s/20020615-1.c.s
+++ b/test/torture-s/20020615-1.c.s
@@ -1,144 +1,325 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020615-1.c"
+	.file	"20020615-1.c"
 	.section	.text.line_hints,"ax",@progbits
-	.hidden	line_hints
+	.hidden	line_hints              # -- Begin function line_hints
 	.globl	line_hints
 	.type	line_hints,@function
 line_hints:                             # @line_hints
 	.param  	i32, i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push53=, 0
+	i32.const	$8=, 0
+	i32.const	$push52=, 0
 	i32.load	$push6=, 4($2)
 	i32.load	$push5=, 4($1)
-	i32.sub 	$push52=, $pop6, $pop5
-	tee_local	$push51=, $5=, $pop52
-	i32.sub 	$push7=, $pop53, $pop51
-	i32.load	$push50=, 8($0)
-	tee_local	$push49=, $4=, $pop50
-	i32.select	$push48=, $pop7, $5, $pop49
-	tee_local	$push47=, $6=, $pop48
-	i32.const	$push46=, 0
+	i32.sub 	$push51=, $pop6, $pop5
+	tee_local	$push50=, $5=, $pop51
+	i32.sub 	$push7=, $pop52, $pop50
+	i32.load	$push49=, 8($0)
+	tee_local	$push48=, $4=, $pop49
+	i32.select	$push47=, $pop7, $5, $pop48
+	tee_local	$push46=, $6=, $pop47
+	i32.const	$push45=, 0
 	i32.load	$push3=, 0($2)
 	i32.load	$push2=, 0($1)
-	i32.sub 	$push45=, $pop3, $pop2
-	tee_local	$push44=, $2=, $pop45
-	i32.sub 	$push4=, $pop46, $pop44
-	i32.load	$push43=, 4($0)
-	tee_local	$push42=, $3=, $pop43
-	i32.select	$push41=, $pop4, $2, $pop42
-	tee_local	$push40=, $7=, $pop41
-	i32.load	$push39=, 0($0)
-	tee_local	$push38=, $1=, $pop39
-	i32.select	$push37=, $pop47, $pop40, $pop38
-	tee_local	$push36=, $2=, $pop37
+	i32.sub 	$push44=, $pop3, $pop2
+	tee_local	$push43=, $2=, $pop44
+	i32.sub 	$push4=, $pop45, $pop43
+	i32.load	$push42=, 4($0)
+	tee_local	$push41=, $3=, $pop42
+	i32.select	$push40=, $pop4, $2, $pop41
+	tee_local	$push39=, $7=, $pop40
+	i32.load	$push38=, 0($0)
+	tee_local	$push37=, $1=, $pop38
+	i32.select	$push36=, $pop46, $pop39, $pop37
+	tee_local	$push35=, $2=, $pop36
 	i32.const	$push8=, 31
-	i32.shr_s	$push35=, $2, $pop8
-	tee_local	$push34=, $0=, $pop35
-	i32.add 	$push9=, $pop36, $pop34
+	i32.shr_s	$push34=, $2, $pop8
+	tee_local	$push33=, $0=, $pop34
+	i32.add 	$push9=, $pop35, $pop33
 	i32.xor 	$5=, $pop9, $0
-	i32.select	$push33=, $7, $6, $1
-	tee_local	$push32=, $0=, $pop33
-	i32.const	$push31=, 31
-	i32.shr_s	$push30=, $0, $pop31
-	tee_local	$push29=, $6=, $pop30
-	i32.add 	$push10=, $pop32, $pop29
+	i32.select	$push32=, $7, $6, $1
+	tee_local	$push31=, $0=, $pop32
+	i32.const	$push30=, 31
+	i32.shr_s	$push29=, $0, $pop30
+	tee_local	$push28=, $6=, $pop29
+	i32.add 	$push10=, $pop31, $pop28
 	i32.xor 	$6=, $pop10, $6
 	block   	
-	i32.eqz 	$push62=, $0
-	br_if   	0, $pop62       # 0: down to label0
+	block   	
+	i32.eqz 	$push60=, $0
+	br_if   	0, $pop60       # 0: down to label1
 # BB#1:                                 # %entry
-	i32.const	$push54=, 4
-	i32.shr_s	$push1=, $6, $pop54
+	i32.const	$push53=, 4
+	i32.shr_s	$push1=, $6, $pop53
 	i32.gt_s	$push11=, $5, $pop1
-	br_if   	0, $pop11       # 0: down to label0
+	br_if   	0, $pop11       # 0: down to label1
 # BB#2:                                 # %if.then21
 	i32.const	$push16=, 2
 	i32.const	$push15=, 1
 	i32.const	$push13=, 0
 	i32.gt_s	$push14=, $0, $pop13
-	i32.select	$push56=, $pop16, $pop15, $pop14
-	tee_local	$push55=, $0=, $pop56
+	i32.select	$push55=, $pop16, $pop15, $pop14
+	tee_local	$push54=, $0=, $pop55
 	i32.const	$push17=, 3
-	i32.xor 	$push18=, $pop55, $pop17
+	i32.xor 	$push18=, $pop54, $pop17
 	i32.select	$push12=, $4, $3, $1
-	i32.select	$push28=, $pop18, $0, $pop12
-	return  	$pop28
+	i32.select	$8=, $pop18, $0, $pop12
+	br      	1               # 1: down to label0
 .LBB0_3:                                # %if.else
-	end_block                       # label0:
-	block   	
-	i32.eqz 	$push63=, $2
-	br_if   	0, $pop63       # 0: down to label1
+	end_block                       # label1:
+	i32.eqz 	$push61=, $2
+	br_if   	0, $pop61       # 0: down to label0
 # BB#4:                                 # %if.else
-	i32.const	$push57=, 4
-	i32.shr_s	$push19=, $5, $pop57
+	i32.const	$push56=, 4
+	i32.shr_s	$push19=, $5, $pop56
 	i32.gt_s	$push20=, $6, $pop19
-	br_if   	0, $pop20       # 0: down to label1
+	br_if   	0, $pop20       # 0: down to label0
 # BB#5:                                 # %if.then31
 	i32.const	$push21=, 29
 	i32.shr_u	$push22=, $2, $pop21
 	i32.const	$push23=, 4
 	i32.and 	$push24=, $pop22, $pop23
-	i32.const	$push60=, 4
-	i32.add 	$push59=, $pop24, $pop60
-	tee_local	$push58=, $0=, $pop59
+	i32.const	$push59=, 4
+	i32.add 	$push58=, $pop24, $pop59
+	tee_local	$push57=, $0=, $pop58
 	i32.const	$push25=, 12
-	i32.xor 	$push26=, $pop58, $pop25
+	i32.xor 	$push26=, $pop57, $pop25
 	i32.select	$push0=, $3, $4, $1
 	i32.select	$push27=, $pop26, $0, $pop0
 	return  	$pop27
 .LBB0_6:                                # %if.end40
-	end_block                       # label1:
-	i32.const	$push61=, 0
-                                        # fallthrough-return: $pop61
+	end_block                       # label0:
+	copy_local	$push62=, $8
+                                        # fallthrough-return: $pop62
 	.endfunc
 .Lfunc_end0:
 	.size	line_hints, .Lfunc_end0-line_hints
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push2=, main.fh
-	i32.const	$push1=, main.gsf
-	i32.const	$push0=, main.gsf+8
-	i32.call	$push3=, line_hints@FUNCTION, $pop2, $pop1, $pop0
-	i32.const	$push4=, 1
-	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	0, $pop5        # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push6=, main.fh+12
-	i32.const	$push16=, main.gsf+16
-	i32.const	$push15=, main.gsf+24
-	i32.call	$push7=, line_hints@FUNCTION, $pop6, $pop16, $pop15
-	i32.const	$push8=, 8
-	i32.ne  	$push9=, $pop7, $pop8
-	br_if   	0, $pop9        # 0: down to label2
-# BB#2:                                 # %lor.lhs.false3
-	i32.const	$push10=, main.fh+24
-	i32.const	$push18=, main.gsf+16
-	i32.const	$push17=, main.gsf+24
-	i32.call	$push11=, line_hints@FUNCTION, $pop10, $pop18, $pop17
-	i32.const	$push12=, 4
-	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	0, $pop13       # 0: down to label2
-# BB#3:                                 # %if.end
-	i32.const	$push14=, 0
-	call    	exit@FUNCTION, $pop14
+	i32.const	$push4=, 0
+	i32.const	$push85=, 0
+	i32.load	$push6=, main.gsf+8($pop85)
+	i32.const	$push84=, 0
+	i32.load	$push5=, main.gsf($pop84)
+	i32.sub 	$push83=, $pop6, $pop5
+	tee_local	$push82=, $3=, $pop83
+	i32.sub 	$push7=, $pop4, $pop82
+	i32.const	$push81=, 0
+	i32.load	$push80=, main.fh+4($pop81)
+	tee_local	$push79=, $0=, $pop80
+	i32.select	$push78=, $pop7, $3, $pop79
+	tee_local	$push77=, $7=, $pop78
+	i32.const	$push76=, 0
+	i32.const	$push75=, 0
+	i32.load	$push9=, main.gsf+12($pop75)
+	i32.const	$push74=, 0
+	i32.load	$push8=, main.gsf+4($pop74)
+	i32.sub 	$push73=, $pop9, $pop8
+	tee_local	$push72=, $3=, $pop73
+	i32.sub 	$push10=, $pop76, $pop72
+	i32.const	$push71=, 0
+	i32.load	$push70=, main.fh+8($pop71)
+	tee_local	$push69=, $1=, $pop70
+	i32.select	$push68=, $pop10, $3, $pop69
+	tee_local	$push67=, $8=, $pop68
+	i32.const	$push66=, 0
+	i32.load	$push65=, main.fh($pop66)
+	tee_local	$push64=, $2=, $pop65
+	i32.select	$push63=, $pop77, $pop67, $pop64
+	tee_local	$push62=, $3=, $pop63
+	i32.eqz 	$push165=, $pop62
+	br_if   	0, $pop165      # 0: down to label2
+# BB#1:                                 # %entry
+	i32.select	$push92=, $8, $7, $2
+	tee_local	$push91=, $7=, $pop92
+	i32.const	$push11=, 31
+	i32.shr_s	$push90=, $7, $pop11
+	tee_local	$push89=, $7=, $pop90
+	i32.add 	$push12=, $pop91, $pop89
+	i32.xor 	$push2=, $pop12, $7
+	i32.const	$push88=, 31
+	i32.shr_s	$push87=, $3, $pop88
+	tee_local	$push86=, $7=, $pop87
+	i32.add 	$push13=, $3, $pop86
+	i32.xor 	$push14=, $pop13, $7
+	i32.const	$push15=, 4
+	i32.shr_s	$push3=, $pop14, $pop15
+	i32.gt_s	$push16=, $pop2, $pop3
+	br_if   	0, $pop16       # 0: down to label2
+# BB#2:                                 # %line_hints.exit
+	i32.const	$push20=, 2
+	i32.const	$push19=, 1
+	i32.const	$push96=, 0
+	i32.gt_s	$push18=, $3, $pop96
+	i32.select	$push95=, $pop20, $pop19, $pop18
+	tee_local	$push94=, $3=, $pop95
+	i32.const	$push21=, 3
+	i32.xor 	$push22=, $pop94, $pop21
+	i32.select	$push17=, $1, $0, $2
+	i32.select	$push23=, $pop22, $3, $pop17
+	i32.const	$push93=, 1
+	i32.ne  	$push24=, $pop23, $pop93
+	br_if   	0, $pop24       # 0: down to label2
+# BB#3:                                 # %lor.lhs.false
+	i32.const	$push132=, 0
+	i32.const	$push131=, 0
+	i32.load	$push29=, main.gsf+28($pop131)
+	i32.const	$push130=, 0
+	i32.load	$push28=, main.gsf+20($pop130)
+	i32.sub 	$push129=, $pop29, $pop28
+	tee_local	$push128=, $8=, $pop129
+	i32.sub 	$push127=, $pop132, $pop128
+	tee_local	$push126=, $5=, $pop127
+	i32.const	$push125=, 0
+	i32.load	$push124=, main.fh+20($pop125)
+	tee_local	$push123=, $10=, $pop124
+	i32.select	$push122=, $pop126, $8, $pop123
+	tee_local	$push121=, $3=, $pop122
+	i32.const	$push120=, 0
+	i32.const	$push119=, 0
+	i32.load	$push27=, main.gsf+24($pop119)
+	i32.const	$push118=, 0
+	i32.load	$push26=, main.gsf+16($pop118)
+	i32.sub 	$push117=, $pop27, $pop26
+	tee_local	$push116=, $0=, $pop117
+	i32.sub 	$push115=, $pop120, $pop116
+	tee_local	$push114=, $4=, $pop115
+	i32.const	$push113=, 0
+	i32.load	$push112=, main.fh+16($pop113)
+	tee_local	$push111=, $9=, $pop112
+	i32.select	$push110=, $pop114, $0, $pop111
+	tee_local	$push109=, $6=, $pop110
+	i32.const	$push108=, 0
+	i32.load	$push107=, main.fh+12($pop108)
+	tee_local	$push106=, $7=, $pop107
+	i32.select	$push105=, $pop121, $pop109, $pop106
+	tee_local	$push104=, $2=, $pop105
+	i32.const	$push30=, 31
+	i32.shr_s	$push103=, $2, $pop30
+	tee_local	$push102=, $1=, $pop103
+	i32.add 	$push31=, $pop104, $pop102
+	i32.xor 	$1=, $pop31, $1
+	i32.select	$push101=, $6, $3, $7
+	tee_local	$push100=, $3=, $pop101
+	i32.const	$push99=, 31
+	i32.shr_s	$push98=, $3, $pop99
+	tee_local	$push97=, $6=, $pop98
+	i32.add 	$push32=, $pop100, $pop97
+	i32.xor 	$6=, $pop32, $6
+	block   	
+	i32.eqz 	$push166=, $3
+	br_if   	0, $pop166      # 0: down to label3
+# BB#4:                                 # %lor.lhs.false
+	i32.const	$push133=, 4
+	i32.shr_s	$push25=, $6, $pop133
+	i32.le_s	$push33=, $1, $pop25
+	br_if   	1, $pop33       # 1: down to label2
+.LBB1_5:                                # %if.else.i82
+	end_block                       # label3:
+	i32.eqz 	$push167=, $2
+	br_if   	0, $pop167      # 0: down to label2
+# BB#6:                                 # %if.else.i82
+	i32.const	$push134=, 4
+	i32.shr_s	$push34=, $1, $pop134
+	i32.gt_s	$push35=, $6, $pop34
+	br_if   	0, $pop35       # 0: down to label2
+# BB#7:                                 # %line_hints.exit89
+	i32.const	$push36=, 29
+	i32.shr_u	$push37=, $2, $pop36
+	i32.const	$push138=, 4
+	i32.and 	$push38=, $pop37, $pop138
+	i32.const	$push137=, 4
+	i32.add 	$push136=, $pop38, $pop137
+	tee_local	$push135=, $3=, $pop136
+	i32.const	$push39=, 12
+	i32.xor 	$push40=, $pop135, $pop39
+	i32.select	$push0=, $9, $10, $7
+	i32.select	$push41=, $pop40, $3, $pop0
+	i32.const	$push42=, 8
+	i32.ne  	$push43=, $pop41, $pop42
+	br_if   	0, $pop43       # 0: down to label2
+# BB#8:                                 # %lor.lhs.false3
+	i32.const	$push45=, 0
+	i32.load	$push159=, main.fh+32($pop45)
+	tee_local	$push158=, $1=, $pop159
+	i32.select	$push157=, $5, $8, $pop158
+	tee_local	$push156=, $3=, $pop157
+	i32.const	$push155=, 0
+	i32.load	$push154=, main.fh+28($pop155)
+	tee_local	$push153=, $6=, $pop154
+	i32.select	$push152=, $4, $0, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 0
+	i32.load	$push149=, main.fh+24($pop150)
+	tee_local	$push148=, $7=, $pop149
+	i32.select	$push147=, $pop156, $pop151, $pop148
+	tee_local	$push146=, $2=, $pop147
+	i32.const	$push46=, 31
+	i32.shr_s	$push145=, $2, $pop46
+	tee_local	$push144=, $8=, $pop145
+	i32.add 	$push47=, $pop146, $pop144
+	i32.xor 	$8=, $pop47, $8
+	i32.select	$push143=, $0, $3, $7
+	tee_local	$push142=, $3=, $pop143
+	i32.const	$push141=, 31
+	i32.shr_s	$push140=, $3, $pop141
+	tee_local	$push139=, $0=, $pop140
+	i32.add 	$push48=, $pop142, $pop139
+	i32.xor 	$0=, $pop48, $0
+	block   	
+	i32.eqz 	$push168=, $3
+	br_if   	0, $pop168      # 0: down to label4
+# BB#9:                                 # %lor.lhs.false3
+	i32.const	$push160=, 4
+	i32.shr_s	$push44=, $0, $pop160
+	i32.le_s	$push49=, $8, $pop44
+	br_if   	1, $pop49       # 1: down to label2
+.LBB1_10:                               # %if.else.i40
+	end_block                       # label4:
+	i32.eqz 	$push169=, $2
+	br_if   	0, $pop169      # 0: down to label2
+# BB#11:                                # %if.else.i40
+	i32.const	$push51=, 4
+	i32.shr_s	$push50=, $8, $pop51
+	i32.gt_s	$push52=, $0, $pop50
+	br_if   	0, $pop52       # 0: down to label2
+# BB#12:                                # %line_hints.exit47
+	i32.const	$push53=, 29
+	i32.shr_u	$push54=, $2, $pop53
+	i32.const	$push55=, 4
+	i32.and 	$push56=, $pop54, $pop55
+	i32.const	$push164=, 4
+	i32.add 	$push163=, $pop56, $pop164
+	tee_local	$push162=, $3=, $pop163
+	i32.const	$push57=, 12
+	i32.xor 	$push58=, $pop162, $pop57
+	i32.select	$push1=, $6, $1, $7
+	i32.select	$push59=, $pop58, $3, $pop1
+	i32.const	$push161=, 4
+	i32.ne  	$push60=, $pop59, $pop161
+	br_if   	0, $pop60       # 0: down to label2
+# BB#13:                                # %if.end
+	i32.const	$push61=, 0
+	call    	exit@FUNCTION, $pop61
 	unreachable
-.LBB1_4:                                # %if.then
+.LBB1_14:                               # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.fh,@object         # @main.fh
 	.section	.data.main.fh,"aw",@progbits
 	.p2align	4
@@ -167,6 +348,6 @@ main.gsf:
 	.size	main.gsf, 32
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020619-1.c.s b/test/torture-s/20020619-1.c.s
index 196864447..a33ddfb5c 100644
--- a/test/torture-s/20020619-1.c.s
+++ b/test/torture-s/20020619-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020619-1.c"
+	.file	"20020619-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020716-1.c.s b/test/torture-s/20020716-1.c.s
index 8ce9fbefa..4d9bb8bc8 100644
--- a/test/torture-s/20020716-1.c.s
+++ b/test/torture-s/20020716-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020716-1.c"
+	.file	"20020716-1.c"
 	.section	.text.sub1,"ax",@progbits
-	.hidden	sub1
+	.hidden	sub1                    # -- Begin function sub1
 	.globl	sub1
 	.type	sub1,@function
 sub1:                                   # @sub1
@@ -13,9 +13,9 @@ sub1:                                   # @sub1
 	.endfunc
 .Lfunc_end0:
 	.size	sub1, .Lfunc_end0-sub1
-
+                                        # -- End function
 	.section	.text.testcond,"ax",@progbits
-	.hidden	testcond
+	.hidden	testcond                # -- Begin function testcond
 	.globl	testcond
 	.type	testcond,@function
 testcond:                               # @testcond
@@ -29,9 +29,9 @@ testcond:                               # @testcond
 	.endfunc
 .Lfunc_end1:
 	.size	testcond, .Lfunc_end1-testcond
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020720-1.c.s b/test/torture-s/20020720-1.c.s
index e11570025..f53101bb4 100644
--- a/test/torture-s/20020720-1.c.s
+++ b/test/torture-s/20020720-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020720-1.c"
+	.file	"20020720-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,6 +24,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020805-1.c.s b/test/torture-s/20020805-1.c.s
index 47992ead5..e7486ac8a 100644
--- a/test/torture-s/20020805-1.c.s
+++ b/test/torture-s/20020805-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020805-1.c"
+	.file	"20020805-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -20,9 +20,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.data.n,"aw",@progbits
@@ -57,6 +57,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020810-1.c.s b/test/torture-s/20020810-1.c.s
index 17f137b87..05c5b20c6 100644
--- a/test/torture-s/20020810-1.c.s
+++ b/test/torture-s/20020810-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020810-1.c"
+	.file	"20020810-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -28,9 +28,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -43,9 +43,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,19 +54,19 @@ main:                                   # @main
 # BB#0:                                 # %f.exit
 	block   	
 	i32.const	$push12=, 0
-	i64.load	$push11=, R($pop12)
-	tee_local	$push10=, $0=, $pop11
-	i32.wrap/i64	$push3=, $pop10
-	i32.const	$push9=, 0
-	i32.load	$push2=, R($pop9)
-	i32.ne  	$push4=, $pop3, $pop2
+	i32.load	$push2=, R($pop12)
+	i32.const	$push11=, 0
+	i64.load	$push10=, R($pop11)
+	tee_local	$push9=, $0=, $pop10
+	i32.wrap/i64	$push3=, $pop9
+	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
 # BB#1:                                 # %f.exit
+	i32.const	$push13=, 0
+	i32.load	$push0=, R+4($pop13)
 	i64.const	$push5=, 32
 	i64.shr_u	$push6=, $0, $pop5
-	i32.wrap/i64	$push0=, $pop6
-	i32.const	$push13=, 0
-	i32.load	$push1=, R+4($pop13)
+	i32.wrap/i64	$push1=, $pop6
 	i32.ne  	$push7=, $pop0, $pop1
 	br_if   	0, $pop7        # 0: down to label1
 # BB#2:                                 # %if.end
@@ -79,7 +79,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	R                       # @R
 	.type	R,@object
 	.section	.data.R,"aw",@progbits
@@ -91,5 +91,5 @@ R:
 	.size	R, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20020819-1.c.s b/test/torture-s/20020819-1.c.s
index 92e221c8c..6622b19db 100644
--- a/test/torture-s/20020819-1.c.s
+++ b/test/torture-s/20020819-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020819-1.c"
+	.file	"20020819-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020904-1.c.s b/test/torture-s/20020904-1.c.s
index a66886a4e..95ab8fe4a 100644
--- a/test/torture-s/20020904-1.c.s
+++ b/test/torture-s/20020904-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020904-1.c"
+	.file	"20020904-1.c"
 	.section	.text.fun,"ax",@progbits
-	.hidden	fun
+	.hidden	fun                     # -- Begin function fun
 	.globl	fun
 	.type	fun,@function
 fun:                                    # @fun
@@ -14,9 +14,9 @@ fun:                                    # @fun
 	.endfunc
 .Lfunc_end0:
 	.size	fun, .Lfunc_end0-fun
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020911-1.c.s b/test/torture-s/20020911-1.c.s
index 8ec400215..19b09a6db 100644
--- a/test/torture-s/20020911-1.c.s
+++ b/test/torture-s/20020911-1.c.s
@@ -1,39 +1,29 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020911-1.c"
+	.file	"20020911-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push1=, 0
-	i32.load16_s	$push11=, c($pop1)
-	tee_local	$push10=, $0=, $pop11
-	i32.const	$push3=, -1
-	i32.gt_s	$push4=, $pop10, $pop3
-	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push2=, 65535
-	i32.and 	$push0=, $0, $pop2
-	i32.const	$push5=, -32768
-	i32.add 	$push6=, $pop0, $pop5
-	i32.const	$push7=, 32768
-	i32.ge_s	$push8=, $pop6, $pop7
-	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
-	i32.const	$push9=, 0
-	return  	$pop9
-.LBB0_3:                                # %if.then
+	i32.const	$push3=, 0
+	i32.load16_s	$push0=, c($pop3)
+	i32.const	$push2=, 0
+	i32.ge_s	$push1=, $pop0, $pop2
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %if.end
+	i32.const	$push4=, 0
+	return  	$pop4
+.LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -44,5 +34,5 @@ c:
 	.size	c, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20020916-1.c.s b/test/torture-s/20020916-1.c.s
index bc020975e..dcb1e5400 100644
--- a/test/torture-s/20020916-1.c.s
+++ b/test/torture-s/20020916-1.c.s
@@ -1,25 +1,22 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020916-1.c"
+	.file	"20020916-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 0
-	i32.gt_s	$push3=, $0, $pop2
-	i32.const	$push0=, 31
-	i32.shr_u	$push1=, $0, $pop0
-	i32.or  	$push4=, $pop3, $pop1
-                                        # fallthrough-return: $pop4
+	i32.const	$push0=, 0
+	i32.ne  	$push1=, $0, $pop0
+                                        # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20020920-1.c.s b/test/torture-s/20020920-1.c.s
index 1fe1d1b4f..6aec7b525 100644
--- a/test/torture-s/20020920-1.c.s
+++ b/test/torture-s/20020920-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20020920-1.c"
+	.file	"20020920-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021010-1.c.s b/test/torture-s/20021010-1.c.s
index cbfc63d47..08d1f8b83 100644
--- a/test/torture-s/20021010-1.c.s
+++ b/test/torture-s/20021010-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021010-1.c"
+	.file	"20021010-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -12,9 +12,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021010-2.c.s b/test/torture-s/20021010-2.c.s
index db8a6fd23..505bcbc36 100644
--- a/test/torture-s/20021010-2.c.s
+++ b/test/torture-s/20021010-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021010-2.c"
+	.file	"20021010-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	expectedwidth           # @expectedwidth
 	.type	expectedwidth,@object
 	.section	.data.expectedwidth,"aw",@progbits
@@ -85,6 +85,6 @@ global_saveRect:
 	.size	global_saveRect, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021011-1.c.s b/test/torture-s/20021011-1.c.s
index fa9a29808..43a39b075 100644
--- a/test/torture-s/20021011-1.c.s
+++ b/test/torture-s/20021011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021011-1.c"
+	.file	"20021011-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	i32.const	$push35=, .L.str
 	i32.call	$push0=, strcmp@FUNCTION, $pop36, $pop35
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %if.end
 	i32.const	$push48=, 0
 	i32.store8	buf+8($pop48), $0
 	i32.const	$push47=, 0
@@ -216,14 +216,14 @@ main:                                   # @main
 # BB#17:                                # %for.cond.15
 	i32.const	$push137=, 0
 	return  	$pop137
-.LBB0_18:                               # %if.then7
+.LBB0_18:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -240,6 +240,6 @@ buf:
 	.size	.L.str, 9
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20021015-1.c.s b/test/torture-s/20021015-1.c.s
index 415214e08..0b345ac17 100644
--- a/test/torture-s/20021015-1.c.s
+++ b/test/torture-s/20021015-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021015-1.c"
+	.file	"20021015-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -24,9 +24,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	g_list                  # @g_list
 	.type	g_list,@object
 	.section	.data.g_list,"aw",@progbits
@@ -58,5 +58,5 @@ g_list:
 	.size	g_list, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20021024-1.c.s b/test/torture-s/20021024-1.c.s
index 7f870aea6..5bff253ab 100644
--- a/test/torture-s/20021024-1.c.s
+++ b/test/torture-s/20021024-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021024-1.c"
+	.file	"20021024-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,9 +10,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -58,9 +58,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -68,10 +68,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop7, $pop8
+	i32.sub 	$push18=, $pop6, $pop8
 	tee_local	$push17=, $0=, $pop18
 	i32.store	__stack_pointer($pop9), $pop17
 	i32.const	$push1=, 0
@@ -98,7 +98,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	cp                      # @cp
 	.type	cp,@object
 	.section	.bss.cp,"aw",@nobits
@@ -125,5 +125,5 @@ main.r:
 	.size	main.r, 512
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021111-1.c.s b/test/torture-s/20021111-1.c.s
index 4cd89edd2..faf5928d3 100644
--- a/test/torture-s/20021111-1.c.s
+++ b/test/torture-s/20021111-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021111-1.c"
+	.file	"20021111-1.c"
 	.section	.text.aim_callhandler,"ax",@progbits
-	.hidden	aim_callhandler
+	.hidden	aim_callhandler         # -- Begin function aim_callhandler
 	.globl	aim_callhandler
 	.type	aim_callhandler,@function
 aim_callhandler:                        # @aim_callhandler
@@ -39,9 +39,9 @@ aim_callhandler:                        # @aim_callhandler
 	.endfunc
 .Lfunc_end0:
 	.size	aim_callhandler, .Lfunc_end0-aim_callhandler
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	aim_callhandler.i,@object # @aim_callhandler.i
 	.section	.bss.aim_callhandler.i,"aw",@nobits
 	.p2align	2
@@ -67,6 +67,6 @@ aim_callhandler.i:
 	.size	aim_callhandler.i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021113-1.c.s b/test/torture-s/20021113-1.c.s
index 0bbaf2508..ad500b6f1 100644
--- a/test/torture-s/20021113-1.c.s
+++ b/test/torture-s/20021113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021113-1.c"
+	.file	"20021113-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021118-1.c.s b/test/torture-s/20021118-1.c.s
index 1468861b0..e6591f575 100644
--- a/test/torture-s/20021118-1.c.s
+++ b/test/torture-s/20021118-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021118-1.c"
+	.file	"20021118-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021118-2.c.s b/test/torture-s/20021118-2.c.s
index 47d458e82..3e16c8fc9 100644
--- a/test/torture-s/20021118-2.c.s
+++ b/test/torture-s/20021118-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021118-2.c"
+	.file	"20021118-2.c"
 	.section	.text.t1,"ax",@progbits
-	.hidden	t1
+	.hidden	t1                      # -- Begin function t1
 	.globl	t1
 	.type	t1,@function
 t1:                                     # @t1
@@ -26,9 +26,9 @@ t1:                                     # @t1
 	.endfunc
 .Lfunc_end0:
 	.size	t1, .Lfunc_end0-t1
-
+                                        # -- End function
 	.section	.text.t2,"ax",@progbits
-	.hidden	t2
+	.hidden	t2                      # -- Begin function t2
 	.globl	t2
 	.type	t2,@function
 t2:                                     # @t2
@@ -55,9 +55,9 @@ t2:                                     # @t2
 	.endfunc
 .Lfunc_end1:
 	.size	t2, .Lfunc_end1-t2
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -76,9 +76,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end2:
 	.size	f1, .Lfunc_end2-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -101,9 +101,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -122,9 +122,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end4:
 	.size	f3, .Lfunc_end4-f3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -136,8 +136,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021118-3.c.s b/test/torture-s/20021118-3.c.s
index 18ec2de05..d9204c022 100644
--- a/test/torture-s/20021118-3.c.s
+++ b/test/torture-s/20021118-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021118-3.c"
+	.file	"20021118-3.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -28,9 +28,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,8 +42,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021119-1.c.s b/test/torture-s/20021119-1.c.s
index 457fdb391..c7ad81f8a 100644
--- a/test/torture-s/20021119-1.c.s
+++ b/test/torture-s/20021119-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021119-1.c"
+	.file	"20021119-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,6 +31,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20021120-1.c.s b/test/torture-s/20021120-1.c.s
index 02e36f92f..f59762eaf 100644
--- a/test/torture-s/20021120-1.c.s
+++ b/test/torture-s/20021120-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021120-1.c"
+	.file	"20021120-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -571,9 +571,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -582,18 +582,18 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$1=, 0
 	f64.const	$0=, 0x0p0
-	i32.const	$2=, gd
-	i32.const	$3=, gf
+	i32.const	$3=, gd
+	i32.const	$2=, gf
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	f64.store	0($2), $0
+	f64.store	0($3), $0
 	f32.convert_s/i32	$push0=, $1
-	f32.store	0($3), $pop0
+	f32.store	0($2), $pop0
 	i32.const	$push17=, 4
-	i32.add 	$3=, $3, $pop17
+	i32.add 	$2=, $2, $pop17
 	i32.const	$push16=, 8
-	i32.add 	$2=, $2, $pop16
+	i32.add 	$3=, $3, $pop16
 	f64.const	$push15=, 0x1p0
 	f64.add 	$0=, $0, $pop15
 	i32.const	$push14=, 1
@@ -606,9 +606,9 @@ main:                                   # @main
 	end_loop
 	i32.const	$push18=, 1
 	call    	foo@FUNCTION, $pop18
+	i32.const	$3=, -1
 	i32.const	$2=, gd
 	i32.const	$1=, 0
-	i32.const	$3=, 0
 .LBB1_3:                                # %for.body6
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -619,10 +619,13 @@ main:                                   # @main
 	br_if   	1, $pop4        # 1: down to label3
 # BB#4:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push19=, gf
-	i32.add 	$push5=, $1, $pop19
+	i32.const	$push22=, gf
+	i32.add 	$push5=, $1, $pop22
 	f32.load	$push6=, 0($pop5)
-	f32.convert_s/i32	$push7=, $3
+	i32.const	$push21=, 1
+	i32.add 	$push20=, $3, $pop21
+	tee_local	$push19=, $3=, $pop20
+	f32.convert_s/i32	$push7=, $pop19
 	f32.ne  	$push8=, $pop6, $pop7
 	br_if   	1, $pop8        # 1: down to label3
 # BB#5:                                 # %for.cond3
@@ -631,11 +634,8 @@ main:                                   # @main
 	i32.add 	$1=, $1, $pop25
 	i32.const	$push24=, 8
 	i32.add 	$2=, $2, $pop24
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $3, $pop23
-	tee_local	$push21=, $3=, $pop22
-	i32.const	$push20=, 31
-	i32.le_s	$push9=, $pop21, $pop20
+	i32.const	$push23=, 30
+	i32.le_u	$push9=, $3, $pop23
 	br_if   	0, $pop9        # 0: up to label4
 # BB#6:                                 # %for.end17
 	end_loop
@@ -649,7 +649,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	gd                      # @gd
 	.type	gd,@object
 	.section	.bss.gd,"aw",@nobits
@@ -669,6 +669,6 @@ gf:
 	.size	gf, 128
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021120-2.c.s b/test/torture-s/20021120-2.c.s
index d73f18e0d..ae3d1b716 100644
--- a/test/torture-s/20021120-2.c.s
+++ b/test/torture-s/20021120-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021120-2.c"
+	.file	"20021120-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	g1                      # @g1
 	.type	g1,@object
 	.section	.bss.g1,"aw",@nobits
@@ -58,5 +58,5 @@ g2:
 	.size	g2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021120-3.c.s b/test/torture-s/20021120-3.c.s
index 7345714d3..99209767a 100644
--- a/test/torture-s/20021120-3.c.s
+++ b/test/torture-s/20021120-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021120-3.c"
+	.file	"20021120-3.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,10 +10,10 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
+	i32.sub 	$push15=, $pop6, $pop8
 	tee_local	$push14=, $3=, $pop15
 	i32.store	__stack_pointer($pop9), $pop14
 	i32.div_u	$push0=, $1, $2
@@ -33,9 +33,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,10 +43,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %if.end
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push10=, $pop4, $pop5
+	i32.sub 	$push10=, $pop3, $pop5
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop6), $pop9
 	i32.const	$push0=, 1073741823
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -69,6 +69,6 @@ main:                                   # @main
 	.size	.L.str, 3
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021127-1.c.s b/test/torture-s/20021127-1.c.s
index 5f47eb569..860885976 100644
--- a/test/torture-s/20021127-1.c.s
+++ b/test/torture-s/20021127-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021127-1.c"
+	.file	"20021127-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,9 +12,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.llabs,"ax",@progbits
-	.hidden	llabs
+	.hidden	llabs                   # -- Begin function llabs
 	.globl	llabs
 	.type	llabs,@function
 llabs:                                  # @llabs
@@ -26,7 +26,7 @@ llabs:                                  # @llabs
 	.endfunc
 .Lfunc_end1:
 	.size	llabs, .Lfunc_end1-llabs
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -37,5 +37,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20021204-1.c.s b/test/torture-s/20021204-1.c.s
index 23c7af832..c86970556 100644
--- a/test/torture-s/20021204-1.c.s
+++ b/test/torture-s/20021204-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021204-1.c"
+	.file	"20021204-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	z                       # @z
 	.type	z,@object
 	.section	.bss.z,"aw",@nobits
@@ -54,6 +54,6 @@ z:
 	.size	z, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021219-1.c.s b/test/torture-s/20021219-1.c.s
index 1875361d5..cf115635f 100644
--- a/test/torture-s/20021219-1.c.s
+++ b/test/torture-s/20021219-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20021219-1.c"
+	.file	"20021219-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,35 +11,35 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push19=, $pop14, $pop15
+	i32.sub 	$push19=, $pop13, $pop15
 	tee_local	$push18=, $0=, $pop19
-	i32.const	$push3=, 14
+	i32.const	$push3=, 10
 	i32.add 	$push4=, $pop18, $pop3
 	i32.const	$push1=, 0
 	i32.load8_u	$push2=, .Lmain.str+10($pop1)
 	i32.store8	0($pop4), $pop2
-	i32.const	$push6=, 12
+	i32.const	$push6=, 8
 	i32.add 	$push7=, $0, $pop6
 	i32.const	$push17=, 0
 	i32.load16_u	$push5=, .Lmain.str+8($pop17):p2align=0
 	i32.store16	0($pop7), $pop5
 	i32.const	$push16=, 0
 	i64.load	$push8=, .Lmain.str($pop16):p2align=0
-	i64.store	4($0):p2align=2, $pop8
-	i32.const	$push9=, 10
-	i32.add 	$0=, $0, $pop9
+	i64.store	0($0), $pop8
+	i32.const	$push9=, 6
+	i32.or  	$0=, $0, $pop9
 	i32.const	$1=, 32
 .LBB1_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.str,@object      # @main.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .Lmain.str:
@@ -81,4 +81,4 @@ main:                                   # @main
 	.size	.Lmain.str, 11
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030105-1.c.s b/test/torture-s/20030105-1.c.s
index 050cbac04..b4de9fa72 100644
--- a/test/torture-s/20030105-1.c.s
+++ b/test/torture-s/20030105-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030105-1.c"
+	.file	"20030105-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,8 +36,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030109-1.c.s b/test/torture-s/20030109-1.c.s
index 662e18065..882d64f6e 100644
--- a/test/torture-s/20030109-1.c.s
+++ b/test/torture-s/20030109-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030109-1.c"
+	.file	"20030109-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -35,5 +35,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20030117-1.c.s b/test/torture-s/20030117-1.c.s
index cacb484af..04a437c51 100644
--- a/test/torture-s/20030117-1.c.s
+++ b/test/torture-s/20030117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030117-1.c"
+	.file	"20030117-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -30,9 +30,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -50,7 +50,7 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030120-1.c.s b/test/torture-s/20030120-1.c.s
index 6966963e1..056b2e70a 100644
--- a/test/torture-s/20030120-1.c.s
+++ b/test/torture-s/20030120-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030120-1.c"
+	.file	"20030120-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,9 +14,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -29,9 +29,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -44,9 +44,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030120-2.c.s b/test/torture-s/20030120-2.c.s
index c9f9134e6..efac761ed 100644
--- a/test/torture-s/20030120-2.c.s
+++ b/test/torture-s/20030120-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030120-2.c"
+	.file	"20030120-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,6 +35,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030125-1.c.s b/test/torture-s/20030125-1.c.s
index 688493e59..80f863422 100644
--- a/test/torture-s/20030125-1.c.s
+++ b/test/torture-s/20030125-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030125-1.c"
+	.file	"20030125-1.c"
 	.section	.text.t,"ax",@progbits
-	.hidden	t
+	.hidden	t                       # -- Begin function t
 	.globl	t
 	.type	t,@function
 t:                                      # @t
@@ -15,9 +15,9 @@ t:                                      # @t
 	.endfunc
 .Lfunc_end0:
 	.size	t, .Lfunc_end0-t
-
+                                        # -- End function
 	.section	.text.sin,"ax",@progbits
-	.hidden	sin
+	.hidden	sin                     # -- Begin function sin
 	.globl	sin
 	.type	sin,@function
 sin:                                    # @sin
@@ -29,9 +29,9 @@ sin:                                    # @sin
 	.endfunc
 .Lfunc_end1:
 	.size	sin, .Lfunc_end1-sin
-
+                                        # -- End function
 	.section	.text.q,"ax",@progbits
-	.hidden	q
+	.hidden	q                       # -- Begin function q
 	.globl	q
 	.type	q,@function
 q:                                      # @q
@@ -44,9 +44,9 @@ q:                                      # @q
 	.endfunc
 .Lfunc_end2:
 	.size	q, .Lfunc_end2-q
-
+                                        # -- End function
 	.section	.text.floor,"ax",@progbits
-	.hidden	floor
+	.hidden	floor                   # -- Begin function floor
 	.globl	floor
 	.type	floor,@function
 floor:                                  # @floor
@@ -58,9 +58,9 @@ floor:                                  # @floor
 	.endfunc
 .Lfunc_end3:
 	.size	floor, .Lfunc_end3-floor
-
+                                        # -- End function
 	.section	.text.q1,"ax",@progbits
-	.hidden	q1
+	.hidden	q1                      # -- Begin function q1
 	.globl	q1
 	.type	q1,@function
 q1:                                     # @q1
@@ -73,9 +73,9 @@ q1:                                     # @q1
 	.endfunc
 .Lfunc_end4:
 	.size	q1, .Lfunc_end4-q1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -86,9 +86,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
-
+                                        # -- End function
 	.section	.text.floorf,"ax",@progbits
-	.hidden	floorf
+	.hidden	floorf                  # -- Begin function floorf
 	.globl	floorf
 	.type	floorf,@function
 floorf:                                 # @floorf
@@ -100,9 +100,9 @@ floorf:                                 # @floorf
 	.endfunc
 .Lfunc_end6:
 	.size	floorf, .Lfunc_end6-floorf
-
+                                        # -- End function
 	.section	.text.sinf,"ax",@progbits
-	.hidden	sinf
+	.hidden	sinf                    # -- Begin function sinf
 	.globl	sinf
 	.type	sinf,@function
 sinf:                                   # @sinf
@@ -114,7 +114,7 @@ sinf:                                   # @sinf
 	.endfunc
 .Lfunc_end7:
 	.size	sinf, .Lfunc_end7-sinf
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20030128-1.c.s b/test/torture-s/20030128-1.c.s
index f2a22fae4..fc8ae5842 100644
--- a/test/torture-s/20030128-1.c.s
+++ b/test/torture-s/20030128-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030128-1.c"
+	.file	"20030128-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -52,6 +52,6 @@ y:
 	.size	y, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030203-1.c.s b/test/torture-s/20030203-1.c.s
index eb598642e..79c511344 100644
--- a/test/torture-s/20030203-1.c.s
+++ b/test/torture-s/20030203-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030203-1.c"
+	.file	"20030203-1.c"
 	.section	.text.do_layer3,"ax",@progbits
-	.hidden	do_layer3
+	.hidden	do_layer3               # -- Begin function do_layer3
 	.globl	do_layer3
 	.type	do_layer3,@function
 do_layer3:                              # @do_layer3
@@ -16,9 +16,9 @@ do_layer3:                              # @do_layer3
 	.endfunc
 .Lfunc_end0:
 	.size	do_layer3, .Lfunc_end0-do_layer3
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -28,9 +28,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,6 +41,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030209-1.c.s b/test/torture-s/20030209-1.c.s
index 9ccf485cb..b67066055 100644
--- a/test/torture-s/20030209-1.c.s
+++ b/test/torture-s/20030209-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030209-1.c"
+	.file	"20030209-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,7 +16,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -27,5 +27,5 @@ x:
 	.size	x, 80000
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030216-1.c.s b/test/torture-s/20030216-1.c.s
index 050d0b0a5..58a6fb682 100644
--- a/test/torture-s/20030216-1.c.s
+++ b/test/torture-s/20030216-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030216-1.c"
+	.file	"20030216-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	one                     # @one
 	.type	one,@object
 	.section	.rodata.one,"a",@progbits
@@ -23,4 +23,4 @@ one:
 	.size	one, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030218-1.c.s b/test/torture-s/20030218-1.c.s
index b272cf1ac..430ae6275 100644
--- a/test/torture-s/20030218-1.c.s
+++ b/test/torture-s/20030218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030218-1.c"
+	.file	"20030218-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,10 +27,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %if.end
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop5, $pop6
+	i32.sub 	$push10=, $pop4, $pop6
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop7), $pop9
 	i32.const	$push2=, 0
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	q                       # @q
 	.type	q,@object
 	.section	.bss.q,"aw",@nobits
@@ -56,5 +56,5 @@ q:
 	.size	q, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030221-1.c.s b/test/torture-s/20030221-1.c.s
index 213509657..49363f044 100644
--- a/test/torture-s/20030221-1.c.s
+++ b/test/torture-s/20030221-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030221-1.c"
+	.file	"20030221-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop7, $pop8
+	i32.sub 	$push18=, $pop6, $pop8
 	tee_local	$push17=, $1=, $pop18
 	i32.store	__stack_pointer($pop9), $pop17
 	i32.const	$push16=, 0
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.Lmain.buf,@object      # @main.buf
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4
@@ -53,6 +53,6 @@ main:                                   # @main
 	.size	.Lmain.buf, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strlen, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20030222-1.c.s b/test/torture-s/20030222-1.c.s
index edd4692b1..20bee4dd4 100644
--- a/test/torture-s/20030222-1.c.s
+++ b/test/torture-s/20030222-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030222-1.c"
+	.file	"20030222-1.c"
 	.section	.text.ll_to_int,"ax",@progbits
-	.hidden	ll_to_int
+	.hidden	ll_to_int               # -- Begin function ll_to_int
 	.globl	ll_to_int
 	.type	ll_to_int,@function
 ll_to_int:                              # @ll_to_int
@@ -14,9 +14,9 @@ ll_to_int:                              # @ll_to_int
 	.endfunc
 .Lfunc_end0:
 	.size	ll_to_int, .Lfunc_end0-ll_to_int
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,10 +24,10 @@ main:                                   # @main
 	.local  	i64, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop3, $pop4
+	i32.sub 	$push10=, $pop2, $pop4
 	tee_local	$push9=, $2=, $pop10
 	i32.store	__stack_pointer($pop5), $pop9
 	i32.const	$push8=, 0
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	val                     # @val
 	.type	val,@object
 	.section	.data.val,"aw",@progbits
@@ -63,6 +63,6 @@ val:
 	.size	val, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030224-2.c.s b/test/torture-s/20030224-2.c.s
index 8b0e5e161..0bf5da478 100644
--- a/test/torture-s/20030224-2.c.s
+++ b/test/torture-s/20030224-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030224-2.c"
+	.file	"20030224-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	node                    # @node
 	.type	node,@object
 	.section	.bss.node,"aw",@nobits
@@ -32,4 +32,4 @@ node_p:
 	.size	node_p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030307-1.c.s b/test/torture-s/20030307-1.c.s
index 57d424eb7..f6e4c1611 100644
--- a/test/torture-s/20030307-1.c.s
+++ b/test/torture-s/20030307-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030307-1.c"
+	.file	"20030307-1.c"
 	.section	.text.vfswrap_lock,"ax",@progbits
-	.hidden	vfswrap_lock
+	.hidden	vfswrap_lock            # -- Begin function vfswrap_lock
 	.globl	vfswrap_lock
 	.type	vfswrap_lock,@function
 vfswrap_lock:                           # @vfswrap_lock
@@ -13,9 +13,9 @@ vfswrap_lock:                           # @vfswrap_lock
 	.endfunc
 .Lfunc_end0:
 	.size	vfswrap_lock, .Lfunc_end0-vfswrap_lock
-
+                                        # -- End function
 	.section	.text.fcntl_lock,"ax",@progbits
-	.hidden	fcntl_lock
+	.hidden	fcntl_lock              # -- Begin function fcntl_lock
 	.globl	fcntl_lock
 	.type	fcntl_lock,@function
 fcntl_lock:                             # @fcntl_lock
@@ -27,9 +27,9 @@ fcntl_lock:                             # @fcntl_lock
 	.endfunc
 .Lfunc_end1:
 	.size	fcntl_lock, .Lfunc_end1-fcntl_lock
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,6 +40,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030313-1.c.s b/test/torture-s/20030313-1.c.s
index e78978adf..3dd1c75cb 100644
--- a/test/torture-s/20030313-1.c.s
+++ b/test/torture-s/20030313-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030313-1.c"
+	.file	"20030313-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -73,16 +73,16 @@ foo:                                    # @foo
 	br_if   	0, $pop37       # 0: down to label0
 # BB#13:                                # %if.end40
 	return
-.LBB0_14:                               # %if.then39
+.LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -90,10 +90,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 160
-	i32.sub 	$push21=, $pop13, $pop14
+	i32.sub 	$push21=, $pop12, $pop14
 	tee_local	$push20=, $0=, $pop21
 	i32.store	__stack_pointer($pop15), $pop20
 	i64.const	$push0=, 47244640257
@@ -104,19 +104,19 @@ main:                                   # @main
 	i32.store	16($0), $pop2
 	i32.const	$push3=, 4
 	i32.store	24($0), $pop3
-	i32.const	$push4=, 0
-	i32.load	$push5=, x($pop4)
-	i32.store	20($0), $pop5
+	i32.const	$push4=, 5
+	i32.store	32($0), $pop4
+	i32.const	$push5=, 6
+	i32.store	40($0), $pop5
+	i32.const	$push6=, 0
+	i32.load	$push7=, x($pop6)
+	i32.store	20($0), $pop7
 	i32.const	$push19=, 0
-	i32.load	$push6=, x+4($pop19)
-	i32.store	28($0), $pop6
-	i32.const	$push7=, 5
-	i32.store	32($0), $pop7
+	i32.load	$push8=, x+4($pop19)
+	i32.store	28($0), $pop8
 	i32.const	$push18=, 0
-	i32.load	$push8=, x+8($pop18)
-	i32.store	36($0), $pop8
-	i32.const	$push9=, 6
-	i32.store	40($0), $pop9
+	i32.load	$push9=, x+8($pop18)
+	i32.store	36($0), $pop9
 	i32.const	$push17=, 0
 	i32.load	$push10=, x+12($pop17)
 	i32.store	44($0), $pop10
@@ -128,7 +128,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -142,6 +142,6 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030316-1.c.s b/test/torture-s/20030316-1.c.s
index 81be12832..c4cb5cc03 100644
--- a/test/torture-s/20030316-1.c.s
+++ b/test/torture-s/20030316-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030316-1.c"
+	.file	"20030316-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030330-1.c.s b/test/torture-s/20030330-1.c.s
index dd6e76312..566531cab 100644
--- a/test/torture-s/20030330-1.c.s
+++ b/test/torture-s/20030330-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030330-1.c"
+	.file	"20030330-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030401-1.c.s b/test/torture-s/20030401-1.c.s
index 57d0a9869..b580fd9f5 100644
--- a/test/torture-s/20030401-1.c.s
+++ b/test/torture-s/20030401-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030401-1.c"
+	.file	"20030401-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -12,9 +12,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,6 +37,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030403-1.c.s b/test/torture-s/20030403-1.c.s
index 1548d4e6c..ce1defe2e 100644
--- a/test/torture-s/20030403-1.c.s
+++ b/test/torture-s/20030403-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030403-1.c"
+	.file	"20030403-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030404-1.c.s b/test/torture-s/20030404-1.c.s
index 1a8d8f0a6..32f2db5db 100644
--- a/test/torture-s/20030404-1.c.s
+++ b/test/torture-s/20030404-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030404-1.c"
+	.file	"20030404-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030408-1.c.s b/test/torture-s/20030408-1.c.s
index d375e6f93..fc300361c 100644
--- a/test/torture-s/20030408-1.c.s
+++ b/test/torture-s/20030408-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030408-1.c"
+	.file	"20030408-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -12,9 +12,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -25,9 +25,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -38,9 +38,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -51,9 +51,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -64,6 +64,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030606-1.c.s b/test/torture-s/20030606-1.c.s
index 86ef44224..02f9fb604 100644
--- a/test/torture-s/20030606-1.c.s
+++ b/test/torture-s/20030606-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030606-1.c"
+	.file	"20030606-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -28,9 +28,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030613-1.c.s b/test/torture-s/20030613-1.c.s
index 9e54cdf66..aef6a1ed0 100644
--- a/test/torture-s/20030613-1.c.s
+++ b/test/torture-s/20030613-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030613-1.c"
+	.file	"20030613-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030626-1.c.s b/test/torture-s/20030626-1.c.s
index 26e98b50e..073087308 100644
--- a/test/torture-s/20030626-1.c.s
+++ b/test/torture-s/20030626-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030626-1.c"
+	.file	"20030626-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -26,4 +26,4 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030626-2.c.s b/test/torture-s/20030626-2.c.s
index e2766cb2e..85e809809 100644
--- a/test/torture-s/20030626-2.c.s
+++ b/test/torture-s/20030626-2.c.s
@@ -1,30 +1,26 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030626-2.c"
+	.file	"20030626-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load8_u	$push1=, .L.str.2+12($pop9)
-	i32.store8	buf+12($pop0), $pop1
-	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load	$push2=, .L.str.2+8($pop7):p2align=0
-	i32.store	buf+8($pop8), $pop2
 	i32.const	$push6=, 0
+	i64.load	$push1=, .L.str.2+5($pop6):p2align=0
+	i64.store	buf+5($pop0):p2align=0, $pop1
 	i32.const	$push5=, 0
-	i64.load	$push3=, .L.str.2($pop5):p2align=0
-	i64.store	buf($pop6), $pop3
 	i32.const	$push4=, 0
-                                        # fallthrough-return: $pop4
+	i64.load	$push2=, .L.str.2($pop4):p2align=0
+	i64.store	buf($pop5), $pop2
+	i32.const	$push3=, 0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -41,4 +37,4 @@ buf:
 	.size	.L.str.2, 13
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030714-1.c.s b/test/torture-s/20030714-1.c.s
index 3f6fb2cda..13989588a 100644
--- a/test/torture-s/20030714-1.c.s
+++ b/test/torture-s/20030714-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030714-1.c"
+	.file	"20030714-1.c"
 	.section	.text.RenderBox_setStyle,"ax",@progbits
-	.hidden	RenderBox_setStyle
+	.hidden	RenderBox_setStyle      # -- Begin function RenderBox_setStyle
 	.globl	RenderBox_setStyle
 	.type	RenderBox_setStyle,@function
 RenderBox_setStyle:                     # @RenderBox_setStyle
@@ -72,9 +72,9 @@ RenderBox_setStyle:                     # @RenderBox_setStyle
 	.endfunc
 .Lfunc_end0:
 	.size	RenderBox_setStyle, .Lfunc_end0-RenderBox_setStyle
-
+                                        # -- End function
 	.section	.text.RenderObject_setStyle,"ax",@progbits
-	.hidden	RenderObject_setStyle
+	.hidden	RenderObject_setStyle   # -- Begin function RenderObject_setStyle
 	.globl	RenderObject_setStyle
 	.type	RenderObject_setStyle,@function
 RenderObject_setStyle:                  # @RenderObject_setStyle
@@ -84,9 +84,9 @@ RenderObject_setStyle:                  # @RenderObject_setStyle
 	.endfunc
 .Lfunc_end1:
 	.size	RenderObject_setStyle, .Lfunc_end1-RenderObject_setStyle
-
+                                        # -- End function
 	.section	.text.removeFromSpecialObjects,"ax",@progbits
-	.hidden	removeFromSpecialObjects
+	.hidden	removeFromSpecialObjects # -- Begin function removeFromSpecialObjects
 	.globl	removeFromSpecialObjects
 	.type	removeFromSpecialObjects,@function
 removeFromSpecialObjects:               # @removeFromSpecialObjects
@@ -96,9 +96,9 @@ removeFromSpecialObjects:               # @removeFromSpecialObjects
 	.endfunc
 .Lfunc_end2:
 	.size	removeFromSpecialObjects, .Lfunc_end2-removeFromSpecialObjects
-
+                                        # -- End function
 	.section	.text.RenderBox_isTableCell,"ax",@progbits
-	.hidden	RenderBox_isTableCell
+	.hidden	RenderBox_isTableCell   # -- Begin function RenderBox_isTableCell
 	.globl	RenderBox_isTableCell
 	.type	RenderBox_isTableCell,@function
 RenderBox_isTableCell:                  # @RenderBox_isTableCell
@@ -110,9 +110,9 @@ RenderBox_isTableCell:                  # @RenderBox_isTableCell
 	.endfunc
 .Lfunc_end3:
 	.size	RenderBox_isTableCell, .Lfunc_end3-RenderBox_isTableCell
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -143,7 +143,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	false                   # @false
 	.type	false,@object
 	.section	.rodata.false,"a",@progbits
@@ -179,5 +179,5 @@ g__style:
 	.size	g__style, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030715-1.c.s b/test/torture-s/20030715-1.c.s
index d331fad14..60e2cde85 100644
--- a/test/torture-s/20030715-1.c.s
+++ b/test/torture-s/20030715-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030715-1.c"
+	.file	"20030715-1.c"
 	.section	.text.ap_check_cmd_context,"ax",@progbits
-	.hidden	ap_check_cmd_context
+	.hidden	ap_check_cmd_context    # -- Begin function ap_check_cmd_context
 	.globl	ap_check_cmd_context
 	.type	ap_check_cmd_context,@function
 ap_check_cmd_context:                   # @ap_check_cmd_context
@@ -13,9 +13,9 @@ ap_check_cmd_context:                   # @ap_check_cmd_context
 	.endfunc
 .Lfunc_end0:
 	.size	ap_check_cmd_context, .Lfunc_end0-ap_check_cmd_context
-
+                                        # -- End function
 	.section	.text.server_type,"ax",@progbits
-	.hidden	server_type
+	.hidden	server_type             # -- Begin function server_type
 	.globl	server_type
 	.type	server_type,@function
 server_type:                            # @server_type
@@ -25,33 +25,34 @@ server_type:                            # @server_type
 # BB#0:                                 # %entry
 	i32.const	$3=, 0
 	block   	
-	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $2, $pop0
-	i32.eqz 	$push5=, $pop1
-	br_if   	0, $pop5        # 0: down to label1
+	i32.eqz 	$push7=, $pop1
+	br_if   	0, $pop7        # 0: down to label0
 # BB#1:                                 # %if.else
-	i32.const	$3=, .L.str.2
+	block   	
 	i32.const	$push2=, .L.str.1
 	i32.call	$push3=, strcmp@FUNCTION, $2, $pop2
-	br_if   	1, $pop3        # 1: down to label0
-# BB#2:
-	i32.const	$3=, 1
-.LBB1_3:                                # %if.end9
+	i32.eqz 	$push8=, $pop3
+	br_if   	0, $pop8        # 0: down to label1
+# BB#2:                                 # %cleanup
+	i32.const	$push5=, .L.str.2
+	return  	$pop5
+.LBB1_3:
 	end_block                       # label1:
-	i32.const	$push4=, 0
-	i32.store	ap_standalone($pop4), $3
-	i32.const	$3=, 0
-.LBB1_4:                                # %cleanup
+	i32.const	$3=, 1
+.LBB1_4:                                # %if.end9
 	end_block                       # label0:
-	copy_local	$push6=, $3
-                                        # fallthrough-return: $pop6
+	i32.const	$push6=, 0
+	i32.store	ap_standalone($pop6), $3
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	server_type, .Lfunc_end1-server_type
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,7 +66,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -93,5 +94,5 @@ ap_standalone:
 	.size	.L.str.2, 50
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20030717-1.c.s b/test/torture-s/20030717-1.c.s
index 3f3ede2f1..2899e1f1a 100644
--- a/test/torture-s/20030717-1.c.s
+++ b/test/torture-s/20030717-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030717-1.c"
+	.file	"20030717-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -74,9 +74,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,6 +87,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030718-1.c.s b/test/torture-s/20030718-1.c.s
index 113612ee8..e5fa53236 100644
--- a/test/torture-s/20030718-1.c.s
+++ b/test/torture-s/20030718-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030718-1.c"
+	.file	"20030718-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030821-1.c.s b/test/torture-s/20030821-1.c.s
index f9ba25a33..373c406f0 100644
--- a/test/torture-s/20030821-1.c.s
+++ b/test/torture-s/20030821-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030821-1.c"
+	.file	"20030821-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20030828-1.c.s b/test/torture-s/20030828-1.c.s
index c4c22b40a..20e5fd5c3 100644
--- a/test/torture-s/20030828-1.c.s
+++ b/test/torture-s/20030828-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030828-1.c"
+	.file	"20030828-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -16,20 +16,20 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop3, $pop4
+	i32.sub 	$push10=, $pop2, $pop4
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop5), $pop9
 	i32.const	$push0=, 0
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -55,5 +55,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030828-2.c.s b/test/torture-s/20030828-2.c.s
index 0c4deae28..27086df3b 100644
--- a/test/torture-s/20030828-2.c.s
+++ b/test/torture-s/20030828-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030828-2.c"
+	.file	"20030828-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030903-1.c.s b/test/torture-s/20030903-1.c.s
index db8851efa..6c2fcef6f 100644
--- a/test/torture-s/20030903-1.c.s
+++ b/test/torture-s/20030903-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030903-1.c"
+	.file	"20030903-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,16 +24,16 @@ main:                                   # @main
 	end_block                       # label0:
 	block   	
 	br_table 	$0, 0, 0, 0, 0, 0 # 0: down to label1
-.LBB0_3:                                # %sw.bb3
+.LBB0_3:                                # %sw.bb
 	end_block                       # label1:
 	call    	y@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.y,"ax",@progbits
-	.type	y,@function
+	.type	y,@function             # -- Begin function y
 y:                                      # @y
 # BB#0:                                 # %entry
 	call    	abort@FUNCTION
@@ -41,7 +41,7 @@ y:                                      # @y
 	.endfunc
 .Lfunc_end1:
 	.size	y, .Lfunc_end1-y
-
+                                        # -- End function
 	.type	test,@object            # @test
 	.section	.bss.test,"aw",@nobits
 	.p2align	2
@@ -50,5 +50,5 @@ test:
 	.size	test, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20030909-1.c.s b/test/torture-s/20030909-1.c.s
index 353939fc2..39f69131c 100644
--- a/test/torture-s/20030909-1.c.s
+++ b/test/torture-s/20030909-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030909-1.c"
+	.file	"20030909-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -19,9 +19,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -31,9 +31,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,8 +45,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030910-1.c.s b/test/torture-s/20030910-1.c.s
index 856c6b4ad..b827f627a 100644
--- a/test/torture-s/20030910-1.c.s
+++ b/test/torture-s/20030910-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030910-1.c"
+	.file	"20030910-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030913-1.c.s b/test/torture-s/20030913-1.c.s
index 523deeeca..1c605fbe3 100644
--- a/test/torture-s/20030913-1.c.s
+++ b/test/torture-s/20030913-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030913-1.c"
+	.file	"20030913-1.c"
 	.section	.text.fn2,"ax",@progbits
-	.hidden	fn2
+	.hidden	fn2                     # -- Begin function fn2
 	.globl	fn2
 	.type	fn2,@function
 fn2:                                    # @fn2
@@ -13,9 +13,9 @@ fn2:                                    # @fn2
 	.endfunc
 .Lfunc_end0:
 	.size	fn2, .Lfunc_end0-fn2
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -27,9 +27,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end1:
 	.size	test, .Lfunc_end1-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	glob                    # @glob
 	.type	glob,@object
 	.section	.bss.glob,"aw",@nobits
@@ -55,5 +55,5 @@ glob:
 	.size	glob, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030914-1.c.s b/test/torture-s/20030914-1.c.s
index 2efe0b526..a02f0d2bd 100644
--- a/test/torture-s/20030914-1.c.s
+++ b/test/torture-s/20030914-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030914-1.c"
+	.file	"20030914-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,10 +9,10 @@ f:                                      # @f
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push117=, 0
-	i32.const	$push114=, 0
-	i32.load	$push115=, __stack_pointer($pop114)
+	i32.const	$push115=, 0
+	i32.load	$push114=, __stack_pointer($pop115)
 	i32.const	$push116=, 512
-	i32.sub 	$push278=, $pop115, $pop116
+	i32.sub 	$push278=, $pop114, $pop116
 	tee_local	$push277=, $5=, $pop278
 	i32.store	__stack_pointer($pop117), $pop277
 	i32.const	$push121=, 496
@@ -327,9 +327,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -341,7 +341,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030914-2.c.s b/test/torture-s/20030914-2.c.s
index ea538227a..309e3a294 100644
--- a/test/torture-s/20030914-2.c.s
+++ b/test/torture-s/20030914-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030914-2.c"
+	.file	"20030914-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	gs                      # @gs
 	.type	gs,@object
 	.section	.bss.gs,"aw",@nobits
@@ -38,5 +38,5 @@ gs:
 	.size	gs, 72
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030916-1.c.s b/test/torture-s/20030916-1.c.s
index f33b83d4e..a9c9a8f75 100644
--- a/test/torture-s/20030916-1.c.s
+++ b/test/torture-s/20030916-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030916-1.c"
+	.file	"20030916-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,128 +9,120 @@ f:                                      # @f
 # BB#0:                                 # %entry
 	i64.const	$push0=, 0
 	i64.store	0($0):p2align=2, $pop0
+	i64.const	$push19=, 0
+	i64.store	992($0):p2align=2, $pop19
 	i32.const	$push1=, 24
 	i32.add 	$push2=, $0, $pop1
-	i64.const	$push22=, 0
-	i64.store	0($pop2):p2align=2, $pop22
+	i64.const	$push18=, 0
+	i64.store	0($pop2):p2align=2, $pop18
 	i32.const	$push3=, 16
 	i32.add 	$push4=, $0, $pop3
-	i64.const	$push21=, 0
-	i64.store	0($pop4):p2align=2, $pop21
+	i64.const	$push17=, 0
+	i64.store	0($pop4):p2align=2, $pop17
 	i32.const	$push5=, 8
 	i32.add 	$push6=, $0, $pop5
-	i64.const	$push20=, 0
-	i64.store	0($pop6):p2align=2, $pop20
-	i32.const	$push7=, 0
-	i32.store	992($0), $pop7
-	i32.const	$push8=, 1020
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push19=, 0
-	i32.store	0($pop9), $pop19
-	i32.const	$push10=, 1012
-	i32.add 	$push11=, $0, $pop10
-	i64.const	$push18=, 0
-	i64.store	0($pop11):p2align=2, $pop18
-	i32.const	$push12=, 1004
-	i32.add 	$push13=, $0, $pop12
-	i64.const	$push17=, 0
-	i64.store	0($pop13):p2align=2, $pop17
-	i32.const	$push14=, 996
-	i32.add 	$push15=, $0, $pop14
 	i64.const	$push16=, 0
-	i64.store	0($pop15):p2align=2, $pop16
+	i64.store	0($pop6):p2align=2, $pop16
+	i32.const	$push7=, 1016
+	i32.add 	$push8=, $0, $pop7
+	i64.const	$push15=, 0
+	i64.store	0($pop8):p2align=2, $pop15
+	i32.const	$push9=, 1008
+	i32.add 	$push10=, $0, $pop9
+	i64.const	$push14=, 0
+	i64.store	0($pop10):p2align=2, $pop14
+	i32.const	$push11=, 1000
+	i32.add 	$push12=, $0, $pop11
+	i64.const	$push13=, 0
+	i64.store	0($pop12):p2align=2, $pop13
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push24=, 0
-	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
-	i32.const	$push23=, 1024
-	i32.sub 	$push26=, $pop22, $pop23
-	tee_local	$push25=, $2=, $pop26
-	i32.store	__stack_pointer($pop24), $pop25
-	i32.const	$0=, 0
+	i32.const	$push22=, 0
+	i32.const	$push20=, 0
+	i32.load	$push19=, __stack_pointer($pop20)
+	i32.const	$push21=, 1024
+	i32.sub 	$push24=, $pop19, $pop21
+	tee_local	$push23=, $0=, $pop24
+	i32.store	__stack_pointer($pop22), $pop23
+	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.add 	$push0=, $2, $0
-	i32.const	$push31=, 1
-	i32.store	0($pop0), $pop31
-	i32.const	$push30=, 4
-	i32.add 	$push29=, $0, $pop30
-	tee_local	$push28=, $0=, $pop29
-	i32.const	$push27=, 1024
-	i32.ne  	$push1=, $pop28, $pop27
+	i32.add 	$push0=, $0, $1
+	i32.const	$push29=, 1
+	i32.store	0($pop0), $pop29
+	i32.const	$push28=, 4
+	i32.add 	$push27=, $1, $pop28
+	tee_local	$push26=, $1=, $pop27
+	i32.const	$push25=, 1024
+	i32.ne  	$push1=, $pop26, $pop25
 	br_if   	0, $pop1        # 0: up to label0
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$push2=, 24
-	i32.add 	$push3=, $2, $pop2
+	i32.add 	$push3=, $0, $pop2
 	i64.const	$push4=, 0
 	i64.store	0($pop3), $pop4
 	i32.const	$push5=, 16
-	i32.add 	$push6=, $2, $pop5
-	i64.const	$push39=, 0
-	i64.store	0($pop6), $pop39
-	i32.const	$1=, 0
-	i32.const	$push7=, 1020
-	i32.add 	$push8=, $2, $pop7
-	i32.const	$push38=, 0
-	i32.store	0($pop8), $pop38
-	i32.const	$push9=, 1012
-	i32.add 	$push10=, $2, $pop9
-	i64.const	$push37=, 0
-	i64.store	0($pop10):p2align=2, $pop37
-	i32.const	$push11=, 1004
-	i32.add 	$push12=, $2, $pop11
+	i32.add 	$push6=, $0, $pop5
 	i64.const	$push36=, 0
-	i64.store	0($pop12):p2align=2, $pop36
-	i32.const	$push13=, 996
-	i32.add 	$push14=, $2, $pop13
+	i64.store	0($pop6), $pop36
+	i32.const	$push7=, 1016
+	i32.add 	$push8=, $0, $pop7
 	i64.const	$push35=, 0
-	i64.store	0($pop14):p2align=2, $pop35
+	i64.store	0($pop8), $pop35
+	i32.const	$push9=, 1008
+	i32.add 	$push10=, $0, $pop9
 	i64.const	$push34=, 0
-	i64.store	8($2), $pop34
+	i64.store	0($pop10), $pop34
+	i32.const	$push11=, 1000
+	i32.add 	$push12=, $0, $pop11
 	i64.const	$push33=, 0
-	i64.store	0($2), $pop33
-	i32.const	$push32=, 0
-	i32.store	992($2), $pop32
-	copy_local	$0=, $2
+	i64.store	0($pop12), $pop33
+	i64.const	$push32=, 0
+	i64.store	8($0), $pop32
+	i64.const	$push31=, 0
+	i64.store	0($0), $pop31
+	i64.const	$push30=, 0
+	i64.store	992($0), $pop30
+	i32.const	$1=, -1
+	copy_local	$0=, $0
 .LBB1_3:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
-	i32.load	$push17=, 0($0)
-	i32.const	$push41=, -8
-	i32.add 	$push15=, $1, $pop41
-	i32.const	$push40=, 240
-	i32.lt_u	$push16=, $pop15, $pop40
-	i32.ne  	$push18=, $pop17, $pop16
-	br_if   	1, $pop18       # 1: down to label1
+	i32.load	$push15=, 0($0)
+	i32.const	$push38=, -7
+	i32.add 	$push13=, $1, $pop38
+	i32.const	$push37=, 240
+	i32.lt_u	$push14=, $pop13, $pop37
+	i32.ne  	$push16=, $pop15, $pop14
+	br_if   	1, $pop16       # 1: down to label1
 # BB#4:                                 # %for.cond1
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push46=, 4
-	i32.add 	$0=, $0, $pop46
-	i32.const	$push45=, 1
-	i32.add 	$push44=, $1, $pop45
-	tee_local	$push43=, $1=, $pop44
-	i32.const	$push42=, 255
-	i32.le_s	$push19=, $pop43, $pop42
-	br_if   	0, $pop19       # 0: up to label2
+	i32.const	$push43=, 4
+	i32.add 	$0=, $0, $pop43
+	i32.const	$push42=, 1
+	i32.add 	$push41=, $1, $pop42
+	tee_local	$push40=, $1=, $pop41
+	i32.const	$push39=, 254
+	i32.le_u	$push17=, $pop40, $pop39
+	br_if   	0, $pop17       # 0: up to label2
 # BB#5:                                 # %for.end10
 	end_loop
-	i32.const	$push20=, 0
-	call    	exit@FUNCTION, $pop20
+	i32.const	$push18=, 0
+	call    	exit@FUNCTION, $pop18
 	unreachable
 .LBB1_6:                                # %if.then
 	end_block                       # label1:
@@ -139,8 +131,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030920-1.c.s b/test/torture-s/20030920-1.c.s
index 0ceb13d65..e3bf1f409 100644
--- a/test/torture-s/20030920-1.c.s
+++ b/test/torture-s/20030920-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030920-1.c"
+	.file	"20030920-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20030928-1.c.s b/test/torture-s/20030928-1.c.s
index 99ea9d0ab..bcf297e6f 100644
--- a/test/torture-s/20030928-1.c.s
+++ b/test/torture-s/20030928-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20030928-1.c"
+	.file	"20030928-1.c"
 	.section	.text.get_addrs,"ax",@progbits
-	.hidden	get_addrs
+	.hidden	get_addrs               # -- Begin function get_addrs
 	.globl	get_addrs
 	.type	get_addrs,@function
 get_addrs:                              # @get_addrs
@@ -59,9 +59,9 @@ get_addrs:                              # @get_addrs
 	.endfunc
 .Lfunc_end0:
 	.size	get_addrs, .Lfunc_end0-get_addrs
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -116,5 +116,5 @@ main:                                   # @main
 	.size	.L.str.7, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20031003-1.c.s b/test/torture-s/20031003-1.c.s
index bcf90c2dd..7fd4caf25 100644
--- a/test/torture-s/20031003-1.c.s
+++ b/test/torture-s/20031003-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031003-1.c"
+	.file	"20031003-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -13,9 +13,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -27,9 +27,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,6 +40,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20031010-1.c.s b/test/torture-s/20031010-1.c.s
index fe040595a..bfe451e30 100644
--- a/test/torture-s/20031010-1.c.s
+++ b/test/torture-s/20031010-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031010-1.c"
+	.file	"20031010-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -31,9 +31,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20031011-1.c.s b/test/torture-s/20031011-1.c.s
index d73a6c212..48995f7e5 100644
--- a/test/torture-s/20031011-1.c.s
+++ b/test/torture-s/20031011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031011-1.c"
+	.file	"20031011-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20031012-1.c.s b/test/torture-s/20031012-1.c.s
index e81c0d0e2..bcbe16952 100644
--- a/test/torture-s/20031012-1.c.s
+++ b/test/torture-s/20031012-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031012-1.c"
+	.file	"20031012-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,10 +10,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 15008
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $2=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i32.const	$push1=, 205
@@ -41,8 +41,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strlen, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20031020-1.c.s b/test/torture-s/20031020-1.c.s
index 69cfa3adb..21f46c15b 100644
--- a/test/torture-s/20031020-1.c.s
+++ b/test/torture-s/20031020-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031020-1.c"
+	.file	"20031020-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20031201-1.c.s b/test/torture-s/20031201-1.c.s
index ed6210993..c9aa9fa69 100644
--- a/test/torture-s/20031201-1.c.s
+++ b/test/torture-s/20031201-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031201-1.c"
+	.file	"20031201-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -27,9 +27,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f0,"ax",@progbits
-	.hidden	f0
+	.hidden	f0                      # -- Begin function f0
 	.globl	f0
 	.type	f0,@function
 f0:                                     # @f0
@@ -66,9 +66,9 @@ f0:                                     # @f0
 	.endfunc
 .Lfunc_end1:
 	.size	f0, .Lfunc_end1-f0
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -98,9 +98,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end2:
 	.size	test, .Lfunc_end2-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -108,10 +108,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push3=, 0
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push7=, $pop1, $pop2
+	i32.sub 	$push7=, $pop0, $pop2
 	tee_local	$push6=, $0=, $pop7
 	i32.store	__stack_pointer($pop3), $pop6
 	i32.const	$push4=, 8
@@ -121,7 +121,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	i,@object               # @i
 	.section	.bss.i,"aw",@nobits
 	.p2align	2
@@ -137,6 +137,6 @@ f0.washere:
 	.size	f0.washere, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20031204-1.c.s b/test/torture-s/20031204-1.c.s
index 8dde906c1..e79dce172 100644
--- a/test/torture-s/20031204-1.c.s
+++ b/test/torture-s/20031204-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031204-1.c"
+	.file	"20031204-1.c"
 	.section	.text.in_aton,"ax",@progbits
-	.hidden	in_aton
+	.hidden	in_aton                 # -- Begin function in_aton
 	.globl	in_aton
 	.type	in_aton,@function
 in_aton:                                # @in_aton
@@ -13,9 +13,9 @@ in_aton:                                # @in_aton
 	.endfunc
 .Lfunc_end0:
 	.size	in_aton, .Lfunc_end0-in_aton
-
+                                        # -- End function
 	.section	.text.root_nfs_parse_addr,"ax",@progbits
-	.hidden	root_nfs_parse_addr
+	.hidden	root_nfs_parse_addr     # -- Begin function root_nfs_parse_addr
 	.globl	root_nfs_parse_addr
 	.type	root_nfs_parse_addr,@function
 root_nfs_parse_addr:                    # @root_nfs_parse_addr
@@ -25,7 +25,7 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 # BB#0:                                 # %entry
 	i32.const	$1=, 0
 	copy_local	$4=, $0
-.LBB1_1:                                # %while.cond1.preheader
+.LBB1_1:                                # %while.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
 	block   	
@@ -82,7 +82,7 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 	i32.const	$push39=, 46
 	i32.eq  	$push9=, $pop8, $pop39
 	i32.or  	$push10=, $pop7, $pop9
-	i32.add 	$push38=, $pop10, $1
+	i32.add 	$push38=, $1, $pop10
 	tee_local	$push37=, $1=, $pop38
 	i32.const	$push36=, 4
 	i32.lt_s	$push11=, $pop37, $pop36
@@ -131,9 +131,9 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 	.endfunc
 .Lfunc_end1:
 	.size	root_nfs_parse_addr, .Lfunc_end1-root_nfs_parse_addr
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -142,7 +142,7 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
 	i32.const	$3=, main.addr
-.LBB2_1:                                # %while.cond1.preheader.i
+.LBB2_1:                                # %while.body.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_2 Depth 2
 	block   	
@@ -199,7 +199,7 @@ main:                                   # @main
 	i32.const	$push41=, 46
 	i32.eq  	$push9=, $pop8, $pop41
 	i32.or  	$push10=, $pop7, $pop9
-	i32.add 	$push40=, $pop10, $0
+	i32.add 	$push40=, $0, $pop10
 	tee_local	$push39=, $0=, $pop40
 	i32.const	$push38=, 4
 	i32.lt_s	$push11=, $pop39, $pop38
@@ -249,7 +249,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	main.addr,@object       # @main.addr
 	.section	.data.main.addr,"aw",@progbits
 	.p2align	4
@@ -258,6 +258,6 @@ main.addr:
 	.size	main.addr, 19
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcpy, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20031211-1.c.s b/test/torture-s/20031211-1.c.s
index 1367355a1..f3a381754 100644
--- a/test/torture-s/20031211-1.c.s
+++ b/test/torture-s/20031211-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031211-1.c"
+	.file	"20031211-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,7 +16,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -27,5 +27,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20031211-2.c.s b/test/torture-s/20031211-2.c.s
index 72398acb1..937179a7c 100644
--- a/test/torture-s/20031211-2.c.s
+++ b/test/torture-s/20031211-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031211-2.c"
+	.file	"20031211-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -35,8 +35,8 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20031214-1.c.s b/test/torture-s/20031214-1.c.s
index 6ed5de912..60583fbab 100644
--- a/test/torture-s/20031214-1.c.s
+++ b/test/torture-s/20031214-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031214-1.c"
+	.file	"20031214-1.c"
 	.section	.text.b,"ax",@progbits
-	.hidden	b
+	.hidden	b                       # -- Begin function b
 	.globl	b
 	.type	b,@function
 b:                                      # @b
@@ -11,9 +11,9 @@ b:                                      # @b
 	.endfunc
 .Lfunc_end0:
 	.size	b, .Lfunc_end0-b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	g                       # @g
 	.type	g,@object
 	.section	.data.g,"aw",@progbits
@@ -65,4 +65,4 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20031215-1.c.s b/test/torture-s/20031215-1.c.s
index b13bd2239..bf3c8a7b7 100644
--- a/test/torture-s/20031215-1.c.s
+++ b/test/torture-s/20031215-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031215-1.c"
+	.file	"20031215-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -10,9 +10,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -21,9 +21,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -32,9 +32,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	ao                      # @ao
 	.type	ao,@object
 	.section	.rodata.ao,"a",@progbits
@@ -68,4 +68,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20031216-1.c.s b/test/torture-s/20031216-1.c.s
index e87599783..730d386d7 100644
--- a/test/torture-s/20031216-1.c.s
+++ b/test/torture-s/20031216-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20031216-1.c"
+	.file	"20031216-1.c"
 	.section	.text.DisplayNumber,"ax",@progbits
-	.hidden	DisplayNumber
+	.hidden	DisplayNumber           # -- Begin function DisplayNumber
 	.globl	DisplayNumber
 	.type	DisplayNumber,@function
 DisplayNumber:                          # @DisplayNumber
@@ -20,9 +20,9 @@ DisplayNumber:                          # @DisplayNumber
 	.endfunc
 .Lfunc_end0:
 	.size	DisplayNumber, .Lfunc_end0-DisplayNumber
-
+                                        # -- End function
 	.section	.text.ReadNumber,"ax",@progbits
-	.hidden	ReadNumber
+	.hidden	ReadNumber              # -- Begin function ReadNumber
 	.globl	ReadNumber
 	.type	ReadNumber,@function
 ReadNumber:                             # @ReadNumber
@@ -33,9 +33,9 @@ ReadNumber:                             # @ReadNumber
 	.endfunc
 .Lfunc_end1:
 	.size	ReadNumber, .Lfunc_end1-ReadNumber
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20040208-1.c.s b/test/torture-s/20040208-1.c.s
index b8325a24e..5a4a44e8b 100644
--- a/test/torture-s/20040208-1.c.s
+++ b/test/torture-s/20040208-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040208-1.c"
+	.file	"20040208-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040218-1.c.s b/test/torture-s/20040218-1.c.s
index f01673063..45ae2cff2 100644
--- a/test/torture-s/20040218-1.c.s
+++ b/test/torture-s/20040218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040218-1.c"
+	.file	"20040218-1.c"
 	.section	.text.xb,"ax",@progbits
-	.hidden	xb
+	.hidden	xb                      # -- Begin function xb
 	.globl	xb
 	.type	xb,@function
 xb:                                     # @xb
@@ -15,9 +15,9 @@ xb:                                     # @xb
 	.endfunc
 .Lfunc_end0:
 	.size	xb, .Lfunc_end0-xb
-
+                                        # -- End function
 	.section	.text.xw,"ax",@progbits
-	.hidden	xw
+	.hidden	xw                      # -- Begin function xw
 	.globl	xw
 	.type	xw,@function
 xw:                                     # @xw
@@ -31,9 +31,9 @@ xw:                                     # @xw
 	.endfunc
 .Lfunc_end1:
 	.size	xw, .Lfunc_end1-xw
-
+                                        # -- End function
 	.section	.text.yb,"ax",@progbits
-	.hidden	yb
+	.hidden	yb                      # -- Begin function yb
 	.globl	yb
 	.type	yb,@function
 yb:                                     # @yb
@@ -51,9 +51,9 @@ yb:                                     # @yb
 	.endfunc
 .Lfunc_end2:
 	.size	yb, .Lfunc_end2-yb
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,10 +61,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push23=, $pop13, $pop14
+	i32.sub 	$push23=, $pop12, $pop14
 	tee_local	$push22=, $0=, $pop23
 	i32.store	__stack_pointer($pop15), $pop22
 	i64.const	$push0=, 68723771703295
@@ -103,8 +103,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040223-1.c.s b/test/torture-s/20040223-1.c.s
index 1cc9ba47b..7f5cea4e8 100644
--- a/test/torture-s/20040223-1.c.s
+++ b/test/torture-s/20040223-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040223-1.c"
+	.file	"20040223-1.c"
 	.section	.text.a,"ax",@progbits
-	.hidden	a
+	.hidden	a                       # -- Begin function a
 	.globl	a
 	.type	a,@function
 a:                                      # @a
@@ -20,9 +20,9 @@ a:                                      # @a
 	.endfunc
 .Lfunc_end0:
 	.size	a, .Lfunc_end0-a
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20040307-1.c.s b/test/torture-s/20040307-1.c.s
index 2aefbfcbe..79161e971 100644
--- a/test/torture-s/20040307-1.c.s
+++ b/test/torture-s/20040307-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040307-1.c"
+	.file	"20040307-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040309-1.c.s b/test/torture-s/20040309-1.c.s
index a15c6744d..09e55059a 100644
--- a/test/torture-s/20040309-1.c.s
+++ b/test/torture-s/20040309-1.c.s
@@ -1,38 +1,27 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040309-1.c"
+	.file	"20040309-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 0
-	block   	
-	i32.const	$push0=, 16
-	i32.shl 	$push1=, $0, $pop0
-	i32.const	$push8=, 16
-	i32.shr_s	$push2=, $pop1, $pop8
-	i32.const	$push3=, -1
-	i32.gt_s	$push4=, $pop2, $pop3
-	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %cond.true
-	i32.const	$push5=, 32768
-	i32.add 	$push6=, $0, $pop5
-	i32.const	$push7=, 65535
-	i32.and 	$1=, $pop6, $pop7
-.LBB0_2:                                # %cond.end
-	end_block                       # label0:
-	copy_local	$push9=, $1
-                                        # fallthrough-return: $pop9
+	i32.const	$push2=, 16
+	i32.shl 	$push3=, $0, $pop2
+	i32.const	$push4=, 31
+	i32.shr_s	$push5=, $pop3, $pop4
+	i32.const	$push0=, 32768
+	i32.xor 	$push1=, $0, $pop0
+	i32.and 	$push6=, $pop5, $pop1
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,6 +32,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040311-1.c.s b/test/torture-s/20040311-1.c.s
index 9f9f16a68..3276104e6 100644
--- a/test/torture-s/20040311-1.c.s
+++ b/test/torture-s/20040311-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040311-1.c"
+	.file	"20040311-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,9 +14,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -29,9 +29,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -44,9 +44,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -59,9 +59,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -72,6 +72,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040313-1.c.s b/test/torture-s/20040313-1.c.s
index 08d201a37..497bddb23 100644
--- a/test/torture-s/20040313-1.c.s
+++ b/test/torture-s/20040313-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040313-1.c"
+	.file	"20040313-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040319-1.c.s b/test/torture-s/20040319-1.c.s
index ac157824d..66da61b82 100644
--- a/test/torture-s/20040319-1.c.s
+++ b/test/torture-s/20040319-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040319-1.c"
+	.file	"20040319-1.c"
 	.section	.text.blah,"ax",@progbits
-	.hidden	blah
+	.hidden	blah                    # -- Begin function blah
 	.globl	blah
 	.type	blah,@function
 blah:                                   # @blah
@@ -18,9 +18,9 @@ blah:                                   # @blah
 	.endfunc
 .Lfunc_end0:
 	.size	blah, .Lfunc_end0-blah
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040331-1.c.s b/test/torture-s/20040331-1.c.s
index ac0434940..256f74ed2 100644
--- a/test/torture-s/20040331-1.c.s
+++ b/test/torture-s/20040331-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040331-1.c"
+	.file	"20040331-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040409-1.c.s b/test/torture-s/20040409-1.c.s
index 8f1f4674f..083a5f07b 100644
--- a/test/torture-s/20040409-1.c.s
+++ b/test/torture-s/20040409-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040409-1.c"
+	.file	"20040409-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,9 +14,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test1u,"ax",@progbits
-	.hidden	test1u
+	.hidden	test1u                  # -- Begin function test1u
 	.globl	test1u
 	.type	test1u,@function
 test1u:                                 # @test1u
@@ -29,9 +29,9 @@ test1u:                                 # @test1u
 	.endfunc
 .Lfunc_end1:
 	.size	test1u, .Lfunc_end1-test1u
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -39,14 +39,14 @@ test2:                                  # @test2
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, -2147483648
-	i32.xor 	$push1=, $0, $pop0
+	i32.or  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test2u,"ax",@progbits
-	.hidden	test2u
+	.hidden	test2u                  # -- Begin function test2u
 	.globl	test2u
 	.type	test2u,@function
 test2u:                                 # @test2u
@@ -59,9 +59,9 @@ test2u:                                 # @test2u
 	.endfunc
 .Lfunc_end3:
 	.size	test2u, .Lfunc_end3-test2u
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -74,9 +74,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end4:
 	.size	test3, .Lfunc_end4-test3
-
+                                        # -- End function
 	.section	.text.test3u,"ax",@progbits
-	.hidden	test3u
+	.hidden	test3u                  # -- Begin function test3u
 	.globl	test3u
 	.type	test3u,@function
 test3u:                                 # @test3u
@@ -89,9 +89,9 @@ test3u:                                 # @test3u
 	.endfunc
 .Lfunc_end5:
 	.size	test3u, .Lfunc_end5-test3u
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -104,9 +104,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end6:
 	.size	test4, .Lfunc_end6-test4
-
+                                        # -- End function
 	.section	.text.test4u,"ax",@progbits
-	.hidden	test4u
+	.hidden	test4u                  # -- Begin function test4u
 	.globl	test4u
 	.type	test4u,@function
 test4u:                                 # @test4u
@@ -119,9 +119,9 @@ test4u:                                 # @test4u
 	.endfunc
 .Lfunc_end7:
 	.size	test4u, .Lfunc_end7-test4u
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -129,14 +129,14 @@ test5:                                  # @test5
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, -2147483648
-	i32.xor 	$push1=, $0, $pop0
+	i32.or  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end8:
 	.size	test5, .Lfunc_end8-test5
-
+                                        # -- End function
 	.section	.text.test5u,"ax",@progbits
-	.hidden	test5u
+	.hidden	test5u                  # -- Begin function test5u
 	.globl	test5u
 	.type	test5u,@function
 test5u:                                 # @test5u
@@ -149,9 +149,9 @@ test5u:                                 # @test5u
 	.endfunc
 .Lfunc_end9:
 	.size	test5u, .Lfunc_end9-test5u
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -164,9 +164,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end10:
 	.size	test6, .Lfunc_end10-test6
-
+                                        # -- End function
 	.section	.text.test6u,"ax",@progbits
-	.hidden	test6u
+	.hidden	test6u                  # -- Begin function test6u
 	.globl	test6u
 	.type	test6u,@function
 test6u:                                 # @test6u
@@ -179,31 +179,36 @@ test6u:                                 # @test6u
 	.endfunc
 .Lfunc_end11:
 	.size	test6u, .Lfunc_end11-test6u
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push0=, -2147483648
-	i32.xor 	$push1=, $0, $pop0
-	i32.ne  	$push2=, $pop1, $1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end20
+	i32.const	$push4=, -2147483648
+	i32.xor 	$push0=, $0, $pop4
+	i32.ne  	$push1=, $pop0, $1
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %if.end
+	i32.const	$push5=, -2147483648
+	i32.or  	$push2=, $0, $pop5
+	i32.ne  	$push3=, $pop2, $1
+	br_if   	0, $pop3        # 0: down to label0
+# BB#2:                                 # %if.end20
 	return
-.LBB12_2:                               # %if.then
+.LBB12_3:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	test, .Lfunc_end12-test
-
+                                        # -- End function
 	.section	.text.testu,"ax",@progbits
-	.hidden	testu
+	.hidden	testu                   # -- Begin function testu
 	.globl	testu
 	.type	testu,@function
 testu:                                  # @testu
@@ -223,20 +228,20 @@ testu:                                  # @testu
 	.endfunc
 .Lfunc_end13:
 	.size	testu, .Lfunc_end13-testu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-                                        # fallthrough-return: $pop0
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end14:
 	.size	main, .Lfunc_end14-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20040409-2.c.s b/test/torture-s/20040409-2.c.s
index 48253be07..be57483f6 100644
--- a/test/torture-s/20040409-2.c.s
+++ b/test/torture-s/20040409-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040409-2.c"
+	.file	"20040409-2.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,9 +14,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test1u,"ax",@progbits
-	.hidden	test1u
+	.hidden	test1u                  # -- Begin function test1u
 	.globl	test1u
 	.type	test1u,@function
 test1u:                                 # @test1u
@@ -29,9 +29,9 @@ test1u:                                 # @test1u
 	.endfunc
 .Lfunc_end1:
 	.size	test1u, .Lfunc_end1-test1u
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -44,9 +44,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test2u,"ax",@progbits
-	.hidden	test2u
+	.hidden	test2u                  # -- Begin function test2u
 	.globl	test2u
 	.type	test2u,@function
 test2u:                                 # @test2u
@@ -59,24 +59,26 @@ test2u:                                 # @test2u
 	.endfunc
 .Lfunc_end3:
 	.size	test2u, .Lfunc_end3-test2u
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -2147478988
-	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, -2147483648
+	i32.or  	$push1=, $0, $pop0
+	i32.const	$push2=, 4660
+	i32.xor 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end4:
 	.size	test3, .Lfunc_end4-test3
-
+                                        # -- End function
 	.section	.text.test3u,"ax",@progbits
-	.hidden	test3u
+	.hidden	test3u                  # -- Begin function test3u
 	.globl	test3u
 	.type	test3u,@function
 test3u:                                 # @test3u
@@ -89,24 +91,26 @@ test3u:                                 # @test3u
 	.endfunc
 .Lfunc_end5:
 	.size	test3u, .Lfunc_end5-test3u
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -2147478988
-	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, -2147483648
+	i32.or  	$push1=, $0, $pop0
+	i32.const	$push2=, 4660
+	i32.xor 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end6:
 	.size	test4, .Lfunc_end6-test4
-
+                                        # -- End function
 	.section	.text.test4u,"ax",@progbits
-	.hidden	test4u
+	.hidden	test4u                  # -- Begin function test4u
 	.globl	test4u
 	.type	test4u,@function
 test4u:                                 # @test4u
@@ -119,9 +123,9 @@ test4u:                                 # @test4u
 	.endfunc
 .Lfunc_end7:
 	.size	test4u, .Lfunc_end7-test4u
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -134,9 +138,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end8:
 	.size	test5, .Lfunc_end8-test5
-
+                                        # -- End function
 	.section	.text.test5u,"ax",@progbits
-	.hidden	test5u
+	.hidden	test5u                  # -- Begin function test5u
 	.globl	test5u
 	.type	test5u,@function
 test5u:                                 # @test5u
@@ -149,9 +153,9 @@ test5u:                                 # @test5u
 	.endfunc
 .Lfunc_end9:
 	.size	test5u, .Lfunc_end9-test5u
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -164,9 +168,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end10:
 	.size	test6, .Lfunc_end10-test6
-
+                                        # -- End function
 	.section	.text.test6u,"ax",@progbits
-	.hidden	test6u
+	.hidden	test6u                  # -- Begin function test6u
 	.globl	test6u
 	.type	test6u,@function
 test6u:                                 # @test6u
@@ -179,9 +183,9 @@ test6u:                                 # @test6u
 	.endfunc
 .Lfunc_end11:
 	.size	test6u, .Lfunc_end11-test6u
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -194,9 +198,9 @@ test7:                                  # @test7
 	.endfunc
 .Lfunc_end12:
 	.size	test7, .Lfunc_end12-test7
-
+                                        # -- End function
 	.section	.text.test7u,"ax",@progbits
-	.hidden	test7u
+	.hidden	test7u                  # -- Begin function test7u
 	.globl	test7u
 	.type	test7u,@function
 test7u:                                 # @test7u
@@ -209,9 +213,9 @@ test7u:                                 # @test7u
 	.endfunc
 .Lfunc_end13:
 	.size	test7u, .Lfunc_end13-test7u
-
+                                        # -- End function
 	.section	.text.test8,"ax",@progbits
-	.hidden	test8
+	.hidden	test8                   # -- Begin function test8
 	.globl	test8
 	.type	test8,@function
 test8:                                  # @test8
@@ -224,9 +228,9 @@ test8:                                  # @test8
 	.endfunc
 .Lfunc_end14:
 	.size	test8, .Lfunc_end14-test8
-
+                                        # -- End function
 	.section	.text.test8u,"ax",@progbits
-	.hidden	test8u
+	.hidden	test8u                  # -- Begin function test8u
 	.globl	test8u
 	.type	test8u,@function
 test8u:                                 # @test8u
@@ -239,24 +243,26 @@ test8u:                                 # @test8u
 	.endfunc
 .Lfunc_end15:
 	.size	test8u, .Lfunc_end15-test8u
-
+                                        # -- End function
 	.section	.text.test9,"ax",@progbits
-	.hidden	test9
+	.hidden	test9                   # -- Begin function test9
 	.globl	test9
 	.type	test9,@function
 test9:                                  # @test9
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -2147478988
-	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, -2147483648
+	i32.or  	$push1=, $0, $pop0
+	i32.const	$push2=, 4660
+	i32.xor 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end16:
 	.size	test9, .Lfunc_end16-test9
-
+                                        # -- End function
 	.section	.text.test9u,"ax",@progbits
-	.hidden	test9u
+	.hidden	test9u                  # -- Begin function test9u
 	.globl	test9u
 	.type	test9u,@function
 test9u:                                 # @test9u
@@ -269,24 +275,26 @@ test9u:                                 # @test9u
 	.endfunc
 .Lfunc_end17:
 	.size	test9u, .Lfunc_end17-test9u
-
+                                        # -- End function
 	.section	.text.test10,"ax",@progbits
-	.hidden	test10
+	.hidden	test10                  # -- Begin function test10
 	.globl	test10
 	.type	test10,@function
 test10:                                 # @test10
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -2147478988
-	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, -2147483648
+	i32.or  	$push1=, $0, $pop0
+	i32.const	$push2=, 4660
+	i32.xor 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end18:
 	.size	test10, .Lfunc_end18-test10
-
+                                        # -- End function
 	.section	.text.test10u,"ax",@progbits
-	.hidden	test10u
+	.hidden	test10u                 # -- Begin function test10u
 	.globl	test10u
 	.type	test10u,@function
 test10u:                                # @test10u
@@ -299,9 +307,9 @@ test10u:                                # @test10u
 	.endfunc
 .Lfunc_end19:
 	.size	test10u, .Lfunc_end19-test10u
-
+                                        # -- End function
 	.section	.text.test11,"ax",@progbits
-	.hidden	test11
+	.hidden	test11                  # -- Begin function test11
 	.globl	test11
 	.type	test11,@function
 test11:                                 # @test11
@@ -314,9 +322,9 @@ test11:                                 # @test11
 	.endfunc
 .Lfunc_end20:
 	.size	test11, .Lfunc_end20-test11
-
+                                        # -- End function
 	.section	.text.test11u,"ax",@progbits
-	.hidden	test11u
+	.hidden	test11u                 # -- Begin function test11u
 	.globl	test11u
 	.type	test11u,@function
 test11u:                                # @test11u
@@ -329,9 +337,9 @@ test11u:                                # @test11u
 	.endfunc
 .Lfunc_end21:
 	.size	test11u, .Lfunc_end21-test11u
-
+                                        # -- End function
 	.section	.text.test12,"ax",@progbits
-	.hidden	test12
+	.hidden	test12                  # -- Begin function test12
 	.globl	test12
 	.type	test12,@function
 test12:                                 # @test12
@@ -344,9 +352,9 @@ test12:                                 # @test12
 	.endfunc
 .Lfunc_end22:
 	.size	test12, .Lfunc_end22-test12
-
+                                        # -- End function
 	.section	.text.test12u,"ax",@progbits
-	.hidden	test12u
+	.hidden	test12u                 # -- Begin function test12u
 	.globl	test12u
 	.type	test12u,@function
 test12u:                                # @test12u
@@ -359,9 +367,9 @@ test12u:                                # @test12u
 	.endfunc
 .Lfunc_end23:
 	.size	test12u, .Lfunc_end23-test12u
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -372,18 +380,25 @@ test:                                   # @test
 	i32.xor 	$push1=, $0, $pop0
 	i32.ne  	$push2=, $pop1, $1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end44
+# BB#1:                                 # %if.end4
+	i32.const	$push3=, -2147483648
+	i32.or  	$push4=, $0, $pop3
+	i32.const	$push5=, 4660
+	i32.xor 	$push6=, $pop4, $pop5
+	i32.ne  	$push7=, $pop6, $1
+	br_if   	0, $pop7        # 0: down to label0
+# BB#2:                                 # %if.end44
 	return
-.LBB24_2:                               # %if.then
+.LBB24_3:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end24:
 	.size	test, .Lfunc_end24-test
-
+                                        # -- End function
 	.section	.text.testu,"ax",@progbits
-	.hidden	testu
+	.hidden	testu                   # -- Begin function testu
 	.globl	testu
 	.type	testu,@function
 testu:                                  # @testu
@@ -403,20 +418,20 @@ testu:                                  # @testu
 	.endfunc
 .Lfunc_end25:
 	.size	testu, .Lfunc_end25-testu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-                                        # fallthrough-return: $pop0
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end26:
 	.size	main, .Lfunc_end26-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20040409-3.c.s b/test/torture-s/20040409-3.c.s
index 5bf4b1b33..8a6c346ca 100644
--- a/test/torture-s/20040409-3.c.s
+++ b/test/torture-s/20040409-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040409-3.c"
+	.file	"20040409-3.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -14,9 +14,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test1u,"ax",@progbits
-	.hidden	test1u
+	.hidden	test1u                  # -- Begin function test1u
 	.globl	test1u
 	.type	test1u,@function
 test1u:                                 # @test1u
@@ -29,24 +29,26 @@ test1u:                                 # @test1u
 	.endfunc
 .Lfunc_end1:
 	.size	test1u, .Lfunc_end1-test1u
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2147483647
+	i32.const	$push0=, -1
 	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push2=, 2147483647
+	i32.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test2u,"ax",@progbits
-	.hidden	test2u
+	.hidden	test2u                  # -- Begin function test2u
 	.globl	test2u
 	.type	test2u,@function
 test2u:                                 # @test2u
@@ -59,9 +61,9 @@ test2u:                                 # @test2u
 	.endfunc
 .Lfunc_end3:
 	.size	test2u, .Lfunc_end3-test2u
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -74,9 +76,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end4:
 	.size	test3, .Lfunc_end4-test3
-
+                                        # -- End function
 	.section	.text.test3u,"ax",@progbits
-	.hidden	test3u
+	.hidden	test3u                  # -- Begin function test3u
 	.globl	test3u
 	.type	test3u,@function
 test3u:                                 # @test3u
@@ -89,9 +91,9 @@ test3u:                                 # @test3u
 	.endfunc
 .Lfunc_end5:
 	.size	test3u, .Lfunc_end5-test3u
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -104,9 +106,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end6:
 	.size	test4, .Lfunc_end6-test4
-
+                                        # -- End function
 	.section	.text.test4u,"ax",@progbits
-	.hidden	test4u
+	.hidden	test4u                  # -- Begin function test4u
 	.globl	test4u
 	.type	test4u,@function
 test4u:                                 # @test4u
@@ -119,24 +121,26 @@ test4u:                                 # @test4u
 	.endfunc
 .Lfunc_end7:
 	.size	test4u, .Lfunc_end7-test4u
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2147483647
+	i32.const	$push0=, -1
 	i32.xor 	$push1=, $0, $pop0
-                                        # fallthrough-return: $pop1
+	i32.const	$push2=, 2147483647
+	i32.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end8:
 	.size	test5, .Lfunc_end8-test5
-
+                                        # -- End function
 	.section	.text.test5u,"ax",@progbits
-	.hidden	test5u
+	.hidden	test5u                  # -- Begin function test5u
 	.globl	test5u
 	.type	test5u,@function
 test5u:                                 # @test5u
@@ -149,9 +153,9 @@ test5u:                                 # @test5u
 	.endfunc
 .Lfunc_end9:
 	.size	test5u, .Lfunc_end9-test5u
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -164,9 +168,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end10:
 	.size	test6, .Lfunc_end10-test6
-
+                                        # -- End function
 	.section	.text.test6u,"ax",@progbits
-	.hidden	test6u
+	.hidden	test6u                  # -- Begin function test6u
 	.globl	test6u
 	.type	test6u,@function
 test6u:                                 # @test6u
@@ -179,31 +183,38 @@ test6u:                                 # @test6u
 	.endfunc
 .Lfunc_end11:
 	.size	test6u, .Lfunc_end11-test6u
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push0=, 2147483647
-	i32.xor 	$push1=, $0, $pop0
-	i32.ne  	$push2=, $pop1, $1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end20
+	i32.const	$push6=, 2147483647
+	i32.xor 	$push0=, $0, $pop6
+	i32.ne  	$push1=, $pop0, $1
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %if.end
+	i32.const	$push2=, -1
+	i32.xor 	$push3=, $0, $pop2
+	i32.const	$push7=, 2147483647
+	i32.and 	$push4=, $pop3, $pop7
+	i32.ne  	$push5=, $pop4, $1
+	br_if   	0, $pop5        # 0: down to label0
+# BB#2:                                 # %if.end20
 	return
-.LBB12_2:                               # %if.then
+.LBB12_3:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	test, .Lfunc_end12-test
-
+                                        # -- End function
 	.section	.text.testu,"ax",@progbits
-	.hidden	testu
+	.hidden	testu                   # -- Begin function testu
 	.globl	testu
 	.type	testu,@function
 testu:                                  # @testu
@@ -223,20 +234,20 @@ testu:                                  # @testu
 	.endfunc
 .Lfunc_end13:
 	.size	testu, .Lfunc_end13-testu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-                                        # fallthrough-return: $pop0
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end14:
 	.size	main, .Lfunc_end14-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20040411-1.c.s b/test/torture-s/20040411-1.c.s
index 90e04d8bb..3a4eeffca 100644
--- a/test/torture-s/20040411-1.c.s
+++ b/test/torture-s/20040411-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040411-1.c"
+	.file	"20040411-1.c"
 	.section	.text.sub1,"ax",@progbits
-	.hidden	sub1
+	.hidden	sub1                    # -- Begin function sub1
 	.globl	sub1
 	.type	sub1,@function
 sub1:                                   # @sub1
@@ -22,9 +22,9 @@ sub1:                                   # @sub1
 	.endfunc
 .Lfunc_end0:
 	.size	sub1, .Lfunc_end0-sub1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,6 +35,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040625-1.c.s b/test/torture-s/20040625-1.c.s
index e282b2fe8..e8b91b086 100644
--- a/test/torture-s/20040625-1.c.s
+++ b/test/torture-s/20040625-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040625-1.c"
+	.file	"20040625-1.c"
 	.section	.text.maybe_next,"ax",@progbits
-	.hidden	maybe_next
+	.hidden	maybe_next              # -- Begin function maybe_next
 	.globl	maybe_next
 	.type	maybe_next,@function
 maybe_next:                             # @maybe_next
@@ -20,9 +20,9 @@ maybe_next:                             # @maybe_next
 	.endfunc
 .Lfunc_end0:
 	.size	maybe_next, .Lfunc_end0-maybe_next
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,10 +30,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push11=, $pop5, $pop6
+	i32.sub 	$push11=, $pop4, $pop6
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop7), $pop10
 	i32.store	8($0), $0
@@ -55,8 +55,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040629-1.c.s b/test/torture-s/20040629-1.c.s
index f8fe56144..43ee1e38c 100644
--- a/test/torture-s/20040629-1.c.s
+++ b/test/torture-s/20040629-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040629-1.c"
+	.file	"20040629-1.c"
 	.section	.text.ret1,"ax",@progbits
-	.hidden	ret1
+	.hidden	ret1                    # -- Begin function ret1
 	.globl	ret1
 	.type	ret1,@function
 ret1:                                   # @ret1
@@ -15,9 +15,9 @@ ret1:                                   # @ret1
 	.endfunc
 .Lfunc_end0:
 	.size	ret1, .Lfunc_end0-ret1
-
+                                        # -- End function
 	.section	.text.ret2,"ax",@progbits
-	.hidden	ret2
+	.hidden	ret2                    # -- Begin function ret2
 	.globl	ret2
 	.type	ret2,@function
 ret2:                                   # @ret2
@@ -33,9 +33,9 @@ ret2:                                   # @ret2
 	.endfunc
 .Lfunc_end1:
 	.size	ret2, .Lfunc_end1-ret2
-
+                                        # -- End function
 	.section	.text.ret3,"ax",@progbits
-	.hidden	ret3
+	.hidden	ret3                    # -- Begin function ret3
 	.globl	ret3
 	.type	ret3,@function
 ret3:                                   # @ret3
@@ -49,9 +49,9 @@ ret3:                                   # @ret3
 	.endfunc
 .Lfunc_end2:
 	.size	ret3, .Lfunc_end2-ret3
-
+                                        # -- End function
 	.section	.text.ret4,"ax",@progbits
-	.hidden	ret4
+	.hidden	ret4                    # -- Begin function ret4
 	.globl	ret4
 	.type	ret4,@function
 ret4:                                   # @ret4
@@ -65,9 +65,9 @@ ret4:                                   # @ret4
 	.endfunc
 .Lfunc_end3:
 	.size	ret4, .Lfunc_end3-ret4
-
+                                        # -- End function
 	.section	.text.ret5,"ax",@progbits
-	.hidden	ret5
+	.hidden	ret5                    # -- Begin function ret5
 	.globl	ret5
 	.type	ret5,@function
 ret5:                                   # @ret5
@@ -83,9 +83,9 @@ ret5:                                   # @ret5
 	.endfunc
 .Lfunc_end4:
 	.size	ret5, .Lfunc_end4-ret5
-
+                                        # -- End function
 	.section	.text.ret6,"ax",@progbits
-	.hidden	ret6
+	.hidden	ret6                    # -- Begin function ret6
 	.globl	ret6
 	.type	ret6,@function
 ret6:                                   # @ret6
@@ -99,9 +99,9 @@ ret6:                                   # @ret6
 	.endfunc
 .Lfunc_end5:
 	.size	ret6, .Lfunc_end5-ret6
-
+                                        # -- End function
 	.section	.text.ret7,"ax",@progbits
-	.hidden	ret7
+	.hidden	ret7                    # -- Begin function ret7
 	.globl	ret7
 	.type	ret7,@function
 ret7:                                   # @ret7
@@ -113,9 +113,9 @@ ret7:                                   # @ret7
 	.endfunc
 .Lfunc_end6:
 	.size	ret7, .Lfunc_end6-ret7
-
+                                        # -- End function
 	.section	.text.ret8,"ax",@progbits
-	.hidden	ret8
+	.hidden	ret8                    # -- Begin function ret8
 	.globl	ret8
 	.type	ret8,@function
 ret8:                                   # @ret8
@@ -127,9 +127,9 @@ ret8:                                   # @ret8
 	.endfunc
 .Lfunc_end7:
 	.size	ret8, .Lfunc_end7-ret8
-
+                                        # -- End function
 	.section	.text.ret9,"ax",@progbits
-	.hidden	ret9
+	.hidden	ret9                    # -- Begin function ret9
 	.globl	ret9
 	.type	ret9,@function
 ret9:                                   # @ret9
@@ -141,9 +141,9 @@ ret9:                                   # @ret9
 	.endfunc
 .Lfunc_end8:
 	.size	ret9, .Lfunc_end8-ret9
-
+                                        # -- End function
 	.section	.text.fn1_1,"ax",@progbits
-	.hidden	fn1_1
+	.hidden	fn1_1                   # -- Begin function fn1_1
 	.globl	fn1_1
 	.type	fn1_1,@function
 fn1_1:                                  # @fn1_1
@@ -165,9 +165,9 @@ fn1_1:                                  # @fn1_1
 	.endfunc
 .Lfunc_end9:
 	.size	fn1_1, .Lfunc_end9-fn1_1
-
+                                        # -- End function
 	.section	.text.fn2_1,"ax",@progbits
-	.hidden	fn2_1
+	.hidden	fn2_1                   # -- Begin function fn2_1
 	.globl	fn2_1
 	.type	fn2_1,@function
 fn2_1:                                  # @fn2_1
@@ -191,9 +191,9 @@ fn2_1:                                  # @fn2_1
 	.endfunc
 .Lfunc_end10:
 	.size	fn2_1, .Lfunc_end10-fn2_1
-
+                                        # -- End function
 	.section	.text.fn3_1,"ax",@progbits
-	.hidden	fn3_1
+	.hidden	fn3_1                   # -- Begin function fn3_1
 	.globl	fn3_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
@@ -210,9 +210,9 @@ fn3_1:                                  # @fn3_1
 	.endfunc
 .Lfunc_end11:
 	.size	fn3_1, .Lfunc_end11-fn3_1
-
+                                        # -- End function
 	.section	.text.fn4_1,"ax",@progbits
-	.hidden	fn4_1
+	.hidden	fn4_1                   # -- Begin function fn4_1
 	.globl	fn4_1
 	.type	fn4_1,@function
 fn4_1:                                  # @fn4_1
@@ -234,9 +234,9 @@ fn4_1:                                  # @fn4_1
 	.endfunc
 .Lfunc_end12:
 	.size	fn4_1, .Lfunc_end12-fn4_1
-
+                                        # -- End function
 	.section	.text.fn5_1,"ax",@progbits
-	.hidden	fn5_1
+	.hidden	fn5_1                   # -- Begin function fn5_1
 	.globl	fn5_1
 	.type	fn5_1,@function
 fn5_1:                                  # @fn5_1
@@ -260,9 +260,9 @@ fn5_1:                                  # @fn5_1
 	.endfunc
 .Lfunc_end13:
 	.size	fn5_1, .Lfunc_end13-fn5_1
-
+                                        # -- End function
 	.section	.text.fn6_1,"ax",@progbits
-	.hidden	fn6_1
+	.hidden	fn6_1                   # -- Begin function fn6_1
 	.globl	fn6_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
@@ -279,9 +279,9 @@ fn6_1:                                  # @fn6_1
 	.endfunc
 .Lfunc_end14:
 	.size	fn6_1, .Lfunc_end14-fn6_1
-
+                                        # -- End function
 	.section	.text.fn7_1,"ax",@progbits
-	.hidden	fn7_1
+	.hidden	fn7_1                   # -- Begin function fn7_1
 	.globl	fn7_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
@@ -296,9 +296,9 @@ fn7_1:                                  # @fn7_1
 	.endfunc
 .Lfunc_end15:
 	.size	fn7_1, .Lfunc_end15-fn7_1
-
+                                        # -- End function
 	.section	.text.fn8_1,"ax",@progbits
-	.hidden	fn8_1
+	.hidden	fn8_1                   # -- Begin function fn8_1
 	.globl	fn8_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
@@ -317,9 +317,9 @@ fn8_1:                                  # @fn8_1
 	.endfunc
 .Lfunc_end16:
 	.size	fn8_1, .Lfunc_end16-fn8_1
-
+                                        # -- End function
 	.section	.text.fn9_1,"ax",@progbits
-	.hidden	fn9_1
+	.hidden	fn9_1                   # -- Begin function fn9_1
 	.globl	fn9_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
@@ -336,9 +336,9 @@ fn9_1:                                  # @fn9_1
 	.endfunc
 .Lfunc_end17:
 	.size	fn9_1, .Lfunc_end17-fn9_1
-
+                                        # -- End function
 	.section	.text.fn1_2,"ax",@progbits
-	.hidden	fn1_2
+	.hidden	fn1_2                   # -- Begin function fn1_2
 	.globl	fn1_2
 	.type	fn1_2,@function
 fn1_2:                                  # @fn1_2
@@ -361,9 +361,9 @@ fn1_2:                                  # @fn1_2
 	.endfunc
 .Lfunc_end18:
 	.size	fn1_2, .Lfunc_end18-fn1_2
-
+                                        # -- End function
 	.section	.text.fn2_2,"ax",@progbits
-	.hidden	fn2_2
+	.hidden	fn2_2                   # -- Begin function fn2_2
 	.globl	fn2_2
 	.type	fn2_2,@function
 fn2_2:                                  # @fn2_2
@@ -386,9 +386,9 @@ fn2_2:                                  # @fn2_2
 	.endfunc
 .Lfunc_end19:
 	.size	fn2_2, .Lfunc_end19-fn2_2
-
+                                        # -- End function
 	.section	.text.fn3_2,"ax",@progbits
-	.hidden	fn3_2
+	.hidden	fn3_2                   # -- Begin function fn3_2
 	.globl	fn3_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
@@ -404,9 +404,9 @@ fn3_2:                                  # @fn3_2
 	.endfunc
 .Lfunc_end20:
 	.size	fn3_2, .Lfunc_end20-fn3_2
-
+                                        # -- End function
 	.section	.text.fn4_2,"ax",@progbits
-	.hidden	fn4_2
+	.hidden	fn4_2                   # -- Begin function fn4_2
 	.globl	fn4_2
 	.type	fn4_2,@function
 fn4_2:                                  # @fn4_2
@@ -429,9 +429,9 @@ fn4_2:                                  # @fn4_2
 	.endfunc
 .Lfunc_end21:
 	.size	fn4_2, .Lfunc_end21-fn4_2
-
+                                        # -- End function
 	.section	.text.fn5_2,"ax",@progbits
-	.hidden	fn5_2
+	.hidden	fn5_2                   # -- Begin function fn5_2
 	.globl	fn5_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
@@ -447,9 +447,9 @@ fn5_2:                                  # @fn5_2
 	.endfunc
 .Lfunc_end22:
 	.size	fn5_2, .Lfunc_end22-fn5_2
-
+                                        # -- End function
 	.section	.text.fn6_2,"ax",@progbits
-	.hidden	fn6_2
+	.hidden	fn6_2                   # -- Begin function fn6_2
 	.globl	fn6_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
@@ -465,9 +465,9 @@ fn6_2:                                  # @fn6_2
 	.endfunc
 .Lfunc_end23:
 	.size	fn6_2, .Lfunc_end23-fn6_2
-
+                                        # -- End function
 	.section	.text.fn7_2,"ax",@progbits
-	.hidden	fn7_2
+	.hidden	fn7_2                   # -- Begin function fn7_2
 	.globl	fn7_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
@@ -483,9 +483,9 @@ fn7_2:                                  # @fn7_2
 	.endfunc
 .Lfunc_end24:
 	.size	fn7_2, .Lfunc_end24-fn7_2
-
+                                        # -- End function
 	.section	.text.fn8_2,"ax",@progbits
-	.hidden	fn8_2
+	.hidden	fn8_2                   # -- Begin function fn8_2
 	.globl	fn8_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
@@ -503,9 +503,9 @@ fn8_2:                                  # @fn8_2
 	.endfunc
 .Lfunc_end25:
 	.size	fn8_2, .Lfunc_end25-fn8_2
-
+                                        # -- End function
 	.section	.text.fn9_2,"ax",@progbits
-	.hidden	fn9_2
+	.hidden	fn9_2                   # -- Begin function fn9_2
 	.globl	fn9_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
@@ -521,9 +521,9 @@ fn9_2:                                  # @fn9_2
 	.endfunc
 .Lfunc_end26:
 	.size	fn9_2, .Lfunc_end26-fn9_2
-
+                                        # -- End function
 	.section	.text.fn1_3,"ax",@progbits
-	.hidden	fn1_3
+	.hidden	fn1_3                   # -- Begin function fn1_3
 	.globl	fn1_3
 	.type	fn1_3,@function
 fn1_3:                                  # @fn1_3
@@ -546,9 +546,9 @@ fn1_3:                                  # @fn1_3
 	.endfunc
 .Lfunc_end27:
 	.size	fn1_3, .Lfunc_end27-fn1_3
-
+                                        # -- End function
 	.section	.text.fn2_3,"ax",@progbits
-	.hidden	fn2_3
+	.hidden	fn2_3                   # -- Begin function fn2_3
 	.globl	fn2_3
 	.type	fn2_3,@function
 fn2_3:                                  # @fn2_3
@@ -571,9 +571,9 @@ fn2_3:                                  # @fn2_3
 	.endfunc
 .Lfunc_end28:
 	.size	fn2_3, .Lfunc_end28-fn2_3
-
+                                        # -- End function
 	.section	.text.fn3_3,"ax",@progbits
-	.hidden	fn3_3
+	.hidden	fn3_3                   # -- Begin function fn3_3
 	.globl	fn3_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
@@ -589,9 +589,9 @@ fn3_3:                                  # @fn3_3
 	.endfunc
 .Lfunc_end29:
 	.size	fn3_3, .Lfunc_end29-fn3_3
-
+                                        # -- End function
 	.section	.text.fn4_3,"ax",@progbits
-	.hidden	fn4_3
+	.hidden	fn4_3                   # -- Begin function fn4_3
 	.globl	fn4_3
 	.type	fn4_3,@function
 fn4_3:                                  # @fn4_3
@@ -614,9 +614,9 @@ fn4_3:                                  # @fn4_3
 	.endfunc
 .Lfunc_end30:
 	.size	fn4_3, .Lfunc_end30-fn4_3
-
+                                        # -- End function
 	.section	.text.fn5_3,"ax",@progbits
-	.hidden	fn5_3
+	.hidden	fn5_3                   # -- Begin function fn5_3
 	.globl	fn5_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
@@ -632,9 +632,9 @@ fn5_3:                                  # @fn5_3
 	.endfunc
 .Lfunc_end31:
 	.size	fn5_3, .Lfunc_end31-fn5_3
-
+                                        # -- End function
 	.section	.text.fn6_3,"ax",@progbits
-	.hidden	fn6_3
+	.hidden	fn6_3                   # -- Begin function fn6_3
 	.globl	fn6_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
@@ -650,9 +650,9 @@ fn6_3:                                  # @fn6_3
 	.endfunc
 .Lfunc_end32:
 	.size	fn6_3, .Lfunc_end32-fn6_3
-
+                                        # -- End function
 	.section	.text.fn7_3,"ax",@progbits
-	.hidden	fn7_3
+	.hidden	fn7_3                   # -- Begin function fn7_3
 	.globl	fn7_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
@@ -668,9 +668,9 @@ fn7_3:                                  # @fn7_3
 	.endfunc
 .Lfunc_end33:
 	.size	fn7_3, .Lfunc_end33-fn7_3
-
+                                        # -- End function
 	.section	.text.fn8_3,"ax",@progbits
-	.hidden	fn8_3
+	.hidden	fn8_3                   # -- Begin function fn8_3
 	.globl	fn8_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
@@ -688,9 +688,9 @@ fn8_3:                                  # @fn8_3
 	.endfunc
 .Lfunc_end34:
 	.size	fn8_3, .Lfunc_end34-fn8_3
-
+                                        # -- End function
 	.section	.text.fn9_3,"ax",@progbits
-	.hidden	fn9_3
+	.hidden	fn9_3                   # -- Begin function fn9_3
 	.globl	fn9_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
@@ -706,9 +706,9 @@ fn9_3:                                  # @fn9_3
 	.endfunc
 .Lfunc_end35:
 	.size	fn9_3, .Lfunc_end35-fn9_3
-
+                                        # -- End function
 	.section	.text.fn1_4,"ax",@progbits
-	.hidden	fn1_4
+	.hidden	fn1_4                   # -- Begin function fn1_4
 	.globl	fn1_4
 	.type	fn1_4,@function
 fn1_4:                                  # @fn1_4
@@ -730,9 +730,9 @@ fn1_4:                                  # @fn1_4
 	.endfunc
 .Lfunc_end36:
 	.size	fn1_4, .Lfunc_end36-fn1_4
-
+                                        # -- End function
 	.section	.text.fn2_4,"ax",@progbits
-	.hidden	fn2_4
+	.hidden	fn2_4                   # -- Begin function fn2_4
 	.globl	fn2_4
 	.type	fn2_4,@function
 fn2_4:                                  # @fn2_4
@@ -756,9 +756,9 @@ fn2_4:                                  # @fn2_4
 	.endfunc
 .Lfunc_end37:
 	.size	fn2_4, .Lfunc_end37-fn2_4
-
+                                        # -- End function
 	.section	.text.fn3_4,"ax",@progbits
-	.hidden	fn3_4
+	.hidden	fn3_4                   # -- Begin function fn3_4
 	.globl	fn3_4
 	.type	fn3_4,@function
 fn3_4:                                  # @fn3_4
@@ -782,9 +782,9 @@ fn3_4:                                  # @fn3_4
 	.endfunc
 .Lfunc_end38:
 	.size	fn3_4, .Lfunc_end38-fn3_4
-
+                                        # -- End function
 	.section	.text.fn4_4,"ax",@progbits
-	.hidden	fn4_4
+	.hidden	fn4_4                   # -- Begin function fn4_4
 	.globl	fn4_4
 	.type	fn4_4,@function
 fn4_4:                                  # @fn4_4
@@ -806,9 +806,9 @@ fn4_4:                                  # @fn4_4
 	.endfunc
 .Lfunc_end39:
 	.size	fn4_4, .Lfunc_end39-fn4_4
-
+                                        # -- End function
 	.section	.text.fn5_4,"ax",@progbits
-	.hidden	fn5_4
+	.hidden	fn5_4                   # -- Begin function fn5_4
 	.globl	fn5_4
 	.type	fn5_4,@function
 fn5_4:                                  # @fn5_4
@@ -832,9 +832,9 @@ fn5_4:                                  # @fn5_4
 	.endfunc
 .Lfunc_end40:
 	.size	fn5_4, .Lfunc_end40-fn5_4
-
+                                        # -- End function
 	.section	.text.fn6_4,"ax",@progbits
-	.hidden	fn6_4
+	.hidden	fn6_4                   # -- Begin function fn6_4
 	.globl	fn6_4
 	.type	fn6_4,@function
 fn6_4:                                  # @fn6_4
@@ -858,9 +858,9 @@ fn6_4:                                  # @fn6_4
 	.endfunc
 .Lfunc_end41:
 	.size	fn6_4, .Lfunc_end41-fn6_4
-
+                                        # -- End function
 	.section	.text.fn7_4,"ax",@progbits
-	.hidden	fn7_4
+	.hidden	fn7_4                   # -- Begin function fn7_4
 	.globl	fn7_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
@@ -875,9 +875,9 @@ fn7_4:                                  # @fn7_4
 	.endfunc
 .Lfunc_end42:
 	.size	fn7_4, .Lfunc_end42-fn7_4
-
+                                        # -- End function
 	.section	.text.fn8_4,"ax",@progbits
-	.hidden	fn8_4
+	.hidden	fn8_4                   # -- Begin function fn8_4
 	.globl	fn8_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
@@ -896,9 +896,9 @@ fn8_4:                                  # @fn8_4
 	.endfunc
 .Lfunc_end43:
 	.size	fn8_4, .Lfunc_end43-fn8_4
-
+                                        # -- End function
 	.section	.text.fn9_4,"ax",@progbits
-	.hidden	fn9_4
+	.hidden	fn9_4                   # -- Begin function fn9_4
 	.globl	fn9_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
@@ -917,9 +917,9 @@ fn9_4:                                  # @fn9_4
 	.endfunc
 .Lfunc_end44:
 	.size	fn9_4, .Lfunc_end44-fn9_4
-
+                                        # -- End function
 	.section	.text.fn1_5,"ax",@progbits
-	.hidden	fn1_5
+	.hidden	fn1_5                   # -- Begin function fn1_5
 	.globl	fn1_5
 	.type	fn1_5,@function
 fn1_5:                                  # @fn1_5
@@ -942,9 +942,9 @@ fn1_5:                                  # @fn1_5
 	.endfunc
 .Lfunc_end45:
 	.size	fn1_5, .Lfunc_end45-fn1_5
-
+                                        # -- End function
 	.section	.text.fn2_5,"ax",@progbits
-	.hidden	fn2_5
+	.hidden	fn2_5                   # -- Begin function fn2_5
 	.globl	fn2_5
 	.type	fn2_5,@function
 fn2_5:                                  # @fn2_5
@@ -967,9 +967,9 @@ fn2_5:                                  # @fn2_5
 	.endfunc
 .Lfunc_end46:
 	.size	fn2_5, .Lfunc_end46-fn2_5
-
+                                        # -- End function
 	.section	.text.fn3_5,"ax",@progbits
-	.hidden	fn3_5
+	.hidden	fn3_5                   # -- Begin function fn3_5
 	.globl	fn3_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
@@ -985,9 +985,9 @@ fn3_5:                                  # @fn3_5
 	.endfunc
 .Lfunc_end47:
 	.size	fn3_5, .Lfunc_end47-fn3_5
-
+                                        # -- End function
 	.section	.text.fn4_5,"ax",@progbits
-	.hidden	fn4_5
+	.hidden	fn4_5                   # -- Begin function fn4_5
 	.globl	fn4_5
 	.type	fn4_5,@function
 fn4_5:                                  # @fn4_5
@@ -1010,9 +1010,9 @@ fn4_5:                                  # @fn4_5
 	.endfunc
 .Lfunc_end48:
 	.size	fn4_5, .Lfunc_end48-fn4_5
-
+                                        # -- End function
 	.section	.text.fn5_5,"ax",@progbits
-	.hidden	fn5_5
+	.hidden	fn5_5                   # -- Begin function fn5_5
 	.globl	fn5_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
@@ -1028,9 +1028,9 @@ fn5_5:                                  # @fn5_5
 	.endfunc
 .Lfunc_end49:
 	.size	fn5_5, .Lfunc_end49-fn5_5
-
+                                        # -- End function
 	.section	.text.fn6_5,"ax",@progbits
-	.hidden	fn6_5
+	.hidden	fn6_5                   # -- Begin function fn6_5
 	.globl	fn6_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
@@ -1046,9 +1046,9 @@ fn6_5:                                  # @fn6_5
 	.endfunc
 .Lfunc_end50:
 	.size	fn6_5, .Lfunc_end50-fn6_5
-
+                                        # -- End function
 	.section	.text.fn7_5,"ax",@progbits
-	.hidden	fn7_5
+	.hidden	fn7_5                   # -- Begin function fn7_5
 	.globl	fn7_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
@@ -1064,9 +1064,9 @@ fn7_5:                                  # @fn7_5
 	.endfunc
 .Lfunc_end51:
 	.size	fn7_5, .Lfunc_end51-fn7_5
-
+                                        # -- End function
 	.section	.text.fn8_5,"ax",@progbits
-	.hidden	fn8_5
+	.hidden	fn8_5                   # -- Begin function fn8_5
 	.globl	fn8_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
@@ -1084,9 +1084,9 @@ fn8_5:                                  # @fn8_5
 	.endfunc
 .Lfunc_end52:
 	.size	fn8_5, .Lfunc_end52-fn8_5
-
+                                        # -- End function
 	.section	.text.fn9_5,"ax",@progbits
-	.hidden	fn9_5
+	.hidden	fn9_5                   # -- Begin function fn9_5
 	.globl	fn9_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
@@ -1102,9 +1102,9 @@ fn9_5:                                  # @fn9_5
 	.endfunc
 .Lfunc_end53:
 	.size	fn9_5, .Lfunc_end53-fn9_5
-
+                                        # -- End function
 	.section	.text.fn1_6,"ax",@progbits
-	.hidden	fn1_6
+	.hidden	fn1_6                   # -- Begin function fn1_6
 	.globl	fn1_6
 	.type	fn1_6,@function
 fn1_6:                                  # @fn1_6
@@ -1127,9 +1127,9 @@ fn1_6:                                  # @fn1_6
 	.endfunc
 .Lfunc_end54:
 	.size	fn1_6, .Lfunc_end54-fn1_6
-
+                                        # -- End function
 	.section	.text.fn2_6,"ax",@progbits
-	.hidden	fn2_6
+	.hidden	fn2_6                   # -- Begin function fn2_6
 	.globl	fn2_6
 	.type	fn2_6,@function
 fn2_6:                                  # @fn2_6
@@ -1152,9 +1152,9 @@ fn2_6:                                  # @fn2_6
 	.endfunc
 .Lfunc_end55:
 	.size	fn2_6, .Lfunc_end55-fn2_6
-
+                                        # -- End function
 	.section	.text.fn3_6,"ax",@progbits
-	.hidden	fn3_6
+	.hidden	fn3_6                   # -- Begin function fn3_6
 	.globl	fn3_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
@@ -1170,9 +1170,9 @@ fn3_6:                                  # @fn3_6
 	.endfunc
 .Lfunc_end56:
 	.size	fn3_6, .Lfunc_end56-fn3_6
-
+                                        # -- End function
 	.section	.text.fn4_6,"ax",@progbits
-	.hidden	fn4_6
+	.hidden	fn4_6                   # -- Begin function fn4_6
 	.globl	fn4_6
 	.type	fn4_6,@function
 fn4_6:                                  # @fn4_6
@@ -1195,9 +1195,9 @@ fn4_6:                                  # @fn4_6
 	.endfunc
 .Lfunc_end57:
 	.size	fn4_6, .Lfunc_end57-fn4_6
-
+                                        # -- End function
 	.section	.text.fn5_6,"ax",@progbits
-	.hidden	fn5_6
+	.hidden	fn5_6                   # -- Begin function fn5_6
 	.globl	fn5_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
@@ -1213,9 +1213,9 @@ fn5_6:                                  # @fn5_6
 	.endfunc
 .Lfunc_end58:
 	.size	fn5_6, .Lfunc_end58-fn5_6
-
+                                        # -- End function
 	.section	.text.fn6_6,"ax",@progbits
-	.hidden	fn6_6
+	.hidden	fn6_6                   # -- Begin function fn6_6
 	.globl	fn6_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
@@ -1231,9 +1231,9 @@ fn6_6:                                  # @fn6_6
 	.endfunc
 .Lfunc_end59:
 	.size	fn6_6, .Lfunc_end59-fn6_6
-
+                                        # -- End function
 	.section	.text.fn7_6,"ax",@progbits
-	.hidden	fn7_6
+	.hidden	fn7_6                   # -- Begin function fn7_6
 	.globl	fn7_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
@@ -1249,9 +1249,9 @@ fn7_6:                                  # @fn7_6
 	.endfunc
 .Lfunc_end60:
 	.size	fn7_6, .Lfunc_end60-fn7_6
-
+                                        # -- End function
 	.section	.text.fn8_6,"ax",@progbits
-	.hidden	fn8_6
+	.hidden	fn8_6                   # -- Begin function fn8_6
 	.globl	fn8_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
@@ -1269,9 +1269,9 @@ fn8_6:                                  # @fn8_6
 	.endfunc
 .Lfunc_end61:
 	.size	fn8_6, .Lfunc_end61-fn8_6
-
+                                        # -- End function
 	.section	.text.fn9_6,"ax",@progbits
-	.hidden	fn9_6
+	.hidden	fn9_6                   # -- Begin function fn9_6
 	.globl	fn9_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
@@ -1287,9 +1287,9 @@ fn9_6:                                  # @fn9_6
 	.endfunc
 .Lfunc_end62:
 	.size	fn9_6, .Lfunc_end62-fn9_6
-
+                                        # -- End function
 	.section	.text.fn1_7,"ax",@progbits
-	.hidden	fn1_7
+	.hidden	fn1_7                   # -- Begin function fn1_7
 	.globl	fn1_7
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
@@ -1306,9 +1306,9 @@ fn1_7:                                  # @fn1_7
 	.endfunc
 .Lfunc_end63:
 	.size	fn1_7, .Lfunc_end63-fn1_7
-
+                                        # -- End function
 	.section	.text.fn2_7,"ax",@progbits
-	.hidden	fn2_7
+	.hidden	fn2_7                   # -- Begin function fn2_7
 	.globl	fn2_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
@@ -1327,9 +1327,9 @@ fn2_7:                                  # @fn2_7
 	.endfunc
 .Lfunc_end64:
 	.size	fn2_7, .Lfunc_end64-fn2_7
-
+                                        # -- End function
 	.section	.text.fn3_7,"ax",@progbits
-	.hidden	fn3_7
+	.hidden	fn3_7                   # -- Begin function fn3_7
 	.globl	fn3_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
@@ -1348,9 +1348,9 @@ fn3_7:                                  # @fn3_7
 	.endfunc
 .Lfunc_end65:
 	.size	fn3_7, .Lfunc_end65-fn3_7
-
+                                        # -- End function
 	.section	.text.fn4_7,"ax",@progbits
-	.hidden	fn4_7
+	.hidden	fn4_7                   # -- Begin function fn4_7
 	.globl	fn4_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
@@ -1367,9 +1367,9 @@ fn4_7:                                  # @fn4_7
 	.endfunc
 .Lfunc_end66:
 	.size	fn4_7, .Lfunc_end66-fn4_7
-
+                                        # -- End function
 	.section	.text.fn5_7,"ax",@progbits
-	.hidden	fn5_7
+	.hidden	fn5_7                   # -- Begin function fn5_7
 	.globl	fn5_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
@@ -1388,9 +1388,9 @@ fn5_7:                                  # @fn5_7
 	.endfunc
 .Lfunc_end67:
 	.size	fn5_7, .Lfunc_end67-fn5_7
-
+                                        # -- End function
 	.section	.text.fn6_7,"ax",@progbits
-	.hidden	fn6_7
+	.hidden	fn6_7                   # -- Begin function fn6_7
 	.globl	fn6_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
@@ -1409,9 +1409,9 @@ fn6_7:                                  # @fn6_7
 	.endfunc
 .Lfunc_end68:
 	.size	fn6_7, .Lfunc_end68-fn6_7
-
+                                        # -- End function
 	.section	.text.fn7_7,"ax",@progbits
-	.hidden	fn7_7
+	.hidden	fn7_7                   # -- Begin function fn7_7
 	.globl	fn7_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
@@ -1428,9 +1428,9 @@ fn7_7:                                  # @fn7_7
 	.endfunc
 .Lfunc_end69:
 	.size	fn7_7, .Lfunc_end69-fn7_7
-
+                                        # -- End function
 	.section	.text.fn8_7,"ax",@progbits
-	.hidden	fn8_7
+	.hidden	fn8_7                   # -- Begin function fn8_7
 	.globl	fn8_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
@@ -1449,9 +1449,9 @@ fn8_7:                                  # @fn8_7
 	.endfunc
 .Lfunc_end70:
 	.size	fn8_7, .Lfunc_end70-fn8_7
-
+                                        # -- End function
 	.section	.text.fn9_7,"ax",@progbits
-	.hidden	fn9_7
+	.hidden	fn9_7                   # -- Begin function fn9_7
 	.globl	fn9_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
@@ -1470,9 +1470,9 @@ fn9_7:                                  # @fn9_7
 	.endfunc
 .Lfunc_end71:
 	.size	fn9_7, .Lfunc_end71-fn9_7
-
+                                        # -- End function
 	.section	.text.fn1_8,"ax",@progbits
-	.hidden	fn1_8
+	.hidden	fn1_8                   # -- Begin function fn1_8
 	.globl	fn1_8
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
@@ -1489,9 +1489,9 @@ fn1_8:                                  # @fn1_8
 	.endfunc
 .Lfunc_end72:
 	.size	fn1_8, .Lfunc_end72-fn1_8
-
+                                        # -- End function
 	.section	.text.fn2_8,"ax",@progbits
-	.hidden	fn2_8
+	.hidden	fn2_8                   # -- Begin function fn2_8
 	.globl	fn2_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
@@ -1510,9 +1510,9 @@ fn2_8:                                  # @fn2_8
 	.endfunc
 .Lfunc_end73:
 	.size	fn2_8, .Lfunc_end73-fn2_8
-
+                                        # -- End function
 	.section	.text.fn3_8,"ax",@progbits
-	.hidden	fn3_8
+	.hidden	fn3_8                   # -- Begin function fn3_8
 	.globl	fn3_8
 	.type	fn3_8,@function
 fn3_8:                                  # @fn3_8
@@ -1536,9 +1536,9 @@ fn3_8:                                  # @fn3_8
 	.endfunc
 .Lfunc_end74:
 	.size	fn3_8, .Lfunc_end74-fn3_8
-
+                                        # -- End function
 	.section	.text.fn4_8,"ax",@progbits
-	.hidden	fn4_8
+	.hidden	fn4_8                   # -- Begin function fn4_8
 	.globl	fn4_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
@@ -1555,9 +1555,9 @@ fn4_8:                                  # @fn4_8
 	.endfunc
 .Lfunc_end75:
 	.size	fn4_8, .Lfunc_end75-fn4_8
-
+                                        # -- End function
 	.section	.text.fn5_8,"ax",@progbits
-	.hidden	fn5_8
+	.hidden	fn5_8                   # -- Begin function fn5_8
 	.globl	fn5_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
@@ -1576,9 +1576,9 @@ fn5_8:                                  # @fn5_8
 	.endfunc
 .Lfunc_end76:
 	.size	fn5_8, .Lfunc_end76-fn5_8
-
+                                        # -- End function
 	.section	.text.fn6_8,"ax",@progbits
-	.hidden	fn6_8
+	.hidden	fn6_8                   # -- Begin function fn6_8
 	.globl	fn6_8
 	.type	fn6_8,@function
 fn6_8:                                  # @fn6_8
@@ -1602,9 +1602,9 @@ fn6_8:                                  # @fn6_8
 	.endfunc
 .Lfunc_end77:
 	.size	fn6_8, .Lfunc_end77-fn6_8
-
+                                        # -- End function
 	.section	.text.fn7_8,"ax",@progbits
-	.hidden	fn7_8
+	.hidden	fn7_8                   # -- Begin function fn7_8
 	.globl	fn7_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
@@ -1621,9 +1621,9 @@ fn7_8:                                  # @fn7_8
 	.endfunc
 .Lfunc_end78:
 	.size	fn7_8, .Lfunc_end78-fn7_8
-
+                                        # -- End function
 	.section	.text.fn8_8,"ax",@progbits
-	.hidden	fn8_8
+	.hidden	fn8_8                   # -- Begin function fn8_8
 	.globl	fn8_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
@@ -1642,9 +1642,9 @@ fn8_8:                                  # @fn8_8
 	.endfunc
 .Lfunc_end79:
 	.size	fn8_8, .Lfunc_end79-fn8_8
-
+                                        # -- End function
 	.section	.text.fn9_8,"ax",@progbits
-	.hidden	fn9_8
+	.hidden	fn9_8                   # -- Begin function fn9_8
 	.globl	fn9_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
@@ -1663,9 +1663,9 @@ fn9_8:                                  # @fn9_8
 	.endfunc
 .Lfunc_end80:
 	.size	fn9_8, .Lfunc_end80-fn9_8
-
+                                        # -- End function
 	.section	.text.fn1_9,"ax",@progbits
-	.hidden	fn1_9
+	.hidden	fn1_9                   # -- Begin function fn1_9
 	.globl	fn1_9
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
@@ -1682,9 +1682,9 @@ fn1_9:                                  # @fn1_9
 	.endfunc
 .Lfunc_end81:
 	.size	fn1_9, .Lfunc_end81-fn1_9
-
+                                        # -- End function
 	.section	.text.fn2_9,"ax",@progbits
-	.hidden	fn2_9
+	.hidden	fn2_9                   # -- Begin function fn2_9
 	.globl	fn2_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
@@ -1703,9 +1703,9 @@ fn2_9:                                  # @fn2_9
 	.endfunc
 .Lfunc_end82:
 	.size	fn2_9, .Lfunc_end82-fn2_9
-
+                                        # -- End function
 	.section	.text.fn3_9,"ax",@progbits
-	.hidden	fn3_9
+	.hidden	fn3_9                   # -- Begin function fn3_9
 	.globl	fn3_9
 	.type	fn3_9,@function
 fn3_9:                                  # @fn3_9
@@ -1729,9 +1729,9 @@ fn3_9:                                  # @fn3_9
 	.endfunc
 .Lfunc_end83:
 	.size	fn3_9, .Lfunc_end83-fn3_9
-
+                                        # -- End function
 	.section	.text.fn4_9,"ax",@progbits
-	.hidden	fn4_9
+	.hidden	fn4_9                   # -- Begin function fn4_9
 	.globl	fn4_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
@@ -1748,9 +1748,9 @@ fn4_9:                                  # @fn4_9
 	.endfunc
 .Lfunc_end84:
 	.size	fn4_9, .Lfunc_end84-fn4_9
-
+                                        # -- End function
 	.section	.text.fn5_9,"ax",@progbits
-	.hidden	fn5_9
+	.hidden	fn5_9                   # -- Begin function fn5_9
 	.globl	fn5_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
@@ -1769,9 +1769,9 @@ fn5_9:                                  # @fn5_9
 	.endfunc
 .Lfunc_end85:
 	.size	fn5_9, .Lfunc_end85-fn5_9
-
+                                        # -- End function
 	.section	.text.fn6_9,"ax",@progbits
-	.hidden	fn6_9
+	.hidden	fn6_9                   # -- Begin function fn6_9
 	.globl	fn6_9
 	.type	fn6_9,@function
 fn6_9:                                  # @fn6_9
@@ -1795,9 +1795,9 @@ fn6_9:                                  # @fn6_9
 	.endfunc
 .Lfunc_end86:
 	.size	fn6_9, .Lfunc_end86-fn6_9
-
+                                        # -- End function
 	.section	.text.fn7_9,"ax",@progbits
-	.hidden	fn7_9
+	.hidden	fn7_9                   # -- Begin function fn7_9
 	.globl	fn7_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
@@ -1814,9 +1814,9 @@ fn7_9:                                  # @fn7_9
 	.endfunc
 .Lfunc_end87:
 	.size	fn7_9, .Lfunc_end87-fn7_9
-
+                                        # -- End function
 	.section	.text.fn8_9,"ax",@progbits
-	.hidden	fn8_9
+	.hidden	fn8_9                   # -- Begin function fn8_9
 	.globl	fn8_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
@@ -1835,9 +1835,9 @@ fn8_9:                                  # @fn8_9
 	.endfunc
 .Lfunc_end88:
 	.size	fn8_9, .Lfunc_end88-fn8_9
-
+                                        # -- End function
 	.section	.text.fn9_9,"ax",@progbits
-	.hidden	fn9_9
+	.hidden	fn9_9                   # -- Begin function fn9_9
 	.globl	fn9_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
@@ -1856,9 +1856,9 @@ fn9_9:                                  # @fn9_9
 	.endfunc
 .Lfunc_end89:
 	.size	fn9_9, .Lfunc_end89-fn9_9
-
+                                        # -- End function
 	.section	.text.fn1_a,"ax",@progbits
-	.hidden	fn1_a
+	.hidden	fn1_a                   # -- Begin function fn1_a
 	.globl	fn1_a
 	.type	fn1_a,@function
 fn1_a:                                  # @fn1_a
@@ -1880,9 +1880,9 @@ fn1_a:                                  # @fn1_a
 	.endfunc
 .Lfunc_end90:
 	.size	fn1_a, .Lfunc_end90-fn1_a
-
+                                        # -- End function
 	.section	.text.fn2_a,"ax",@progbits
-	.hidden	fn2_a
+	.hidden	fn2_a                   # -- Begin function fn2_a
 	.globl	fn2_a
 	.type	fn2_a,@function
 fn2_a:                                  # @fn2_a
@@ -1908,9 +1908,9 @@ fn2_a:                                  # @fn2_a
 	.endfunc
 .Lfunc_end91:
 	.size	fn2_a, .Lfunc_end91-fn2_a
-
+                                        # -- End function
 	.section	.text.fn3_a,"ax",@progbits
-	.hidden	fn3_a
+	.hidden	fn3_a                   # -- Begin function fn3_a
 	.globl	fn3_a
 	.type	fn3_a,@function
 fn3_a:                                  # @fn3_a
@@ -1934,9 +1934,9 @@ fn3_a:                                  # @fn3_a
 	.endfunc
 .Lfunc_end92:
 	.size	fn3_a, .Lfunc_end92-fn3_a
-
+                                        # -- End function
 	.section	.text.fn4_a,"ax",@progbits
-	.hidden	fn4_a
+	.hidden	fn4_a                   # -- Begin function fn4_a
 	.globl	fn4_a
 	.type	fn4_a,@function
 fn4_a:                                  # @fn4_a
@@ -1958,9 +1958,9 @@ fn4_a:                                  # @fn4_a
 	.endfunc
 .Lfunc_end93:
 	.size	fn4_a, .Lfunc_end93-fn4_a
-
+                                        # -- End function
 	.section	.text.fn5_a,"ax",@progbits
-	.hidden	fn5_a
+	.hidden	fn5_a                   # -- Begin function fn5_a
 	.globl	fn5_a
 	.type	fn5_a,@function
 fn5_a:                                  # @fn5_a
@@ -1986,9 +1986,9 @@ fn5_a:                                  # @fn5_a
 	.endfunc
 .Lfunc_end94:
 	.size	fn5_a, .Lfunc_end94-fn5_a
-
+                                        # -- End function
 	.section	.text.fn6_a,"ax",@progbits
-	.hidden	fn6_a
+	.hidden	fn6_a                   # -- Begin function fn6_a
 	.globl	fn6_a
 	.type	fn6_a,@function
 fn6_a:                                  # @fn6_a
@@ -2012,9 +2012,9 @@ fn6_a:                                  # @fn6_a
 	.endfunc
 .Lfunc_end95:
 	.size	fn6_a, .Lfunc_end95-fn6_a
-
+                                        # -- End function
 	.section	.text.fn7_a,"ax",@progbits
-	.hidden	fn7_a
+	.hidden	fn7_a                   # -- Begin function fn7_a
 	.globl	fn7_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
@@ -2029,9 +2029,9 @@ fn7_a:                                  # @fn7_a
 	.endfunc
 .Lfunc_end96:
 	.size	fn7_a, .Lfunc_end96-fn7_a
-
+                                        # -- End function
 	.section	.text.fn8_a,"ax",@progbits
-	.hidden	fn8_a
+	.hidden	fn8_a                   # -- Begin function fn8_a
 	.globl	fn8_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
@@ -2046,9 +2046,9 @@ fn8_a:                                  # @fn8_a
 	.endfunc
 .Lfunc_end97:
 	.size	fn8_a, .Lfunc_end97-fn8_a
-
+                                        # -- End function
 	.section	.text.fn9_a,"ax",@progbits
-	.hidden	fn9_a
+	.hidden	fn9_a                   # -- Begin function fn9_a
 	.globl	fn9_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
@@ -2063,9 +2063,9 @@ fn9_a:                                  # @fn9_a
 	.endfunc
 .Lfunc_end98:
 	.size	fn9_a, .Lfunc_end98-fn9_a
-
+                                        # -- End function
 	.section	.text.fn1_b,"ax",@progbits
-	.hidden	fn1_b
+	.hidden	fn1_b                   # -- Begin function fn1_b
 	.globl	fn1_b
 	.type	fn1_b,@function
 fn1_b:                                  # @fn1_b
@@ -2087,9 +2087,9 @@ fn1_b:                                  # @fn1_b
 	.endfunc
 .Lfunc_end99:
 	.size	fn1_b, .Lfunc_end99-fn1_b
-
+                                        # -- End function
 	.section	.text.fn2_b,"ax",@progbits
-	.hidden	fn2_b
+	.hidden	fn2_b                   # -- Begin function fn2_b
 	.globl	fn2_b
 	.type	fn2_b,@function
 fn2_b:                                  # @fn2_b
@@ -2115,9 +2115,9 @@ fn2_b:                                  # @fn2_b
 	.endfunc
 .Lfunc_end100:
 	.size	fn2_b, .Lfunc_end100-fn2_b
-
+                                        # -- End function
 	.section	.text.fn3_b,"ax",@progbits
-	.hidden	fn3_b
+	.hidden	fn3_b                   # -- Begin function fn3_b
 	.globl	fn3_b
 	.type	fn3_b,@function
 fn3_b:                                  # @fn3_b
@@ -2141,9 +2141,9 @@ fn3_b:                                  # @fn3_b
 	.endfunc
 .Lfunc_end101:
 	.size	fn3_b, .Lfunc_end101-fn3_b
-
+                                        # -- End function
 	.section	.text.fn4_b,"ax",@progbits
-	.hidden	fn4_b
+	.hidden	fn4_b                   # -- Begin function fn4_b
 	.globl	fn4_b
 	.type	fn4_b,@function
 fn4_b:                                  # @fn4_b
@@ -2165,9 +2165,9 @@ fn4_b:                                  # @fn4_b
 	.endfunc
 .Lfunc_end102:
 	.size	fn4_b, .Lfunc_end102-fn4_b
-
+                                        # -- End function
 	.section	.text.fn5_b,"ax",@progbits
-	.hidden	fn5_b
+	.hidden	fn5_b                   # -- Begin function fn5_b
 	.globl	fn5_b
 	.type	fn5_b,@function
 fn5_b:                                  # @fn5_b
@@ -2193,9 +2193,9 @@ fn5_b:                                  # @fn5_b
 	.endfunc
 .Lfunc_end103:
 	.size	fn5_b, .Lfunc_end103-fn5_b
-
+                                        # -- End function
 	.section	.text.fn6_b,"ax",@progbits
-	.hidden	fn6_b
+	.hidden	fn6_b                   # -- Begin function fn6_b
 	.globl	fn6_b
 	.type	fn6_b,@function
 fn6_b:                                  # @fn6_b
@@ -2219,9 +2219,9 @@ fn6_b:                                  # @fn6_b
 	.endfunc
 .Lfunc_end104:
 	.size	fn6_b, .Lfunc_end104-fn6_b
-
+                                        # -- End function
 	.section	.text.fn7_b,"ax",@progbits
-	.hidden	fn7_b
+	.hidden	fn7_b                   # -- Begin function fn7_b
 	.globl	fn7_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
@@ -2236,9 +2236,9 @@ fn7_b:                                  # @fn7_b
 	.endfunc
 .Lfunc_end105:
 	.size	fn7_b, .Lfunc_end105-fn7_b
-
+                                        # -- End function
 	.section	.text.fn8_b,"ax",@progbits
-	.hidden	fn8_b
+	.hidden	fn8_b                   # -- Begin function fn8_b
 	.globl	fn8_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
@@ -2253,9 +2253,9 @@ fn8_b:                                  # @fn8_b
 	.endfunc
 .Lfunc_end106:
 	.size	fn8_b, .Lfunc_end106-fn8_b
-
+                                        # -- End function
 	.section	.text.fn9_b,"ax",@progbits
-	.hidden	fn9_b
+	.hidden	fn9_b                   # -- Begin function fn9_b
 	.globl	fn9_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
@@ -2270,9 +2270,9 @@ fn9_b:                                  # @fn9_b
 	.endfunc
 .Lfunc_end107:
 	.size	fn9_b, .Lfunc_end107-fn9_b
-
+                                        # -- End function
 	.section	.text.fn1_c,"ax",@progbits
-	.hidden	fn1_c
+	.hidden	fn1_c                   # -- Begin function fn1_c
 	.globl	fn1_c
 	.type	fn1_c,@function
 fn1_c:                                  # @fn1_c
@@ -2295,9 +2295,9 @@ fn1_c:                                  # @fn1_c
 	.endfunc
 .Lfunc_end108:
 	.size	fn1_c, .Lfunc_end108-fn1_c
-
+                                        # -- End function
 	.section	.text.fn2_c,"ax",@progbits
-	.hidden	fn2_c
+	.hidden	fn2_c                   # -- Begin function fn2_c
 	.globl	fn2_c
 	.type	fn2_c,@function
 fn2_c:                                  # @fn2_c
@@ -2320,9 +2320,9 @@ fn2_c:                                  # @fn2_c
 	.endfunc
 .Lfunc_end109:
 	.size	fn2_c, .Lfunc_end109-fn2_c
-
+                                        # -- End function
 	.section	.text.fn3_c,"ax",@progbits
-	.hidden	fn3_c
+	.hidden	fn3_c                   # -- Begin function fn3_c
 	.globl	fn3_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
@@ -2338,9 +2338,9 @@ fn3_c:                                  # @fn3_c
 	.endfunc
 .Lfunc_end110:
 	.size	fn3_c, .Lfunc_end110-fn3_c
-
+                                        # -- End function
 	.section	.text.fn4_c,"ax",@progbits
-	.hidden	fn4_c
+	.hidden	fn4_c                   # -- Begin function fn4_c
 	.globl	fn4_c
 	.type	fn4_c,@function
 fn4_c:                                  # @fn4_c
@@ -2363,9 +2363,9 @@ fn4_c:                                  # @fn4_c
 	.endfunc
 .Lfunc_end111:
 	.size	fn4_c, .Lfunc_end111-fn4_c
-
+                                        # -- End function
 	.section	.text.fn5_c,"ax",@progbits
-	.hidden	fn5_c
+	.hidden	fn5_c                   # -- Begin function fn5_c
 	.globl	fn5_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
@@ -2381,9 +2381,9 @@ fn5_c:                                  # @fn5_c
 	.endfunc
 .Lfunc_end112:
 	.size	fn5_c, .Lfunc_end112-fn5_c
-
+                                        # -- End function
 	.section	.text.fn6_c,"ax",@progbits
-	.hidden	fn6_c
+	.hidden	fn6_c                   # -- Begin function fn6_c
 	.globl	fn6_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
@@ -2399,9 +2399,9 @@ fn6_c:                                  # @fn6_c
 	.endfunc
 .Lfunc_end113:
 	.size	fn6_c, .Lfunc_end113-fn6_c
-
+                                        # -- End function
 	.section	.text.fn7_c,"ax",@progbits
-	.hidden	fn7_c
+	.hidden	fn7_c                   # -- Begin function fn7_c
 	.globl	fn7_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
@@ -2417,9 +2417,9 @@ fn7_c:                                  # @fn7_c
 	.endfunc
 .Lfunc_end114:
 	.size	fn7_c, .Lfunc_end114-fn7_c
-
+                                        # -- End function
 	.section	.text.fn8_c,"ax",@progbits
-	.hidden	fn8_c
+	.hidden	fn8_c                   # -- Begin function fn8_c
 	.globl	fn8_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
@@ -2437,9 +2437,9 @@ fn8_c:                                  # @fn8_c
 	.endfunc
 .Lfunc_end115:
 	.size	fn8_c, .Lfunc_end115-fn8_c
-
+                                        # -- End function
 	.section	.text.fn9_c,"ax",@progbits
-	.hidden	fn9_c
+	.hidden	fn9_c                   # -- Begin function fn9_c
 	.globl	fn9_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
@@ -2455,9 +2455,9 @@ fn9_c:                                  # @fn9_c
 	.endfunc
 .Lfunc_end116:
 	.size	fn9_c, .Lfunc_end116-fn9_c
-
+                                        # -- End function
 	.section	.text.fn1_d,"ax",@progbits
-	.hidden	fn1_d
+	.hidden	fn1_d                   # -- Begin function fn1_d
 	.globl	fn1_d
 	.type	fn1_d,@function
 fn1_d:                                  # @fn1_d
@@ -2480,9 +2480,9 @@ fn1_d:                                  # @fn1_d
 	.endfunc
 .Lfunc_end117:
 	.size	fn1_d, .Lfunc_end117-fn1_d
-
+                                        # -- End function
 	.section	.text.fn2_d,"ax",@progbits
-	.hidden	fn2_d
+	.hidden	fn2_d                   # -- Begin function fn2_d
 	.globl	fn2_d
 	.type	fn2_d,@function
 fn2_d:                                  # @fn2_d
@@ -2505,9 +2505,9 @@ fn2_d:                                  # @fn2_d
 	.endfunc
 .Lfunc_end118:
 	.size	fn2_d, .Lfunc_end118-fn2_d
-
+                                        # -- End function
 	.section	.text.fn3_d,"ax",@progbits
-	.hidden	fn3_d
+	.hidden	fn3_d                   # -- Begin function fn3_d
 	.globl	fn3_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
@@ -2523,9 +2523,9 @@ fn3_d:                                  # @fn3_d
 	.endfunc
 .Lfunc_end119:
 	.size	fn3_d, .Lfunc_end119-fn3_d
-
+                                        # -- End function
 	.section	.text.fn4_d,"ax",@progbits
-	.hidden	fn4_d
+	.hidden	fn4_d                   # -- Begin function fn4_d
 	.globl	fn4_d
 	.type	fn4_d,@function
 fn4_d:                                  # @fn4_d
@@ -2548,9 +2548,9 @@ fn4_d:                                  # @fn4_d
 	.endfunc
 .Lfunc_end120:
 	.size	fn4_d, .Lfunc_end120-fn4_d
-
+                                        # -- End function
 	.section	.text.fn5_d,"ax",@progbits
-	.hidden	fn5_d
+	.hidden	fn5_d                   # -- Begin function fn5_d
 	.globl	fn5_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
@@ -2566,9 +2566,9 @@ fn5_d:                                  # @fn5_d
 	.endfunc
 .Lfunc_end121:
 	.size	fn5_d, .Lfunc_end121-fn5_d
-
+                                        # -- End function
 	.section	.text.fn6_d,"ax",@progbits
-	.hidden	fn6_d
+	.hidden	fn6_d                   # -- Begin function fn6_d
 	.globl	fn6_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
@@ -2584,9 +2584,9 @@ fn6_d:                                  # @fn6_d
 	.endfunc
 .Lfunc_end122:
 	.size	fn6_d, .Lfunc_end122-fn6_d
-
+                                        # -- End function
 	.section	.text.fn7_d,"ax",@progbits
-	.hidden	fn7_d
+	.hidden	fn7_d                   # -- Begin function fn7_d
 	.globl	fn7_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
@@ -2602,9 +2602,9 @@ fn7_d:                                  # @fn7_d
 	.endfunc
 .Lfunc_end123:
 	.size	fn7_d, .Lfunc_end123-fn7_d
-
+                                        # -- End function
 	.section	.text.fn8_d,"ax",@progbits
-	.hidden	fn8_d
+	.hidden	fn8_d                   # -- Begin function fn8_d
 	.globl	fn8_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
@@ -2622,9 +2622,9 @@ fn8_d:                                  # @fn8_d
 	.endfunc
 .Lfunc_end124:
 	.size	fn8_d, .Lfunc_end124-fn8_d
-
+                                        # -- End function
 	.section	.text.fn9_d,"ax",@progbits
-	.hidden	fn9_d
+	.hidden	fn9_d                   # -- Begin function fn9_d
 	.globl	fn9_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
@@ -2640,9 +2640,9 @@ fn9_d:                                  # @fn9_d
 	.endfunc
 .Lfunc_end125:
 	.size	fn9_d, .Lfunc_end125-fn9_d
-
+                                        # -- End function
 	.section	.text.fn1_e,"ax",@progbits
-	.hidden	fn1_e
+	.hidden	fn1_e                   # -- Begin function fn1_e
 	.globl	fn1_e
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
@@ -2658,9 +2658,9 @@ fn1_e:                                  # @fn1_e
 	.endfunc
 .Lfunc_end126:
 	.size	fn1_e, .Lfunc_end126-fn1_e
-
+                                        # -- End function
 	.section	.text.fn2_e,"ax",@progbits
-	.hidden	fn2_e
+	.hidden	fn2_e                   # -- Begin function fn2_e
 	.globl	fn2_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
@@ -2676,9 +2676,9 @@ fn2_e:                                  # @fn2_e
 	.endfunc
 .Lfunc_end127:
 	.size	fn2_e, .Lfunc_end127-fn2_e
-
+                                        # -- End function
 	.section	.text.fn3_e,"ax",@progbits
-	.hidden	fn3_e
+	.hidden	fn3_e                   # -- Begin function fn3_e
 	.globl	fn3_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
@@ -2694,9 +2694,9 @@ fn3_e:                                  # @fn3_e
 	.endfunc
 .Lfunc_end128:
 	.size	fn3_e, .Lfunc_end128-fn3_e
-
+                                        # -- End function
 	.section	.text.fn4_e,"ax",@progbits
-	.hidden	fn4_e
+	.hidden	fn4_e                   # -- Begin function fn4_e
 	.globl	fn4_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
@@ -2712,9 +2712,9 @@ fn4_e:                                  # @fn4_e
 	.endfunc
 .Lfunc_end129:
 	.size	fn4_e, .Lfunc_end129-fn4_e
-
+                                        # -- End function
 	.section	.text.fn5_e,"ax",@progbits
-	.hidden	fn5_e
+	.hidden	fn5_e                   # -- Begin function fn5_e
 	.globl	fn5_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
@@ -2724,9 +2724,9 @@ fn5_e:                                  # @fn5_e
 	.endfunc
 .Lfunc_end130:
 	.size	fn5_e, .Lfunc_end130-fn5_e
-
+                                        # -- End function
 	.section	.text.fn6_e,"ax",@progbits
-	.hidden	fn6_e
+	.hidden	fn6_e                   # -- Begin function fn6_e
 	.globl	fn6_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
@@ -2742,9 +2742,9 @@ fn6_e:                                  # @fn6_e
 	.endfunc
 .Lfunc_end131:
 	.size	fn6_e, .Lfunc_end131-fn6_e
-
+                                        # -- End function
 	.section	.text.fn7_e,"ax",@progbits
-	.hidden	fn7_e
+	.hidden	fn7_e                   # -- Begin function fn7_e
 	.globl	fn7_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
@@ -2760,9 +2760,9 @@ fn7_e:                                  # @fn7_e
 	.endfunc
 .Lfunc_end132:
 	.size	fn7_e, .Lfunc_end132-fn7_e
-
+                                        # -- End function
 	.section	.text.fn8_e,"ax",@progbits
-	.hidden	fn8_e
+	.hidden	fn8_e                   # -- Begin function fn8_e
 	.globl	fn8_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
@@ -2778,9 +2778,9 @@ fn8_e:                                  # @fn8_e
 	.endfunc
 .Lfunc_end133:
 	.size	fn8_e, .Lfunc_end133-fn8_e
-
+                                        # -- End function
 	.section	.text.fn9_e,"ax",@progbits
-	.hidden	fn9_e
+	.hidden	fn9_e                   # -- Begin function fn9_e
 	.globl	fn9_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
@@ -2796,9 +2796,9 @@ fn9_e:                                  # @fn9_e
 	.endfunc
 .Lfunc_end134:
 	.size	fn9_e, .Lfunc_end134-fn9_e
-
+                                        # -- End function
 	.section	.text.fn1_f,"ax",@progbits
-	.hidden	fn1_f
+	.hidden	fn1_f                   # -- Begin function fn1_f
 	.globl	fn1_f
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
@@ -2814,9 +2814,9 @@ fn1_f:                                  # @fn1_f
 	.endfunc
 .Lfunc_end135:
 	.size	fn1_f, .Lfunc_end135-fn1_f
-
+                                        # -- End function
 	.section	.text.fn2_f,"ax",@progbits
-	.hidden	fn2_f
+	.hidden	fn2_f                   # -- Begin function fn2_f
 	.globl	fn2_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
@@ -2832,9 +2832,9 @@ fn2_f:                                  # @fn2_f
 	.endfunc
 .Lfunc_end136:
 	.size	fn2_f, .Lfunc_end136-fn2_f
-
+                                        # -- End function
 	.section	.text.fn3_f,"ax",@progbits
-	.hidden	fn3_f
+	.hidden	fn3_f                   # -- Begin function fn3_f
 	.globl	fn3_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
@@ -2850,9 +2850,9 @@ fn3_f:                                  # @fn3_f
 	.endfunc
 .Lfunc_end137:
 	.size	fn3_f, .Lfunc_end137-fn3_f
-
+                                        # -- End function
 	.section	.text.fn4_f,"ax",@progbits
-	.hidden	fn4_f
+	.hidden	fn4_f                   # -- Begin function fn4_f
 	.globl	fn4_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
@@ -2868,9 +2868,9 @@ fn4_f:                                  # @fn4_f
 	.endfunc
 .Lfunc_end138:
 	.size	fn4_f, .Lfunc_end138-fn4_f
-
+                                        # -- End function
 	.section	.text.fn5_f,"ax",@progbits
-	.hidden	fn5_f
+	.hidden	fn5_f                   # -- Begin function fn5_f
 	.globl	fn5_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
@@ -2886,9 +2886,9 @@ fn5_f:                                  # @fn5_f
 	.endfunc
 .Lfunc_end139:
 	.size	fn5_f, .Lfunc_end139-fn5_f
-
+                                        # -- End function
 	.section	.text.fn6_f,"ax",@progbits
-	.hidden	fn6_f
+	.hidden	fn6_f                   # -- Begin function fn6_f
 	.globl	fn6_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
@@ -2904,9 +2904,9 @@ fn6_f:                                  # @fn6_f
 	.endfunc
 .Lfunc_end140:
 	.size	fn6_f, .Lfunc_end140-fn6_f
-
+                                        # -- End function
 	.section	.text.fn7_f,"ax",@progbits
-	.hidden	fn7_f
+	.hidden	fn7_f                   # -- Begin function fn7_f
 	.globl	fn7_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
@@ -2922,9 +2922,9 @@ fn7_f:                                  # @fn7_f
 	.endfunc
 .Lfunc_end141:
 	.size	fn7_f, .Lfunc_end141-fn7_f
-
+                                        # -- End function
 	.section	.text.fn8_f,"ax",@progbits
-	.hidden	fn8_f
+	.hidden	fn8_f                   # -- Begin function fn8_f
 	.globl	fn8_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
@@ -2940,9 +2940,9 @@ fn8_f:                                  # @fn8_f
 	.endfunc
 .Lfunc_end142:
 	.size	fn8_f, .Lfunc_end142-fn8_f
-
+                                        # -- End function
 	.section	.text.fn9_f,"ax",@progbits
-	.hidden	fn9_f
+	.hidden	fn9_f                   # -- Begin function fn9_f
 	.globl	fn9_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
@@ -2958,9 +2958,9 @@ fn9_f:                                  # @fn9_f
 	.endfunc
 .Lfunc_end143:
 	.size	fn9_f, .Lfunc_end143-fn9_f
-
+                                        # -- End function
 	.section	.text.fn1_g,"ax",@progbits
-	.hidden	fn1_g
+	.hidden	fn1_g                   # -- Begin function fn1_g
 	.globl	fn1_g
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
@@ -2976,9 +2976,9 @@ fn1_g:                                  # @fn1_g
 	.endfunc
 .Lfunc_end144:
 	.size	fn1_g, .Lfunc_end144-fn1_g
-
+                                        # -- End function
 	.section	.text.fn2_g,"ax",@progbits
-	.hidden	fn2_g
+	.hidden	fn2_g                   # -- Begin function fn2_g
 	.globl	fn2_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
@@ -2994,9 +2994,9 @@ fn2_g:                                  # @fn2_g
 	.endfunc
 .Lfunc_end145:
 	.size	fn2_g, .Lfunc_end145-fn2_g
-
+                                        # -- End function
 	.section	.text.fn3_g,"ax",@progbits
-	.hidden	fn3_g
+	.hidden	fn3_g                   # -- Begin function fn3_g
 	.globl	fn3_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
@@ -3012,9 +3012,9 @@ fn3_g:                                  # @fn3_g
 	.endfunc
 .Lfunc_end146:
 	.size	fn3_g, .Lfunc_end146-fn3_g
-
+                                        # -- End function
 	.section	.text.fn4_g,"ax",@progbits
-	.hidden	fn4_g
+	.hidden	fn4_g                   # -- Begin function fn4_g
 	.globl	fn4_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
@@ -3030,9 +3030,9 @@ fn4_g:                                  # @fn4_g
 	.endfunc
 .Lfunc_end147:
 	.size	fn4_g, .Lfunc_end147-fn4_g
-
+                                        # -- End function
 	.section	.text.fn5_g,"ax",@progbits
-	.hidden	fn5_g
+	.hidden	fn5_g                   # -- Begin function fn5_g
 	.globl	fn5_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
@@ -3048,9 +3048,9 @@ fn5_g:                                  # @fn5_g
 	.endfunc
 .Lfunc_end148:
 	.size	fn5_g, .Lfunc_end148-fn5_g
-
+                                        # -- End function
 	.section	.text.fn6_g,"ax",@progbits
-	.hidden	fn6_g
+	.hidden	fn6_g                   # -- Begin function fn6_g
 	.globl	fn6_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
@@ -3066,9 +3066,9 @@ fn6_g:                                  # @fn6_g
 	.endfunc
 .Lfunc_end149:
 	.size	fn6_g, .Lfunc_end149-fn6_g
-
+                                        # -- End function
 	.section	.text.fn7_g,"ax",@progbits
-	.hidden	fn7_g
+	.hidden	fn7_g                   # -- Begin function fn7_g
 	.globl	fn7_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
@@ -3084,9 +3084,9 @@ fn7_g:                                  # @fn7_g
 	.endfunc
 .Lfunc_end150:
 	.size	fn7_g, .Lfunc_end150-fn7_g
-
+                                        # -- End function
 	.section	.text.fn8_g,"ax",@progbits
-	.hidden	fn8_g
+	.hidden	fn8_g                   # -- Begin function fn8_g
 	.globl	fn8_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
@@ -3102,9 +3102,9 @@ fn8_g:                                  # @fn8_g
 	.endfunc
 .Lfunc_end151:
 	.size	fn8_g, .Lfunc_end151-fn8_g
-
+                                        # -- End function
 	.section	.text.fn9_g,"ax",@progbits
-	.hidden	fn9_g
+	.hidden	fn9_g                   # -- Begin function fn9_g
 	.globl	fn9_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
@@ -3120,9 +3120,9 @@ fn9_g:                                  # @fn9_g
 	.endfunc
 .Lfunc_end152:
 	.size	fn9_g, .Lfunc_end152-fn9_g
-
+                                        # -- End function
 	.section	.text.fn1_h,"ax",@progbits
-	.hidden	fn1_h
+	.hidden	fn1_h                   # -- Begin function fn1_h
 	.globl	fn1_h
 	.type	fn1_h,@function
 fn1_h:                                  # @fn1_h
@@ -3145,9 +3145,9 @@ fn1_h:                                  # @fn1_h
 	.endfunc
 .Lfunc_end153:
 	.size	fn1_h, .Lfunc_end153-fn1_h
-
+                                        # -- End function
 	.section	.text.fn2_h,"ax",@progbits
-	.hidden	fn2_h
+	.hidden	fn2_h                   # -- Begin function fn2_h
 	.globl	fn2_h
 	.type	fn2_h,@function
 fn2_h:                                  # @fn2_h
@@ -3174,9 +3174,9 @@ fn2_h:                                  # @fn2_h
 	.endfunc
 .Lfunc_end154:
 	.size	fn2_h, .Lfunc_end154-fn2_h
-
+                                        # -- End function
 	.section	.text.fn3_h,"ax",@progbits
-	.hidden	fn3_h
+	.hidden	fn3_h                   # -- Begin function fn3_h
 	.globl	fn3_h
 	.type	fn3_h,@function
 fn3_h:                                  # @fn3_h
@@ -3199,9 +3199,9 @@ fn3_h:                                  # @fn3_h
 	.endfunc
 .Lfunc_end155:
 	.size	fn3_h, .Lfunc_end155-fn3_h
-
+                                        # -- End function
 	.section	.text.fn4_h,"ax",@progbits
-	.hidden	fn4_h
+	.hidden	fn4_h                   # -- Begin function fn4_h
 	.globl	fn4_h
 	.type	fn4_h,@function
 fn4_h:                                  # @fn4_h
@@ -3224,9 +3224,9 @@ fn4_h:                                  # @fn4_h
 	.endfunc
 .Lfunc_end156:
 	.size	fn4_h, .Lfunc_end156-fn4_h
-
+                                        # -- End function
 	.section	.text.fn5_h,"ax",@progbits
-	.hidden	fn5_h
+	.hidden	fn5_h                   # -- Begin function fn5_h
 	.globl	fn5_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
@@ -3242,9 +3242,9 @@ fn5_h:                                  # @fn5_h
 	.endfunc
 .Lfunc_end157:
 	.size	fn5_h, .Lfunc_end157-fn5_h
-
+                                        # -- End function
 	.section	.text.fn6_h,"ax",@progbits
-	.hidden	fn6_h
+	.hidden	fn6_h                   # -- Begin function fn6_h
 	.globl	fn6_h
 	.type	fn6_h,@function
 fn6_h:                                  # @fn6_h
@@ -3267,9 +3267,9 @@ fn6_h:                                  # @fn6_h
 	.endfunc
 .Lfunc_end158:
 	.size	fn6_h, .Lfunc_end158-fn6_h
-
+                                        # -- End function
 	.section	.text.fn7_h,"ax",@progbits
-	.hidden	fn7_h
+	.hidden	fn7_h                   # -- Begin function fn7_h
 	.globl	fn7_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
@@ -3285,9 +3285,9 @@ fn7_h:                                  # @fn7_h
 	.endfunc
 .Lfunc_end159:
 	.size	fn7_h, .Lfunc_end159-fn7_h
-
+                                        # -- End function
 	.section	.text.fn8_h,"ax",@progbits
-	.hidden	fn8_h
+	.hidden	fn8_h                   # -- Begin function fn8_h
 	.globl	fn8_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
@@ -3303,9 +3303,9 @@ fn8_h:                                  # @fn8_h
 	.endfunc
 .Lfunc_end160:
 	.size	fn8_h, .Lfunc_end160-fn8_h
-
+                                        # -- End function
 	.section	.text.fn9_h,"ax",@progbits
-	.hidden	fn9_h
+	.hidden	fn9_h                   # -- Begin function fn9_h
 	.globl	fn9_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
@@ -3321,9 +3321,9 @@ fn9_h:                                  # @fn9_h
 	.endfunc
 .Lfunc_end161:
 	.size	fn9_h, .Lfunc_end161-fn9_h
-
+                                        # -- End function
 	.section	.text.fn1_i,"ax",@progbits
-	.hidden	fn1_i
+	.hidden	fn1_i                   # -- Begin function fn1_i
 	.globl	fn1_i
 	.type	fn1_i,@function
 fn1_i:                                  # @fn1_i
@@ -3346,9 +3346,9 @@ fn1_i:                                  # @fn1_i
 	.endfunc
 .Lfunc_end162:
 	.size	fn1_i, .Lfunc_end162-fn1_i
-
+                                        # -- End function
 	.section	.text.fn2_i,"ax",@progbits
-	.hidden	fn2_i
+	.hidden	fn2_i                   # -- Begin function fn2_i
 	.globl	fn2_i
 	.type	fn2_i,@function
 fn2_i:                                  # @fn2_i
@@ -3375,9 +3375,9 @@ fn2_i:                                  # @fn2_i
 	.endfunc
 .Lfunc_end163:
 	.size	fn2_i, .Lfunc_end163-fn2_i
-
+                                        # -- End function
 	.section	.text.fn3_i,"ax",@progbits
-	.hidden	fn3_i
+	.hidden	fn3_i                   # -- Begin function fn3_i
 	.globl	fn3_i
 	.type	fn3_i,@function
 fn3_i:                                  # @fn3_i
@@ -3402,9 +3402,9 @@ fn3_i:                                  # @fn3_i
 	.endfunc
 .Lfunc_end164:
 	.size	fn3_i, .Lfunc_end164-fn3_i
-
+                                        # -- End function
 	.section	.text.fn4_i,"ax",@progbits
-	.hidden	fn4_i
+	.hidden	fn4_i                   # -- Begin function fn4_i
 	.globl	fn4_i
 	.type	fn4_i,@function
 fn4_i:                                  # @fn4_i
@@ -3427,38 +3427,21 @@ fn4_i:                                  # @fn4_i
 	.endfunc
 .Lfunc_end165:
 	.size	fn4_i, .Lfunc_end165-fn4_i
-
+                                        # -- End function
 	.section	.text.fn5_i,"ax",@progbits
-	.hidden	fn5_i
+	.hidden	fn5_i                   # -- Begin function fn5_i
 	.globl	fn5_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, c($pop14)
-	tee_local	$push12=, $1=, $pop13
-	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.const	$push5=, 1
-	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 19
-	i32.rem_u	$push8=, $pop6, $pop7
-	i32.const	$push11=, 5
-	i32.shl 	$push9=, $pop8, $pop11
-	i32.const	$push1=, -33
-	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push10=, $pop9, $pop2
-	i32.store	c($pop0), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
 	.size	fn5_i, .Lfunc_end166-fn5_i
-
+                                        # -- End function
 	.section	.text.fn6_i,"ax",@progbits
-	.hidden	fn6_i
+	.hidden	fn6_i                   # -- Begin function fn6_i
 	.globl	fn6_i
 	.type	fn6_i,@function
 fn6_i:                                  # @fn6_i
@@ -3483,9 +3466,9 @@ fn6_i:                                  # @fn6_i
 	.endfunc
 .Lfunc_end167:
 	.size	fn6_i, .Lfunc_end167-fn6_i
-
+                                        # -- End function
 	.section	.text.fn7_i,"ax",@progbits
-	.hidden	fn7_i
+	.hidden	fn7_i                   # -- Begin function fn7_i
 	.globl	fn7_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
@@ -3501,9 +3484,9 @@ fn7_i:                                  # @fn7_i
 	.endfunc
 .Lfunc_end168:
 	.size	fn7_i, .Lfunc_end168-fn7_i
-
+                                        # -- End function
 	.section	.text.fn8_i,"ax",@progbits
-	.hidden	fn8_i
+	.hidden	fn8_i                   # -- Begin function fn8_i
 	.globl	fn8_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
@@ -3519,9 +3502,9 @@ fn8_i:                                  # @fn8_i
 	.endfunc
 .Lfunc_end169:
 	.size	fn8_i, .Lfunc_end169-fn8_i
-
+                                        # -- End function
 	.section	.text.fn9_i,"ax",@progbits
-	.hidden	fn9_i
+	.hidden	fn9_i                   # -- Begin function fn9_i
 	.globl	fn9_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
@@ -3537,9 +3520,9 @@ fn9_i:                                  # @fn9_i
 	.endfunc
 .Lfunc_end170:
 	.size	fn9_i, .Lfunc_end170-fn9_i
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -3559,7 +3542,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end171:
 	.size	main, .Lfunc_end171-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -3588,4 +3571,4 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040703-1.c.s b/test/torture-s/20040703-1.c.s
index b7afb0b20..f0f95910c 100644
--- a/test/torture-s/20040703-1.c.s
+++ b/test/torture-s/20040703-1.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040703-1.c"
+	.file	"20040703-1.c"
 	.section	.text.num_lshift,"ax",@progbits
-	.hidden	num_lshift
+	.hidden	num_lshift              # -- Begin function num_lshift
 	.globl	num_lshift
 	.type	num_lshift,@function
 num_lshift:                             # @num_lshift
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i64, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push93=, 0
-	i32.load	$push94=, __stack_pointer($pop93)
+	i32.const	$push94=, 0
+	i32.load	$push93=, __stack_pointer($pop94)
 	i32.const	$push95=, 16
-	i32.sub 	$12=, $pop94, $pop95
+	i32.sub 	$12=, $pop93, $pop95
 	block   	
 	block   	
 	block   	
@@ -265,7 +265,7 @@ num_lshift:                             # @num_lshift
 	i32.ne  	$push83=, $4, $3
 	i32.or  	$push85=, $pop84, $pop83
 	i32.store	0($pop87), $pop85
-.LBB0_33:                               # %if.end37
+.LBB0_33:                               # %if.end36
 	end_block                       # label0:
 	i64.load	$push88=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop88
@@ -279,69 +279,59 @@ num_lshift:                             # @num_lshift
 	.endfunc
 .Lfunc_end0:
 	.size	num_lshift, .Lfunc_end0-num_lshift
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
-	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
-	i32.const	$push21=, 32
-	i32.sub 	$push30=, $pop20, $pop21
-	tee_local	$push29=, $0=, $pop30
-	i32.store	__stack_pointer($pop22), $pop29
-	i32.const	$push2=, 12
+	i32.const	$push16=, 0
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 32
+	i32.sub 	$push22=, $pop13, $pop15
+	tee_local	$push21=, $0=, $pop22
+	i32.store	__stack_pointer($pop16), $pop21
+	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
-	i32.load	$push1=, num+12($pop0)
-	i32.store	0($pop3), $pop1
-	i32.const	$push5=, 8
-	i32.add 	$push6=, $0, $pop5
-	i32.const	$push28=, 0
-	i32.load	$push4=, num+8($pop28)
-	i32.store	0($pop6), $pop4
-	i32.const	$push8=, 4
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push27=, 0
-	i32.load	$push7=, num+4($pop27)
-	i32.store	0($pop9), $pop7
-	i32.const	$push26=, 0
-	i32.load	$push10=, num($pop26)
-	i32.store	0($0), $pop10
-	i32.const	$push23=, 16
-	i32.add 	$push24=, $0, $pop23
-	i32.const	$push12=, 64
-	i32.const	$push25=, 0
-	i32.load	$push11=, n($pop25)
-	call    	num_lshift@FUNCTION, $pop24, $0, $pop12, $pop11
+	i64.load	$push1=, num+8($pop0):p2align=2
+	i64.store	0($pop3), $pop1
+	i32.const	$push20=, 0
+	i64.load	$push4=, num($pop20):p2align=2
+	i64.store	0($0), $pop4
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $0, $pop17
+	i32.const	$push6=, 64
+	i32.const	$push19=, 0
+	i32.load	$push5=, n($pop19)
+	call    	num_lshift@FUNCTION, $pop18, $0, $pop6, $pop5
 	block   	
-	i32.load	$push14=, 20($0)
-	i32.const	$push13=, 196608
-	i32.ne  	$push15=, $pop14, $pop13
-	br_if   	0, $pop15       # 0: down to label18
+	i32.load	$push8=, 20($0)
+	i32.const	$push7=, 196608
+	i32.ne  	$push9=, $pop8, $pop7
+	br_if   	0, $pop9        # 0: down to label18
 # BB#1:                                 # %if.end
-	i32.load	$push16=, 16($0)
-	br_if   	0, $pop16       # 0: down to label18
+	i32.load	$push10=, 16($0)
+	br_if   	0, $pop10       # 0: down to label18
 # BB#2:                                 # %if.end3
-	i32.load	$push17=, 28($0)
-	br_if   	0, $pop17       # 0: down to label18
+	i32.load	$push11=, 28($0)
+	br_if   	0, $pop11       # 0: down to label18
 # BB#3:                                 # %if.end6
-	i32.const	$push18=, 0
-	call    	exit@FUNCTION, $pop18
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
-.LBB1_4:                                # %if.then5
+.LBB1_4:                                # %if.then
 	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	precision               # @precision
 	.type	precision,@object
 	.section	.data.precision,"aw",@progbits
@@ -373,6 +363,6 @@ num:
 	.size	num, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040704-1.c.s b/test/torture-s/20040704-1.c.s
index 94719832f..2e782ad27 100644
--- a/test/torture-s/20040704-1.c.s
+++ b/test/torture-s/20040704-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040704-1.c"
+	.file	"20040704-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040705-1.c.s b/test/torture-s/20040705-1.c.s
index 3401026d0..2ca53549b 100644
--- a/test/torture-s/20040705-1.c.s
+++ b/test/torture-s/20040705-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040705-1.c"
+	.file	"20040705-1.c"
 	.section	.text.ret1,"ax",@progbits
-	.hidden	ret1
+	.hidden	ret1                    # -- Begin function ret1
 	.globl	ret1
 	.type	ret1,@function
 ret1:                                   # @ret1
@@ -15,9 +15,9 @@ ret1:                                   # @ret1
 	.endfunc
 .Lfunc_end0:
 	.size	ret1, .Lfunc_end0-ret1
-
+                                        # -- End function
 	.section	.text.ret2,"ax",@progbits
-	.hidden	ret2
+	.hidden	ret2                    # -- Begin function ret2
 	.globl	ret2
 	.type	ret2,@function
 ret2:                                   # @ret2
@@ -33,9 +33,9 @@ ret2:                                   # @ret2
 	.endfunc
 .Lfunc_end1:
 	.size	ret2, .Lfunc_end1-ret2
-
+                                        # -- End function
 	.section	.text.ret3,"ax",@progbits
-	.hidden	ret3
+	.hidden	ret3                    # -- Begin function ret3
 	.globl	ret3
 	.type	ret3,@function
 ret3:                                   # @ret3
@@ -49,9 +49,9 @@ ret3:                                   # @ret3
 	.endfunc
 .Lfunc_end2:
 	.size	ret3, .Lfunc_end2-ret3
-
+                                        # -- End function
 	.section	.text.ret4,"ax",@progbits
-	.hidden	ret4
+	.hidden	ret4                    # -- Begin function ret4
 	.globl	ret4
 	.type	ret4,@function
 ret4:                                   # @ret4
@@ -65,9 +65,9 @@ ret4:                                   # @ret4
 	.endfunc
 .Lfunc_end3:
 	.size	ret4, .Lfunc_end3-ret4
-
+                                        # -- End function
 	.section	.text.ret5,"ax",@progbits
-	.hidden	ret5
+	.hidden	ret5                    # -- Begin function ret5
 	.globl	ret5
 	.type	ret5,@function
 ret5:                                   # @ret5
@@ -83,9 +83,9 @@ ret5:                                   # @ret5
 	.endfunc
 .Lfunc_end4:
 	.size	ret5, .Lfunc_end4-ret5
-
+                                        # -- End function
 	.section	.text.ret6,"ax",@progbits
-	.hidden	ret6
+	.hidden	ret6                    # -- Begin function ret6
 	.globl	ret6
 	.type	ret6,@function
 ret6:                                   # @ret6
@@ -99,9 +99,9 @@ ret6:                                   # @ret6
 	.endfunc
 .Lfunc_end5:
 	.size	ret6, .Lfunc_end5-ret6
-
+                                        # -- End function
 	.section	.text.ret7,"ax",@progbits
-	.hidden	ret7
+	.hidden	ret7                    # -- Begin function ret7
 	.globl	ret7
 	.type	ret7,@function
 ret7:                                   # @ret7
@@ -113,9 +113,9 @@ ret7:                                   # @ret7
 	.endfunc
 .Lfunc_end6:
 	.size	ret7, .Lfunc_end6-ret7
-
+                                        # -- End function
 	.section	.text.ret8,"ax",@progbits
-	.hidden	ret8
+	.hidden	ret8                    # -- Begin function ret8
 	.globl	ret8
 	.type	ret8,@function
 ret8:                                   # @ret8
@@ -127,9 +127,9 @@ ret8:                                   # @ret8
 	.endfunc
 .Lfunc_end7:
 	.size	ret8, .Lfunc_end7-ret8
-
+                                        # -- End function
 	.section	.text.ret9,"ax",@progbits
-	.hidden	ret9
+	.hidden	ret9                    # -- Begin function ret9
 	.globl	ret9
 	.type	ret9,@function
 ret9:                                   # @ret9
@@ -141,9 +141,9 @@ ret9:                                   # @ret9
 	.endfunc
 .Lfunc_end8:
 	.size	ret9, .Lfunc_end8-ret9
-
+                                        # -- End function
 	.section	.text.fn1_1,"ax",@progbits
-	.hidden	fn1_1
+	.hidden	fn1_1                   # -- Begin function fn1_1
 	.globl	fn1_1
 	.type	fn1_1,@function
 fn1_1:                                  # @fn1_1
@@ -165,9 +165,9 @@ fn1_1:                                  # @fn1_1
 	.endfunc
 .Lfunc_end9:
 	.size	fn1_1, .Lfunc_end9-fn1_1
-
+                                        # -- End function
 	.section	.text.fn2_1,"ax",@progbits
-	.hidden	fn2_1
+	.hidden	fn2_1                   # -- Begin function fn2_1
 	.globl	fn2_1
 	.type	fn2_1,@function
 fn2_1:                                  # @fn2_1
@@ -191,9 +191,9 @@ fn2_1:                                  # @fn2_1
 	.endfunc
 .Lfunc_end10:
 	.size	fn2_1, .Lfunc_end10-fn2_1
-
+                                        # -- End function
 	.section	.text.fn3_1,"ax",@progbits
-	.hidden	fn3_1
+	.hidden	fn3_1                   # -- Begin function fn3_1
 	.globl	fn3_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
@@ -210,9 +210,9 @@ fn3_1:                                  # @fn3_1
 	.endfunc
 .Lfunc_end11:
 	.size	fn3_1, .Lfunc_end11-fn3_1
-
+                                        # -- End function
 	.section	.text.fn4_1,"ax",@progbits
-	.hidden	fn4_1
+	.hidden	fn4_1                   # -- Begin function fn4_1
 	.globl	fn4_1
 	.type	fn4_1,@function
 fn4_1:                                  # @fn4_1
@@ -234,9 +234,9 @@ fn4_1:                                  # @fn4_1
 	.endfunc
 .Lfunc_end12:
 	.size	fn4_1, .Lfunc_end12-fn4_1
-
+                                        # -- End function
 	.section	.text.fn5_1,"ax",@progbits
-	.hidden	fn5_1
+	.hidden	fn5_1                   # -- Begin function fn5_1
 	.globl	fn5_1
 	.type	fn5_1,@function
 fn5_1:                                  # @fn5_1
@@ -260,9 +260,9 @@ fn5_1:                                  # @fn5_1
 	.endfunc
 .Lfunc_end13:
 	.size	fn5_1, .Lfunc_end13-fn5_1
-
+                                        # -- End function
 	.section	.text.fn6_1,"ax",@progbits
-	.hidden	fn6_1
+	.hidden	fn6_1                   # -- Begin function fn6_1
 	.globl	fn6_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
@@ -279,9 +279,9 @@ fn6_1:                                  # @fn6_1
 	.endfunc
 .Lfunc_end14:
 	.size	fn6_1, .Lfunc_end14-fn6_1
-
+                                        # -- End function
 	.section	.text.fn7_1,"ax",@progbits
-	.hidden	fn7_1
+	.hidden	fn7_1                   # -- Begin function fn7_1
 	.globl	fn7_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
@@ -296,9 +296,9 @@ fn7_1:                                  # @fn7_1
 	.endfunc
 .Lfunc_end15:
 	.size	fn7_1, .Lfunc_end15-fn7_1
-
+                                        # -- End function
 	.section	.text.fn8_1,"ax",@progbits
-	.hidden	fn8_1
+	.hidden	fn8_1                   # -- Begin function fn8_1
 	.globl	fn8_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
@@ -317,9 +317,9 @@ fn8_1:                                  # @fn8_1
 	.endfunc
 .Lfunc_end16:
 	.size	fn8_1, .Lfunc_end16-fn8_1
-
+                                        # -- End function
 	.section	.text.fn9_1,"ax",@progbits
-	.hidden	fn9_1
+	.hidden	fn9_1                   # -- Begin function fn9_1
 	.globl	fn9_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
@@ -336,9 +336,9 @@ fn9_1:                                  # @fn9_1
 	.endfunc
 .Lfunc_end17:
 	.size	fn9_1, .Lfunc_end17-fn9_1
-
+                                        # -- End function
 	.section	.text.fn1_2,"ax",@progbits
-	.hidden	fn1_2
+	.hidden	fn1_2                   # -- Begin function fn1_2
 	.globl	fn1_2
 	.type	fn1_2,@function
 fn1_2:                                  # @fn1_2
@@ -361,9 +361,9 @@ fn1_2:                                  # @fn1_2
 	.endfunc
 .Lfunc_end18:
 	.size	fn1_2, .Lfunc_end18-fn1_2
-
+                                        # -- End function
 	.section	.text.fn2_2,"ax",@progbits
-	.hidden	fn2_2
+	.hidden	fn2_2                   # -- Begin function fn2_2
 	.globl	fn2_2
 	.type	fn2_2,@function
 fn2_2:                                  # @fn2_2
@@ -386,9 +386,9 @@ fn2_2:                                  # @fn2_2
 	.endfunc
 .Lfunc_end19:
 	.size	fn2_2, .Lfunc_end19-fn2_2
-
+                                        # -- End function
 	.section	.text.fn3_2,"ax",@progbits
-	.hidden	fn3_2
+	.hidden	fn3_2                   # -- Begin function fn3_2
 	.globl	fn3_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
@@ -404,9 +404,9 @@ fn3_2:                                  # @fn3_2
 	.endfunc
 .Lfunc_end20:
 	.size	fn3_2, .Lfunc_end20-fn3_2
-
+                                        # -- End function
 	.section	.text.fn4_2,"ax",@progbits
-	.hidden	fn4_2
+	.hidden	fn4_2                   # -- Begin function fn4_2
 	.globl	fn4_2
 	.type	fn4_2,@function
 fn4_2:                                  # @fn4_2
@@ -429,9 +429,9 @@ fn4_2:                                  # @fn4_2
 	.endfunc
 .Lfunc_end21:
 	.size	fn4_2, .Lfunc_end21-fn4_2
-
+                                        # -- End function
 	.section	.text.fn5_2,"ax",@progbits
-	.hidden	fn5_2
+	.hidden	fn5_2                   # -- Begin function fn5_2
 	.globl	fn5_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
@@ -447,9 +447,9 @@ fn5_2:                                  # @fn5_2
 	.endfunc
 .Lfunc_end22:
 	.size	fn5_2, .Lfunc_end22-fn5_2
-
+                                        # -- End function
 	.section	.text.fn6_2,"ax",@progbits
-	.hidden	fn6_2
+	.hidden	fn6_2                   # -- Begin function fn6_2
 	.globl	fn6_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
@@ -465,9 +465,9 @@ fn6_2:                                  # @fn6_2
 	.endfunc
 .Lfunc_end23:
 	.size	fn6_2, .Lfunc_end23-fn6_2
-
+                                        # -- End function
 	.section	.text.fn7_2,"ax",@progbits
-	.hidden	fn7_2
+	.hidden	fn7_2                   # -- Begin function fn7_2
 	.globl	fn7_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
@@ -483,9 +483,9 @@ fn7_2:                                  # @fn7_2
 	.endfunc
 .Lfunc_end24:
 	.size	fn7_2, .Lfunc_end24-fn7_2
-
+                                        # -- End function
 	.section	.text.fn8_2,"ax",@progbits
-	.hidden	fn8_2
+	.hidden	fn8_2                   # -- Begin function fn8_2
 	.globl	fn8_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
@@ -503,9 +503,9 @@ fn8_2:                                  # @fn8_2
 	.endfunc
 .Lfunc_end25:
 	.size	fn8_2, .Lfunc_end25-fn8_2
-
+                                        # -- End function
 	.section	.text.fn9_2,"ax",@progbits
-	.hidden	fn9_2
+	.hidden	fn9_2                   # -- Begin function fn9_2
 	.globl	fn9_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
@@ -521,9 +521,9 @@ fn9_2:                                  # @fn9_2
 	.endfunc
 .Lfunc_end26:
 	.size	fn9_2, .Lfunc_end26-fn9_2
-
+                                        # -- End function
 	.section	.text.fn1_3,"ax",@progbits
-	.hidden	fn1_3
+	.hidden	fn1_3                   # -- Begin function fn1_3
 	.globl	fn1_3
 	.type	fn1_3,@function
 fn1_3:                                  # @fn1_3
@@ -546,9 +546,9 @@ fn1_3:                                  # @fn1_3
 	.endfunc
 .Lfunc_end27:
 	.size	fn1_3, .Lfunc_end27-fn1_3
-
+                                        # -- End function
 	.section	.text.fn2_3,"ax",@progbits
-	.hidden	fn2_3
+	.hidden	fn2_3                   # -- Begin function fn2_3
 	.globl	fn2_3
 	.type	fn2_3,@function
 fn2_3:                                  # @fn2_3
@@ -571,9 +571,9 @@ fn2_3:                                  # @fn2_3
 	.endfunc
 .Lfunc_end28:
 	.size	fn2_3, .Lfunc_end28-fn2_3
-
+                                        # -- End function
 	.section	.text.fn3_3,"ax",@progbits
-	.hidden	fn3_3
+	.hidden	fn3_3                   # -- Begin function fn3_3
 	.globl	fn3_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
@@ -589,9 +589,9 @@ fn3_3:                                  # @fn3_3
 	.endfunc
 .Lfunc_end29:
 	.size	fn3_3, .Lfunc_end29-fn3_3
-
+                                        # -- End function
 	.section	.text.fn4_3,"ax",@progbits
-	.hidden	fn4_3
+	.hidden	fn4_3                   # -- Begin function fn4_3
 	.globl	fn4_3
 	.type	fn4_3,@function
 fn4_3:                                  # @fn4_3
@@ -614,9 +614,9 @@ fn4_3:                                  # @fn4_3
 	.endfunc
 .Lfunc_end30:
 	.size	fn4_3, .Lfunc_end30-fn4_3
-
+                                        # -- End function
 	.section	.text.fn5_3,"ax",@progbits
-	.hidden	fn5_3
+	.hidden	fn5_3                   # -- Begin function fn5_3
 	.globl	fn5_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
@@ -632,9 +632,9 @@ fn5_3:                                  # @fn5_3
 	.endfunc
 .Lfunc_end31:
 	.size	fn5_3, .Lfunc_end31-fn5_3
-
+                                        # -- End function
 	.section	.text.fn6_3,"ax",@progbits
-	.hidden	fn6_3
+	.hidden	fn6_3                   # -- Begin function fn6_3
 	.globl	fn6_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
@@ -650,9 +650,9 @@ fn6_3:                                  # @fn6_3
 	.endfunc
 .Lfunc_end32:
 	.size	fn6_3, .Lfunc_end32-fn6_3
-
+                                        # -- End function
 	.section	.text.fn7_3,"ax",@progbits
-	.hidden	fn7_3
+	.hidden	fn7_3                   # -- Begin function fn7_3
 	.globl	fn7_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
@@ -668,9 +668,9 @@ fn7_3:                                  # @fn7_3
 	.endfunc
 .Lfunc_end33:
 	.size	fn7_3, .Lfunc_end33-fn7_3
-
+                                        # -- End function
 	.section	.text.fn8_3,"ax",@progbits
-	.hidden	fn8_3
+	.hidden	fn8_3                   # -- Begin function fn8_3
 	.globl	fn8_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
@@ -688,9 +688,9 @@ fn8_3:                                  # @fn8_3
 	.endfunc
 .Lfunc_end34:
 	.size	fn8_3, .Lfunc_end34-fn8_3
-
+                                        # -- End function
 	.section	.text.fn9_3,"ax",@progbits
-	.hidden	fn9_3
+	.hidden	fn9_3                   # -- Begin function fn9_3
 	.globl	fn9_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
@@ -706,9 +706,9 @@ fn9_3:                                  # @fn9_3
 	.endfunc
 .Lfunc_end35:
 	.size	fn9_3, .Lfunc_end35-fn9_3
-
+                                        # -- End function
 	.section	.text.fn1_4,"ax",@progbits
-	.hidden	fn1_4
+	.hidden	fn1_4                   # -- Begin function fn1_4
 	.globl	fn1_4
 	.type	fn1_4,@function
 fn1_4:                                  # @fn1_4
@@ -730,9 +730,9 @@ fn1_4:                                  # @fn1_4
 	.endfunc
 .Lfunc_end36:
 	.size	fn1_4, .Lfunc_end36-fn1_4
-
+                                        # -- End function
 	.section	.text.fn2_4,"ax",@progbits
-	.hidden	fn2_4
+	.hidden	fn2_4                   # -- Begin function fn2_4
 	.globl	fn2_4
 	.type	fn2_4,@function
 fn2_4:                                  # @fn2_4
@@ -756,9 +756,9 @@ fn2_4:                                  # @fn2_4
 	.endfunc
 .Lfunc_end37:
 	.size	fn2_4, .Lfunc_end37-fn2_4
-
+                                        # -- End function
 	.section	.text.fn3_4,"ax",@progbits
-	.hidden	fn3_4
+	.hidden	fn3_4                   # -- Begin function fn3_4
 	.globl	fn3_4
 	.type	fn3_4,@function
 fn3_4:                                  # @fn3_4
@@ -782,9 +782,9 @@ fn3_4:                                  # @fn3_4
 	.endfunc
 .Lfunc_end38:
 	.size	fn3_4, .Lfunc_end38-fn3_4
-
+                                        # -- End function
 	.section	.text.fn4_4,"ax",@progbits
-	.hidden	fn4_4
+	.hidden	fn4_4                   # -- Begin function fn4_4
 	.globl	fn4_4
 	.type	fn4_4,@function
 fn4_4:                                  # @fn4_4
@@ -806,9 +806,9 @@ fn4_4:                                  # @fn4_4
 	.endfunc
 .Lfunc_end39:
 	.size	fn4_4, .Lfunc_end39-fn4_4
-
+                                        # -- End function
 	.section	.text.fn5_4,"ax",@progbits
-	.hidden	fn5_4
+	.hidden	fn5_4                   # -- Begin function fn5_4
 	.globl	fn5_4
 	.type	fn5_4,@function
 fn5_4:                                  # @fn5_4
@@ -832,9 +832,9 @@ fn5_4:                                  # @fn5_4
 	.endfunc
 .Lfunc_end40:
 	.size	fn5_4, .Lfunc_end40-fn5_4
-
+                                        # -- End function
 	.section	.text.fn6_4,"ax",@progbits
-	.hidden	fn6_4
+	.hidden	fn6_4                   # -- Begin function fn6_4
 	.globl	fn6_4
 	.type	fn6_4,@function
 fn6_4:                                  # @fn6_4
@@ -858,9 +858,9 @@ fn6_4:                                  # @fn6_4
 	.endfunc
 .Lfunc_end41:
 	.size	fn6_4, .Lfunc_end41-fn6_4
-
+                                        # -- End function
 	.section	.text.fn7_4,"ax",@progbits
-	.hidden	fn7_4
+	.hidden	fn7_4                   # -- Begin function fn7_4
 	.globl	fn7_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
@@ -875,9 +875,9 @@ fn7_4:                                  # @fn7_4
 	.endfunc
 .Lfunc_end42:
 	.size	fn7_4, .Lfunc_end42-fn7_4
-
+                                        # -- End function
 	.section	.text.fn8_4,"ax",@progbits
-	.hidden	fn8_4
+	.hidden	fn8_4                   # -- Begin function fn8_4
 	.globl	fn8_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
@@ -896,9 +896,9 @@ fn8_4:                                  # @fn8_4
 	.endfunc
 .Lfunc_end43:
 	.size	fn8_4, .Lfunc_end43-fn8_4
-
+                                        # -- End function
 	.section	.text.fn9_4,"ax",@progbits
-	.hidden	fn9_4
+	.hidden	fn9_4                   # -- Begin function fn9_4
 	.globl	fn9_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
@@ -917,9 +917,9 @@ fn9_4:                                  # @fn9_4
 	.endfunc
 .Lfunc_end44:
 	.size	fn9_4, .Lfunc_end44-fn9_4
-
+                                        # -- End function
 	.section	.text.fn1_5,"ax",@progbits
-	.hidden	fn1_5
+	.hidden	fn1_5                   # -- Begin function fn1_5
 	.globl	fn1_5
 	.type	fn1_5,@function
 fn1_5:                                  # @fn1_5
@@ -942,9 +942,9 @@ fn1_5:                                  # @fn1_5
 	.endfunc
 .Lfunc_end45:
 	.size	fn1_5, .Lfunc_end45-fn1_5
-
+                                        # -- End function
 	.section	.text.fn2_5,"ax",@progbits
-	.hidden	fn2_5
+	.hidden	fn2_5                   # -- Begin function fn2_5
 	.globl	fn2_5
 	.type	fn2_5,@function
 fn2_5:                                  # @fn2_5
@@ -967,9 +967,9 @@ fn2_5:                                  # @fn2_5
 	.endfunc
 .Lfunc_end46:
 	.size	fn2_5, .Lfunc_end46-fn2_5
-
+                                        # -- End function
 	.section	.text.fn3_5,"ax",@progbits
-	.hidden	fn3_5
+	.hidden	fn3_5                   # -- Begin function fn3_5
 	.globl	fn3_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
@@ -985,9 +985,9 @@ fn3_5:                                  # @fn3_5
 	.endfunc
 .Lfunc_end47:
 	.size	fn3_5, .Lfunc_end47-fn3_5
-
+                                        # -- End function
 	.section	.text.fn4_5,"ax",@progbits
-	.hidden	fn4_5
+	.hidden	fn4_5                   # -- Begin function fn4_5
 	.globl	fn4_5
 	.type	fn4_5,@function
 fn4_5:                                  # @fn4_5
@@ -1010,9 +1010,9 @@ fn4_5:                                  # @fn4_5
 	.endfunc
 .Lfunc_end48:
 	.size	fn4_5, .Lfunc_end48-fn4_5
-
+                                        # -- End function
 	.section	.text.fn5_5,"ax",@progbits
-	.hidden	fn5_5
+	.hidden	fn5_5                   # -- Begin function fn5_5
 	.globl	fn5_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
@@ -1028,9 +1028,9 @@ fn5_5:                                  # @fn5_5
 	.endfunc
 .Lfunc_end49:
 	.size	fn5_5, .Lfunc_end49-fn5_5
-
+                                        # -- End function
 	.section	.text.fn6_5,"ax",@progbits
-	.hidden	fn6_5
+	.hidden	fn6_5                   # -- Begin function fn6_5
 	.globl	fn6_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
@@ -1046,9 +1046,9 @@ fn6_5:                                  # @fn6_5
 	.endfunc
 .Lfunc_end50:
 	.size	fn6_5, .Lfunc_end50-fn6_5
-
+                                        # -- End function
 	.section	.text.fn7_5,"ax",@progbits
-	.hidden	fn7_5
+	.hidden	fn7_5                   # -- Begin function fn7_5
 	.globl	fn7_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
@@ -1064,9 +1064,9 @@ fn7_5:                                  # @fn7_5
 	.endfunc
 .Lfunc_end51:
 	.size	fn7_5, .Lfunc_end51-fn7_5
-
+                                        # -- End function
 	.section	.text.fn8_5,"ax",@progbits
-	.hidden	fn8_5
+	.hidden	fn8_5                   # -- Begin function fn8_5
 	.globl	fn8_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
@@ -1084,9 +1084,9 @@ fn8_5:                                  # @fn8_5
 	.endfunc
 .Lfunc_end52:
 	.size	fn8_5, .Lfunc_end52-fn8_5
-
+                                        # -- End function
 	.section	.text.fn9_5,"ax",@progbits
-	.hidden	fn9_5
+	.hidden	fn9_5                   # -- Begin function fn9_5
 	.globl	fn9_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
@@ -1102,9 +1102,9 @@ fn9_5:                                  # @fn9_5
 	.endfunc
 .Lfunc_end53:
 	.size	fn9_5, .Lfunc_end53-fn9_5
-
+                                        # -- End function
 	.section	.text.fn1_6,"ax",@progbits
-	.hidden	fn1_6
+	.hidden	fn1_6                   # -- Begin function fn1_6
 	.globl	fn1_6
 	.type	fn1_6,@function
 fn1_6:                                  # @fn1_6
@@ -1127,9 +1127,9 @@ fn1_6:                                  # @fn1_6
 	.endfunc
 .Lfunc_end54:
 	.size	fn1_6, .Lfunc_end54-fn1_6
-
+                                        # -- End function
 	.section	.text.fn2_6,"ax",@progbits
-	.hidden	fn2_6
+	.hidden	fn2_6                   # -- Begin function fn2_6
 	.globl	fn2_6
 	.type	fn2_6,@function
 fn2_6:                                  # @fn2_6
@@ -1152,9 +1152,9 @@ fn2_6:                                  # @fn2_6
 	.endfunc
 .Lfunc_end55:
 	.size	fn2_6, .Lfunc_end55-fn2_6
-
+                                        # -- End function
 	.section	.text.fn3_6,"ax",@progbits
-	.hidden	fn3_6
+	.hidden	fn3_6                   # -- Begin function fn3_6
 	.globl	fn3_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
@@ -1170,9 +1170,9 @@ fn3_6:                                  # @fn3_6
 	.endfunc
 .Lfunc_end56:
 	.size	fn3_6, .Lfunc_end56-fn3_6
-
+                                        # -- End function
 	.section	.text.fn4_6,"ax",@progbits
-	.hidden	fn4_6
+	.hidden	fn4_6                   # -- Begin function fn4_6
 	.globl	fn4_6
 	.type	fn4_6,@function
 fn4_6:                                  # @fn4_6
@@ -1195,9 +1195,9 @@ fn4_6:                                  # @fn4_6
 	.endfunc
 .Lfunc_end57:
 	.size	fn4_6, .Lfunc_end57-fn4_6
-
+                                        # -- End function
 	.section	.text.fn5_6,"ax",@progbits
-	.hidden	fn5_6
+	.hidden	fn5_6                   # -- Begin function fn5_6
 	.globl	fn5_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
@@ -1213,9 +1213,9 @@ fn5_6:                                  # @fn5_6
 	.endfunc
 .Lfunc_end58:
 	.size	fn5_6, .Lfunc_end58-fn5_6
-
+                                        # -- End function
 	.section	.text.fn6_6,"ax",@progbits
-	.hidden	fn6_6
+	.hidden	fn6_6                   # -- Begin function fn6_6
 	.globl	fn6_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
@@ -1231,9 +1231,9 @@ fn6_6:                                  # @fn6_6
 	.endfunc
 .Lfunc_end59:
 	.size	fn6_6, .Lfunc_end59-fn6_6
-
+                                        # -- End function
 	.section	.text.fn7_6,"ax",@progbits
-	.hidden	fn7_6
+	.hidden	fn7_6                   # -- Begin function fn7_6
 	.globl	fn7_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
@@ -1249,9 +1249,9 @@ fn7_6:                                  # @fn7_6
 	.endfunc
 .Lfunc_end60:
 	.size	fn7_6, .Lfunc_end60-fn7_6
-
+                                        # -- End function
 	.section	.text.fn8_6,"ax",@progbits
-	.hidden	fn8_6
+	.hidden	fn8_6                   # -- Begin function fn8_6
 	.globl	fn8_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
@@ -1269,9 +1269,9 @@ fn8_6:                                  # @fn8_6
 	.endfunc
 .Lfunc_end61:
 	.size	fn8_6, .Lfunc_end61-fn8_6
-
+                                        # -- End function
 	.section	.text.fn9_6,"ax",@progbits
-	.hidden	fn9_6
+	.hidden	fn9_6                   # -- Begin function fn9_6
 	.globl	fn9_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
@@ -1287,9 +1287,9 @@ fn9_6:                                  # @fn9_6
 	.endfunc
 .Lfunc_end62:
 	.size	fn9_6, .Lfunc_end62-fn9_6
-
+                                        # -- End function
 	.section	.text.fn1_7,"ax",@progbits
-	.hidden	fn1_7
+	.hidden	fn1_7                   # -- Begin function fn1_7
 	.globl	fn1_7
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
@@ -1306,9 +1306,9 @@ fn1_7:                                  # @fn1_7
 	.endfunc
 .Lfunc_end63:
 	.size	fn1_7, .Lfunc_end63-fn1_7
-
+                                        # -- End function
 	.section	.text.fn2_7,"ax",@progbits
-	.hidden	fn2_7
+	.hidden	fn2_7                   # -- Begin function fn2_7
 	.globl	fn2_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
@@ -1327,9 +1327,9 @@ fn2_7:                                  # @fn2_7
 	.endfunc
 .Lfunc_end64:
 	.size	fn2_7, .Lfunc_end64-fn2_7
-
+                                        # -- End function
 	.section	.text.fn3_7,"ax",@progbits
-	.hidden	fn3_7
+	.hidden	fn3_7                   # -- Begin function fn3_7
 	.globl	fn3_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
@@ -1348,9 +1348,9 @@ fn3_7:                                  # @fn3_7
 	.endfunc
 .Lfunc_end65:
 	.size	fn3_7, .Lfunc_end65-fn3_7
-
+                                        # -- End function
 	.section	.text.fn4_7,"ax",@progbits
-	.hidden	fn4_7
+	.hidden	fn4_7                   # -- Begin function fn4_7
 	.globl	fn4_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
@@ -1367,9 +1367,9 @@ fn4_7:                                  # @fn4_7
 	.endfunc
 .Lfunc_end66:
 	.size	fn4_7, .Lfunc_end66-fn4_7
-
+                                        # -- End function
 	.section	.text.fn5_7,"ax",@progbits
-	.hidden	fn5_7
+	.hidden	fn5_7                   # -- Begin function fn5_7
 	.globl	fn5_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
@@ -1388,9 +1388,9 @@ fn5_7:                                  # @fn5_7
 	.endfunc
 .Lfunc_end67:
 	.size	fn5_7, .Lfunc_end67-fn5_7
-
+                                        # -- End function
 	.section	.text.fn6_7,"ax",@progbits
-	.hidden	fn6_7
+	.hidden	fn6_7                   # -- Begin function fn6_7
 	.globl	fn6_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
@@ -1409,9 +1409,9 @@ fn6_7:                                  # @fn6_7
 	.endfunc
 .Lfunc_end68:
 	.size	fn6_7, .Lfunc_end68-fn6_7
-
+                                        # -- End function
 	.section	.text.fn7_7,"ax",@progbits
-	.hidden	fn7_7
+	.hidden	fn7_7                   # -- Begin function fn7_7
 	.globl	fn7_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
@@ -1428,9 +1428,9 @@ fn7_7:                                  # @fn7_7
 	.endfunc
 .Lfunc_end69:
 	.size	fn7_7, .Lfunc_end69-fn7_7
-
+                                        # -- End function
 	.section	.text.fn8_7,"ax",@progbits
-	.hidden	fn8_7
+	.hidden	fn8_7                   # -- Begin function fn8_7
 	.globl	fn8_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
@@ -1449,9 +1449,9 @@ fn8_7:                                  # @fn8_7
 	.endfunc
 .Lfunc_end70:
 	.size	fn8_7, .Lfunc_end70-fn8_7
-
+                                        # -- End function
 	.section	.text.fn9_7,"ax",@progbits
-	.hidden	fn9_7
+	.hidden	fn9_7                   # -- Begin function fn9_7
 	.globl	fn9_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
@@ -1470,9 +1470,9 @@ fn9_7:                                  # @fn9_7
 	.endfunc
 .Lfunc_end71:
 	.size	fn9_7, .Lfunc_end71-fn9_7
-
+                                        # -- End function
 	.section	.text.fn1_8,"ax",@progbits
-	.hidden	fn1_8
+	.hidden	fn1_8                   # -- Begin function fn1_8
 	.globl	fn1_8
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
@@ -1489,9 +1489,9 @@ fn1_8:                                  # @fn1_8
 	.endfunc
 .Lfunc_end72:
 	.size	fn1_8, .Lfunc_end72-fn1_8
-
+                                        # -- End function
 	.section	.text.fn2_8,"ax",@progbits
-	.hidden	fn2_8
+	.hidden	fn2_8                   # -- Begin function fn2_8
 	.globl	fn2_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
@@ -1510,9 +1510,9 @@ fn2_8:                                  # @fn2_8
 	.endfunc
 .Lfunc_end73:
 	.size	fn2_8, .Lfunc_end73-fn2_8
-
+                                        # -- End function
 	.section	.text.fn3_8,"ax",@progbits
-	.hidden	fn3_8
+	.hidden	fn3_8                   # -- Begin function fn3_8
 	.globl	fn3_8
 	.type	fn3_8,@function
 fn3_8:                                  # @fn3_8
@@ -1536,9 +1536,9 @@ fn3_8:                                  # @fn3_8
 	.endfunc
 .Lfunc_end74:
 	.size	fn3_8, .Lfunc_end74-fn3_8
-
+                                        # -- End function
 	.section	.text.fn4_8,"ax",@progbits
-	.hidden	fn4_8
+	.hidden	fn4_8                   # -- Begin function fn4_8
 	.globl	fn4_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
@@ -1555,9 +1555,9 @@ fn4_8:                                  # @fn4_8
 	.endfunc
 .Lfunc_end75:
 	.size	fn4_8, .Lfunc_end75-fn4_8
-
+                                        # -- End function
 	.section	.text.fn5_8,"ax",@progbits
-	.hidden	fn5_8
+	.hidden	fn5_8                   # -- Begin function fn5_8
 	.globl	fn5_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
@@ -1576,9 +1576,9 @@ fn5_8:                                  # @fn5_8
 	.endfunc
 .Lfunc_end76:
 	.size	fn5_8, .Lfunc_end76-fn5_8
-
+                                        # -- End function
 	.section	.text.fn6_8,"ax",@progbits
-	.hidden	fn6_8
+	.hidden	fn6_8                   # -- Begin function fn6_8
 	.globl	fn6_8
 	.type	fn6_8,@function
 fn6_8:                                  # @fn6_8
@@ -1602,9 +1602,9 @@ fn6_8:                                  # @fn6_8
 	.endfunc
 .Lfunc_end77:
 	.size	fn6_8, .Lfunc_end77-fn6_8
-
+                                        # -- End function
 	.section	.text.fn7_8,"ax",@progbits
-	.hidden	fn7_8
+	.hidden	fn7_8                   # -- Begin function fn7_8
 	.globl	fn7_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
@@ -1621,9 +1621,9 @@ fn7_8:                                  # @fn7_8
 	.endfunc
 .Lfunc_end78:
 	.size	fn7_8, .Lfunc_end78-fn7_8
-
+                                        # -- End function
 	.section	.text.fn8_8,"ax",@progbits
-	.hidden	fn8_8
+	.hidden	fn8_8                   # -- Begin function fn8_8
 	.globl	fn8_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
@@ -1642,9 +1642,9 @@ fn8_8:                                  # @fn8_8
 	.endfunc
 .Lfunc_end79:
 	.size	fn8_8, .Lfunc_end79-fn8_8
-
+                                        # -- End function
 	.section	.text.fn9_8,"ax",@progbits
-	.hidden	fn9_8
+	.hidden	fn9_8                   # -- Begin function fn9_8
 	.globl	fn9_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
@@ -1663,9 +1663,9 @@ fn9_8:                                  # @fn9_8
 	.endfunc
 .Lfunc_end80:
 	.size	fn9_8, .Lfunc_end80-fn9_8
-
+                                        # -- End function
 	.section	.text.fn1_9,"ax",@progbits
-	.hidden	fn1_9
+	.hidden	fn1_9                   # -- Begin function fn1_9
 	.globl	fn1_9
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
@@ -1682,9 +1682,9 @@ fn1_9:                                  # @fn1_9
 	.endfunc
 .Lfunc_end81:
 	.size	fn1_9, .Lfunc_end81-fn1_9
-
+                                        # -- End function
 	.section	.text.fn2_9,"ax",@progbits
-	.hidden	fn2_9
+	.hidden	fn2_9                   # -- Begin function fn2_9
 	.globl	fn2_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
@@ -1703,9 +1703,9 @@ fn2_9:                                  # @fn2_9
 	.endfunc
 .Lfunc_end82:
 	.size	fn2_9, .Lfunc_end82-fn2_9
-
+                                        # -- End function
 	.section	.text.fn3_9,"ax",@progbits
-	.hidden	fn3_9
+	.hidden	fn3_9                   # -- Begin function fn3_9
 	.globl	fn3_9
 	.type	fn3_9,@function
 fn3_9:                                  # @fn3_9
@@ -1729,9 +1729,9 @@ fn3_9:                                  # @fn3_9
 	.endfunc
 .Lfunc_end83:
 	.size	fn3_9, .Lfunc_end83-fn3_9
-
+                                        # -- End function
 	.section	.text.fn4_9,"ax",@progbits
-	.hidden	fn4_9
+	.hidden	fn4_9                   # -- Begin function fn4_9
 	.globl	fn4_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
@@ -1748,9 +1748,9 @@ fn4_9:                                  # @fn4_9
 	.endfunc
 .Lfunc_end84:
 	.size	fn4_9, .Lfunc_end84-fn4_9
-
+                                        # -- End function
 	.section	.text.fn5_9,"ax",@progbits
-	.hidden	fn5_9
+	.hidden	fn5_9                   # -- Begin function fn5_9
 	.globl	fn5_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
@@ -1769,9 +1769,9 @@ fn5_9:                                  # @fn5_9
 	.endfunc
 .Lfunc_end85:
 	.size	fn5_9, .Lfunc_end85-fn5_9
-
+                                        # -- End function
 	.section	.text.fn6_9,"ax",@progbits
-	.hidden	fn6_9
+	.hidden	fn6_9                   # -- Begin function fn6_9
 	.globl	fn6_9
 	.type	fn6_9,@function
 fn6_9:                                  # @fn6_9
@@ -1795,9 +1795,9 @@ fn6_9:                                  # @fn6_9
 	.endfunc
 .Lfunc_end86:
 	.size	fn6_9, .Lfunc_end86-fn6_9
-
+                                        # -- End function
 	.section	.text.fn7_9,"ax",@progbits
-	.hidden	fn7_9
+	.hidden	fn7_9                   # -- Begin function fn7_9
 	.globl	fn7_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
@@ -1814,9 +1814,9 @@ fn7_9:                                  # @fn7_9
 	.endfunc
 .Lfunc_end87:
 	.size	fn7_9, .Lfunc_end87-fn7_9
-
+                                        # -- End function
 	.section	.text.fn8_9,"ax",@progbits
-	.hidden	fn8_9
+	.hidden	fn8_9                   # -- Begin function fn8_9
 	.globl	fn8_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
@@ -1835,9 +1835,9 @@ fn8_9:                                  # @fn8_9
 	.endfunc
 .Lfunc_end88:
 	.size	fn8_9, .Lfunc_end88-fn8_9
-
+                                        # -- End function
 	.section	.text.fn9_9,"ax",@progbits
-	.hidden	fn9_9
+	.hidden	fn9_9                   # -- Begin function fn9_9
 	.globl	fn9_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
@@ -1856,9 +1856,9 @@ fn9_9:                                  # @fn9_9
 	.endfunc
 .Lfunc_end89:
 	.size	fn9_9, .Lfunc_end89-fn9_9
-
+                                        # -- End function
 	.section	.text.fn1_a,"ax",@progbits
-	.hidden	fn1_a
+	.hidden	fn1_a                   # -- Begin function fn1_a
 	.globl	fn1_a
 	.type	fn1_a,@function
 fn1_a:                                  # @fn1_a
@@ -1880,9 +1880,9 @@ fn1_a:                                  # @fn1_a
 	.endfunc
 .Lfunc_end90:
 	.size	fn1_a, .Lfunc_end90-fn1_a
-
+                                        # -- End function
 	.section	.text.fn2_a,"ax",@progbits
-	.hidden	fn2_a
+	.hidden	fn2_a                   # -- Begin function fn2_a
 	.globl	fn2_a
 	.type	fn2_a,@function
 fn2_a:                                  # @fn2_a
@@ -1908,9 +1908,9 @@ fn2_a:                                  # @fn2_a
 	.endfunc
 .Lfunc_end91:
 	.size	fn2_a, .Lfunc_end91-fn2_a
-
+                                        # -- End function
 	.section	.text.fn3_a,"ax",@progbits
-	.hidden	fn3_a
+	.hidden	fn3_a                   # -- Begin function fn3_a
 	.globl	fn3_a
 	.type	fn3_a,@function
 fn3_a:                                  # @fn3_a
@@ -1934,9 +1934,9 @@ fn3_a:                                  # @fn3_a
 	.endfunc
 .Lfunc_end92:
 	.size	fn3_a, .Lfunc_end92-fn3_a
-
+                                        # -- End function
 	.section	.text.fn4_a,"ax",@progbits
-	.hidden	fn4_a
+	.hidden	fn4_a                   # -- Begin function fn4_a
 	.globl	fn4_a
 	.type	fn4_a,@function
 fn4_a:                                  # @fn4_a
@@ -1958,9 +1958,9 @@ fn4_a:                                  # @fn4_a
 	.endfunc
 .Lfunc_end93:
 	.size	fn4_a, .Lfunc_end93-fn4_a
-
+                                        # -- End function
 	.section	.text.fn5_a,"ax",@progbits
-	.hidden	fn5_a
+	.hidden	fn5_a                   # -- Begin function fn5_a
 	.globl	fn5_a
 	.type	fn5_a,@function
 fn5_a:                                  # @fn5_a
@@ -1986,9 +1986,9 @@ fn5_a:                                  # @fn5_a
 	.endfunc
 .Lfunc_end94:
 	.size	fn5_a, .Lfunc_end94-fn5_a
-
+                                        # -- End function
 	.section	.text.fn6_a,"ax",@progbits
-	.hidden	fn6_a
+	.hidden	fn6_a                   # -- Begin function fn6_a
 	.globl	fn6_a
 	.type	fn6_a,@function
 fn6_a:                                  # @fn6_a
@@ -2012,9 +2012,9 @@ fn6_a:                                  # @fn6_a
 	.endfunc
 .Lfunc_end95:
 	.size	fn6_a, .Lfunc_end95-fn6_a
-
+                                        # -- End function
 	.section	.text.fn7_a,"ax",@progbits
-	.hidden	fn7_a
+	.hidden	fn7_a                   # -- Begin function fn7_a
 	.globl	fn7_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
@@ -2029,9 +2029,9 @@ fn7_a:                                  # @fn7_a
 	.endfunc
 .Lfunc_end96:
 	.size	fn7_a, .Lfunc_end96-fn7_a
-
+                                        # -- End function
 	.section	.text.fn8_a,"ax",@progbits
-	.hidden	fn8_a
+	.hidden	fn8_a                   # -- Begin function fn8_a
 	.globl	fn8_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
@@ -2046,9 +2046,9 @@ fn8_a:                                  # @fn8_a
 	.endfunc
 .Lfunc_end97:
 	.size	fn8_a, .Lfunc_end97-fn8_a
-
+                                        # -- End function
 	.section	.text.fn9_a,"ax",@progbits
-	.hidden	fn9_a
+	.hidden	fn9_a                   # -- Begin function fn9_a
 	.globl	fn9_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
@@ -2063,9 +2063,9 @@ fn9_a:                                  # @fn9_a
 	.endfunc
 .Lfunc_end98:
 	.size	fn9_a, .Lfunc_end98-fn9_a
-
+                                        # -- End function
 	.section	.text.fn1_b,"ax",@progbits
-	.hidden	fn1_b
+	.hidden	fn1_b                   # -- Begin function fn1_b
 	.globl	fn1_b
 	.type	fn1_b,@function
 fn1_b:                                  # @fn1_b
@@ -2087,9 +2087,9 @@ fn1_b:                                  # @fn1_b
 	.endfunc
 .Lfunc_end99:
 	.size	fn1_b, .Lfunc_end99-fn1_b
-
+                                        # -- End function
 	.section	.text.fn2_b,"ax",@progbits
-	.hidden	fn2_b
+	.hidden	fn2_b                   # -- Begin function fn2_b
 	.globl	fn2_b
 	.type	fn2_b,@function
 fn2_b:                                  # @fn2_b
@@ -2115,9 +2115,9 @@ fn2_b:                                  # @fn2_b
 	.endfunc
 .Lfunc_end100:
 	.size	fn2_b, .Lfunc_end100-fn2_b
-
+                                        # -- End function
 	.section	.text.fn3_b,"ax",@progbits
-	.hidden	fn3_b
+	.hidden	fn3_b                   # -- Begin function fn3_b
 	.globl	fn3_b
 	.type	fn3_b,@function
 fn3_b:                                  # @fn3_b
@@ -2141,9 +2141,9 @@ fn3_b:                                  # @fn3_b
 	.endfunc
 .Lfunc_end101:
 	.size	fn3_b, .Lfunc_end101-fn3_b
-
+                                        # -- End function
 	.section	.text.fn4_b,"ax",@progbits
-	.hidden	fn4_b
+	.hidden	fn4_b                   # -- Begin function fn4_b
 	.globl	fn4_b
 	.type	fn4_b,@function
 fn4_b:                                  # @fn4_b
@@ -2165,9 +2165,9 @@ fn4_b:                                  # @fn4_b
 	.endfunc
 .Lfunc_end102:
 	.size	fn4_b, .Lfunc_end102-fn4_b
-
+                                        # -- End function
 	.section	.text.fn5_b,"ax",@progbits
-	.hidden	fn5_b
+	.hidden	fn5_b                   # -- Begin function fn5_b
 	.globl	fn5_b
 	.type	fn5_b,@function
 fn5_b:                                  # @fn5_b
@@ -2193,9 +2193,9 @@ fn5_b:                                  # @fn5_b
 	.endfunc
 .Lfunc_end103:
 	.size	fn5_b, .Lfunc_end103-fn5_b
-
+                                        # -- End function
 	.section	.text.fn6_b,"ax",@progbits
-	.hidden	fn6_b
+	.hidden	fn6_b                   # -- Begin function fn6_b
 	.globl	fn6_b
 	.type	fn6_b,@function
 fn6_b:                                  # @fn6_b
@@ -2219,9 +2219,9 @@ fn6_b:                                  # @fn6_b
 	.endfunc
 .Lfunc_end104:
 	.size	fn6_b, .Lfunc_end104-fn6_b
-
+                                        # -- End function
 	.section	.text.fn7_b,"ax",@progbits
-	.hidden	fn7_b
+	.hidden	fn7_b                   # -- Begin function fn7_b
 	.globl	fn7_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
@@ -2236,9 +2236,9 @@ fn7_b:                                  # @fn7_b
 	.endfunc
 .Lfunc_end105:
 	.size	fn7_b, .Lfunc_end105-fn7_b
-
+                                        # -- End function
 	.section	.text.fn8_b,"ax",@progbits
-	.hidden	fn8_b
+	.hidden	fn8_b                   # -- Begin function fn8_b
 	.globl	fn8_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
@@ -2253,9 +2253,9 @@ fn8_b:                                  # @fn8_b
 	.endfunc
 .Lfunc_end106:
 	.size	fn8_b, .Lfunc_end106-fn8_b
-
+                                        # -- End function
 	.section	.text.fn9_b,"ax",@progbits
-	.hidden	fn9_b
+	.hidden	fn9_b                   # -- Begin function fn9_b
 	.globl	fn9_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
@@ -2270,9 +2270,9 @@ fn9_b:                                  # @fn9_b
 	.endfunc
 .Lfunc_end107:
 	.size	fn9_b, .Lfunc_end107-fn9_b
-
+                                        # -- End function
 	.section	.text.fn1_c,"ax",@progbits
-	.hidden	fn1_c
+	.hidden	fn1_c                   # -- Begin function fn1_c
 	.globl	fn1_c
 	.type	fn1_c,@function
 fn1_c:                                  # @fn1_c
@@ -2295,9 +2295,9 @@ fn1_c:                                  # @fn1_c
 	.endfunc
 .Lfunc_end108:
 	.size	fn1_c, .Lfunc_end108-fn1_c
-
+                                        # -- End function
 	.section	.text.fn2_c,"ax",@progbits
-	.hidden	fn2_c
+	.hidden	fn2_c                   # -- Begin function fn2_c
 	.globl	fn2_c
 	.type	fn2_c,@function
 fn2_c:                                  # @fn2_c
@@ -2320,9 +2320,9 @@ fn2_c:                                  # @fn2_c
 	.endfunc
 .Lfunc_end109:
 	.size	fn2_c, .Lfunc_end109-fn2_c
-
+                                        # -- End function
 	.section	.text.fn3_c,"ax",@progbits
-	.hidden	fn3_c
+	.hidden	fn3_c                   # -- Begin function fn3_c
 	.globl	fn3_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
@@ -2338,9 +2338,9 @@ fn3_c:                                  # @fn3_c
 	.endfunc
 .Lfunc_end110:
 	.size	fn3_c, .Lfunc_end110-fn3_c
-
+                                        # -- End function
 	.section	.text.fn4_c,"ax",@progbits
-	.hidden	fn4_c
+	.hidden	fn4_c                   # -- Begin function fn4_c
 	.globl	fn4_c
 	.type	fn4_c,@function
 fn4_c:                                  # @fn4_c
@@ -2363,9 +2363,9 @@ fn4_c:                                  # @fn4_c
 	.endfunc
 .Lfunc_end111:
 	.size	fn4_c, .Lfunc_end111-fn4_c
-
+                                        # -- End function
 	.section	.text.fn5_c,"ax",@progbits
-	.hidden	fn5_c
+	.hidden	fn5_c                   # -- Begin function fn5_c
 	.globl	fn5_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
@@ -2381,9 +2381,9 @@ fn5_c:                                  # @fn5_c
 	.endfunc
 .Lfunc_end112:
 	.size	fn5_c, .Lfunc_end112-fn5_c
-
+                                        # -- End function
 	.section	.text.fn6_c,"ax",@progbits
-	.hidden	fn6_c
+	.hidden	fn6_c                   # -- Begin function fn6_c
 	.globl	fn6_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
@@ -2399,9 +2399,9 @@ fn6_c:                                  # @fn6_c
 	.endfunc
 .Lfunc_end113:
 	.size	fn6_c, .Lfunc_end113-fn6_c
-
+                                        # -- End function
 	.section	.text.fn7_c,"ax",@progbits
-	.hidden	fn7_c
+	.hidden	fn7_c                   # -- Begin function fn7_c
 	.globl	fn7_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
@@ -2417,9 +2417,9 @@ fn7_c:                                  # @fn7_c
 	.endfunc
 .Lfunc_end114:
 	.size	fn7_c, .Lfunc_end114-fn7_c
-
+                                        # -- End function
 	.section	.text.fn8_c,"ax",@progbits
-	.hidden	fn8_c
+	.hidden	fn8_c                   # -- Begin function fn8_c
 	.globl	fn8_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
@@ -2437,9 +2437,9 @@ fn8_c:                                  # @fn8_c
 	.endfunc
 .Lfunc_end115:
 	.size	fn8_c, .Lfunc_end115-fn8_c
-
+                                        # -- End function
 	.section	.text.fn9_c,"ax",@progbits
-	.hidden	fn9_c
+	.hidden	fn9_c                   # -- Begin function fn9_c
 	.globl	fn9_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
@@ -2455,9 +2455,9 @@ fn9_c:                                  # @fn9_c
 	.endfunc
 .Lfunc_end116:
 	.size	fn9_c, .Lfunc_end116-fn9_c
-
+                                        # -- End function
 	.section	.text.fn1_d,"ax",@progbits
-	.hidden	fn1_d
+	.hidden	fn1_d                   # -- Begin function fn1_d
 	.globl	fn1_d
 	.type	fn1_d,@function
 fn1_d:                                  # @fn1_d
@@ -2480,9 +2480,9 @@ fn1_d:                                  # @fn1_d
 	.endfunc
 .Lfunc_end117:
 	.size	fn1_d, .Lfunc_end117-fn1_d
-
+                                        # -- End function
 	.section	.text.fn2_d,"ax",@progbits
-	.hidden	fn2_d
+	.hidden	fn2_d                   # -- Begin function fn2_d
 	.globl	fn2_d
 	.type	fn2_d,@function
 fn2_d:                                  # @fn2_d
@@ -2505,9 +2505,9 @@ fn2_d:                                  # @fn2_d
 	.endfunc
 .Lfunc_end118:
 	.size	fn2_d, .Lfunc_end118-fn2_d
-
+                                        # -- End function
 	.section	.text.fn3_d,"ax",@progbits
-	.hidden	fn3_d
+	.hidden	fn3_d                   # -- Begin function fn3_d
 	.globl	fn3_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
@@ -2523,9 +2523,9 @@ fn3_d:                                  # @fn3_d
 	.endfunc
 .Lfunc_end119:
 	.size	fn3_d, .Lfunc_end119-fn3_d
-
+                                        # -- End function
 	.section	.text.fn4_d,"ax",@progbits
-	.hidden	fn4_d
+	.hidden	fn4_d                   # -- Begin function fn4_d
 	.globl	fn4_d
 	.type	fn4_d,@function
 fn4_d:                                  # @fn4_d
@@ -2548,9 +2548,9 @@ fn4_d:                                  # @fn4_d
 	.endfunc
 .Lfunc_end120:
 	.size	fn4_d, .Lfunc_end120-fn4_d
-
+                                        # -- End function
 	.section	.text.fn5_d,"ax",@progbits
-	.hidden	fn5_d
+	.hidden	fn5_d                   # -- Begin function fn5_d
 	.globl	fn5_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
@@ -2566,9 +2566,9 @@ fn5_d:                                  # @fn5_d
 	.endfunc
 .Lfunc_end121:
 	.size	fn5_d, .Lfunc_end121-fn5_d
-
+                                        # -- End function
 	.section	.text.fn6_d,"ax",@progbits
-	.hidden	fn6_d
+	.hidden	fn6_d                   # -- Begin function fn6_d
 	.globl	fn6_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
@@ -2584,9 +2584,9 @@ fn6_d:                                  # @fn6_d
 	.endfunc
 .Lfunc_end122:
 	.size	fn6_d, .Lfunc_end122-fn6_d
-
+                                        # -- End function
 	.section	.text.fn7_d,"ax",@progbits
-	.hidden	fn7_d
+	.hidden	fn7_d                   # -- Begin function fn7_d
 	.globl	fn7_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
@@ -2602,9 +2602,9 @@ fn7_d:                                  # @fn7_d
 	.endfunc
 .Lfunc_end123:
 	.size	fn7_d, .Lfunc_end123-fn7_d
-
+                                        # -- End function
 	.section	.text.fn8_d,"ax",@progbits
-	.hidden	fn8_d
+	.hidden	fn8_d                   # -- Begin function fn8_d
 	.globl	fn8_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
@@ -2622,9 +2622,9 @@ fn8_d:                                  # @fn8_d
 	.endfunc
 .Lfunc_end124:
 	.size	fn8_d, .Lfunc_end124-fn8_d
-
+                                        # -- End function
 	.section	.text.fn9_d,"ax",@progbits
-	.hidden	fn9_d
+	.hidden	fn9_d                   # -- Begin function fn9_d
 	.globl	fn9_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
@@ -2640,9 +2640,9 @@ fn9_d:                                  # @fn9_d
 	.endfunc
 .Lfunc_end125:
 	.size	fn9_d, .Lfunc_end125-fn9_d
-
+                                        # -- End function
 	.section	.text.fn1_e,"ax",@progbits
-	.hidden	fn1_e
+	.hidden	fn1_e                   # -- Begin function fn1_e
 	.globl	fn1_e
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
@@ -2658,9 +2658,9 @@ fn1_e:                                  # @fn1_e
 	.endfunc
 .Lfunc_end126:
 	.size	fn1_e, .Lfunc_end126-fn1_e
-
+                                        # -- End function
 	.section	.text.fn2_e,"ax",@progbits
-	.hidden	fn2_e
+	.hidden	fn2_e                   # -- Begin function fn2_e
 	.globl	fn2_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
@@ -2676,9 +2676,9 @@ fn2_e:                                  # @fn2_e
 	.endfunc
 .Lfunc_end127:
 	.size	fn2_e, .Lfunc_end127-fn2_e
-
+                                        # -- End function
 	.section	.text.fn3_e,"ax",@progbits
-	.hidden	fn3_e
+	.hidden	fn3_e                   # -- Begin function fn3_e
 	.globl	fn3_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
@@ -2694,9 +2694,9 @@ fn3_e:                                  # @fn3_e
 	.endfunc
 .Lfunc_end128:
 	.size	fn3_e, .Lfunc_end128-fn3_e
-
+                                        # -- End function
 	.section	.text.fn4_e,"ax",@progbits
-	.hidden	fn4_e
+	.hidden	fn4_e                   # -- Begin function fn4_e
 	.globl	fn4_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
@@ -2712,9 +2712,9 @@ fn4_e:                                  # @fn4_e
 	.endfunc
 .Lfunc_end129:
 	.size	fn4_e, .Lfunc_end129-fn4_e
-
+                                        # -- End function
 	.section	.text.fn5_e,"ax",@progbits
-	.hidden	fn5_e
+	.hidden	fn5_e                   # -- Begin function fn5_e
 	.globl	fn5_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
@@ -2724,9 +2724,9 @@ fn5_e:                                  # @fn5_e
 	.endfunc
 .Lfunc_end130:
 	.size	fn5_e, .Lfunc_end130-fn5_e
-
+                                        # -- End function
 	.section	.text.fn6_e,"ax",@progbits
-	.hidden	fn6_e
+	.hidden	fn6_e                   # -- Begin function fn6_e
 	.globl	fn6_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
@@ -2742,9 +2742,9 @@ fn6_e:                                  # @fn6_e
 	.endfunc
 .Lfunc_end131:
 	.size	fn6_e, .Lfunc_end131-fn6_e
-
+                                        # -- End function
 	.section	.text.fn7_e,"ax",@progbits
-	.hidden	fn7_e
+	.hidden	fn7_e                   # -- Begin function fn7_e
 	.globl	fn7_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
@@ -2760,9 +2760,9 @@ fn7_e:                                  # @fn7_e
 	.endfunc
 .Lfunc_end132:
 	.size	fn7_e, .Lfunc_end132-fn7_e
-
+                                        # -- End function
 	.section	.text.fn8_e,"ax",@progbits
-	.hidden	fn8_e
+	.hidden	fn8_e                   # -- Begin function fn8_e
 	.globl	fn8_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
@@ -2778,9 +2778,9 @@ fn8_e:                                  # @fn8_e
 	.endfunc
 .Lfunc_end133:
 	.size	fn8_e, .Lfunc_end133-fn8_e
-
+                                        # -- End function
 	.section	.text.fn9_e,"ax",@progbits
-	.hidden	fn9_e
+	.hidden	fn9_e                   # -- Begin function fn9_e
 	.globl	fn9_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
@@ -2796,9 +2796,9 @@ fn9_e:                                  # @fn9_e
 	.endfunc
 .Lfunc_end134:
 	.size	fn9_e, .Lfunc_end134-fn9_e
-
+                                        # -- End function
 	.section	.text.fn1_f,"ax",@progbits
-	.hidden	fn1_f
+	.hidden	fn1_f                   # -- Begin function fn1_f
 	.globl	fn1_f
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
@@ -2814,9 +2814,9 @@ fn1_f:                                  # @fn1_f
 	.endfunc
 .Lfunc_end135:
 	.size	fn1_f, .Lfunc_end135-fn1_f
-
+                                        # -- End function
 	.section	.text.fn2_f,"ax",@progbits
-	.hidden	fn2_f
+	.hidden	fn2_f                   # -- Begin function fn2_f
 	.globl	fn2_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
@@ -2832,9 +2832,9 @@ fn2_f:                                  # @fn2_f
 	.endfunc
 .Lfunc_end136:
 	.size	fn2_f, .Lfunc_end136-fn2_f
-
+                                        # -- End function
 	.section	.text.fn3_f,"ax",@progbits
-	.hidden	fn3_f
+	.hidden	fn3_f                   # -- Begin function fn3_f
 	.globl	fn3_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
@@ -2850,9 +2850,9 @@ fn3_f:                                  # @fn3_f
 	.endfunc
 .Lfunc_end137:
 	.size	fn3_f, .Lfunc_end137-fn3_f
-
+                                        # -- End function
 	.section	.text.fn4_f,"ax",@progbits
-	.hidden	fn4_f
+	.hidden	fn4_f                   # -- Begin function fn4_f
 	.globl	fn4_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
@@ -2868,9 +2868,9 @@ fn4_f:                                  # @fn4_f
 	.endfunc
 .Lfunc_end138:
 	.size	fn4_f, .Lfunc_end138-fn4_f
-
+                                        # -- End function
 	.section	.text.fn5_f,"ax",@progbits
-	.hidden	fn5_f
+	.hidden	fn5_f                   # -- Begin function fn5_f
 	.globl	fn5_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
@@ -2886,9 +2886,9 @@ fn5_f:                                  # @fn5_f
 	.endfunc
 .Lfunc_end139:
 	.size	fn5_f, .Lfunc_end139-fn5_f
-
+                                        # -- End function
 	.section	.text.fn6_f,"ax",@progbits
-	.hidden	fn6_f
+	.hidden	fn6_f                   # -- Begin function fn6_f
 	.globl	fn6_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
@@ -2904,9 +2904,9 @@ fn6_f:                                  # @fn6_f
 	.endfunc
 .Lfunc_end140:
 	.size	fn6_f, .Lfunc_end140-fn6_f
-
+                                        # -- End function
 	.section	.text.fn7_f,"ax",@progbits
-	.hidden	fn7_f
+	.hidden	fn7_f                   # -- Begin function fn7_f
 	.globl	fn7_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
@@ -2922,9 +2922,9 @@ fn7_f:                                  # @fn7_f
 	.endfunc
 .Lfunc_end141:
 	.size	fn7_f, .Lfunc_end141-fn7_f
-
+                                        # -- End function
 	.section	.text.fn8_f,"ax",@progbits
-	.hidden	fn8_f
+	.hidden	fn8_f                   # -- Begin function fn8_f
 	.globl	fn8_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
@@ -2940,9 +2940,9 @@ fn8_f:                                  # @fn8_f
 	.endfunc
 .Lfunc_end142:
 	.size	fn8_f, .Lfunc_end142-fn8_f
-
+                                        # -- End function
 	.section	.text.fn9_f,"ax",@progbits
-	.hidden	fn9_f
+	.hidden	fn9_f                   # -- Begin function fn9_f
 	.globl	fn9_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
@@ -2958,9 +2958,9 @@ fn9_f:                                  # @fn9_f
 	.endfunc
 .Lfunc_end143:
 	.size	fn9_f, .Lfunc_end143-fn9_f
-
+                                        # -- End function
 	.section	.text.fn1_g,"ax",@progbits
-	.hidden	fn1_g
+	.hidden	fn1_g                   # -- Begin function fn1_g
 	.globl	fn1_g
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
@@ -2976,9 +2976,9 @@ fn1_g:                                  # @fn1_g
 	.endfunc
 .Lfunc_end144:
 	.size	fn1_g, .Lfunc_end144-fn1_g
-
+                                        # -- End function
 	.section	.text.fn2_g,"ax",@progbits
-	.hidden	fn2_g
+	.hidden	fn2_g                   # -- Begin function fn2_g
 	.globl	fn2_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
@@ -2994,9 +2994,9 @@ fn2_g:                                  # @fn2_g
 	.endfunc
 .Lfunc_end145:
 	.size	fn2_g, .Lfunc_end145-fn2_g
-
+                                        # -- End function
 	.section	.text.fn3_g,"ax",@progbits
-	.hidden	fn3_g
+	.hidden	fn3_g                   # -- Begin function fn3_g
 	.globl	fn3_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
@@ -3012,9 +3012,9 @@ fn3_g:                                  # @fn3_g
 	.endfunc
 .Lfunc_end146:
 	.size	fn3_g, .Lfunc_end146-fn3_g
-
+                                        # -- End function
 	.section	.text.fn4_g,"ax",@progbits
-	.hidden	fn4_g
+	.hidden	fn4_g                   # -- Begin function fn4_g
 	.globl	fn4_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
@@ -3030,9 +3030,9 @@ fn4_g:                                  # @fn4_g
 	.endfunc
 .Lfunc_end147:
 	.size	fn4_g, .Lfunc_end147-fn4_g
-
+                                        # -- End function
 	.section	.text.fn5_g,"ax",@progbits
-	.hidden	fn5_g
+	.hidden	fn5_g                   # -- Begin function fn5_g
 	.globl	fn5_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
@@ -3048,9 +3048,9 @@ fn5_g:                                  # @fn5_g
 	.endfunc
 .Lfunc_end148:
 	.size	fn5_g, .Lfunc_end148-fn5_g
-
+                                        # -- End function
 	.section	.text.fn6_g,"ax",@progbits
-	.hidden	fn6_g
+	.hidden	fn6_g                   # -- Begin function fn6_g
 	.globl	fn6_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
@@ -3066,9 +3066,9 @@ fn6_g:                                  # @fn6_g
 	.endfunc
 .Lfunc_end149:
 	.size	fn6_g, .Lfunc_end149-fn6_g
-
+                                        # -- End function
 	.section	.text.fn7_g,"ax",@progbits
-	.hidden	fn7_g
+	.hidden	fn7_g                   # -- Begin function fn7_g
 	.globl	fn7_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
@@ -3084,9 +3084,9 @@ fn7_g:                                  # @fn7_g
 	.endfunc
 .Lfunc_end150:
 	.size	fn7_g, .Lfunc_end150-fn7_g
-
+                                        # -- End function
 	.section	.text.fn8_g,"ax",@progbits
-	.hidden	fn8_g
+	.hidden	fn8_g                   # -- Begin function fn8_g
 	.globl	fn8_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
@@ -3102,9 +3102,9 @@ fn8_g:                                  # @fn8_g
 	.endfunc
 .Lfunc_end151:
 	.size	fn8_g, .Lfunc_end151-fn8_g
-
+                                        # -- End function
 	.section	.text.fn9_g,"ax",@progbits
-	.hidden	fn9_g
+	.hidden	fn9_g                   # -- Begin function fn9_g
 	.globl	fn9_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
@@ -3120,9 +3120,9 @@ fn9_g:                                  # @fn9_g
 	.endfunc
 .Lfunc_end152:
 	.size	fn9_g, .Lfunc_end152-fn9_g
-
+                                        # -- End function
 	.section	.text.fn1_h,"ax",@progbits
-	.hidden	fn1_h
+	.hidden	fn1_h                   # -- Begin function fn1_h
 	.globl	fn1_h
 	.type	fn1_h,@function
 fn1_h:                                  # @fn1_h
@@ -3145,9 +3145,9 @@ fn1_h:                                  # @fn1_h
 	.endfunc
 .Lfunc_end153:
 	.size	fn1_h, .Lfunc_end153-fn1_h
-
+                                        # -- End function
 	.section	.text.fn2_h,"ax",@progbits
-	.hidden	fn2_h
+	.hidden	fn2_h                   # -- Begin function fn2_h
 	.globl	fn2_h
 	.type	fn2_h,@function
 fn2_h:                                  # @fn2_h
@@ -3174,9 +3174,9 @@ fn2_h:                                  # @fn2_h
 	.endfunc
 .Lfunc_end154:
 	.size	fn2_h, .Lfunc_end154-fn2_h
-
+                                        # -- End function
 	.section	.text.fn3_h,"ax",@progbits
-	.hidden	fn3_h
+	.hidden	fn3_h                   # -- Begin function fn3_h
 	.globl	fn3_h
 	.type	fn3_h,@function
 fn3_h:                                  # @fn3_h
@@ -3199,9 +3199,9 @@ fn3_h:                                  # @fn3_h
 	.endfunc
 .Lfunc_end155:
 	.size	fn3_h, .Lfunc_end155-fn3_h
-
+                                        # -- End function
 	.section	.text.fn4_h,"ax",@progbits
-	.hidden	fn4_h
+	.hidden	fn4_h                   # -- Begin function fn4_h
 	.globl	fn4_h
 	.type	fn4_h,@function
 fn4_h:                                  # @fn4_h
@@ -3224,9 +3224,9 @@ fn4_h:                                  # @fn4_h
 	.endfunc
 .Lfunc_end156:
 	.size	fn4_h, .Lfunc_end156-fn4_h
-
+                                        # -- End function
 	.section	.text.fn5_h,"ax",@progbits
-	.hidden	fn5_h
+	.hidden	fn5_h                   # -- Begin function fn5_h
 	.globl	fn5_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
@@ -3242,9 +3242,9 @@ fn5_h:                                  # @fn5_h
 	.endfunc
 .Lfunc_end157:
 	.size	fn5_h, .Lfunc_end157-fn5_h
-
+                                        # -- End function
 	.section	.text.fn6_h,"ax",@progbits
-	.hidden	fn6_h
+	.hidden	fn6_h                   # -- Begin function fn6_h
 	.globl	fn6_h
 	.type	fn6_h,@function
 fn6_h:                                  # @fn6_h
@@ -3267,9 +3267,9 @@ fn6_h:                                  # @fn6_h
 	.endfunc
 .Lfunc_end158:
 	.size	fn6_h, .Lfunc_end158-fn6_h
-
+                                        # -- End function
 	.section	.text.fn7_h,"ax",@progbits
-	.hidden	fn7_h
+	.hidden	fn7_h                   # -- Begin function fn7_h
 	.globl	fn7_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
@@ -3285,9 +3285,9 @@ fn7_h:                                  # @fn7_h
 	.endfunc
 .Lfunc_end159:
 	.size	fn7_h, .Lfunc_end159-fn7_h
-
+                                        # -- End function
 	.section	.text.fn8_h,"ax",@progbits
-	.hidden	fn8_h
+	.hidden	fn8_h                   # -- Begin function fn8_h
 	.globl	fn8_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
@@ -3303,9 +3303,9 @@ fn8_h:                                  # @fn8_h
 	.endfunc
 .Lfunc_end160:
 	.size	fn8_h, .Lfunc_end160-fn8_h
-
+                                        # -- End function
 	.section	.text.fn9_h,"ax",@progbits
-	.hidden	fn9_h
+	.hidden	fn9_h                   # -- Begin function fn9_h
 	.globl	fn9_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
@@ -3321,9 +3321,9 @@ fn9_h:                                  # @fn9_h
 	.endfunc
 .Lfunc_end161:
 	.size	fn9_h, .Lfunc_end161-fn9_h
-
+                                        # -- End function
 	.section	.text.fn1_i,"ax",@progbits
-	.hidden	fn1_i
+	.hidden	fn1_i                   # -- Begin function fn1_i
 	.globl	fn1_i
 	.type	fn1_i,@function
 fn1_i:                                  # @fn1_i
@@ -3346,9 +3346,9 @@ fn1_i:                                  # @fn1_i
 	.endfunc
 .Lfunc_end162:
 	.size	fn1_i, .Lfunc_end162-fn1_i
-
+                                        # -- End function
 	.section	.text.fn2_i,"ax",@progbits
-	.hidden	fn2_i
+	.hidden	fn2_i                   # -- Begin function fn2_i
 	.globl	fn2_i
 	.type	fn2_i,@function
 fn2_i:                                  # @fn2_i
@@ -3375,9 +3375,9 @@ fn2_i:                                  # @fn2_i
 	.endfunc
 .Lfunc_end163:
 	.size	fn2_i, .Lfunc_end163-fn2_i
-
+                                        # -- End function
 	.section	.text.fn3_i,"ax",@progbits
-	.hidden	fn3_i
+	.hidden	fn3_i                   # -- Begin function fn3_i
 	.globl	fn3_i
 	.type	fn3_i,@function
 fn3_i:                                  # @fn3_i
@@ -3402,9 +3402,9 @@ fn3_i:                                  # @fn3_i
 	.endfunc
 .Lfunc_end164:
 	.size	fn3_i, .Lfunc_end164-fn3_i
-
+                                        # -- End function
 	.section	.text.fn4_i,"ax",@progbits
-	.hidden	fn4_i
+	.hidden	fn4_i                   # -- Begin function fn4_i
 	.globl	fn4_i
 	.type	fn4_i,@function
 fn4_i:                                  # @fn4_i
@@ -3427,38 +3427,21 @@ fn4_i:                                  # @fn4_i
 	.endfunc
 .Lfunc_end165:
 	.size	fn4_i, .Lfunc_end165-fn4_i
-
+                                        # -- End function
 	.section	.text.fn5_i,"ax",@progbits
-	.hidden	fn5_i
+	.hidden	fn5_i                   # -- Begin function fn5_i
 	.globl	fn5_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, c+8($pop14)
-	tee_local	$push12=, $1=, $pop13
-	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.const	$push5=, 1
-	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 19
-	i32.rem_u	$push8=, $pop6, $pop7
-	i32.const	$push11=, 5
-	i32.shl 	$push9=, $pop8, $pop11
-	i32.const	$push1=, -33
-	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push10=, $pop9, $pop2
-	i32.store	c+8($pop0), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
 	.size	fn5_i, .Lfunc_end166-fn5_i
-
+                                        # -- End function
 	.section	.text.fn6_i,"ax",@progbits
-	.hidden	fn6_i
+	.hidden	fn6_i                   # -- Begin function fn6_i
 	.globl	fn6_i
 	.type	fn6_i,@function
 fn6_i:                                  # @fn6_i
@@ -3483,9 +3466,9 @@ fn6_i:                                  # @fn6_i
 	.endfunc
 .Lfunc_end167:
 	.size	fn6_i, .Lfunc_end167-fn6_i
-
+                                        # -- End function
 	.section	.text.fn7_i,"ax",@progbits
-	.hidden	fn7_i
+	.hidden	fn7_i                   # -- Begin function fn7_i
 	.globl	fn7_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
@@ -3501,9 +3484,9 @@ fn7_i:                                  # @fn7_i
 	.endfunc
 .Lfunc_end168:
 	.size	fn7_i, .Lfunc_end168-fn7_i
-
+                                        # -- End function
 	.section	.text.fn8_i,"ax",@progbits
-	.hidden	fn8_i
+	.hidden	fn8_i                   # -- Begin function fn8_i
 	.globl	fn8_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
@@ -3519,9 +3502,9 @@ fn8_i:                                  # @fn8_i
 	.endfunc
 .Lfunc_end169:
 	.size	fn8_i, .Lfunc_end169-fn8_i
-
+                                        # -- End function
 	.section	.text.fn9_i,"ax",@progbits
-	.hidden	fn9_i
+	.hidden	fn9_i                   # -- Begin function fn9_i
 	.globl	fn9_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
@@ -3537,9 +3520,9 @@ fn9_i:                                  # @fn9_i
 	.endfunc
 .Lfunc_end170:
 	.size	fn9_i, .Lfunc_end170-fn9_i
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -3559,7 +3542,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end171:
 	.size	main, .Lfunc_end171-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -3588,4 +3571,4 @@ d:
 	.size	d, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040705-2.c.s b/test/torture-s/20040705-2.c.s
index f67bea955..541891d11 100644
--- a/test/torture-s/20040705-2.c.s
+++ b/test/torture-s/20040705-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040705-2.c"
+	.file	"20040705-2.c"
 	.section	.text.ret1,"ax",@progbits
-	.hidden	ret1
+	.hidden	ret1                    # -- Begin function ret1
 	.globl	ret1
 	.type	ret1,@function
 ret1:                                   # @ret1
@@ -15,9 +15,9 @@ ret1:                                   # @ret1
 	.endfunc
 .Lfunc_end0:
 	.size	ret1, .Lfunc_end0-ret1
-
+                                        # -- End function
 	.section	.text.ret2,"ax",@progbits
-	.hidden	ret2
+	.hidden	ret2                    # -- Begin function ret2
 	.globl	ret2
 	.type	ret2,@function
 ret2:                                   # @ret2
@@ -33,9 +33,9 @@ ret2:                                   # @ret2
 	.endfunc
 .Lfunc_end1:
 	.size	ret2, .Lfunc_end1-ret2
-
+                                        # -- End function
 	.section	.text.ret3,"ax",@progbits
-	.hidden	ret3
+	.hidden	ret3                    # -- Begin function ret3
 	.globl	ret3
 	.type	ret3,@function
 ret3:                                   # @ret3
@@ -49,9 +49,9 @@ ret3:                                   # @ret3
 	.endfunc
 .Lfunc_end2:
 	.size	ret3, .Lfunc_end2-ret3
-
+                                        # -- End function
 	.section	.text.ret4,"ax",@progbits
-	.hidden	ret4
+	.hidden	ret4                    # -- Begin function ret4
 	.globl	ret4
 	.type	ret4,@function
 ret4:                                   # @ret4
@@ -65,9 +65,9 @@ ret4:                                   # @ret4
 	.endfunc
 .Lfunc_end3:
 	.size	ret4, .Lfunc_end3-ret4
-
+                                        # -- End function
 	.section	.text.ret5,"ax",@progbits
-	.hidden	ret5
+	.hidden	ret5                    # -- Begin function ret5
 	.globl	ret5
 	.type	ret5,@function
 ret5:                                   # @ret5
@@ -83,9 +83,9 @@ ret5:                                   # @ret5
 	.endfunc
 .Lfunc_end4:
 	.size	ret5, .Lfunc_end4-ret5
-
+                                        # -- End function
 	.section	.text.ret6,"ax",@progbits
-	.hidden	ret6
+	.hidden	ret6                    # -- Begin function ret6
 	.globl	ret6
 	.type	ret6,@function
 ret6:                                   # @ret6
@@ -99,9 +99,9 @@ ret6:                                   # @ret6
 	.endfunc
 .Lfunc_end5:
 	.size	ret6, .Lfunc_end5-ret6
-
+                                        # -- End function
 	.section	.text.ret7,"ax",@progbits
-	.hidden	ret7
+	.hidden	ret7                    # -- Begin function ret7
 	.globl	ret7
 	.type	ret7,@function
 ret7:                                   # @ret7
@@ -113,9 +113,9 @@ ret7:                                   # @ret7
 	.endfunc
 .Lfunc_end6:
 	.size	ret7, .Lfunc_end6-ret7
-
+                                        # -- End function
 	.section	.text.ret8,"ax",@progbits
-	.hidden	ret8
+	.hidden	ret8                    # -- Begin function ret8
 	.globl	ret8
 	.type	ret8,@function
 ret8:                                   # @ret8
@@ -127,9 +127,9 @@ ret8:                                   # @ret8
 	.endfunc
 .Lfunc_end7:
 	.size	ret8, .Lfunc_end7-ret8
-
+                                        # -- End function
 	.section	.text.ret9,"ax",@progbits
-	.hidden	ret9
+	.hidden	ret9                    # -- Begin function ret9
 	.globl	ret9
 	.type	ret9,@function
 ret9:                                   # @ret9
@@ -141,9 +141,9 @@ ret9:                                   # @ret9
 	.endfunc
 .Lfunc_end8:
 	.size	ret9, .Lfunc_end8-ret9
-
+                                        # -- End function
 	.section	.text.fn1_1,"ax",@progbits
-	.hidden	fn1_1
+	.hidden	fn1_1                   # -- Begin function fn1_1
 	.globl	fn1_1
 	.type	fn1_1,@function
 fn1_1:                                  # @fn1_1
@@ -165,9 +165,9 @@ fn1_1:                                  # @fn1_1
 	.endfunc
 .Lfunc_end9:
 	.size	fn1_1, .Lfunc_end9-fn1_1
-
+                                        # -- End function
 	.section	.text.fn2_1,"ax",@progbits
-	.hidden	fn2_1
+	.hidden	fn2_1                   # -- Begin function fn2_1
 	.globl	fn2_1
 	.type	fn2_1,@function
 fn2_1:                                  # @fn2_1
@@ -191,9 +191,9 @@ fn2_1:                                  # @fn2_1
 	.endfunc
 .Lfunc_end10:
 	.size	fn2_1, .Lfunc_end10-fn2_1
-
+                                        # -- End function
 	.section	.text.fn3_1,"ax",@progbits
-	.hidden	fn3_1
+	.hidden	fn3_1                   # -- Begin function fn3_1
 	.globl	fn3_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
@@ -210,9 +210,9 @@ fn3_1:                                  # @fn3_1
 	.endfunc
 .Lfunc_end11:
 	.size	fn3_1, .Lfunc_end11-fn3_1
-
+                                        # -- End function
 	.section	.text.fn4_1,"ax",@progbits
-	.hidden	fn4_1
+	.hidden	fn4_1                   # -- Begin function fn4_1
 	.globl	fn4_1
 	.type	fn4_1,@function
 fn4_1:                                  # @fn4_1
@@ -234,9 +234,9 @@ fn4_1:                                  # @fn4_1
 	.endfunc
 .Lfunc_end12:
 	.size	fn4_1, .Lfunc_end12-fn4_1
-
+                                        # -- End function
 	.section	.text.fn5_1,"ax",@progbits
-	.hidden	fn5_1
+	.hidden	fn5_1                   # -- Begin function fn5_1
 	.globl	fn5_1
 	.type	fn5_1,@function
 fn5_1:                                  # @fn5_1
@@ -260,9 +260,9 @@ fn5_1:                                  # @fn5_1
 	.endfunc
 .Lfunc_end13:
 	.size	fn5_1, .Lfunc_end13-fn5_1
-
+                                        # -- End function
 	.section	.text.fn6_1,"ax",@progbits
-	.hidden	fn6_1
+	.hidden	fn6_1                   # -- Begin function fn6_1
 	.globl	fn6_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
@@ -279,9 +279,9 @@ fn6_1:                                  # @fn6_1
 	.endfunc
 .Lfunc_end14:
 	.size	fn6_1, .Lfunc_end14-fn6_1
-
+                                        # -- End function
 	.section	.text.fn7_1,"ax",@progbits
-	.hidden	fn7_1
+	.hidden	fn7_1                   # -- Begin function fn7_1
 	.globl	fn7_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
@@ -296,9 +296,9 @@ fn7_1:                                  # @fn7_1
 	.endfunc
 .Lfunc_end15:
 	.size	fn7_1, .Lfunc_end15-fn7_1
-
+                                        # -- End function
 	.section	.text.fn8_1,"ax",@progbits
-	.hidden	fn8_1
+	.hidden	fn8_1                   # -- Begin function fn8_1
 	.globl	fn8_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
@@ -317,9 +317,9 @@ fn8_1:                                  # @fn8_1
 	.endfunc
 .Lfunc_end16:
 	.size	fn8_1, .Lfunc_end16-fn8_1
-
+                                        # -- End function
 	.section	.text.fn9_1,"ax",@progbits
-	.hidden	fn9_1
+	.hidden	fn9_1                   # -- Begin function fn9_1
 	.globl	fn9_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
@@ -336,9 +336,9 @@ fn9_1:                                  # @fn9_1
 	.endfunc
 .Lfunc_end17:
 	.size	fn9_1, .Lfunc_end17-fn9_1
-
+                                        # -- End function
 	.section	.text.fn1_2,"ax",@progbits
-	.hidden	fn1_2
+	.hidden	fn1_2                   # -- Begin function fn1_2
 	.globl	fn1_2
 	.type	fn1_2,@function
 fn1_2:                                  # @fn1_2
@@ -361,9 +361,9 @@ fn1_2:                                  # @fn1_2
 	.endfunc
 .Lfunc_end18:
 	.size	fn1_2, .Lfunc_end18-fn1_2
-
+                                        # -- End function
 	.section	.text.fn2_2,"ax",@progbits
-	.hidden	fn2_2
+	.hidden	fn2_2                   # -- Begin function fn2_2
 	.globl	fn2_2
 	.type	fn2_2,@function
 fn2_2:                                  # @fn2_2
@@ -386,9 +386,9 @@ fn2_2:                                  # @fn2_2
 	.endfunc
 .Lfunc_end19:
 	.size	fn2_2, .Lfunc_end19-fn2_2
-
+                                        # -- End function
 	.section	.text.fn3_2,"ax",@progbits
-	.hidden	fn3_2
+	.hidden	fn3_2                   # -- Begin function fn3_2
 	.globl	fn3_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
@@ -404,9 +404,9 @@ fn3_2:                                  # @fn3_2
 	.endfunc
 .Lfunc_end20:
 	.size	fn3_2, .Lfunc_end20-fn3_2
-
+                                        # -- End function
 	.section	.text.fn4_2,"ax",@progbits
-	.hidden	fn4_2
+	.hidden	fn4_2                   # -- Begin function fn4_2
 	.globl	fn4_2
 	.type	fn4_2,@function
 fn4_2:                                  # @fn4_2
@@ -429,9 +429,9 @@ fn4_2:                                  # @fn4_2
 	.endfunc
 .Lfunc_end21:
 	.size	fn4_2, .Lfunc_end21-fn4_2
-
+                                        # -- End function
 	.section	.text.fn5_2,"ax",@progbits
-	.hidden	fn5_2
+	.hidden	fn5_2                   # -- Begin function fn5_2
 	.globl	fn5_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
@@ -447,9 +447,9 @@ fn5_2:                                  # @fn5_2
 	.endfunc
 .Lfunc_end22:
 	.size	fn5_2, .Lfunc_end22-fn5_2
-
+                                        # -- End function
 	.section	.text.fn6_2,"ax",@progbits
-	.hidden	fn6_2
+	.hidden	fn6_2                   # -- Begin function fn6_2
 	.globl	fn6_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
@@ -465,9 +465,9 @@ fn6_2:                                  # @fn6_2
 	.endfunc
 .Lfunc_end23:
 	.size	fn6_2, .Lfunc_end23-fn6_2
-
+                                        # -- End function
 	.section	.text.fn7_2,"ax",@progbits
-	.hidden	fn7_2
+	.hidden	fn7_2                   # -- Begin function fn7_2
 	.globl	fn7_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
@@ -483,9 +483,9 @@ fn7_2:                                  # @fn7_2
 	.endfunc
 .Lfunc_end24:
 	.size	fn7_2, .Lfunc_end24-fn7_2
-
+                                        # -- End function
 	.section	.text.fn8_2,"ax",@progbits
-	.hidden	fn8_2
+	.hidden	fn8_2                   # -- Begin function fn8_2
 	.globl	fn8_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
@@ -503,9 +503,9 @@ fn8_2:                                  # @fn8_2
 	.endfunc
 .Lfunc_end25:
 	.size	fn8_2, .Lfunc_end25-fn8_2
-
+                                        # -- End function
 	.section	.text.fn9_2,"ax",@progbits
-	.hidden	fn9_2
+	.hidden	fn9_2                   # -- Begin function fn9_2
 	.globl	fn9_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
@@ -521,9 +521,9 @@ fn9_2:                                  # @fn9_2
 	.endfunc
 .Lfunc_end26:
 	.size	fn9_2, .Lfunc_end26-fn9_2
-
+                                        # -- End function
 	.section	.text.fn1_3,"ax",@progbits
-	.hidden	fn1_3
+	.hidden	fn1_3                   # -- Begin function fn1_3
 	.globl	fn1_3
 	.type	fn1_3,@function
 fn1_3:                                  # @fn1_3
@@ -546,9 +546,9 @@ fn1_3:                                  # @fn1_3
 	.endfunc
 .Lfunc_end27:
 	.size	fn1_3, .Lfunc_end27-fn1_3
-
+                                        # -- End function
 	.section	.text.fn2_3,"ax",@progbits
-	.hidden	fn2_3
+	.hidden	fn2_3                   # -- Begin function fn2_3
 	.globl	fn2_3
 	.type	fn2_3,@function
 fn2_3:                                  # @fn2_3
@@ -571,9 +571,9 @@ fn2_3:                                  # @fn2_3
 	.endfunc
 .Lfunc_end28:
 	.size	fn2_3, .Lfunc_end28-fn2_3
-
+                                        # -- End function
 	.section	.text.fn3_3,"ax",@progbits
-	.hidden	fn3_3
+	.hidden	fn3_3                   # -- Begin function fn3_3
 	.globl	fn3_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
@@ -589,9 +589,9 @@ fn3_3:                                  # @fn3_3
 	.endfunc
 .Lfunc_end29:
 	.size	fn3_3, .Lfunc_end29-fn3_3
-
+                                        # -- End function
 	.section	.text.fn4_3,"ax",@progbits
-	.hidden	fn4_3
+	.hidden	fn4_3                   # -- Begin function fn4_3
 	.globl	fn4_3
 	.type	fn4_3,@function
 fn4_3:                                  # @fn4_3
@@ -614,9 +614,9 @@ fn4_3:                                  # @fn4_3
 	.endfunc
 .Lfunc_end30:
 	.size	fn4_3, .Lfunc_end30-fn4_3
-
+                                        # -- End function
 	.section	.text.fn5_3,"ax",@progbits
-	.hidden	fn5_3
+	.hidden	fn5_3                   # -- Begin function fn5_3
 	.globl	fn5_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
@@ -632,9 +632,9 @@ fn5_3:                                  # @fn5_3
 	.endfunc
 .Lfunc_end31:
 	.size	fn5_3, .Lfunc_end31-fn5_3
-
+                                        # -- End function
 	.section	.text.fn6_3,"ax",@progbits
-	.hidden	fn6_3
+	.hidden	fn6_3                   # -- Begin function fn6_3
 	.globl	fn6_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
@@ -650,9 +650,9 @@ fn6_3:                                  # @fn6_3
 	.endfunc
 .Lfunc_end32:
 	.size	fn6_3, .Lfunc_end32-fn6_3
-
+                                        # -- End function
 	.section	.text.fn7_3,"ax",@progbits
-	.hidden	fn7_3
+	.hidden	fn7_3                   # -- Begin function fn7_3
 	.globl	fn7_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
@@ -668,9 +668,9 @@ fn7_3:                                  # @fn7_3
 	.endfunc
 .Lfunc_end33:
 	.size	fn7_3, .Lfunc_end33-fn7_3
-
+                                        # -- End function
 	.section	.text.fn8_3,"ax",@progbits
-	.hidden	fn8_3
+	.hidden	fn8_3                   # -- Begin function fn8_3
 	.globl	fn8_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
@@ -688,9 +688,9 @@ fn8_3:                                  # @fn8_3
 	.endfunc
 .Lfunc_end34:
 	.size	fn8_3, .Lfunc_end34-fn8_3
-
+                                        # -- End function
 	.section	.text.fn9_3,"ax",@progbits
-	.hidden	fn9_3
+	.hidden	fn9_3                   # -- Begin function fn9_3
 	.globl	fn9_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
@@ -706,9 +706,9 @@ fn9_3:                                  # @fn9_3
 	.endfunc
 .Lfunc_end35:
 	.size	fn9_3, .Lfunc_end35-fn9_3
-
+                                        # -- End function
 	.section	.text.fn1_4,"ax",@progbits
-	.hidden	fn1_4
+	.hidden	fn1_4                   # -- Begin function fn1_4
 	.globl	fn1_4
 	.type	fn1_4,@function
 fn1_4:                                  # @fn1_4
@@ -730,9 +730,9 @@ fn1_4:                                  # @fn1_4
 	.endfunc
 .Lfunc_end36:
 	.size	fn1_4, .Lfunc_end36-fn1_4
-
+                                        # -- End function
 	.section	.text.fn2_4,"ax",@progbits
-	.hidden	fn2_4
+	.hidden	fn2_4                   # -- Begin function fn2_4
 	.globl	fn2_4
 	.type	fn2_4,@function
 fn2_4:                                  # @fn2_4
@@ -756,9 +756,9 @@ fn2_4:                                  # @fn2_4
 	.endfunc
 .Lfunc_end37:
 	.size	fn2_4, .Lfunc_end37-fn2_4
-
+                                        # -- End function
 	.section	.text.fn3_4,"ax",@progbits
-	.hidden	fn3_4
+	.hidden	fn3_4                   # -- Begin function fn3_4
 	.globl	fn3_4
 	.type	fn3_4,@function
 fn3_4:                                  # @fn3_4
@@ -782,9 +782,9 @@ fn3_4:                                  # @fn3_4
 	.endfunc
 .Lfunc_end38:
 	.size	fn3_4, .Lfunc_end38-fn3_4
-
+                                        # -- End function
 	.section	.text.fn4_4,"ax",@progbits
-	.hidden	fn4_4
+	.hidden	fn4_4                   # -- Begin function fn4_4
 	.globl	fn4_4
 	.type	fn4_4,@function
 fn4_4:                                  # @fn4_4
@@ -806,9 +806,9 @@ fn4_4:                                  # @fn4_4
 	.endfunc
 .Lfunc_end39:
 	.size	fn4_4, .Lfunc_end39-fn4_4
-
+                                        # -- End function
 	.section	.text.fn5_4,"ax",@progbits
-	.hidden	fn5_4
+	.hidden	fn5_4                   # -- Begin function fn5_4
 	.globl	fn5_4
 	.type	fn5_4,@function
 fn5_4:                                  # @fn5_4
@@ -832,9 +832,9 @@ fn5_4:                                  # @fn5_4
 	.endfunc
 .Lfunc_end40:
 	.size	fn5_4, .Lfunc_end40-fn5_4
-
+                                        # -- End function
 	.section	.text.fn6_4,"ax",@progbits
-	.hidden	fn6_4
+	.hidden	fn6_4                   # -- Begin function fn6_4
 	.globl	fn6_4
 	.type	fn6_4,@function
 fn6_4:                                  # @fn6_4
@@ -858,9 +858,9 @@ fn6_4:                                  # @fn6_4
 	.endfunc
 .Lfunc_end41:
 	.size	fn6_4, .Lfunc_end41-fn6_4
-
+                                        # -- End function
 	.section	.text.fn7_4,"ax",@progbits
-	.hidden	fn7_4
+	.hidden	fn7_4                   # -- Begin function fn7_4
 	.globl	fn7_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
@@ -875,9 +875,9 @@ fn7_4:                                  # @fn7_4
 	.endfunc
 .Lfunc_end42:
 	.size	fn7_4, .Lfunc_end42-fn7_4
-
+                                        # -- End function
 	.section	.text.fn8_4,"ax",@progbits
-	.hidden	fn8_4
+	.hidden	fn8_4                   # -- Begin function fn8_4
 	.globl	fn8_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
@@ -896,9 +896,9 @@ fn8_4:                                  # @fn8_4
 	.endfunc
 .Lfunc_end43:
 	.size	fn8_4, .Lfunc_end43-fn8_4
-
+                                        # -- End function
 	.section	.text.fn9_4,"ax",@progbits
-	.hidden	fn9_4
+	.hidden	fn9_4                   # -- Begin function fn9_4
 	.globl	fn9_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
@@ -917,9 +917,9 @@ fn9_4:                                  # @fn9_4
 	.endfunc
 .Lfunc_end44:
 	.size	fn9_4, .Lfunc_end44-fn9_4
-
+                                        # -- End function
 	.section	.text.fn1_5,"ax",@progbits
-	.hidden	fn1_5
+	.hidden	fn1_5                   # -- Begin function fn1_5
 	.globl	fn1_5
 	.type	fn1_5,@function
 fn1_5:                                  # @fn1_5
@@ -942,9 +942,9 @@ fn1_5:                                  # @fn1_5
 	.endfunc
 .Lfunc_end45:
 	.size	fn1_5, .Lfunc_end45-fn1_5
-
+                                        # -- End function
 	.section	.text.fn2_5,"ax",@progbits
-	.hidden	fn2_5
+	.hidden	fn2_5                   # -- Begin function fn2_5
 	.globl	fn2_5
 	.type	fn2_5,@function
 fn2_5:                                  # @fn2_5
@@ -967,9 +967,9 @@ fn2_5:                                  # @fn2_5
 	.endfunc
 .Lfunc_end46:
 	.size	fn2_5, .Lfunc_end46-fn2_5
-
+                                        # -- End function
 	.section	.text.fn3_5,"ax",@progbits
-	.hidden	fn3_5
+	.hidden	fn3_5                   # -- Begin function fn3_5
 	.globl	fn3_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
@@ -985,9 +985,9 @@ fn3_5:                                  # @fn3_5
 	.endfunc
 .Lfunc_end47:
 	.size	fn3_5, .Lfunc_end47-fn3_5
-
+                                        # -- End function
 	.section	.text.fn4_5,"ax",@progbits
-	.hidden	fn4_5
+	.hidden	fn4_5                   # -- Begin function fn4_5
 	.globl	fn4_5
 	.type	fn4_5,@function
 fn4_5:                                  # @fn4_5
@@ -1010,9 +1010,9 @@ fn4_5:                                  # @fn4_5
 	.endfunc
 .Lfunc_end48:
 	.size	fn4_5, .Lfunc_end48-fn4_5
-
+                                        # -- End function
 	.section	.text.fn5_5,"ax",@progbits
-	.hidden	fn5_5
+	.hidden	fn5_5                   # -- Begin function fn5_5
 	.globl	fn5_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
@@ -1028,9 +1028,9 @@ fn5_5:                                  # @fn5_5
 	.endfunc
 .Lfunc_end49:
 	.size	fn5_5, .Lfunc_end49-fn5_5
-
+                                        # -- End function
 	.section	.text.fn6_5,"ax",@progbits
-	.hidden	fn6_5
+	.hidden	fn6_5                   # -- Begin function fn6_5
 	.globl	fn6_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
@@ -1046,9 +1046,9 @@ fn6_5:                                  # @fn6_5
 	.endfunc
 .Lfunc_end50:
 	.size	fn6_5, .Lfunc_end50-fn6_5
-
+                                        # -- End function
 	.section	.text.fn7_5,"ax",@progbits
-	.hidden	fn7_5
+	.hidden	fn7_5                   # -- Begin function fn7_5
 	.globl	fn7_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
@@ -1064,9 +1064,9 @@ fn7_5:                                  # @fn7_5
 	.endfunc
 .Lfunc_end51:
 	.size	fn7_5, .Lfunc_end51-fn7_5
-
+                                        # -- End function
 	.section	.text.fn8_5,"ax",@progbits
-	.hidden	fn8_5
+	.hidden	fn8_5                   # -- Begin function fn8_5
 	.globl	fn8_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
@@ -1084,9 +1084,9 @@ fn8_5:                                  # @fn8_5
 	.endfunc
 .Lfunc_end52:
 	.size	fn8_5, .Lfunc_end52-fn8_5
-
+                                        # -- End function
 	.section	.text.fn9_5,"ax",@progbits
-	.hidden	fn9_5
+	.hidden	fn9_5                   # -- Begin function fn9_5
 	.globl	fn9_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
@@ -1102,9 +1102,9 @@ fn9_5:                                  # @fn9_5
 	.endfunc
 .Lfunc_end53:
 	.size	fn9_5, .Lfunc_end53-fn9_5
-
+                                        # -- End function
 	.section	.text.fn1_6,"ax",@progbits
-	.hidden	fn1_6
+	.hidden	fn1_6                   # -- Begin function fn1_6
 	.globl	fn1_6
 	.type	fn1_6,@function
 fn1_6:                                  # @fn1_6
@@ -1127,9 +1127,9 @@ fn1_6:                                  # @fn1_6
 	.endfunc
 .Lfunc_end54:
 	.size	fn1_6, .Lfunc_end54-fn1_6
-
+                                        # -- End function
 	.section	.text.fn2_6,"ax",@progbits
-	.hidden	fn2_6
+	.hidden	fn2_6                   # -- Begin function fn2_6
 	.globl	fn2_6
 	.type	fn2_6,@function
 fn2_6:                                  # @fn2_6
@@ -1152,9 +1152,9 @@ fn2_6:                                  # @fn2_6
 	.endfunc
 .Lfunc_end55:
 	.size	fn2_6, .Lfunc_end55-fn2_6
-
+                                        # -- End function
 	.section	.text.fn3_6,"ax",@progbits
-	.hidden	fn3_6
+	.hidden	fn3_6                   # -- Begin function fn3_6
 	.globl	fn3_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
@@ -1170,9 +1170,9 @@ fn3_6:                                  # @fn3_6
 	.endfunc
 .Lfunc_end56:
 	.size	fn3_6, .Lfunc_end56-fn3_6
-
+                                        # -- End function
 	.section	.text.fn4_6,"ax",@progbits
-	.hidden	fn4_6
+	.hidden	fn4_6                   # -- Begin function fn4_6
 	.globl	fn4_6
 	.type	fn4_6,@function
 fn4_6:                                  # @fn4_6
@@ -1195,9 +1195,9 @@ fn4_6:                                  # @fn4_6
 	.endfunc
 .Lfunc_end57:
 	.size	fn4_6, .Lfunc_end57-fn4_6
-
+                                        # -- End function
 	.section	.text.fn5_6,"ax",@progbits
-	.hidden	fn5_6
+	.hidden	fn5_6                   # -- Begin function fn5_6
 	.globl	fn5_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
@@ -1213,9 +1213,9 @@ fn5_6:                                  # @fn5_6
 	.endfunc
 .Lfunc_end58:
 	.size	fn5_6, .Lfunc_end58-fn5_6
-
+                                        # -- End function
 	.section	.text.fn6_6,"ax",@progbits
-	.hidden	fn6_6
+	.hidden	fn6_6                   # -- Begin function fn6_6
 	.globl	fn6_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
@@ -1231,9 +1231,9 @@ fn6_6:                                  # @fn6_6
 	.endfunc
 .Lfunc_end59:
 	.size	fn6_6, .Lfunc_end59-fn6_6
-
+                                        # -- End function
 	.section	.text.fn7_6,"ax",@progbits
-	.hidden	fn7_6
+	.hidden	fn7_6                   # -- Begin function fn7_6
 	.globl	fn7_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
@@ -1249,9 +1249,9 @@ fn7_6:                                  # @fn7_6
 	.endfunc
 .Lfunc_end60:
 	.size	fn7_6, .Lfunc_end60-fn7_6
-
+                                        # -- End function
 	.section	.text.fn8_6,"ax",@progbits
-	.hidden	fn8_6
+	.hidden	fn8_6                   # -- Begin function fn8_6
 	.globl	fn8_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
@@ -1269,9 +1269,9 @@ fn8_6:                                  # @fn8_6
 	.endfunc
 .Lfunc_end61:
 	.size	fn8_6, .Lfunc_end61-fn8_6
-
+                                        # -- End function
 	.section	.text.fn9_6,"ax",@progbits
-	.hidden	fn9_6
+	.hidden	fn9_6                   # -- Begin function fn9_6
 	.globl	fn9_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
@@ -1287,9 +1287,9 @@ fn9_6:                                  # @fn9_6
 	.endfunc
 .Lfunc_end62:
 	.size	fn9_6, .Lfunc_end62-fn9_6
-
+                                        # -- End function
 	.section	.text.fn1_7,"ax",@progbits
-	.hidden	fn1_7
+	.hidden	fn1_7                   # -- Begin function fn1_7
 	.globl	fn1_7
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
@@ -1306,9 +1306,9 @@ fn1_7:                                  # @fn1_7
 	.endfunc
 .Lfunc_end63:
 	.size	fn1_7, .Lfunc_end63-fn1_7
-
+                                        # -- End function
 	.section	.text.fn2_7,"ax",@progbits
-	.hidden	fn2_7
+	.hidden	fn2_7                   # -- Begin function fn2_7
 	.globl	fn2_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
@@ -1327,9 +1327,9 @@ fn2_7:                                  # @fn2_7
 	.endfunc
 .Lfunc_end64:
 	.size	fn2_7, .Lfunc_end64-fn2_7
-
+                                        # -- End function
 	.section	.text.fn3_7,"ax",@progbits
-	.hidden	fn3_7
+	.hidden	fn3_7                   # -- Begin function fn3_7
 	.globl	fn3_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
@@ -1348,9 +1348,9 @@ fn3_7:                                  # @fn3_7
 	.endfunc
 .Lfunc_end65:
 	.size	fn3_7, .Lfunc_end65-fn3_7
-
+                                        # -- End function
 	.section	.text.fn4_7,"ax",@progbits
-	.hidden	fn4_7
+	.hidden	fn4_7                   # -- Begin function fn4_7
 	.globl	fn4_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
@@ -1367,9 +1367,9 @@ fn4_7:                                  # @fn4_7
 	.endfunc
 .Lfunc_end66:
 	.size	fn4_7, .Lfunc_end66-fn4_7
-
+                                        # -- End function
 	.section	.text.fn5_7,"ax",@progbits
-	.hidden	fn5_7
+	.hidden	fn5_7                   # -- Begin function fn5_7
 	.globl	fn5_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
@@ -1388,9 +1388,9 @@ fn5_7:                                  # @fn5_7
 	.endfunc
 .Lfunc_end67:
 	.size	fn5_7, .Lfunc_end67-fn5_7
-
+                                        # -- End function
 	.section	.text.fn6_7,"ax",@progbits
-	.hidden	fn6_7
+	.hidden	fn6_7                   # -- Begin function fn6_7
 	.globl	fn6_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
@@ -1409,9 +1409,9 @@ fn6_7:                                  # @fn6_7
 	.endfunc
 .Lfunc_end68:
 	.size	fn6_7, .Lfunc_end68-fn6_7
-
+                                        # -- End function
 	.section	.text.fn7_7,"ax",@progbits
-	.hidden	fn7_7
+	.hidden	fn7_7                   # -- Begin function fn7_7
 	.globl	fn7_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
@@ -1428,9 +1428,9 @@ fn7_7:                                  # @fn7_7
 	.endfunc
 .Lfunc_end69:
 	.size	fn7_7, .Lfunc_end69-fn7_7
-
+                                        # -- End function
 	.section	.text.fn8_7,"ax",@progbits
-	.hidden	fn8_7
+	.hidden	fn8_7                   # -- Begin function fn8_7
 	.globl	fn8_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
@@ -1449,9 +1449,9 @@ fn8_7:                                  # @fn8_7
 	.endfunc
 .Lfunc_end70:
 	.size	fn8_7, .Lfunc_end70-fn8_7
-
+                                        # -- End function
 	.section	.text.fn9_7,"ax",@progbits
-	.hidden	fn9_7
+	.hidden	fn9_7                   # -- Begin function fn9_7
 	.globl	fn9_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
@@ -1470,9 +1470,9 @@ fn9_7:                                  # @fn9_7
 	.endfunc
 .Lfunc_end71:
 	.size	fn9_7, .Lfunc_end71-fn9_7
-
+                                        # -- End function
 	.section	.text.fn1_8,"ax",@progbits
-	.hidden	fn1_8
+	.hidden	fn1_8                   # -- Begin function fn1_8
 	.globl	fn1_8
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
@@ -1489,9 +1489,9 @@ fn1_8:                                  # @fn1_8
 	.endfunc
 .Lfunc_end72:
 	.size	fn1_8, .Lfunc_end72-fn1_8
-
+                                        # -- End function
 	.section	.text.fn2_8,"ax",@progbits
-	.hidden	fn2_8
+	.hidden	fn2_8                   # -- Begin function fn2_8
 	.globl	fn2_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
@@ -1510,9 +1510,9 @@ fn2_8:                                  # @fn2_8
 	.endfunc
 .Lfunc_end73:
 	.size	fn2_8, .Lfunc_end73-fn2_8
-
+                                        # -- End function
 	.section	.text.fn3_8,"ax",@progbits
-	.hidden	fn3_8
+	.hidden	fn3_8                   # -- Begin function fn3_8
 	.globl	fn3_8
 	.type	fn3_8,@function
 fn3_8:                                  # @fn3_8
@@ -1536,9 +1536,9 @@ fn3_8:                                  # @fn3_8
 	.endfunc
 .Lfunc_end74:
 	.size	fn3_8, .Lfunc_end74-fn3_8
-
+                                        # -- End function
 	.section	.text.fn4_8,"ax",@progbits
-	.hidden	fn4_8
+	.hidden	fn4_8                   # -- Begin function fn4_8
 	.globl	fn4_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
@@ -1555,9 +1555,9 @@ fn4_8:                                  # @fn4_8
 	.endfunc
 .Lfunc_end75:
 	.size	fn4_8, .Lfunc_end75-fn4_8
-
+                                        # -- End function
 	.section	.text.fn5_8,"ax",@progbits
-	.hidden	fn5_8
+	.hidden	fn5_8                   # -- Begin function fn5_8
 	.globl	fn5_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
@@ -1576,9 +1576,9 @@ fn5_8:                                  # @fn5_8
 	.endfunc
 .Lfunc_end76:
 	.size	fn5_8, .Lfunc_end76-fn5_8
-
+                                        # -- End function
 	.section	.text.fn6_8,"ax",@progbits
-	.hidden	fn6_8
+	.hidden	fn6_8                   # -- Begin function fn6_8
 	.globl	fn6_8
 	.type	fn6_8,@function
 fn6_8:                                  # @fn6_8
@@ -1602,9 +1602,9 @@ fn6_8:                                  # @fn6_8
 	.endfunc
 .Lfunc_end77:
 	.size	fn6_8, .Lfunc_end77-fn6_8
-
+                                        # -- End function
 	.section	.text.fn7_8,"ax",@progbits
-	.hidden	fn7_8
+	.hidden	fn7_8                   # -- Begin function fn7_8
 	.globl	fn7_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
@@ -1621,9 +1621,9 @@ fn7_8:                                  # @fn7_8
 	.endfunc
 .Lfunc_end78:
 	.size	fn7_8, .Lfunc_end78-fn7_8
-
+                                        # -- End function
 	.section	.text.fn8_8,"ax",@progbits
-	.hidden	fn8_8
+	.hidden	fn8_8                   # -- Begin function fn8_8
 	.globl	fn8_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
@@ -1642,9 +1642,9 @@ fn8_8:                                  # @fn8_8
 	.endfunc
 .Lfunc_end79:
 	.size	fn8_8, .Lfunc_end79-fn8_8
-
+                                        # -- End function
 	.section	.text.fn9_8,"ax",@progbits
-	.hidden	fn9_8
+	.hidden	fn9_8                   # -- Begin function fn9_8
 	.globl	fn9_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
@@ -1663,9 +1663,9 @@ fn9_8:                                  # @fn9_8
 	.endfunc
 .Lfunc_end80:
 	.size	fn9_8, .Lfunc_end80-fn9_8
-
+                                        # -- End function
 	.section	.text.fn1_9,"ax",@progbits
-	.hidden	fn1_9
+	.hidden	fn1_9                   # -- Begin function fn1_9
 	.globl	fn1_9
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
@@ -1682,9 +1682,9 @@ fn1_9:                                  # @fn1_9
 	.endfunc
 .Lfunc_end81:
 	.size	fn1_9, .Lfunc_end81-fn1_9
-
+                                        # -- End function
 	.section	.text.fn2_9,"ax",@progbits
-	.hidden	fn2_9
+	.hidden	fn2_9                   # -- Begin function fn2_9
 	.globl	fn2_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
@@ -1703,9 +1703,9 @@ fn2_9:                                  # @fn2_9
 	.endfunc
 .Lfunc_end82:
 	.size	fn2_9, .Lfunc_end82-fn2_9
-
+                                        # -- End function
 	.section	.text.fn3_9,"ax",@progbits
-	.hidden	fn3_9
+	.hidden	fn3_9                   # -- Begin function fn3_9
 	.globl	fn3_9
 	.type	fn3_9,@function
 fn3_9:                                  # @fn3_9
@@ -1729,9 +1729,9 @@ fn3_9:                                  # @fn3_9
 	.endfunc
 .Lfunc_end83:
 	.size	fn3_9, .Lfunc_end83-fn3_9
-
+                                        # -- End function
 	.section	.text.fn4_9,"ax",@progbits
-	.hidden	fn4_9
+	.hidden	fn4_9                   # -- Begin function fn4_9
 	.globl	fn4_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
@@ -1748,9 +1748,9 @@ fn4_9:                                  # @fn4_9
 	.endfunc
 .Lfunc_end84:
 	.size	fn4_9, .Lfunc_end84-fn4_9
-
+                                        # -- End function
 	.section	.text.fn5_9,"ax",@progbits
-	.hidden	fn5_9
+	.hidden	fn5_9                   # -- Begin function fn5_9
 	.globl	fn5_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
@@ -1769,9 +1769,9 @@ fn5_9:                                  # @fn5_9
 	.endfunc
 .Lfunc_end85:
 	.size	fn5_9, .Lfunc_end85-fn5_9
-
+                                        # -- End function
 	.section	.text.fn6_9,"ax",@progbits
-	.hidden	fn6_9
+	.hidden	fn6_9                   # -- Begin function fn6_9
 	.globl	fn6_9
 	.type	fn6_9,@function
 fn6_9:                                  # @fn6_9
@@ -1795,9 +1795,9 @@ fn6_9:                                  # @fn6_9
 	.endfunc
 .Lfunc_end86:
 	.size	fn6_9, .Lfunc_end86-fn6_9
-
+                                        # -- End function
 	.section	.text.fn7_9,"ax",@progbits
-	.hidden	fn7_9
+	.hidden	fn7_9                   # -- Begin function fn7_9
 	.globl	fn7_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
@@ -1814,9 +1814,9 @@ fn7_9:                                  # @fn7_9
 	.endfunc
 .Lfunc_end87:
 	.size	fn7_9, .Lfunc_end87-fn7_9
-
+                                        # -- End function
 	.section	.text.fn8_9,"ax",@progbits
-	.hidden	fn8_9
+	.hidden	fn8_9                   # -- Begin function fn8_9
 	.globl	fn8_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
@@ -1835,9 +1835,9 @@ fn8_9:                                  # @fn8_9
 	.endfunc
 .Lfunc_end88:
 	.size	fn8_9, .Lfunc_end88-fn8_9
-
+                                        # -- End function
 	.section	.text.fn9_9,"ax",@progbits
-	.hidden	fn9_9
+	.hidden	fn9_9                   # -- Begin function fn9_9
 	.globl	fn9_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
@@ -1856,9 +1856,9 @@ fn9_9:                                  # @fn9_9
 	.endfunc
 .Lfunc_end89:
 	.size	fn9_9, .Lfunc_end89-fn9_9
-
+                                        # -- End function
 	.section	.text.fn1_a,"ax",@progbits
-	.hidden	fn1_a
+	.hidden	fn1_a                   # -- Begin function fn1_a
 	.globl	fn1_a
 	.type	fn1_a,@function
 fn1_a:                                  # @fn1_a
@@ -1880,9 +1880,9 @@ fn1_a:                                  # @fn1_a
 	.endfunc
 .Lfunc_end90:
 	.size	fn1_a, .Lfunc_end90-fn1_a
-
+                                        # -- End function
 	.section	.text.fn2_a,"ax",@progbits
-	.hidden	fn2_a
+	.hidden	fn2_a                   # -- Begin function fn2_a
 	.globl	fn2_a
 	.type	fn2_a,@function
 fn2_a:                                  # @fn2_a
@@ -1908,9 +1908,9 @@ fn2_a:                                  # @fn2_a
 	.endfunc
 .Lfunc_end91:
 	.size	fn2_a, .Lfunc_end91-fn2_a
-
+                                        # -- End function
 	.section	.text.fn3_a,"ax",@progbits
-	.hidden	fn3_a
+	.hidden	fn3_a                   # -- Begin function fn3_a
 	.globl	fn3_a
 	.type	fn3_a,@function
 fn3_a:                                  # @fn3_a
@@ -1934,9 +1934,9 @@ fn3_a:                                  # @fn3_a
 	.endfunc
 .Lfunc_end92:
 	.size	fn3_a, .Lfunc_end92-fn3_a
-
+                                        # -- End function
 	.section	.text.fn4_a,"ax",@progbits
-	.hidden	fn4_a
+	.hidden	fn4_a                   # -- Begin function fn4_a
 	.globl	fn4_a
 	.type	fn4_a,@function
 fn4_a:                                  # @fn4_a
@@ -1958,9 +1958,9 @@ fn4_a:                                  # @fn4_a
 	.endfunc
 .Lfunc_end93:
 	.size	fn4_a, .Lfunc_end93-fn4_a
-
+                                        # -- End function
 	.section	.text.fn5_a,"ax",@progbits
-	.hidden	fn5_a
+	.hidden	fn5_a                   # -- Begin function fn5_a
 	.globl	fn5_a
 	.type	fn5_a,@function
 fn5_a:                                  # @fn5_a
@@ -1986,9 +1986,9 @@ fn5_a:                                  # @fn5_a
 	.endfunc
 .Lfunc_end94:
 	.size	fn5_a, .Lfunc_end94-fn5_a
-
+                                        # -- End function
 	.section	.text.fn6_a,"ax",@progbits
-	.hidden	fn6_a
+	.hidden	fn6_a                   # -- Begin function fn6_a
 	.globl	fn6_a
 	.type	fn6_a,@function
 fn6_a:                                  # @fn6_a
@@ -2012,9 +2012,9 @@ fn6_a:                                  # @fn6_a
 	.endfunc
 .Lfunc_end95:
 	.size	fn6_a, .Lfunc_end95-fn6_a
-
+                                        # -- End function
 	.section	.text.fn7_a,"ax",@progbits
-	.hidden	fn7_a
+	.hidden	fn7_a                   # -- Begin function fn7_a
 	.globl	fn7_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
@@ -2029,9 +2029,9 @@ fn7_a:                                  # @fn7_a
 	.endfunc
 .Lfunc_end96:
 	.size	fn7_a, .Lfunc_end96-fn7_a
-
+                                        # -- End function
 	.section	.text.fn8_a,"ax",@progbits
-	.hidden	fn8_a
+	.hidden	fn8_a                   # -- Begin function fn8_a
 	.globl	fn8_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
@@ -2046,9 +2046,9 @@ fn8_a:                                  # @fn8_a
 	.endfunc
 .Lfunc_end97:
 	.size	fn8_a, .Lfunc_end97-fn8_a
-
+                                        # -- End function
 	.section	.text.fn9_a,"ax",@progbits
-	.hidden	fn9_a
+	.hidden	fn9_a                   # -- Begin function fn9_a
 	.globl	fn9_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
@@ -2063,9 +2063,9 @@ fn9_a:                                  # @fn9_a
 	.endfunc
 .Lfunc_end98:
 	.size	fn9_a, .Lfunc_end98-fn9_a
-
+                                        # -- End function
 	.section	.text.fn1_b,"ax",@progbits
-	.hidden	fn1_b
+	.hidden	fn1_b                   # -- Begin function fn1_b
 	.globl	fn1_b
 	.type	fn1_b,@function
 fn1_b:                                  # @fn1_b
@@ -2087,9 +2087,9 @@ fn1_b:                                  # @fn1_b
 	.endfunc
 .Lfunc_end99:
 	.size	fn1_b, .Lfunc_end99-fn1_b
-
+                                        # -- End function
 	.section	.text.fn2_b,"ax",@progbits
-	.hidden	fn2_b
+	.hidden	fn2_b                   # -- Begin function fn2_b
 	.globl	fn2_b
 	.type	fn2_b,@function
 fn2_b:                                  # @fn2_b
@@ -2115,9 +2115,9 @@ fn2_b:                                  # @fn2_b
 	.endfunc
 .Lfunc_end100:
 	.size	fn2_b, .Lfunc_end100-fn2_b
-
+                                        # -- End function
 	.section	.text.fn3_b,"ax",@progbits
-	.hidden	fn3_b
+	.hidden	fn3_b                   # -- Begin function fn3_b
 	.globl	fn3_b
 	.type	fn3_b,@function
 fn3_b:                                  # @fn3_b
@@ -2141,9 +2141,9 @@ fn3_b:                                  # @fn3_b
 	.endfunc
 .Lfunc_end101:
 	.size	fn3_b, .Lfunc_end101-fn3_b
-
+                                        # -- End function
 	.section	.text.fn4_b,"ax",@progbits
-	.hidden	fn4_b
+	.hidden	fn4_b                   # -- Begin function fn4_b
 	.globl	fn4_b
 	.type	fn4_b,@function
 fn4_b:                                  # @fn4_b
@@ -2165,9 +2165,9 @@ fn4_b:                                  # @fn4_b
 	.endfunc
 .Lfunc_end102:
 	.size	fn4_b, .Lfunc_end102-fn4_b
-
+                                        # -- End function
 	.section	.text.fn5_b,"ax",@progbits
-	.hidden	fn5_b
+	.hidden	fn5_b                   # -- Begin function fn5_b
 	.globl	fn5_b
 	.type	fn5_b,@function
 fn5_b:                                  # @fn5_b
@@ -2193,9 +2193,9 @@ fn5_b:                                  # @fn5_b
 	.endfunc
 .Lfunc_end103:
 	.size	fn5_b, .Lfunc_end103-fn5_b
-
+                                        # -- End function
 	.section	.text.fn6_b,"ax",@progbits
-	.hidden	fn6_b
+	.hidden	fn6_b                   # -- Begin function fn6_b
 	.globl	fn6_b
 	.type	fn6_b,@function
 fn6_b:                                  # @fn6_b
@@ -2219,9 +2219,9 @@ fn6_b:                                  # @fn6_b
 	.endfunc
 .Lfunc_end104:
 	.size	fn6_b, .Lfunc_end104-fn6_b
-
+                                        # -- End function
 	.section	.text.fn7_b,"ax",@progbits
-	.hidden	fn7_b
+	.hidden	fn7_b                   # -- Begin function fn7_b
 	.globl	fn7_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
@@ -2236,9 +2236,9 @@ fn7_b:                                  # @fn7_b
 	.endfunc
 .Lfunc_end105:
 	.size	fn7_b, .Lfunc_end105-fn7_b
-
+                                        # -- End function
 	.section	.text.fn8_b,"ax",@progbits
-	.hidden	fn8_b
+	.hidden	fn8_b                   # -- Begin function fn8_b
 	.globl	fn8_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
@@ -2253,9 +2253,9 @@ fn8_b:                                  # @fn8_b
 	.endfunc
 .Lfunc_end106:
 	.size	fn8_b, .Lfunc_end106-fn8_b
-
+                                        # -- End function
 	.section	.text.fn9_b,"ax",@progbits
-	.hidden	fn9_b
+	.hidden	fn9_b                   # -- Begin function fn9_b
 	.globl	fn9_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
@@ -2270,9 +2270,9 @@ fn9_b:                                  # @fn9_b
 	.endfunc
 .Lfunc_end107:
 	.size	fn9_b, .Lfunc_end107-fn9_b
-
+                                        # -- End function
 	.section	.text.fn1_c,"ax",@progbits
-	.hidden	fn1_c
+	.hidden	fn1_c                   # -- Begin function fn1_c
 	.globl	fn1_c
 	.type	fn1_c,@function
 fn1_c:                                  # @fn1_c
@@ -2295,9 +2295,9 @@ fn1_c:                                  # @fn1_c
 	.endfunc
 .Lfunc_end108:
 	.size	fn1_c, .Lfunc_end108-fn1_c
-
+                                        # -- End function
 	.section	.text.fn2_c,"ax",@progbits
-	.hidden	fn2_c
+	.hidden	fn2_c                   # -- Begin function fn2_c
 	.globl	fn2_c
 	.type	fn2_c,@function
 fn2_c:                                  # @fn2_c
@@ -2320,9 +2320,9 @@ fn2_c:                                  # @fn2_c
 	.endfunc
 .Lfunc_end109:
 	.size	fn2_c, .Lfunc_end109-fn2_c
-
+                                        # -- End function
 	.section	.text.fn3_c,"ax",@progbits
-	.hidden	fn3_c
+	.hidden	fn3_c                   # -- Begin function fn3_c
 	.globl	fn3_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
@@ -2338,9 +2338,9 @@ fn3_c:                                  # @fn3_c
 	.endfunc
 .Lfunc_end110:
 	.size	fn3_c, .Lfunc_end110-fn3_c
-
+                                        # -- End function
 	.section	.text.fn4_c,"ax",@progbits
-	.hidden	fn4_c
+	.hidden	fn4_c                   # -- Begin function fn4_c
 	.globl	fn4_c
 	.type	fn4_c,@function
 fn4_c:                                  # @fn4_c
@@ -2363,9 +2363,9 @@ fn4_c:                                  # @fn4_c
 	.endfunc
 .Lfunc_end111:
 	.size	fn4_c, .Lfunc_end111-fn4_c
-
+                                        # -- End function
 	.section	.text.fn5_c,"ax",@progbits
-	.hidden	fn5_c
+	.hidden	fn5_c                   # -- Begin function fn5_c
 	.globl	fn5_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
@@ -2381,9 +2381,9 @@ fn5_c:                                  # @fn5_c
 	.endfunc
 .Lfunc_end112:
 	.size	fn5_c, .Lfunc_end112-fn5_c
-
+                                        # -- End function
 	.section	.text.fn6_c,"ax",@progbits
-	.hidden	fn6_c
+	.hidden	fn6_c                   # -- Begin function fn6_c
 	.globl	fn6_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
@@ -2399,9 +2399,9 @@ fn6_c:                                  # @fn6_c
 	.endfunc
 .Lfunc_end113:
 	.size	fn6_c, .Lfunc_end113-fn6_c
-
+                                        # -- End function
 	.section	.text.fn7_c,"ax",@progbits
-	.hidden	fn7_c
+	.hidden	fn7_c                   # -- Begin function fn7_c
 	.globl	fn7_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
@@ -2417,9 +2417,9 @@ fn7_c:                                  # @fn7_c
 	.endfunc
 .Lfunc_end114:
 	.size	fn7_c, .Lfunc_end114-fn7_c
-
+                                        # -- End function
 	.section	.text.fn8_c,"ax",@progbits
-	.hidden	fn8_c
+	.hidden	fn8_c                   # -- Begin function fn8_c
 	.globl	fn8_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
@@ -2437,9 +2437,9 @@ fn8_c:                                  # @fn8_c
 	.endfunc
 .Lfunc_end115:
 	.size	fn8_c, .Lfunc_end115-fn8_c
-
+                                        # -- End function
 	.section	.text.fn9_c,"ax",@progbits
-	.hidden	fn9_c
+	.hidden	fn9_c                   # -- Begin function fn9_c
 	.globl	fn9_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
@@ -2455,9 +2455,9 @@ fn9_c:                                  # @fn9_c
 	.endfunc
 .Lfunc_end116:
 	.size	fn9_c, .Lfunc_end116-fn9_c
-
+                                        # -- End function
 	.section	.text.fn1_d,"ax",@progbits
-	.hidden	fn1_d
+	.hidden	fn1_d                   # -- Begin function fn1_d
 	.globl	fn1_d
 	.type	fn1_d,@function
 fn1_d:                                  # @fn1_d
@@ -2480,9 +2480,9 @@ fn1_d:                                  # @fn1_d
 	.endfunc
 .Lfunc_end117:
 	.size	fn1_d, .Lfunc_end117-fn1_d
-
+                                        # -- End function
 	.section	.text.fn2_d,"ax",@progbits
-	.hidden	fn2_d
+	.hidden	fn2_d                   # -- Begin function fn2_d
 	.globl	fn2_d
 	.type	fn2_d,@function
 fn2_d:                                  # @fn2_d
@@ -2505,9 +2505,9 @@ fn2_d:                                  # @fn2_d
 	.endfunc
 .Lfunc_end118:
 	.size	fn2_d, .Lfunc_end118-fn2_d
-
+                                        # -- End function
 	.section	.text.fn3_d,"ax",@progbits
-	.hidden	fn3_d
+	.hidden	fn3_d                   # -- Begin function fn3_d
 	.globl	fn3_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
@@ -2523,9 +2523,9 @@ fn3_d:                                  # @fn3_d
 	.endfunc
 .Lfunc_end119:
 	.size	fn3_d, .Lfunc_end119-fn3_d
-
+                                        # -- End function
 	.section	.text.fn4_d,"ax",@progbits
-	.hidden	fn4_d
+	.hidden	fn4_d                   # -- Begin function fn4_d
 	.globl	fn4_d
 	.type	fn4_d,@function
 fn4_d:                                  # @fn4_d
@@ -2548,9 +2548,9 @@ fn4_d:                                  # @fn4_d
 	.endfunc
 .Lfunc_end120:
 	.size	fn4_d, .Lfunc_end120-fn4_d
-
+                                        # -- End function
 	.section	.text.fn5_d,"ax",@progbits
-	.hidden	fn5_d
+	.hidden	fn5_d                   # -- Begin function fn5_d
 	.globl	fn5_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
@@ -2566,9 +2566,9 @@ fn5_d:                                  # @fn5_d
 	.endfunc
 .Lfunc_end121:
 	.size	fn5_d, .Lfunc_end121-fn5_d
-
+                                        # -- End function
 	.section	.text.fn6_d,"ax",@progbits
-	.hidden	fn6_d
+	.hidden	fn6_d                   # -- Begin function fn6_d
 	.globl	fn6_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
@@ -2584,9 +2584,9 @@ fn6_d:                                  # @fn6_d
 	.endfunc
 .Lfunc_end122:
 	.size	fn6_d, .Lfunc_end122-fn6_d
-
+                                        # -- End function
 	.section	.text.fn7_d,"ax",@progbits
-	.hidden	fn7_d
+	.hidden	fn7_d                   # -- Begin function fn7_d
 	.globl	fn7_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
@@ -2602,9 +2602,9 @@ fn7_d:                                  # @fn7_d
 	.endfunc
 .Lfunc_end123:
 	.size	fn7_d, .Lfunc_end123-fn7_d
-
+                                        # -- End function
 	.section	.text.fn8_d,"ax",@progbits
-	.hidden	fn8_d
+	.hidden	fn8_d                   # -- Begin function fn8_d
 	.globl	fn8_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
@@ -2622,9 +2622,9 @@ fn8_d:                                  # @fn8_d
 	.endfunc
 .Lfunc_end124:
 	.size	fn8_d, .Lfunc_end124-fn8_d
-
+                                        # -- End function
 	.section	.text.fn9_d,"ax",@progbits
-	.hidden	fn9_d
+	.hidden	fn9_d                   # -- Begin function fn9_d
 	.globl	fn9_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
@@ -2640,9 +2640,9 @@ fn9_d:                                  # @fn9_d
 	.endfunc
 .Lfunc_end125:
 	.size	fn9_d, .Lfunc_end125-fn9_d
-
+                                        # -- End function
 	.section	.text.fn1_e,"ax",@progbits
-	.hidden	fn1_e
+	.hidden	fn1_e                   # -- Begin function fn1_e
 	.globl	fn1_e
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
@@ -2658,9 +2658,9 @@ fn1_e:                                  # @fn1_e
 	.endfunc
 .Lfunc_end126:
 	.size	fn1_e, .Lfunc_end126-fn1_e
-
+                                        # -- End function
 	.section	.text.fn2_e,"ax",@progbits
-	.hidden	fn2_e
+	.hidden	fn2_e                   # -- Begin function fn2_e
 	.globl	fn2_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
@@ -2676,9 +2676,9 @@ fn2_e:                                  # @fn2_e
 	.endfunc
 .Lfunc_end127:
 	.size	fn2_e, .Lfunc_end127-fn2_e
-
+                                        # -- End function
 	.section	.text.fn3_e,"ax",@progbits
-	.hidden	fn3_e
+	.hidden	fn3_e                   # -- Begin function fn3_e
 	.globl	fn3_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
@@ -2694,9 +2694,9 @@ fn3_e:                                  # @fn3_e
 	.endfunc
 .Lfunc_end128:
 	.size	fn3_e, .Lfunc_end128-fn3_e
-
+                                        # -- End function
 	.section	.text.fn4_e,"ax",@progbits
-	.hidden	fn4_e
+	.hidden	fn4_e                   # -- Begin function fn4_e
 	.globl	fn4_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
@@ -2712,9 +2712,9 @@ fn4_e:                                  # @fn4_e
 	.endfunc
 .Lfunc_end129:
 	.size	fn4_e, .Lfunc_end129-fn4_e
-
+                                        # -- End function
 	.section	.text.fn5_e,"ax",@progbits
-	.hidden	fn5_e
+	.hidden	fn5_e                   # -- Begin function fn5_e
 	.globl	fn5_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
@@ -2724,9 +2724,9 @@ fn5_e:                                  # @fn5_e
 	.endfunc
 .Lfunc_end130:
 	.size	fn5_e, .Lfunc_end130-fn5_e
-
+                                        # -- End function
 	.section	.text.fn6_e,"ax",@progbits
-	.hidden	fn6_e
+	.hidden	fn6_e                   # -- Begin function fn6_e
 	.globl	fn6_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
@@ -2742,9 +2742,9 @@ fn6_e:                                  # @fn6_e
 	.endfunc
 .Lfunc_end131:
 	.size	fn6_e, .Lfunc_end131-fn6_e
-
+                                        # -- End function
 	.section	.text.fn7_e,"ax",@progbits
-	.hidden	fn7_e
+	.hidden	fn7_e                   # -- Begin function fn7_e
 	.globl	fn7_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
@@ -2760,9 +2760,9 @@ fn7_e:                                  # @fn7_e
 	.endfunc
 .Lfunc_end132:
 	.size	fn7_e, .Lfunc_end132-fn7_e
-
+                                        # -- End function
 	.section	.text.fn8_e,"ax",@progbits
-	.hidden	fn8_e
+	.hidden	fn8_e                   # -- Begin function fn8_e
 	.globl	fn8_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
@@ -2778,9 +2778,9 @@ fn8_e:                                  # @fn8_e
 	.endfunc
 .Lfunc_end133:
 	.size	fn8_e, .Lfunc_end133-fn8_e
-
+                                        # -- End function
 	.section	.text.fn9_e,"ax",@progbits
-	.hidden	fn9_e
+	.hidden	fn9_e                   # -- Begin function fn9_e
 	.globl	fn9_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
@@ -2796,9 +2796,9 @@ fn9_e:                                  # @fn9_e
 	.endfunc
 .Lfunc_end134:
 	.size	fn9_e, .Lfunc_end134-fn9_e
-
+                                        # -- End function
 	.section	.text.fn1_f,"ax",@progbits
-	.hidden	fn1_f
+	.hidden	fn1_f                   # -- Begin function fn1_f
 	.globl	fn1_f
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
@@ -2814,9 +2814,9 @@ fn1_f:                                  # @fn1_f
 	.endfunc
 .Lfunc_end135:
 	.size	fn1_f, .Lfunc_end135-fn1_f
-
+                                        # -- End function
 	.section	.text.fn2_f,"ax",@progbits
-	.hidden	fn2_f
+	.hidden	fn2_f                   # -- Begin function fn2_f
 	.globl	fn2_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
@@ -2832,9 +2832,9 @@ fn2_f:                                  # @fn2_f
 	.endfunc
 .Lfunc_end136:
 	.size	fn2_f, .Lfunc_end136-fn2_f
-
+                                        # -- End function
 	.section	.text.fn3_f,"ax",@progbits
-	.hidden	fn3_f
+	.hidden	fn3_f                   # -- Begin function fn3_f
 	.globl	fn3_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
@@ -2850,9 +2850,9 @@ fn3_f:                                  # @fn3_f
 	.endfunc
 .Lfunc_end137:
 	.size	fn3_f, .Lfunc_end137-fn3_f
-
+                                        # -- End function
 	.section	.text.fn4_f,"ax",@progbits
-	.hidden	fn4_f
+	.hidden	fn4_f                   # -- Begin function fn4_f
 	.globl	fn4_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
@@ -2868,9 +2868,9 @@ fn4_f:                                  # @fn4_f
 	.endfunc
 .Lfunc_end138:
 	.size	fn4_f, .Lfunc_end138-fn4_f
-
+                                        # -- End function
 	.section	.text.fn5_f,"ax",@progbits
-	.hidden	fn5_f
+	.hidden	fn5_f                   # -- Begin function fn5_f
 	.globl	fn5_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
@@ -2886,9 +2886,9 @@ fn5_f:                                  # @fn5_f
 	.endfunc
 .Lfunc_end139:
 	.size	fn5_f, .Lfunc_end139-fn5_f
-
+                                        # -- End function
 	.section	.text.fn6_f,"ax",@progbits
-	.hidden	fn6_f
+	.hidden	fn6_f                   # -- Begin function fn6_f
 	.globl	fn6_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
@@ -2904,9 +2904,9 @@ fn6_f:                                  # @fn6_f
 	.endfunc
 .Lfunc_end140:
 	.size	fn6_f, .Lfunc_end140-fn6_f
-
+                                        # -- End function
 	.section	.text.fn7_f,"ax",@progbits
-	.hidden	fn7_f
+	.hidden	fn7_f                   # -- Begin function fn7_f
 	.globl	fn7_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
@@ -2922,9 +2922,9 @@ fn7_f:                                  # @fn7_f
 	.endfunc
 .Lfunc_end141:
 	.size	fn7_f, .Lfunc_end141-fn7_f
-
+                                        # -- End function
 	.section	.text.fn8_f,"ax",@progbits
-	.hidden	fn8_f
+	.hidden	fn8_f                   # -- Begin function fn8_f
 	.globl	fn8_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
@@ -2940,9 +2940,9 @@ fn8_f:                                  # @fn8_f
 	.endfunc
 .Lfunc_end142:
 	.size	fn8_f, .Lfunc_end142-fn8_f
-
+                                        # -- End function
 	.section	.text.fn9_f,"ax",@progbits
-	.hidden	fn9_f
+	.hidden	fn9_f                   # -- Begin function fn9_f
 	.globl	fn9_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
@@ -2958,9 +2958,9 @@ fn9_f:                                  # @fn9_f
 	.endfunc
 .Lfunc_end143:
 	.size	fn9_f, .Lfunc_end143-fn9_f
-
+                                        # -- End function
 	.section	.text.fn1_g,"ax",@progbits
-	.hidden	fn1_g
+	.hidden	fn1_g                   # -- Begin function fn1_g
 	.globl	fn1_g
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
@@ -2976,9 +2976,9 @@ fn1_g:                                  # @fn1_g
 	.endfunc
 .Lfunc_end144:
 	.size	fn1_g, .Lfunc_end144-fn1_g
-
+                                        # -- End function
 	.section	.text.fn2_g,"ax",@progbits
-	.hidden	fn2_g
+	.hidden	fn2_g                   # -- Begin function fn2_g
 	.globl	fn2_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
@@ -2994,9 +2994,9 @@ fn2_g:                                  # @fn2_g
 	.endfunc
 .Lfunc_end145:
 	.size	fn2_g, .Lfunc_end145-fn2_g
-
+                                        # -- End function
 	.section	.text.fn3_g,"ax",@progbits
-	.hidden	fn3_g
+	.hidden	fn3_g                   # -- Begin function fn3_g
 	.globl	fn3_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
@@ -3012,9 +3012,9 @@ fn3_g:                                  # @fn3_g
 	.endfunc
 .Lfunc_end146:
 	.size	fn3_g, .Lfunc_end146-fn3_g
-
+                                        # -- End function
 	.section	.text.fn4_g,"ax",@progbits
-	.hidden	fn4_g
+	.hidden	fn4_g                   # -- Begin function fn4_g
 	.globl	fn4_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
@@ -3030,9 +3030,9 @@ fn4_g:                                  # @fn4_g
 	.endfunc
 .Lfunc_end147:
 	.size	fn4_g, .Lfunc_end147-fn4_g
-
+                                        # -- End function
 	.section	.text.fn5_g,"ax",@progbits
-	.hidden	fn5_g
+	.hidden	fn5_g                   # -- Begin function fn5_g
 	.globl	fn5_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
@@ -3048,9 +3048,9 @@ fn5_g:                                  # @fn5_g
 	.endfunc
 .Lfunc_end148:
 	.size	fn5_g, .Lfunc_end148-fn5_g
-
+                                        # -- End function
 	.section	.text.fn6_g,"ax",@progbits
-	.hidden	fn6_g
+	.hidden	fn6_g                   # -- Begin function fn6_g
 	.globl	fn6_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
@@ -3066,9 +3066,9 @@ fn6_g:                                  # @fn6_g
 	.endfunc
 .Lfunc_end149:
 	.size	fn6_g, .Lfunc_end149-fn6_g
-
+                                        # -- End function
 	.section	.text.fn7_g,"ax",@progbits
-	.hidden	fn7_g
+	.hidden	fn7_g                   # -- Begin function fn7_g
 	.globl	fn7_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
@@ -3084,9 +3084,9 @@ fn7_g:                                  # @fn7_g
 	.endfunc
 .Lfunc_end150:
 	.size	fn7_g, .Lfunc_end150-fn7_g
-
+                                        # -- End function
 	.section	.text.fn8_g,"ax",@progbits
-	.hidden	fn8_g
+	.hidden	fn8_g                   # -- Begin function fn8_g
 	.globl	fn8_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
@@ -3102,9 +3102,9 @@ fn8_g:                                  # @fn8_g
 	.endfunc
 .Lfunc_end151:
 	.size	fn8_g, .Lfunc_end151-fn8_g
-
+                                        # -- End function
 	.section	.text.fn9_g,"ax",@progbits
-	.hidden	fn9_g
+	.hidden	fn9_g                   # -- Begin function fn9_g
 	.globl	fn9_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
@@ -3120,9 +3120,9 @@ fn9_g:                                  # @fn9_g
 	.endfunc
 .Lfunc_end152:
 	.size	fn9_g, .Lfunc_end152-fn9_g
-
+                                        # -- End function
 	.section	.text.fn1_h,"ax",@progbits
-	.hidden	fn1_h
+	.hidden	fn1_h                   # -- Begin function fn1_h
 	.globl	fn1_h
 	.type	fn1_h,@function
 fn1_h:                                  # @fn1_h
@@ -3145,9 +3145,9 @@ fn1_h:                                  # @fn1_h
 	.endfunc
 .Lfunc_end153:
 	.size	fn1_h, .Lfunc_end153-fn1_h
-
+                                        # -- End function
 	.section	.text.fn2_h,"ax",@progbits
-	.hidden	fn2_h
+	.hidden	fn2_h                   # -- Begin function fn2_h
 	.globl	fn2_h
 	.type	fn2_h,@function
 fn2_h:                                  # @fn2_h
@@ -3174,9 +3174,9 @@ fn2_h:                                  # @fn2_h
 	.endfunc
 .Lfunc_end154:
 	.size	fn2_h, .Lfunc_end154-fn2_h
-
+                                        # -- End function
 	.section	.text.fn3_h,"ax",@progbits
-	.hidden	fn3_h
+	.hidden	fn3_h                   # -- Begin function fn3_h
 	.globl	fn3_h
 	.type	fn3_h,@function
 fn3_h:                                  # @fn3_h
@@ -3199,9 +3199,9 @@ fn3_h:                                  # @fn3_h
 	.endfunc
 .Lfunc_end155:
 	.size	fn3_h, .Lfunc_end155-fn3_h
-
+                                        # -- End function
 	.section	.text.fn4_h,"ax",@progbits
-	.hidden	fn4_h
+	.hidden	fn4_h                   # -- Begin function fn4_h
 	.globl	fn4_h
 	.type	fn4_h,@function
 fn4_h:                                  # @fn4_h
@@ -3224,9 +3224,9 @@ fn4_h:                                  # @fn4_h
 	.endfunc
 .Lfunc_end156:
 	.size	fn4_h, .Lfunc_end156-fn4_h
-
+                                        # -- End function
 	.section	.text.fn5_h,"ax",@progbits
-	.hidden	fn5_h
+	.hidden	fn5_h                   # -- Begin function fn5_h
 	.globl	fn5_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
@@ -3242,9 +3242,9 @@ fn5_h:                                  # @fn5_h
 	.endfunc
 .Lfunc_end157:
 	.size	fn5_h, .Lfunc_end157-fn5_h
-
+                                        # -- End function
 	.section	.text.fn6_h,"ax",@progbits
-	.hidden	fn6_h
+	.hidden	fn6_h                   # -- Begin function fn6_h
 	.globl	fn6_h
 	.type	fn6_h,@function
 fn6_h:                                  # @fn6_h
@@ -3267,9 +3267,9 @@ fn6_h:                                  # @fn6_h
 	.endfunc
 .Lfunc_end158:
 	.size	fn6_h, .Lfunc_end158-fn6_h
-
+                                        # -- End function
 	.section	.text.fn7_h,"ax",@progbits
-	.hidden	fn7_h
+	.hidden	fn7_h                   # -- Begin function fn7_h
 	.globl	fn7_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
@@ -3285,9 +3285,9 @@ fn7_h:                                  # @fn7_h
 	.endfunc
 .Lfunc_end159:
 	.size	fn7_h, .Lfunc_end159-fn7_h
-
+                                        # -- End function
 	.section	.text.fn8_h,"ax",@progbits
-	.hidden	fn8_h
+	.hidden	fn8_h                   # -- Begin function fn8_h
 	.globl	fn8_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
@@ -3303,9 +3303,9 @@ fn8_h:                                  # @fn8_h
 	.endfunc
 .Lfunc_end160:
 	.size	fn8_h, .Lfunc_end160-fn8_h
-
+                                        # -- End function
 	.section	.text.fn9_h,"ax",@progbits
-	.hidden	fn9_h
+	.hidden	fn9_h                   # -- Begin function fn9_h
 	.globl	fn9_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
@@ -3321,9 +3321,9 @@ fn9_h:                                  # @fn9_h
 	.endfunc
 .Lfunc_end161:
 	.size	fn9_h, .Lfunc_end161-fn9_h
-
+                                        # -- End function
 	.section	.text.fn1_i,"ax",@progbits
-	.hidden	fn1_i
+	.hidden	fn1_i                   # -- Begin function fn1_i
 	.globl	fn1_i
 	.type	fn1_i,@function
 fn1_i:                                  # @fn1_i
@@ -3346,9 +3346,9 @@ fn1_i:                                  # @fn1_i
 	.endfunc
 .Lfunc_end162:
 	.size	fn1_i, .Lfunc_end162-fn1_i
-
+                                        # -- End function
 	.section	.text.fn2_i,"ax",@progbits
-	.hidden	fn2_i
+	.hidden	fn2_i                   # -- Begin function fn2_i
 	.globl	fn2_i
 	.type	fn2_i,@function
 fn2_i:                                  # @fn2_i
@@ -3375,9 +3375,9 @@ fn2_i:                                  # @fn2_i
 	.endfunc
 .Lfunc_end163:
 	.size	fn2_i, .Lfunc_end163-fn2_i
-
+                                        # -- End function
 	.section	.text.fn3_i,"ax",@progbits
-	.hidden	fn3_i
+	.hidden	fn3_i                   # -- Begin function fn3_i
 	.globl	fn3_i
 	.type	fn3_i,@function
 fn3_i:                                  # @fn3_i
@@ -3402,9 +3402,9 @@ fn3_i:                                  # @fn3_i
 	.endfunc
 .Lfunc_end164:
 	.size	fn3_i, .Lfunc_end164-fn3_i
-
+                                        # -- End function
 	.section	.text.fn4_i,"ax",@progbits
-	.hidden	fn4_i
+	.hidden	fn4_i                   # -- Begin function fn4_i
 	.globl	fn4_i
 	.type	fn4_i,@function
 fn4_i:                                  # @fn4_i
@@ -3427,38 +3427,21 @@ fn4_i:                                  # @fn4_i
 	.endfunc
 .Lfunc_end165:
 	.size	fn4_i, .Lfunc_end165-fn4_i
-
+                                        # -- End function
 	.section	.text.fn5_i,"ax",@progbits
-	.hidden	fn5_i
+	.hidden	fn5_i                   # -- Begin function fn5_i
 	.globl	fn5_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, c($pop14)
-	tee_local	$push12=, $1=, $pop13
-	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.const	$push5=, 1
-	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 19
-	i32.rem_u	$push8=, $pop6, $pop7
-	i32.const	$push11=, 5
-	i32.shl 	$push9=, $pop8, $pop11
-	i32.const	$push1=, -33
-	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push10=, $pop9, $pop2
-	i32.store	c($pop0), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
 	.size	fn5_i, .Lfunc_end166-fn5_i
-
+                                        # -- End function
 	.section	.text.fn6_i,"ax",@progbits
-	.hidden	fn6_i
+	.hidden	fn6_i                   # -- Begin function fn6_i
 	.globl	fn6_i
 	.type	fn6_i,@function
 fn6_i:                                  # @fn6_i
@@ -3483,9 +3466,9 @@ fn6_i:                                  # @fn6_i
 	.endfunc
 .Lfunc_end167:
 	.size	fn6_i, .Lfunc_end167-fn6_i
-
+                                        # -- End function
 	.section	.text.fn7_i,"ax",@progbits
-	.hidden	fn7_i
+	.hidden	fn7_i                   # -- Begin function fn7_i
 	.globl	fn7_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
@@ -3501,9 +3484,9 @@ fn7_i:                                  # @fn7_i
 	.endfunc
 .Lfunc_end168:
 	.size	fn7_i, .Lfunc_end168-fn7_i
-
+                                        # -- End function
 	.section	.text.fn8_i,"ax",@progbits
-	.hidden	fn8_i
+	.hidden	fn8_i                   # -- Begin function fn8_i
 	.globl	fn8_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
@@ -3519,9 +3502,9 @@ fn8_i:                                  # @fn8_i
 	.endfunc
 .Lfunc_end169:
 	.size	fn8_i, .Lfunc_end169-fn8_i
-
+                                        # -- End function
 	.section	.text.fn9_i,"ax",@progbits
-	.hidden	fn9_i
+	.hidden	fn9_i                   # -- Begin function fn9_i
 	.globl	fn9_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
@@ -3537,9 +3520,9 @@ fn9_i:                                  # @fn9_i
 	.endfunc
 .Lfunc_end170:
 	.size	fn9_i, .Lfunc_end170-fn9_i
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -3559,7 +3542,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end171:
 	.size	main, .Lfunc_end171-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -3588,4 +3571,4 @@ d:
 	.size	d, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040706-1.c.s b/test/torture-s/20040706-1.c.s
index 2719a751c..dcdb345b3 100644
--- a/test/torture-s/20040706-1.c.s
+++ b/test/torture-s/20040706-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040706-1.c"
+	.file	"20040706-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040707-1.c.s b/test/torture-s/20040707-1.c.s
index 904372313..e9e2c3718 100644
--- a/test/torture-s/20040707-1.c.s
+++ b/test/torture-s/20040707-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040707-1.c"
+	.file	"20040707-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,7 +25,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040709-1.c.s b/test/torture-s/20040709-1.c.s
index 5987fa3d3..d448de3d0 100644
--- a/test/torture-s/20040709-1.c.s
+++ b/test/torture-s/20040709-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040709-1.c"
+	.file	"20040709-1.c"
 	.section	.text.myrnd,"ax",@progbits
-	.hidden	myrnd
+	.hidden	myrnd                   # -- Begin function myrnd
 	.globl	myrnd
 	.type	myrnd,@function
 myrnd:                                  # @myrnd
@@ -25,9 +25,9 @@ myrnd:                                  # @myrnd
 	.endfunc
 .Lfunc_end0:
 	.size	myrnd, .Lfunc_end0-myrnd
-
+                                        # -- End function
 	.section	.text.retmeA,"ax",@progbits
-	.hidden	retmeA
+	.hidden	retmeA                  # -- Begin function retmeA
 	.globl	retmeA
 	.type	retmeA,@function
 retmeA:                                 # @retmeA
@@ -39,9 +39,9 @@ retmeA:                                 # @retmeA
 	.endfunc
 .Lfunc_end1:
 	.size	retmeA, .Lfunc_end1-retmeA
-
+                                        # -- End function
 	.section	.text.fn1A,"ax",@progbits
-	.hidden	fn1A
+	.hidden	fn1A                    # -- Begin function fn1A
 	.globl	fn1A
 	.type	fn1A,@function
 fn1A:                                   # @fn1A
@@ -59,9 +59,9 @@ fn1A:                                   # @fn1A
 	.endfunc
 .Lfunc_end2:
 	.size	fn1A, .Lfunc_end2-fn1A
-
+                                        # -- End function
 	.section	.text.fn2A,"ax",@progbits
-	.hidden	fn2A
+	.hidden	fn2A                    # -- Begin function fn2A
 	.globl	fn2A
 	.type	fn2A,@function
 fn2A:                                   # @fn2A
@@ -81,9 +81,9 @@ fn2A:                                   # @fn2A
 	.endfunc
 .Lfunc_end3:
 	.size	fn2A, .Lfunc_end3-fn2A
-
+                                        # -- End function
 	.section	.text.retitA,"ax",@progbits
-	.hidden	retitA
+	.hidden	retitA                  # -- Begin function retitA
 	.globl	retitA
 	.type	retitA,@function
 retitA:                                 # @retitA
@@ -97,9 +97,9 @@ retitA:                                 # @retitA
 	.endfunc
 .Lfunc_end4:
 	.size	retitA, .Lfunc_end4-retitA
-
+                                        # -- End function
 	.section	.text.fn3A,"ax",@progbits
-	.hidden	fn3A
+	.hidden	fn3A                    # -- Begin function fn3A
 	.globl	fn3A
 	.type	fn3A,@function
 fn3A:                                   # @fn3A
@@ -120,9 +120,9 @@ fn3A:                                   # @fn3A
 	.endfunc
 .Lfunc_end5:
 	.size	fn3A, .Lfunc_end5-fn3A
-
+                                        # -- End function
 	.section	.text.testA,"ax",@progbits
-	.hidden	testA
+	.hidden	testA                   # -- Begin function testA
 	.globl	testA
 	.type	testA,@function
 testA:                                  # @testA
@@ -171,7 +171,7 @@ testA:                                  # @testA
 	i32.mul 	$push9=, $1, $pop61
 	i32.const	$push60=, 12345
 	i32.add 	$push59=, $pop9, $pop60
-	tee_local	$push58=, $2=, $pop59
+	tee_local	$push58=, $3=, $pop59
 	i32.const	$push57=, 1103515245
 	i32.mul 	$push10=, $pop58, $pop57
 	i32.const	$push56=, 12345
@@ -180,10 +180,10 @@ testA:                                  # @testA
 	i32.store	myrnd.s($pop62), $pop54
 	i32.const	$push53=, 0
 	i32.const	$push52=, 16
-	i32.shr_u	$push11=, $2, $pop52
+	i32.shr_u	$push11=, $3, $pop52
 	i32.const	$push51=, 2047
 	i32.and 	$push50=, $pop11, $pop51
-	tee_local	$push49=, $2=, $pop50
+	tee_local	$push49=, $3=, $pop50
 	i32.const	$push48=, 17
 	i32.shl 	$push12=, $pop49, $pop48
 	i32.const	$push47=, 0
@@ -191,7 +191,7 @@ testA:                                  # @testA
 	tee_local	$push45=, $0=, $pop46
 	i32.const	$push44=, 131071
 	i32.and 	$push43=, $pop45, $pop44
-	tee_local	$push42=, $3=, $pop43
+	tee_local	$push42=, $2=, $pop43
 	i32.or  	$push41=, $pop12, $pop42
 	tee_local	$push40=, $4=, $pop41
 	i32.store	sA($pop53), $pop40
@@ -201,7 +201,7 @@ testA:                                  # @testA
 	i32.const	$push38=, 2047
 	i32.and 	$push37=, $pop13, $pop38
 	tee_local	$push36=, $5=, $pop37
-	i32.add 	$push14=, $pop36, $2
+	i32.add 	$push14=, $pop36, $3
 	i32.const	$push35=, 17
 	i32.shl 	$push15=, $5, $pop35
 	i32.add 	$push16=, $pop15, $4
@@ -220,14 +220,14 @@ testA:                                  # @testA
 	i32.mul 	$push22=, $pop106, $pop105
 	i32.const	$push104=, 12345
 	i32.add 	$push103=, $pop22, $pop104
-	tee_local	$push102=, $2=, $pop103
+	tee_local	$push102=, $3=, $pop103
 	i32.store	myrnd.s($pop108), $pop102
 	i32.const	$push101=, 0
 	i32.const	$push100=, 16
-	i32.shr_u	$push26=, $2, $pop100
+	i32.shr_u	$push26=, $3, $pop100
 	i32.const	$push99=, 2047
 	i32.and 	$push98=, $pop26, $pop99
-	tee_local	$push97=, $2=, $pop98
+	tee_local	$push97=, $3=, $pop98
 	i32.const	$push96=, 17
 	i32.shl 	$push27=, $pop97, $pop96
 	i32.const	$push95=, 16
@@ -237,7 +237,7 @@ testA:                                  # @testA
 	tee_local	$push92=, $4=, $pop93
 	i32.const	$push91=, 17
 	i32.shl 	$push24=, $pop92, $pop91
-	i32.or  	$push25=, $pop24, $3
+	i32.or  	$push25=, $pop24, $2
 	i32.add 	$push90=, $pop27, $pop25
 	tee_local	$push89=, $1=, $pop90
 	i32.store	sA($pop101), $pop89
@@ -246,23 +246,23 @@ testA:                                  # @testA
 	i32.and 	$push29=, $pop28, $pop88
 	br_if   	0, $pop29       # 0: down to label0
 # BB#2:                                 # %lor.lhs.false125
-	i32.add 	$push32=, $2, $4
+	i32.add 	$push32=, $3, $4
 	i32.const	$push30=, 17
 	i32.shr_u	$push31=, $1, $pop30
 	i32.ne  	$push33=, $pop32, $pop31
 	br_if   	0, $pop33       # 0: down to label0
 # BB#3:                                 # %if.end131
 	return
-.LBB6_4:                                # %if.then130
+.LBB6_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	testA, .Lfunc_end6-testA
-
+                                        # -- End function
 	.section	.text.retmeB,"ax",@progbits
-	.hidden	retmeB
+	.hidden	retmeB                  # -- Begin function retmeB
 	.globl	retmeB
 	.type	retmeB,@function
 retmeB:                                 # @retmeB
@@ -274,29 +274,29 @@ retmeB:                                 # @retmeB
 	.endfunc
 .Lfunc_end7:
 	.size	retmeB, .Lfunc_end7-retmeB
-
+                                        # -- End function
 	.section	.text.fn1B,"ax",@progbits
-	.hidden	fn1B
+	.hidden	fn1B                    # -- Begin function fn1B
 	.globl	fn1B
 	.type	fn1B,@function
 fn1B:                                   # @fn1B
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 0
-	i32.load	$push3=, sB($pop2)
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push4=, $pop3, $pop1
+	i32.const	$push2=, 0
+	i32.load	$push3=, sB($pop2)
+	i32.add 	$push4=, $pop1, $pop3
 	i32.const	$push6=, 17
 	i32.shr_u	$push5=, $pop4, $pop6
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end8:
 	.size	fn1B, .Lfunc_end8-fn1B
-
+                                        # -- End function
 	.section	.text.fn2B,"ax",@progbits
-	.hidden	fn2B
+	.hidden	fn2B                    # -- Begin function fn2B
 	.globl	fn2B
 	.type	fn2B,@function
 fn2B:                                   # @fn2B
@@ -316,9 +316,9 @@ fn2B:                                   # @fn2B
 	.endfunc
 .Lfunc_end9:
 	.size	fn2B, .Lfunc_end9-fn2B
-
+                                        # -- End function
 	.section	.text.retitB,"ax",@progbits
-	.hidden	retitB
+	.hidden	retitB                  # -- Begin function retitB
 	.globl	retitB
 	.type	retitB,@function
 retitB:                                 # @retitB
@@ -332,9 +332,9 @@ retitB:                                 # @retitB
 	.endfunc
 .Lfunc_end10:
 	.size	retitB, .Lfunc_end10-retitB
-
+                                        # -- End function
 	.section	.text.fn3B,"ax",@progbits
-	.hidden	fn3B
+	.hidden	fn3B                    # -- Begin function fn3B
 	.globl	fn3B
 	.type	fn3B,@function
 fn3B:                                   # @fn3B
@@ -355,201 +355,185 @@ fn3B:                                   # @fn3B
 	.endfunc
 .Lfunc_end11:
 	.size	fn3B, .Lfunc_end11-fn3B
-
+                                        # -- End function
 	.section	.text.testB,"ax",@progbits
-	.hidden	testB
+	.hidden	testB                   # -- Begin function testB
 	.globl	testB
 	.type	testB,@function
 testB:                                  # @testB
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push124=, 0
-	i32.const	$push123=, 0
-	i32.load	$push0=, myrnd.s($pop123)
-	i32.const	$push122=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop122
-	i32.const	$push121=, 12345
-	i32.add 	$push120=, $pop1, $pop121
-	tee_local	$push119=, $0=, $pop120
-	i32.const	$push118=, 16
-	i32.shr_u	$push2=, $pop119, $pop118
-	i32.store8	sB($pop124), $pop2
-	i32.const	$push117=, 0
-	i32.const	$push116=, 1103515245
-	i32.mul 	$push3=, $0, $pop116
-	i32.const	$push115=, 12345
-	i32.add 	$push114=, $pop3, $pop115
-	tee_local	$push113=, $0=, $pop114
-	i32.const	$push112=, 16
-	i32.shr_u	$push4=, $pop113, $pop112
-	i32.store8	sB+1($pop117), $pop4
-	i32.const	$push111=, 0
-	i32.const	$push110=, 1103515245
-	i32.mul 	$push5=, $0, $pop110
-	i32.const	$push109=, 12345
-	i32.add 	$push108=, $pop5, $pop109
-	tee_local	$push107=, $0=, $pop108
-	i32.const	$push106=, 16
-	i32.shr_u	$push6=, $pop107, $pop106
-	i32.store8	sB+2($pop111), $pop6
-	i32.const	$push105=, 0
-	i32.const	$push104=, 1103515245
-	i32.mul 	$push7=, $0, $pop104
-	i32.const	$push103=, 12345
-	i32.add 	$push102=, $pop7, $pop103
-	tee_local	$push101=, $0=, $pop102
-	i32.const	$push100=, 16
-	i32.shr_u	$push8=, $pop101, $pop100
-	i32.store8	sB+3($pop105), $pop8
-	i32.const	$push99=, 0
-	i32.const	$push98=, 1103515245
-	i32.mul 	$push9=, $0, $pop98
-	i32.const	$push97=, 12345
-	i32.add 	$push96=, $pop9, $pop97
-	tee_local	$push95=, $0=, $pop96
-	i32.const	$push94=, 16
-	i32.shr_u	$push10=, $pop95, $pop94
-	i32.store8	sB+4($pop99), $pop10
-	i32.const	$push93=, 0
-	i32.const	$push92=, 1103515245
-	i32.mul 	$push11=, $0, $pop92
-	i32.const	$push91=, 12345
-	i32.add 	$push90=, $pop11, $pop91
-	tee_local	$push89=, $0=, $pop90
-	i32.const	$push88=, 16
-	i32.shr_u	$push12=, $pop89, $pop88
-	i32.store8	sB+5($pop93), $pop12
-	i32.const	$push87=, 0
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push13=, $0, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop13, $pop85
-	tee_local	$push83=, $0=, $pop84
-	i32.const	$push82=, 16
-	i32.shr_u	$push14=, $pop83, $pop82
-	i32.store8	sB+6($pop87), $pop14
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push15=, $0, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop15, $pop79
-	tee_local	$push77=, $0=, $pop78
-	i32.const	$push76=, 16
-	i32.shr_u	$push16=, $pop77, $pop76
-	i32.store8	sB+7($pop81), $pop16
-	i32.const	$push75=, 0
-	i32.load	$1=, sB($pop75)
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push17=, $0, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop17, $pop72
-	tee_local	$push70=, $3=, $pop71
+	i32.const	$push119=, 0
+	i32.const	$push118=, 0
+	i32.load	$push0=, myrnd.s($pop118)
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$push115=, $pop1, $pop116
+	tee_local	$push114=, $1=, $pop115
+	i32.const	$push113=, 16
+	i32.shr_u	$push2=, $pop114, $pop113
+	i32.store8	sB($pop119), $pop2
+	i32.const	$push112=, 0
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push3=, $1, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$push109=, $pop3, $pop110
+	tee_local	$push108=, $1=, $pop109
+	i32.const	$push107=, 16
+	i32.shr_u	$push4=, $pop108, $pop107
+	i32.store8	sB+1($pop112), $pop4
+	i32.const	$push106=, 0
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push5=, $1, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$push103=, $pop5, $pop104
+	tee_local	$push102=, $1=, $pop103
+	i32.const	$push101=, 16
+	i32.shr_u	$push6=, $pop102, $pop101
+	i32.store8	sB+2($pop106), $pop6
+	i32.const	$push100=, 0
+	i32.const	$push99=, 1103515245
+	i32.mul 	$push7=, $1, $pop99
+	i32.const	$push98=, 12345
+	i32.add 	$push97=, $pop7, $pop98
+	tee_local	$push96=, $1=, $pop97
+	i32.const	$push95=, 16
+	i32.shr_u	$push8=, $pop96, $pop95
+	i32.store8	sB+3($pop100), $pop8
+	i32.const	$push94=, 0
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push9=, $1, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$push91=, $pop9, $pop92
+	tee_local	$push90=, $1=, $pop91
+	i32.const	$push89=, 16
+	i32.shr_u	$push10=, $pop90, $pop89
+	i32.store8	sB+4($pop94), $pop10
+	i32.const	$push88=, 0
+	i32.const	$push87=, 1103515245
+	i32.mul 	$push11=, $1, $pop87
+	i32.const	$push86=, 12345
+	i32.add 	$push85=, $pop11, $pop86
+	tee_local	$push84=, $1=, $pop85
+	i32.const	$push83=, 16
+	i32.shr_u	$push12=, $pop84, $pop83
+	i32.store8	sB+5($pop88), $pop12
+	i32.const	$push82=, 0
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push13=, $1, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$push79=, $pop13, $pop80
+	tee_local	$push78=, $1=, $pop79
+	i32.const	$push77=, 16
+	i32.shr_u	$push14=, $pop78, $pop77
+	i32.store8	sB+6($pop82), $pop14
+	i32.const	$push76=, 0
+	i32.const	$push75=, 1103515245
+	i32.mul 	$push15=, $1, $pop75
+	i32.const	$push74=, 12345
+	i32.add 	$push73=, $pop15, $pop74
+	tee_local	$push72=, $1=, $pop73
+	i32.const	$push71=, 16
+	i32.shr_u	$push16=, $pop72, $pop71
+	i32.store8	sB+7($pop76), $pop16
+	i32.const	$push70=, 0
 	i32.const	$push69=, 1103515245
-	i32.mul 	$push18=, $pop70, $pop69
+	i32.mul 	$push17=, $1, $pop69
 	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop18, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.store	myrnd.s($pop74), $pop66
-	i32.const	$push65=, 0
-	i32.const	$push64=, 16
-	i32.shr_u	$push20=, $3, $pop64
-	i32.const	$push63=, 2047
-	i32.and 	$push62=, $pop20, $pop63
-	tee_local	$push61=, $3=, $pop62
-	i32.const	$push60=, 17
-	i32.shl 	$push21=, $pop61, $pop60
-	i32.const	$push59=, 131071
-	i32.and 	$push19=, $1, $pop59
-	i32.or  	$push58=, $pop21, $pop19
-	tee_local	$push57=, $1=, $pop58
-	i32.store	sB($pop65), $pop57
+	i32.add 	$push67=, $pop17, $pop68
+	tee_local	$push66=, $3=, $pop67
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push18=, $pop66, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$push63=, $pop18, $pop64
+	tee_local	$push62=, $1=, $pop63
+	i32.store	myrnd.s($pop70), $pop62
+	i32.const	$push61=, 0
+	i32.const	$push60=, 16
+	i32.shr_u	$push19=, $3, $pop60
+	i32.const	$push59=, 2047
+	i32.and 	$push58=, $pop19, $pop59
+	tee_local	$push57=, $3=, $pop58
+	i32.const	$push56=, 17
+	i32.shl 	$push20=, $pop57, $pop56
+	i32.const	$push55=, 0
+	i32.load	$push54=, sB($pop55)
+	tee_local	$push53=, $0=, $pop54
+	i32.const	$push52=, 131071
+	i32.and 	$push51=, $pop53, $pop52
+	tee_local	$push50=, $2=, $pop51
+	i32.or  	$push49=, $pop20, $pop50
+	tee_local	$push48=, $4=, $pop49
+	i32.store	sB($pop61), $pop48
 	block   	
-	i32.const	$push56=, 16
-	i32.shr_u	$push22=, $0, $pop56
-	i32.const	$push55=, 2047
-	i32.and 	$push54=, $pop22, $pop55
-	tee_local	$push53=, $4=, $pop54
-	i32.add 	$push23=, $pop53, $3
-	i32.const	$push52=, 17
-	i32.shl 	$push24=, $4, $pop52
-	i32.add 	$push25=, $pop24, $1
-	i32.const	$push51=, 17
-	i32.shr_u	$push26=, $pop25, $pop51
-	i32.ne  	$push27=, $pop23, $pop26
-	br_if   	0, $pop27       # 0: down to label1
+	i32.const	$push47=, 16
+	i32.shr_u	$push21=, $1, $pop47
+	i32.const	$push46=, 2047
+	i32.and 	$push45=, $pop21, $pop46
+	tee_local	$push44=, $5=, $pop45
+	i32.add 	$push22=, $pop44, $3
+	i32.const	$push43=, 17
+	i32.shl 	$push23=, $5, $pop43
+	i32.add 	$push24=, $pop23, $4
+	i32.const	$push42=, 17
+	i32.shr_u	$push25=, $pop24, $pop42
+	i32.ne  	$push26=, $pop22, $pop25
+	br_if   	0, $pop26       # 0: down to label1
 # BB#1:                                 # %if.end76
-	i32.const	$push153=, 0
-	i32.const	$push152=, 1103515245
-	i32.mul 	$push28=, $0, $pop152
-	i32.const	$push151=, 12345
-	i32.add 	$push150=, $pop28, $pop151
-	tee_local	$push149=, $3=, $pop150
-	i32.const	$push29=, -1029531031
-	i32.mul 	$push30=, $pop149, $pop29
-	i32.const	$push31=, -740551042
-	i32.add 	$push148=, $pop30, $pop31
-	tee_local	$push147=, $0=, $pop148
-	i32.const	$push146=, 1103515245
-	i32.mul 	$push32=, $pop147, $pop146
-	i32.const	$push145=, 12345
-	i32.add 	$push144=, $pop32, $pop145
-	tee_local	$push143=, $4=, $pop144
-	i32.store	myrnd.s($pop153), $pop143
-	i32.const	$push142=, 0
-	i32.const	$push141=, 16
-	i32.shr_u	$push36=, $4, $pop141
-	i32.const	$push140=, 2047
-	i32.and 	$push139=, $pop36, $pop140
-	tee_local	$push138=, $4=, $pop139
-	i32.const	$push137=, 17
-	i32.shl 	$push37=, $pop138, $pop137
-	i32.const	$push136=, 16
-	i32.shr_u	$push33=, $0, $pop136
-	i32.const	$push135=, 2047
-	i32.and 	$push134=, $pop33, $pop135
-	tee_local	$push133=, $2=, $pop134
-	i32.const	$push132=, 17
-	i32.shl 	$push34=, $pop133, $pop132
-	i32.const	$push131=, 131071
-	i32.and 	$push130=, $1, $pop131
-	tee_local	$push129=, $1=, $pop130
-	i32.or  	$push35=, $pop34, $pop129
-	i32.add 	$push128=, $pop37, $pop35
-	tee_local	$push127=, $0=, $pop128
-	i32.store	sB($pop142), $pop127
-	i32.const	$push38=, 1
-	i32.shl 	$push39=, $3, $pop38
-	i32.const	$push40=, 268304384
-	i32.and 	$push41=, $pop39, $pop40
-	i32.or  	$push42=, $pop41, $1
-	i32.xor 	$push126=, $0, $pop42
-	tee_local	$push125=, $1=, $pop126
-	i32.const	$push43=, 63
-	i32.and 	$push44=, $pop125, $pop43
-	br_if   	0, $pop44       # 0: down to label1
-# BB#2:                                 # %lor.lhs.false91
-	i32.add 	$push48=, $4, $2
-	i32.const	$push46=, 17
-	i32.shr_u	$push47=, $0, $pop46
-	i32.ne  	$push49=, $pop48, $pop47
-	br_if   	0, $pop49       # 0: down to label1
-# BB#3:                                 # %lor.lhs.false91
-	i32.const	$push50=, 131008
-	i32.and 	$push45=, $1, $pop50
-	br_if   	0, $pop45       # 0: down to label1
-# BB#4:                                 # %if.end115
+	i32.const	$push140=, 0
+	i32.const	$push27=, -2139243339
+	i32.mul 	$push28=, $1, $pop27
+	i32.const	$push29=, -1492899873
+	i32.add 	$push139=, $pop28, $pop29
+	tee_local	$push138=, $1=, $pop139
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push30=, $pop138, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$push135=, $pop30, $pop136
+	tee_local	$push134=, $3=, $pop135
+	i32.store	myrnd.s($pop140), $pop134
+	i32.const	$push133=, 0
+	i32.const	$push132=, 16
+	i32.shr_u	$push34=, $3, $pop132
+	i32.const	$push131=, 2047
+	i32.and 	$push130=, $pop34, $pop131
+	tee_local	$push129=, $3=, $pop130
+	i32.const	$push128=, 17
+	i32.shl 	$push35=, $pop129, $pop128
+	i32.const	$push127=, 16
+	i32.shr_u	$push31=, $1, $pop127
+	i32.const	$push126=, 2047
+	i32.and 	$push125=, $pop31, $pop126
+	tee_local	$push124=, $4=, $pop125
+	i32.const	$push123=, 17
+	i32.shl 	$push32=, $pop124, $pop123
+	i32.or  	$push33=, $pop32, $2
+	i32.add 	$push122=, $pop35, $pop33
+	tee_local	$push121=, $1=, $pop122
+	i32.store	sB($pop133), $pop121
+	i32.xor 	$push36=, $1, $0
+	i32.const	$push120=, 131071
+	i32.and 	$push37=, $pop36, $pop120
+	br_if   	0, $pop37       # 0: down to label1
+# BB#2:                                 # %lor.lhs.false109
+	i32.add 	$push40=, $3, $4
+	i32.const	$push38=, 17
+	i32.shr_u	$push39=, $1, $pop38
+	i32.ne  	$push41=, $pop40, $pop39
+	br_if   	0, $pop41       # 0: down to label1
+# BB#3:                                 # %if.end115
 	return
-.LBB12_5:                               # %if.then114
+.LBB12_4:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	testB, .Lfunc_end12-testB
-
+                                        # -- End function
 	.section	.text.retmeC,"ax",@progbits
-	.hidden	retmeC
+	.hidden	retmeC                  # -- Begin function retmeC
 	.globl	retmeC
 	.type	retmeC,@function
 retmeC:                                 # @retmeC
@@ -561,29 +545,29 @@ retmeC:                                 # @retmeC
 	.endfunc
 .Lfunc_end13:
 	.size	retmeC, .Lfunc_end13-retmeC
-
+                                        # -- End function
 	.section	.text.fn1C,"ax",@progbits
-	.hidden	fn1C
+	.hidden	fn1C                    # -- Begin function fn1C
 	.globl	fn1C
 	.type	fn1C,@function
 fn1C:                                   # @fn1C
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 0
-	i32.load	$push3=, sC+4($pop2)
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push4=, $pop3, $pop1
+	i32.const	$push2=, 0
+	i32.load	$push3=, sC+4($pop2)
+	i32.add 	$push4=, $pop1, $pop3
 	i32.const	$push6=, 17
 	i32.shr_u	$push5=, $pop4, $pop6
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end14:
 	.size	fn1C, .Lfunc_end14-fn1C
-
+                                        # -- End function
 	.section	.text.fn2C,"ax",@progbits
-	.hidden	fn2C
+	.hidden	fn2C                    # -- Begin function fn2C
 	.globl	fn2C
 	.type	fn2C,@function
 fn2C:                                   # @fn2C
@@ -603,9 +587,9 @@ fn2C:                                   # @fn2C
 	.endfunc
 .Lfunc_end15:
 	.size	fn2C, .Lfunc_end15-fn2C
-
+                                        # -- End function
 	.section	.text.retitC,"ax",@progbits
-	.hidden	retitC
+	.hidden	retitC                  # -- Begin function retitC
 	.globl	retitC
 	.type	retitC,@function
 retitC:                                 # @retitC
@@ -619,9 +603,9 @@ retitC:                                 # @retitC
 	.endfunc
 .Lfunc_end16:
 	.size	retitC, .Lfunc_end16-retitC
-
+                                        # -- End function
 	.section	.text.fn3C,"ax",@progbits
-	.hidden	fn3C
+	.hidden	fn3C                    # -- Begin function fn3C
 	.globl	fn3C
 	.type	fn3C,@function
 fn3C:                                   # @fn3C
@@ -642,199 +626,185 @@ fn3C:                                   # @fn3C
 	.endfunc
 .Lfunc_end17:
 	.size	fn3C, .Lfunc_end17-fn3C
-
+                                        # -- End function
 	.section	.text.testC,"ax",@progbits
-	.hidden	testC
+	.hidden	testC                   # -- Begin function testC
 	.globl	testC
 	.type	testC,@function
 testC:                                  # @testC
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push125=, 0
-	i32.const	$push124=, 0
-	i32.load	$push0=, myrnd.s($pop124)
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop1, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push2=, $pop120, $pop119
-	i32.store8	sC($pop125), $pop2
+	i32.const	$push119=, 0
 	i32.const	$push118=, 0
+	i32.load	$push0=, myrnd.s($pop118)
 	i32.const	$push117=, 1103515245
-	i32.mul 	$push3=, $0, $pop117
+	i32.mul 	$push1=, $pop0, $pop117
 	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop3, $pop116
+	i32.add 	$push115=, $pop1, $pop116
 	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push4=, $pop114, $pop113
-	i32.store8	sC+1($pop118), $pop4
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push5=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop5, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push6=, $pop108, $pop107
-	i32.store8	sC+2($pop112), $pop6
-	i32.const	$push106=, 0
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push2=, $pop114, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$push111=, $pop2, $pop112
+	tee_local	$push110=, $1=, $pop111
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push3=, $pop110, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$push107=, $pop3, $pop108
+	tee_local	$push106=, $2=, $pop107
 	i32.const	$push105=, 1103515245
-	i32.mul 	$push7=, $0, $pop105
+	i32.mul 	$push4=, $pop106, $pop105
 	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop7, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push8=, $pop102, $pop101
-	i32.store8	sC+3($pop106), $pop8
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push9=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop9, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push10=, $pop96, $pop95
-	i32.store8	sC+4($pop100), $pop10
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push11=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop11, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push12=, $pop90, $pop89
-	i32.store8	sC+5($pop94), $pop12
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push13=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop13, $pop86
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push14=, $pop84, $pop83
-	i32.store8	sC+6($pop88), $pop14
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push15=, $0, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop15, $pop80
-	tee_local	$push78=, $0=, $pop79
+	i32.add 	$push103=, $pop4, $pop104
+	tee_local	$push102=, $3=, $pop103
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push5=, $pop102, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$push99=, $pop5, $pop100
+	tee_local	$push98=, $4=, $pop99
+	i32.const	$push97=, 16
+	i32.shr_u	$push6=, $pop98, $pop97
+	i32.store8	sC+4($pop119), $pop6
+	i32.const	$push96=, 0
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push7=, $4, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$push93=, $pop7, $pop94
+	tee_local	$push92=, $4=, $pop93
+	i32.const	$push91=, 16
+	i32.shr_u	$push8=, $pop92, $pop91
+	i32.store8	sC+5($pop96), $pop8
+	i32.const	$push90=, 0
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push9=, $4, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$push87=, $pop9, $pop88
+	tee_local	$push86=, $4=, $pop87
+	i32.const	$push85=, 16
+	i32.shr_u	$push10=, $pop86, $pop85
+	i32.store8	sC+6($pop90), $pop10
+	i32.const	$push84=, 0
+	i32.const	$push83=, 1103515245
+	i32.mul 	$push11=, $4, $pop83
+	i32.const	$push82=, 12345
+	i32.add 	$push81=, $pop11, $pop82
+	tee_local	$push80=, $4=, $pop81
+	i32.const	$push79=, 16
+	i32.shr_u	$push12=, $pop80, $pop79
+	i32.store8	sC+7($pop84), $pop12
+	i32.const	$push78=, 0
 	i32.const	$push77=, 16
-	i32.shr_u	$push16=, $pop78, $pop77
-	i32.store8	sC+7($pop82), $pop16
+	i32.shr_u	$push13=, $0, $pop77
+	i32.store8	sC($pop78), $pop13
 	i32.const	$push76=, 0
-	i32.load	$2=, sC+4($pop76)
-	i32.const	$push75=, 0
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push17=, $0, $pop74
-	i32.const	$push73=, 12345
-	i32.add 	$push72=, $pop17, $pop73
-	tee_local	$push71=, $1=, $pop72
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push18=, $pop71, $pop70
-	i32.const	$push69=, 12345
-	i32.add 	$push68=, $pop18, $pop69
-	tee_local	$push67=, $0=, $pop68
-	i32.store	myrnd.s($pop75), $pop67
-	i32.const	$push66=, 0
-	i32.const	$push65=, 16
-	i32.shr_u	$push20=, $1, $pop65
-	i32.const	$push64=, 2047
-	i32.and 	$push63=, $pop20, $pop64
-	tee_local	$push62=, $1=, $pop63
-	i32.const	$push61=, 17
-	i32.shl 	$push21=, $pop62, $pop61
-	i32.const	$push19=, 131071
-	i32.and 	$push60=, $2, $pop19
-	tee_local	$push59=, $2=, $pop60
-	i32.or  	$push58=, $pop21, $pop59
-	tee_local	$push57=, $3=, $pop58
-	i32.store	sC+4($pop66), $pop57
+	i32.const	$push75=, 16
+	i32.shr_u	$push14=, $1, $pop75
+	i32.store8	sC+1($pop76), $pop14
+	i32.const	$push74=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push15=, $2, $pop73
+	i32.store8	sC+2($pop74), $pop15
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push16=, $3, $pop71
+	i32.store8	sC+3($pop72), $pop16
+	i32.const	$push70=, 0
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push17=, $4, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$push67=, $pop17, $pop68
+	tee_local	$push66=, $1=, $pop67
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push18=, $pop66, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$push63=, $pop18, $pop64
+	tee_local	$push62=, $0=, $pop63
+	i32.store	myrnd.s($pop70), $pop62
+	i32.const	$push61=, 0
+	i32.const	$push60=, 16
+	i32.shr_u	$push19=, $1, $pop60
+	i32.const	$push59=, 2047
+	i32.and 	$push58=, $pop19, $pop59
+	tee_local	$push57=, $1=, $pop58
+	i32.const	$push56=, 17
+	i32.shl 	$push20=, $pop57, $pop56
+	i32.const	$push55=, 0
+	i32.load	$push54=, sC+4($pop55)
+	tee_local	$push53=, $2=, $pop54
+	i32.const	$push52=, 131071
+	i32.and 	$push51=, $pop53, $pop52
+	tee_local	$push50=, $3=, $pop51
+	i32.or  	$push49=, $pop20, $pop50
+	tee_local	$push48=, $4=, $pop49
+	i32.store	sC+4($pop61), $pop48
 	block   	
-	i32.const	$push56=, 16
-	i32.shr_u	$push22=, $0, $pop56
-	i32.const	$push55=, 2047
-	i32.and 	$push54=, $pop22, $pop55
-	tee_local	$push53=, $4=, $pop54
-	i32.add 	$push23=, $pop53, $1
-	i32.const	$push52=, 17
-	i32.shl 	$push24=, $4, $pop52
-	i32.add 	$push25=, $pop24, $3
-	i32.const	$push51=, 17
-	i32.shr_u	$push26=, $pop25, $pop51
-	i32.ne  	$push27=, $pop23, $pop26
-	br_if   	0, $pop27       # 0: down to label2
+	i32.const	$push47=, 16
+	i32.shr_u	$push21=, $0, $pop47
+	i32.const	$push46=, 2047
+	i32.and 	$push45=, $pop21, $pop46
+	tee_local	$push44=, $5=, $pop45
+	i32.add 	$push22=, $pop44, $1
+	i32.const	$push43=, 17
+	i32.shl 	$push23=, $5, $pop43
+	i32.add 	$push24=, $pop23, $4
+	i32.const	$push42=, 17
+	i32.shr_u	$push25=, $pop24, $pop42
+	i32.ne  	$push26=, $pop22, $pop25
+	br_if   	0, $pop26       # 0: down to label2
 # BB#1:                                 # %if.end80
-	i32.const	$push151=, 0
-	i32.const	$push150=, 1103515245
-	i32.mul 	$push28=, $0, $pop150
-	i32.const	$push149=, 12345
-	i32.add 	$push148=, $pop28, $pop149
-	tee_local	$push147=, $1=, $pop148
-	i32.const	$push29=, -1029531031
-	i32.mul 	$push30=, $pop147, $pop29
-	i32.const	$push31=, -740551042
-	i32.add 	$push146=, $pop30, $pop31
-	tee_local	$push145=, $0=, $pop146
-	i32.const	$push144=, 1103515245
-	i32.mul 	$push32=, $pop145, $pop144
-	i32.const	$push143=, 12345
-	i32.add 	$push142=, $pop32, $pop143
-	tee_local	$push141=, $3=, $pop142
-	i32.store	myrnd.s($pop151), $pop141
 	i32.const	$push140=, 0
-	i32.const	$push139=, 16
-	i32.shr_u	$push36=, $3, $pop139
-	i32.const	$push138=, 2047
-	i32.and 	$push137=, $pop36, $pop138
-	tee_local	$push136=, $3=, $pop137
-	i32.const	$push135=, 17
-	i32.shl 	$push37=, $pop136, $pop135
-	i32.const	$push134=, 16
-	i32.shr_u	$push33=, $0, $pop134
-	i32.const	$push133=, 2047
-	i32.and 	$push132=, $pop33, $pop133
-	tee_local	$push131=, $4=, $pop132
-	i32.const	$push130=, 17
-	i32.shl 	$push34=, $pop131, $pop130
-	i32.or  	$push35=, $pop34, $2
-	i32.add 	$push129=, $pop37, $pop35
-	tee_local	$push128=, $0=, $pop129
-	i32.store	sC+4($pop140), $pop128
-	i32.const	$push38=, 1
-	i32.shl 	$push39=, $1, $pop38
-	i32.const	$push40=, 268304384
-	i32.and 	$push41=, $pop39, $pop40
-	i32.or  	$push42=, $pop41, $2
-	i32.xor 	$push127=, $0, $pop42
-	tee_local	$push126=, $2=, $pop127
-	i32.const	$push43=, 63
-	i32.and 	$push44=, $pop126, $pop43
-	br_if   	0, $pop44       # 0: down to label2
-# BB#2:                                 # %lor.lhs.false96
-	i32.add 	$push48=, $3, $4
-	i32.const	$push46=, 17
-	i32.shr_u	$push47=, $0, $pop46
-	i32.ne  	$push49=, $pop48, $pop47
-	br_if   	0, $pop49       # 0: down to label2
-# BB#3:                                 # %lor.lhs.false96
-	i32.const	$push50=, 131008
-	i32.and 	$push45=, $2, $pop50
-	br_if   	0, $pop45       # 0: down to label2
-# BB#4:                                 # %if.end121
+	i32.const	$push27=, -2139243339
+	i32.mul 	$push28=, $0, $pop27
+	i32.const	$push29=, -1492899873
+	i32.add 	$push139=, $pop28, $pop29
+	tee_local	$push138=, $0=, $pop139
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push30=, $pop138, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$push135=, $pop30, $pop136
+	tee_local	$push134=, $1=, $pop135
+	i32.store	myrnd.s($pop140), $pop134
+	i32.const	$push133=, 0
+	i32.const	$push132=, 16
+	i32.shr_u	$push34=, $1, $pop132
+	i32.const	$push131=, 2047
+	i32.and 	$push130=, $pop34, $pop131
+	tee_local	$push129=, $1=, $pop130
+	i32.const	$push128=, 17
+	i32.shl 	$push35=, $pop129, $pop128
+	i32.const	$push127=, 16
+	i32.shr_u	$push31=, $0, $pop127
+	i32.const	$push126=, 2047
+	i32.and 	$push125=, $pop31, $pop126
+	tee_local	$push124=, $4=, $pop125
+	i32.const	$push123=, 17
+	i32.shl 	$push32=, $pop124, $pop123
+	i32.or  	$push33=, $pop32, $3
+	i32.add 	$push122=, $pop35, $pop33
+	tee_local	$push121=, $0=, $pop122
+	i32.store	sC+4($pop133), $pop121
+	i32.xor 	$push36=, $0, $2
+	i32.const	$push120=, 131071
+	i32.and 	$push37=, $pop36, $pop120
+	br_if   	0, $pop37       # 0: down to label2
+# BB#2:                                 # %lor.lhs.false115
+	i32.add 	$push40=, $1, $4
+	i32.const	$push38=, 17
+	i32.shr_u	$push39=, $0, $pop38
+	i32.ne  	$push41=, $pop40, $pop39
+	br_if   	0, $pop41       # 0: down to label2
+# BB#3:                                 # %if.end121
 	return
-.LBB18_5:                               # %if.then120
+.LBB18_4:                               # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end18:
 	.size	testC, .Lfunc_end18-testC
-
+                                        # -- End function
 	.section	.text.retmeD,"ax",@progbits
-	.hidden	retmeD
+	.hidden	retmeD                  # -- Begin function retmeD
 	.globl	retmeD
 	.type	retmeD,@function
 retmeD:                                 # @retmeD
@@ -846,9 +816,9 @@ retmeD:                                 # @retmeD
 	.endfunc
 .Lfunc_end19:
 	.size	retmeD, .Lfunc_end19-retmeD
-
+                                        # -- End function
 	.section	.text.fn1D,"ax",@progbits
-	.hidden	fn1D
+	.hidden	fn1D                    # -- Begin function fn1D
 	.globl	fn1D
 	.type	fn1D,@function
 fn1D:                                   # @fn1D
@@ -867,9 +837,9 @@ fn1D:                                   # @fn1D
 	.endfunc
 .Lfunc_end20:
 	.size	fn1D, .Lfunc_end20-fn1D
-
+                                        # -- End function
 	.section	.text.fn2D,"ax",@progbits
-	.hidden	fn2D
+	.hidden	fn2D                    # -- Begin function fn2D
 	.globl	fn2D
 	.type	fn2D,@function
 fn2D:                                   # @fn2D
@@ -890,9 +860,9 @@ fn2D:                                   # @fn2D
 	.endfunc
 .Lfunc_end21:
 	.size	fn2D, .Lfunc_end21-fn2D
-
+                                        # -- End function
 	.section	.text.retitD,"ax",@progbits
-	.hidden	retitD
+	.hidden	retitD                  # -- Begin function retitD
 	.globl	retitD
 	.type	retitD,@function
 retitD:                                 # @retitD
@@ -907,9 +877,9 @@ retitD:                                 # @retitD
 	.endfunc
 .Lfunc_end22:
 	.size	retitD, .Lfunc_end22-retitD
-
+                                        # -- End function
 	.section	.text.fn3D,"ax",@progbits
-	.hidden	fn3D
+	.hidden	fn3D                    # -- Begin function fn3D
 	.globl	fn3D
 	.type	fn3D,@function
 fn3D:                                   # @fn3D
@@ -939,126 +909,126 @@ fn3D:                                   # @fn3D
 	.endfunc
 .Lfunc_end23:
 	.size	fn3D, .Lfunc_end23-fn3D
-
+                                        # -- End function
 	.section	.text.testD,"ax",@progbits
-	.hidden	testD
+	.hidden	testD                   # -- Begin function testD
 	.globl	testD
 	.type	testD,@function
 testD:                                  # @testD
-	.local  	i32, i32, i64
+	.local  	i32, i32
 # BB#0:                                 # %if.end158
 	i32.const	$push0=, 0
-	i32.const	$push93=, 0
-	i32.load	$push1=, myrnd.s($pop93)
+	i32.const	$push94=, 0
+	i32.load	$push1=, myrnd.s($pop94)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push92=, $pop3, $pop4
-	tee_local	$push91=, $0=, $pop92
+	i32.add 	$push93=, $pop3, $pop4
+	tee_local	$push92=, $0=, $pop93
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop91, $pop5
+	i32.shr_u	$push6=, $pop92, $pop5
 	i32.store8	sD($pop0), $pop6
-	i32.const	$push90=, 0
-	i32.const	$push89=, 1103515245
-	i32.mul 	$push7=, $0, $pop89
-	i32.const	$push88=, 12345
-	i32.add 	$push87=, $pop7, $pop88
-	tee_local	$push86=, $0=, $pop87
-	i32.const	$push85=, 16
-	i32.shr_u	$push8=, $pop86, $pop85
-	i32.store8	sD+1($pop90), $pop8
-	i32.const	$push84=, 0
-	i32.const	$push83=, 1103515245
-	i32.mul 	$push9=, $0, $pop83
-	i32.const	$push82=, 12345
-	i32.add 	$push81=, $pop9, $pop82
-	tee_local	$push80=, $0=, $pop81
-	i32.const	$push79=, 16
-	i32.shr_u	$push10=, $pop80, $pop79
-	i32.store8	sD+2($pop84), $pop10
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push11=, $0, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop11, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 16
-	i32.shr_u	$push12=, $pop74, $pop73
-	i32.store8	sD+3($pop78), $pop12
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push13=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop13, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 16
-	i32.shr_u	$push14=, $pop68, $pop67
-	i32.store8	sD+4($pop72), $pop14
-	i32.const	$push66=, 0
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push15=, $0, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop15, $pop64
-	tee_local	$push62=, $0=, $pop63
-	i32.const	$push61=, 16
-	i32.shr_u	$push16=, $pop62, $pop61
-	i32.store8	sD+5($pop66), $pop16
-	i32.const	$push60=, 0
-	i32.const	$push59=, 1103515245
-	i32.mul 	$push17=, $0, $pop59
-	i32.const	$push58=, 12345
-	i32.add 	$push57=, $pop17, $pop58
-	tee_local	$push56=, $0=, $pop57
-	i32.const	$push55=, 16
-	i32.shr_u	$push18=, $pop56, $pop55
-	i32.store8	sD+6($pop60), $pop18
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push19=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop19, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push20=, $pop50, $pop49
-	i32.store8	sD+7($pop54), $pop20
-	i32.const	$push48=, 0
-	i64.load	$2=, sD($pop48)
-	i32.const	$push47=, 0
+	i32.const	$push91=, 0
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push7=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$push88=, $pop7, $pop89
+	tee_local	$push87=, $0=, $pop88
+	i32.const	$push86=, 16
+	i32.shr_u	$push8=, $pop87, $pop86
+	i32.store8	sD+1($pop91), $pop8
+	i32.const	$push85=, 0
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push9=, $0, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop9, $pop83
+	tee_local	$push81=, $0=, $pop82
+	i32.const	$push80=, 16
+	i32.shr_u	$push10=, $pop81, $pop80
+	i32.store8	sD+2($pop85), $pop10
+	i32.const	$push79=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push11=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop11, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push12=, $pop75, $pop74
+	i32.store8	sD+3($pop79), $pop12
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push13=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop13, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push14=, $pop69, $pop68
+	i32.store8	sD+4($pop73), $pop14
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push15=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop15, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push16=, $pop63, $pop62
+	i32.store8	sD+5($pop67), $pop16
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push17=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop17, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push18=, $pop57, $pop56
+	i32.store8	sD+6($pop61), $pop18
+	i32.const	$push55=, 0
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push19=, $0, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$push52=, $pop19, $pop53
+	tee_local	$push51=, $0=, $pop52
+	i32.const	$push50=, 16
+	i32.shr_u	$push20=, $pop51, $pop50
+	i32.store8	sD+7($pop55), $pop20
+	i32.const	$push49=, 0
 	i32.const	$push21=, -341751747
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, 229283573
-	i32.add 	$push46=, $pop22, $pop23
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, 1103515245
-	i32.mul 	$push24=, $pop45, $pop44
-	i32.const	$push43=, 12345
-	i32.add 	$push42=, $pop24, $pop43
-	tee_local	$push41=, $1=, $pop42
-	i32.store	myrnd.s($pop47), $pop41
-	i32.const	$push40=, 0
-	i32.const	$push39=, 16
-	i32.shr_u	$push28=, $1, $pop39
+	i32.add 	$push48=, $pop22, $pop23
+	tee_local	$push47=, $0=, $pop48
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push24=, $pop47, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$push44=, $pop24, $pop45
+	tee_local	$push43=, $1=, $pop44
+	i32.store	myrnd.s($pop49), $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push28=, $1, $pop41
 	i32.const	$push26=, 2047
 	i32.and 	$push29=, $pop28, $pop26
-	i32.const	$push38=, 16
-	i32.shr_u	$push25=, $0, $pop38
-	i32.const	$push37=, 2047
-	i32.and 	$push27=, $pop25, $pop37
+	i32.const	$push40=, 16
+	i32.shr_u	$push25=, $0, $pop40
+	i32.const	$push39=, 2047
+	i32.and 	$push27=, $pop25, $pop39
 	i32.add 	$push30=, $pop29, $pop27
 	i64.extend_u/i32	$push31=, $pop30
 	i64.const	$push32=, 35
 	i64.shl 	$push33=, $pop31, $pop32
-	i64.const	$push34=, 34359738367
-	i64.and 	$push35=, $2, $pop34
-	i64.or  	$push36=, $pop33, $pop35
-	i64.store	sD($pop40), $pop36
+	i32.const	$push38=, 0
+	i64.load	$push34=, sD($pop38)
+	i64.const	$push35=, 34359738367
+	i64.and 	$push36=, $pop34, $pop35
+	i64.or  	$push37=, $pop33, $pop36
+	i64.store	sD($pop42), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end24:
 	.size	testD, .Lfunc_end24-testD
-
+                                        # -- End function
 	.section	.text.retmeE,"ax",@progbits
-	.hidden	retmeE
+	.hidden	retmeE                  # -- Begin function retmeE
 	.globl	retmeE
 	.type	retmeE,@function
 retmeE:                                 # @retmeE
@@ -1076,9 +1046,9 @@ retmeE:                                 # @retmeE
 	.endfunc
 .Lfunc_end25:
 	.size	retmeE, .Lfunc_end25-retmeE
-
+                                        # -- End function
 	.section	.text.fn1E,"ax",@progbits
-	.hidden	fn1E
+	.hidden	fn1E                    # -- Begin function fn1E
 	.globl	fn1E
 	.type	fn1E,@function
 fn1E:                                   # @fn1E
@@ -1097,9 +1067,9 @@ fn1E:                                   # @fn1E
 	.endfunc
 .Lfunc_end26:
 	.size	fn1E, .Lfunc_end26-fn1E
-
+                                        # -- End function
 	.section	.text.fn2E,"ax",@progbits
-	.hidden	fn2E
+	.hidden	fn2E                    # -- Begin function fn2E
 	.globl	fn2E
 	.type	fn2E,@function
 fn2E:                                   # @fn2E
@@ -1120,9 +1090,9 @@ fn2E:                                   # @fn2E
 	.endfunc
 .Lfunc_end27:
 	.size	fn2E, .Lfunc_end27-fn2E
-
+                                        # -- End function
 	.section	.text.retitE,"ax",@progbits
-	.hidden	retitE
+	.hidden	retitE                  # -- Begin function retitE
 	.globl	retitE
 	.type	retitE,@function
 retitE:                                 # @retitE
@@ -1137,9 +1107,9 @@ retitE:                                 # @retitE
 	.endfunc
 .Lfunc_end28:
 	.size	retitE, .Lfunc_end28-retitE
-
+                                        # -- End function
 	.section	.text.fn3E,"ax",@progbits
-	.hidden	fn3E
+	.hidden	fn3E                    # -- Begin function fn3E
 	.globl	fn3E
 	.type	fn3E,@function
 fn3E:                                   # @fn3E
@@ -1169,198 +1139,198 @@ fn3E:                                   # @fn3E
 	.endfunc
 .Lfunc_end29:
 	.size	fn3E, .Lfunc_end29-fn3E
-
+                                        # -- End function
 	.section	.text.testE,"ax",@progbits
-	.hidden	testE
+	.hidden	testE                   # -- Begin function testE
 	.globl	testE
 	.type	testE,@function
 testE:                                  # @testE
-	.local  	i32, i32, i64
-# BB#0:                                 # %if.end142
+	.local  	i32, i32
+# BB#0:                                 # %if.end95
 	i32.const	$push0=, 0
-	i32.const	$push157=, 0
-	i32.load	$push1=, myrnd.s($pop157)
+	i32.const	$push158=, 0
+	i32.load	$push1=, myrnd.s($pop158)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push156=, $pop3, $pop4
-	tee_local	$push155=, $0=, $pop156
+	i32.add 	$push157=, $pop3, $pop4
+	tee_local	$push156=, $0=, $pop157
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop155, $pop5
+	i32.shr_u	$push6=, $pop156, $pop5
 	i32.store8	sE($pop0), $pop6
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push7=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop7, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push8=, $pop150, $pop149
-	i32.store8	sE+1($pop154), $pop8
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push9=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop9, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push10=, $pop144, $pop143
-	i32.store8	sE+2($pop148), $pop10
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push11=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop11, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push12=, $pop138, $pop137
-	i32.store8	sE+3($pop142), $pop12
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push13=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop13, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push14=, $pop132, $pop131
-	i32.store8	sE+4($pop136), $pop14
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push15=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop15, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push16=, $pop126, $pop125
-	i32.store8	sE+5($pop130), $pop16
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push17=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop17, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push18=, $pop120, $pop119
-	i32.store8	sE+6($pop124), $pop18
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push19=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop19, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push20=, $pop114, $pop113
-	i32.store8	sE+7($pop118), $pop20
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push21=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop21, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push22=, $pop108, $pop107
-	i32.store8	sE+8($pop112), $pop22
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push23=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop23, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push24=, $pop102, $pop101
-	i32.store8	sE+9($pop106), $pop24
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push25=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop25, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push26=, $pop96, $pop95
-	i32.store8	sE+10($pop100), $pop26
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push27=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop27, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push28=, $pop90, $pop89
-	i32.store8	sE+11($pop94), $pop28
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push29=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop29, $pop86
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push30=, $pop84, $pop83
-	i32.store8	sE+12($pop88), $pop30
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push31=, $0, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop31, $pop80
-	tee_local	$push78=, $0=, $pop79
-	i32.const	$push77=, 16
-	i32.shr_u	$push32=, $pop78, $pop77
-	i32.store8	sE+13($pop82), $pop32
-	i32.const	$push76=, 0
-	i32.const	$push75=, 1103515245
-	i32.mul 	$push33=, $0, $pop75
-	i32.const	$push74=, 12345
-	i32.add 	$push73=, $pop33, $pop74
-	tee_local	$push72=, $0=, $pop73
-	i32.const	$push71=, 16
-	i32.shr_u	$push34=, $pop72, $pop71
-	i32.store8	sE+14($pop76), $pop34
-	i32.const	$push70=, 0
-	i32.const	$push69=, 1103515245
-	i32.mul 	$push35=, $0, $pop69
-	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop35, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.const	$push65=, 16
-	i32.shr_u	$push36=, $pop66, $pop65
-	i32.store8	sE+15($pop70), $pop36
-	i32.const	$push64=, 0
-	i64.load	$2=, sE+8($pop64)
-	i32.const	$push63=, 0
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push7=, $0, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop7, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push8=, $pop151, $pop150
+	i32.store8	sE+1($pop155), $pop8
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push9=, $0, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop9, $pop147
+	tee_local	$push145=, $0=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push10=, $pop145, $pop144
+	i32.store8	sE+2($pop149), $pop10
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push11=, $0, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop11, $pop141
+	tee_local	$push139=, $0=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push12=, $pop139, $pop138
+	i32.store8	sE+3($pop143), $pop12
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push13=, $0, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop13, $pop135
+	tee_local	$push133=, $0=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push14=, $pop133, $pop132
+	i32.store8	sE+4($pop137), $pop14
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push15=, $0, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop15, $pop129
+	tee_local	$push127=, $0=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $pop127, $pop126
+	i32.store8	sE+5($pop131), $pop16
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push17=, $0, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop17, $pop123
+	tee_local	$push121=, $0=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push18=, $pop121, $pop120
+	i32.store8	sE+6($pop125), $pop18
+	i32.const	$push119=, 0
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push19=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$push116=, $pop19, $pop117
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 16
+	i32.shr_u	$push20=, $pop115, $pop114
+	i32.store8	sE+7($pop119), $pop20
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1103515245
+	i32.mul 	$push21=, $0, $pop112
+	i32.const	$push111=, 12345
+	i32.add 	$push110=, $pop21, $pop111
+	tee_local	$push109=, $0=, $pop110
+	i32.const	$push108=, 16
+	i32.shr_u	$push22=, $pop109, $pop108
+	i32.store8	sE+8($pop113), $pop22
+	i32.const	$push107=, 0
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push23=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$push104=, $pop23, $pop105
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 16
+	i32.shr_u	$push24=, $pop103, $pop102
+	i32.store8	sE+9($pop107), $pop24
+	i32.const	$push101=, 0
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push25=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop25, $pop99
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 16
+	i32.shr_u	$push26=, $pop97, $pop96
+	i32.store8	sE+10($pop101), $pop26
+	i32.const	$push95=, 0
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push27=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$push92=, $pop27, $pop93
+	tee_local	$push91=, $0=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push28=, $pop91, $pop90
+	i32.store8	sE+11($pop95), $pop28
+	i32.const	$push89=, 0
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push29=, $0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop29, $pop87
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push30=, $pop85, $pop84
+	i32.store8	sE+12($pop89), $pop30
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push31=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop31, $pop81
+	tee_local	$push79=, $0=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push32=, $pop79, $pop78
+	i32.store8	sE+13($pop83), $pop32
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push33=, $0, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop33, $pop75
+	tee_local	$push73=, $0=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push34=, $pop73, $pop72
+	i32.store8	sE+14($pop77), $pop34
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push35=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop35, $pop69
+	tee_local	$push67=, $0=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push36=, $pop67, $pop66
+	i32.store8	sE+15($pop71), $pop36
+	i32.const	$push65=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push62=, $pop38, $pop39
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 1103515245
-	i32.mul 	$push40=, $pop61, $pop60
-	i32.const	$push59=, 12345
-	i32.add 	$push58=, $pop40, $pop59
-	tee_local	$push57=, $1=, $pop58
-	i32.store	myrnd.s($pop63), $pop57
-	i32.const	$push56=, 0
-	i32.const	$push55=, 16
-	i32.shr_u	$push44=, $1, $pop55
+	i32.add 	$push64=, $pop38, $pop39
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push40=, $pop63, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop40, $pop61
+	tee_local	$push59=, $1=, $pop60
+	i32.store	myrnd.s($pop65), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push44=, $1, $pop57
 	i32.const	$push42=, 2047
 	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push54=, 16
-	i32.shr_u	$push41=, $0, $pop54
-	i32.const	$push53=, 2047
-	i32.and 	$push43=, $pop41, $pop53
+	i32.const	$push56=, 16
+	i32.shr_u	$push41=, $0, $pop56
+	i32.const	$push55=, 2047
+	i32.and 	$push43=, $pop41, $pop55
 	i32.add 	$push46=, $pop45, $pop43
 	i64.extend_u/i32	$push47=, $pop46
 	i64.const	$push48=, 35
 	i64.shl 	$push49=, $pop47, $pop48
-	i64.const	$push50=, 34359738367
-	i64.and 	$push51=, $2, $pop50
-	i64.or  	$push52=, $pop49, $pop51
-	i64.store	sE+8($pop56), $pop52
+	i32.const	$push54=, 0
+	i64.load	$push50=, sE+8($pop54)
+	i64.const	$push51=, 34359738367
+	i64.and 	$push52=, $pop50, $pop51
+	i64.or  	$push53=, $pop49, $pop52
+	i64.store	sE+8($pop58), $pop53
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end30:
 	.size	testE, .Lfunc_end30-testE
-
+                                        # -- End function
 	.section	.text.retmeF,"ax",@progbits
-	.hidden	retmeF
+	.hidden	retmeF                  # -- Begin function retmeF
 	.globl	retmeF
 	.type	retmeF,@function
 retmeF:                                 # @retmeF
@@ -1378,9 +1348,9 @@ retmeF:                                 # @retmeF
 	.endfunc
 .Lfunc_end31:
 	.size	retmeF, .Lfunc_end31-retmeF
-
+                                        # -- End function
 	.section	.text.fn1F,"ax",@progbits
-	.hidden	fn1F
+	.hidden	fn1F                    # -- Begin function fn1F
 	.globl	fn1F
 	.type	fn1F,@function
 fn1F:                                   # @fn1F
@@ -1399,9 +1369,9 @@ fn1F:                                   # @fn1F
 	.endfunc
 .Lfunc_end32:
 	.size	fn1F, .Lfunc_end32-fn1F
-
+                                        # -- End function
 	.section	.text.fn2F,"ax",@progbits
-	.hidden	fn2F
+	.hidden	fn2F                    # -- Begin function fn2F
 	.globl	fn2F
 	.type	fn2F,@function
 fn2F:                                   # @fn2F
@@ -1422,9 +1392,9 @@ fn2F:                                   # @fn2F
 	.endfunc
 .Lfunc_end33:
 	.size	fn2F, .Lfunc_end33-fn2F
-
+                                        # -- End function
 	.section	.text.retitF,"ax",@progbits
-	.hidden	retitF
+	.hidden	retitF                  # -- Begin function retitF
 	.globl	retitF
 	.type	retitF,@function
 retitF:                                 # @retitF
@@ -1439,9 +1409,9 @@ retitF:                                 # @retitF
 	.endfunc
 .Lfunc_end34:
 	.size	retitF, .Lfunc_end34-retitF
-
+                                        # -- End function
 	.section	.text.fn3F,"ax",@progbits
-	.hidden	fn3F
+	.hidden	fn3F                    # -- Begin function fn3F
 	.globl	fn3F
 	.type	fn3F,@function
 fn3F:                                   # @fn3F
@@ -1471,198 +1441,198 @@ fn3F:                                   # @fn3F
 	.endfunc
 .Lfunc_end35:
 	.size	fn3F, .Lfunc_end35-fn3F
-
+                                        # -- End function
 	.section	.text.testF,"ax",@progbits
-	.hidden	testF
+	.hidden	testF                   # -- Begin function testF
 	.globl	testF
 	.type	testF,@function
 testF:                                  # @testF
-	.local  	i32, i32, i64
-# BB#0:                                 # %if.end136
+	.local  	i32, i32
+# BB#0:                                 # %if.end91
 	i32.const	$push0=, 0
-	i32.const	$push157=, 0
-	i32.load	$push1=, myrnd.s($pop157)
+	i32.const	$push158=, 0
+	i32.load	$push1=, myrnd.s($pop158)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push156=, $pop3, $pop4
-	tee_local	$push155=, $0=, $pop156
+	i32.add 	$push157=, $pop3, $pop4
+	tee_local	$push156=, $0=, $pop157
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop155, $pop5
+	i32.shr_u	$push6=, $pop156, $pop5
 	i32.store8	sF($pop0), $pop6
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push7=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop7, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push8=, $pop150, $pop149
-	i32.store8	sF+1($pop154), $pop8
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push9=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop9, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push10=, $pop144, $pop143
-	i32.store8	sF+2($pop148), $pop10
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push11=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop11, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push12=, $pop138, $pop137
-	i32.store8	sF+3($pop142), $pop12
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push13=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop13, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push14=, $pop132, $pop131
-	i32.store8	sF+4($pop136), $pop14
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push15=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop15, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push16=, $pop126, $pop125
-	i32.store8	sF+5($pop130), $pop16
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push17=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop17, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push18=, $pop120, $pop119
-	i32.store8	sF+6($pop124), $pop18
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push19=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop19, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push20=, $pop114, $pop113
-	i32.store8	sF+7($pop118), $pop20
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push21=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop21, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push22=, $pop108, $pop107
-	i32.store8	sF+8($pop112), $pop22
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push23=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop23, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push24=, $pop102, $pop101
-	i32.store8	sF+9($pop106), $pop24
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push25=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop25, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push26=, $pop96, $pop95
-	i32.store8	sF+10($pop100), $pop26
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push27=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop27, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push28=, $pop90, $pop89
-	i32.store8	sF+11($pop94), $pop28
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push29=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop29, $pop86
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push30=, $pop84, $pop83
-	i32.store8	sF+12($pop88), $pop30
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push31=, $0, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop31, $pop80
-	tee_local	$push78=, $0=, $pop79
-	i32.const	$push77=, 16
-	i32.shr_u	$push32=, $pop78, $pop77
-	i32.store8	sF+13($pop82), $pop32
-	i32.const	$push76=, 0
-	i32.const	$push75=, 1103515245
-	i32.mul 	$push33=, $0, $pop75
-	i32.const	$push74=, 12345
-	i32.add 	$push73=, $pop33, $pop74
-	tee_local	$push72=, $0=, $pop73
-	i32.const	$push71=, 16
-	i32.shr_u	$push34=, $pop72, $pop71
-	i32.store8	sF+14($pop76), $pop34
-	i32.const	$push70=, 0
-	i32.const	$push69=, 1103515245
-	i32.mul 	$push35=, $0, $pop69
-	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop35, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.const	$push65=, 16
-	i32.shr_u	$push36=, $pop66, $pop65
-	i32.store8	sF+15($pop70), $pop36
-	i32.const	$push64=, 0
-	i64.load	$2=, sF($pop64)
-	i32.const	$push63=, 0
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push7=, $0, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop7, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push8=, $pop151, $pop150
+	i32.store8	sF+1($pop155), $pop8
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push9=, $0, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop9, $pop147
+	tee_local	$push145=, $0=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push10=, $pop145, $pop144
+	i32.store8	sF+2($pop149), $pop10
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push11=, $0, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop11, $pop141
+	tee_local	$push139=, $0=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push12=, $pop139, $pop138
+	i32.store8	sF+3($pop143), $pop12
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push13=, $0, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop13, $pop135
+	tee_local	$push133=, $0=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push14=, $pop133, $pop132
+	i32.store8	sF+4($pop137), $pop14
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push15=, $0, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop15, $pop129
+	tee_local	$push127=, $0=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $pop127, $pop126
+	i32.store8	sF+5($pop131), $pop16
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push17=, $0, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop17, $pop123
+	tee_local	$push121=, $0=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push18=, $pop121, $pop120
+	i32.store8	sF+6($pop125), $pop18
+	i32.const	$push119=, 0
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push19=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$push116=, $pop19, $pop117
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 16
+	i32.shr_u	$push20=, $pop115, $pop114
+	i32.store8	sF+7($pop119), $pop20
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1103515245
+	i32.mul 	$push21=, $0, $pop112
+	i32.const	$push111=, 12345
+	i32.add 	$push110=, $pop21, $pop111
+	tee_local	$push109=, $0=, $pop110
+	i32.const	$push108=, 16
+	i32.shr_u	$push22=, $pop109, $pop108
+	i32.store8	sF+8($pop113), $pop22
+	i32.const	$push107=, 0
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push23=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$push104=, $pop23, $pop105
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 16
+	i32.shr_u	$push24=, $pop103, $pop102
+	i32.store8	sF+9($pop107), $pop24
+	i32.const	$push101=, 0
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push25=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop25, $pop99
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 16
+	i32.shr_u	$push26=, $pop97, $pop96
+	i32.store8	sF+10($pop101), $pop26
+	i32.const	$push95=, 0
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push27=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$push92=, $pop27, $pop93
+	tee_local	$push91=, $0=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push28=, $pop91, $pop90
+	i32.store8	sF+11($pop95), $pop28
+	i32.const	$push89=, 0
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push29=, $0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop29, $pop87
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push30=, $pop85, $pop84
+	i32.store8	sF+12($pop89), $pop30
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push31=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop31, $pop81
+	tee_local	$push79=, $0=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push32=, $pop79, $pop78
+	i32.store8	sF+13($pop83), $pop32
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push33=, $0, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop33, $pop75
+	tee_local	$push73=, $0=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push34=, $pop73, $pop72
+	i32.store8	sF+14($pop77), $pop34
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push35=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop35, $pop69
+	tee_local	$push67=, $0=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push36=, $pop67, $pop66
+	i32.store8	sF+15($pop71), $pop36
+	i32.const	$push65=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push62=, $pop38, $pop39
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 1103515245
-	i32.mul 	$push40=, $pop61, $pop60
-	i32.const	$push59=, 12345
-	i32.add 	$push58=, $pop40, $pop59
-	tee_local	$push57=, $1=, $pop58
-	i32.store	myrnd.s($pop63), $pop57
-	i32.const	$push56=, 0
-	i32.const	$push55=, 16
-	i32.shr_u	$push44=, $1, $pop55
+	i32.add 	$push64=, $pop38, $pop39
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push40=, $pop63, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop40, $pop61
+	tee_local	$push59=, $1=, $pop60
+	i32.store	myrnd.s($pop65), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push44=, $1, $pop57
 	i32.const	$push42=, 2047
 	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push54=, 16
-	i32.shr_u	$push41=, $0, $pop54
-	i32.const	$push53=, 2047
-	i32.and 	$push43=, $pop41, $pop53
+	i32.const	$push56=, 16
+	i32.shr_u	$push41=, $0, $pop56
+	i32.const	$push55=, 2047
+	i32.and 	$push43=, $pop41, $pop55
 	i32.add 	$push46=, $pop45, $pop43
 	i64.extend_u/i32	$push47=, $pop46
 	i64.const	$push48=, 35
 	i64.shl 	$push49=, $pop47, $pop48
-	i64.const	$push50=, 34359738367
-	i64.and 	$push51=, $2, $pop50
-	i64.or  	$push52=, $pop49, $pop51
-	i64.store	sF($pop56), $pop52
+	i32.const	$push54=, 0
+	i64.load	$push50=, sF($pop54)
+	i64.const	$push51=, 34359738367
+	i64.and 	$push52=, $pop50, $pop51
+	i64.or  	$push53=, $pop49, $pop52
+	i64.store	sF($pop58), $pop53
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end36:
 	.size	testF, .Lfunc_end36-testF
-
+                                        # -- End function
 	.section	.text.retmeG,"ax",@progbits
-	.hidden	retmeG
+	.hidden	retmeG                  # -- Begin function retmeG
 	.globl	retmeG
 	.type	retmeG,@function
 retmeG:                                 # @retmeG
@@ -1680,9 +1650,9 @@ retmeG:                                 # @retmeG
 	.endfunc
 .Lfunc_end37:
 	.size	retmeG, .Lfunc_end37-retmeG
-
+                                        # -- End function
 	.section	.text.fn1G,"ax",@progbits
-	.hidden	fn1G
+	.hidden	fn1G                    # -- Begin function fn1G
 	.globl	fn1G
 	.type	fn1G,@function
 fn1G:                                   # @fn1G
@@ -1700,9 +1670,9 @@ fn1G:                                   # @fn1G
 	.endfunc
 .Lfunc_end38:
 	.size	fn1G, .Lfunc_end38-fn1G
-
+                                        # -- End function
 	.section	.text.fn2G,"ax",@progbits
-	.hidden	fn2G
+	.hidden	fn2G                    # -- Begin function fn2G
 	.globl	fn2G
 	.type	fn2G,@function
 fn2G:                                   # @fn2G
@@ -1722,9 +1692,9 @@ fn2G:                                   # @fn2G
 	.endfunc
 .Lfunc_end39:
 	.size	fn2G, .Lfunc_end39-fn2G
-
+                                        # -- End function
 	.section	.text.retitG,"ax",@progbits
-	.hidden	retitG
+	.hidden	retitG                  # -- Begin function retitG
 	.globl	retitG
 	.type	retitG,@function
 retitG:                                 # @retitG
@@ -1738,9 +1708,9 @@ retitG:                                 # @retitG
 	.endfunc
 .Lfunc_end40:
 	.size	retitG, .Lfunc_end40-retitG
-
+                                        # -- End function
 	.section	.text.fn3G,"ax",@progbits
-	.hidden	fn3G
+	.hidden	fn3G                    # -- Begin function fn3G
 	.globl	fn3G
 	.type	fn3G,@function
 fn3G:                                   # @fn3G
@@ -1761,191 +1731,192 @@ fn3G:                                   # @fn3G
 	.endfunc
 .Lfunc_end41:
 	.size	fn3G, .Lfunc_end41-fn3G
-
+                                        # -- End function
 	.section	.text.testG,"ax",@progbits
-	.hidden	testG
+	.hidden	testG                   # -- Begin function testG
 	.globl	testG
 	.type	testG,@function
 testG:                                  # @testG
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push179=, 0
-	i32.const	$push178=, 0
-	i32.load	$push0=, myrnd.s($pop178)
-	i32.const	$push177=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop177
-	i32.const	$push176=, 12345
-	i32.add 	$push175=, $pop1, $pop176
-	tee_local	$push174=, $0=, $pop175
-	i32.const	$push173=, 16
-	i32.shr_u	$push2=, $pop174, $pop173
-	i32.store8	sG($pop179), $pop2
-	i32.const	$push172=, 0
-	i32.const	$push171=, 1103515245
-	i32.mul 	$push3=, $0, $pop171
-	i32.const	$push170=, 12345
-	i32.add 	$push169=, $pop3, $pop170
-	tee_local	$push168=, $0=, $pop169
-	i32.const	$push167=, 16
-	i32.shr_u	$push4=, $pop168, $pop167
-	i32.store8	sG+1($pop172), $pop4
-	i32.const	$push166=, 0
-	i32.const	$push165=, 1103515245
-	i32.mul 	$push5=, $0, $pop165
-	i32.const	$push164=, 12345
-	i32.add 	$push163=, $pop5, $pop164
-	tee_local	$push162=, $0=, $pop163
-	i32.const	$push161=, 16
-	i32.shr_u	$push6=, $pop162, $pop161
-	i32.store8	sG+2($pop166), $pop6
-	i32.const	$push160=, 0
-	i32.const	$push159=, 1103515245
-	i32.mul 	$push7=, $0, $pop159
-	i32.const	$push158=, 12345
-	i32.add 	$push157=, $pop7, $pop158
-	tee_local	$push156=, $0=, $pop157
-	i32.const	$push155=, 16
-	i32.shr_u	$push8=, $pop156, $pop155
-	i32.store8	sG+3($pop160), $pop8
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push9=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop9, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push10=, $pop150, $pop149
-	i32.store8	sG+4($pop154), $pop10
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push11=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop11, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push12=, $pop144, $pop143
-	i32.store8	sG+5($pop148), $pop12
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push13=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop13, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push14=, $pop138, $pop137
-	i32.store8	sG+6($pop142), $pop14
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push15=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop15, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push16=, $pop132, $pop131
-	i32.store8	sG+7($pop136), $pop16
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push17=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop17, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push18=, $pop126, $pop125
-	i32.store8	sG+8($pop130), $pop18
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push19=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop19, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push20=, $pop120, $pop119
-	i32.store8	sG+9($pop124), $pop20
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push21=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop21, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push22=, $pop114, $pop113
-	i32.store8	sG+10($pop118), $pop22
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push23=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop23, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push24=, $pop108, $pop107
-	i32.store8	sG+11($pop112), $pop24
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push25=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop25, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push26=, $pop102, $pop101
-	i32.store8	sG+12($pop106), $pop26
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push27=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop27, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push28=, $pop96, $pop95
-	i32.store8	sG+13($pop100), $pop28
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push29=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop29, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push30=, $pop90, $pop89
-	i32.store8	sG+14($pop94), $pop30
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push31=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop31, $pop86
-	tee_local	$push84=, $1=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push32=, $pop84, $pop83
-	i32.store8	sG+15($pop88), $pop32
-	i32.const	$push82=, 0
-	i32.load	$0=, sG($pop82)
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push33=, $1, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop33, $pop79
-	tee_local	$push77=, $2=, $pop78
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push34=, $pop77, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop34, $pop75
-	tee_local	$push73=, $1=, $pop74
-	i32.store	myrnd.s($pop81), $pop73
-	i32.const	$push72=, 0
-	i32.const	$push71=, 16
-	i32.shr_u	$push70=, $2, $pop71
-	tee_local	$push69=, $2=, $pop70
-	i32.const	$push68=, 25
-	i32.shl 	$push35=, $pop69, $pop68
+	i32.const	$push181=, 0
+	i32.const	$push180=, 0
+	i32.load	$push0=, myrnd.s($pop180)
+	i32.const	$push179=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop179
+	i32.const	$push178=, 12345
+	i32.add 	$push177=, $pop1, $pop178
+	tee_local	$push176=, $1=, $pop177
+	i32.const	$push175=, 16
+	i32.shr_u	$push2=, $pop176, $pop175
+	i32.store8	sG($pop181), $pop2
+	i32.const	$push174=, 0
+	i32.const	$push173=, 1103515245
+	i32.mul 	$push3=, $1, $pop173
+	i32.const	$push172=, 12345
+	i32.add 	$push171=, $pop3, $pop172
+	tee_local	$push170=, $1=, $pop171
+	i32.const	$push169=, 16
+	i32.shr_u	$push4=, $pop170, $pop169
+	i32.store8	sG+1($pop174), $pop4
+	i32.const	$push168=, 0
+	i32.const	$push167=, 1103515245
+	i32.mul 	$push5=, $1, $pop167
+	i32.const	$push166=, 12345
+	i32.add 	$push165=, $pop5, $pop166
+	tee_local	$push164=, $1=, $pop165
+	i32.const	$push163=, 16
+	i32.shr_u	$push6=, $pop164, $pop163
+	i32.store8	sG+2($pop168), $pop6
+	i32.const	$push162=, 0
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push7=, $1, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$push159=, $pop7, $pop160
+	tee_local	$push158=, $1=, $pop159
+	i32.const	$push157=, 16
+	i32.shr_u	$push8=, $pop158, $pop157
+	i32.store8	sG+3($pop162), $pop8
+	i32.const	$push156=, 0
+	i32.const	$push155=, 1103515245
+	i32.mul 	$push9=, $1, $pop155
+	i32.const	$push154=, 12345
+	i32.add 	$push153=, $pop9, $pop154
+	tee_local	$push152=, $1=, $pop153
+	i32.const	$push151=, 16
+	i32.shr_u	$push10=, $pop152, $pop151
+	i32.store8	sG+4($pop156), $pop10
+	i32.const	$push150=, 0
+	i32.const	$push149=, 1103515245
+	i32.mul 	$push11=, $1, $pop149
+	i32.const	$push148=, 12345
+	i32.add 	$push147=, $pop11, $pop148
+	tee_local	$push146=, $1=, $pop147
+	i32.const	$push145=, 16
+	i32.shr_u	$push12=, $pop146, $pop145
+	i32.store8	sG+5($pop150), $pop12
+	i32.const	$push144=, 0
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push13=, $1, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$push141=, $pop13, $pop142
+	tee_local	$push140=, $1=, $pop141
+	i32.const	$push139=, 16
+	i32.shr_u	$push14=, $pop140, $pop139
+	i32.store8	sG+6($pop144), $pop14
+	i32.const	$push138=, 0
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push15=, $1, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$push135=, $pop15, $pop136
+	tee_local	$push134=, $1=, $pop135
+	i32.const	$push133=, 16
+	i32.shr_u	$push16=, $pop134, $pop133
+	i32.store8	sG+7($pop138), $pop16
+	i32.const	$push132=, 0
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push17=, $1, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$push129=, $pop17, $pop130
+	tee_local	$push128=, $1=, $pop129
+	i32.const	$push127=, 16
+	i32.shr_u	$push18=, $pop128, $pop127
+	i32.store8	sG+8($pop132), $pop18
+	i32.const	$push126=, 0
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push19=, $1, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$push123=, $pop19, $pop124
+	tee_local	$push122=, $1=, $pop123
+	i32.const	$push121=, 16
+	i32.shr_u	$push20=, $pop122, $pop121
+	i32.store8	sG+9($pop126), $pop20
+	i32.const	$push120=, 0
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push21=, $1, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$push117=, $pop21, $pop118
+	tee_local	$push116=, $1=, $pop117
+	i32.const	$push115=, 16
+	i32.shr_u	$push22=, $pop116, $pop115
+	i32.store8	sG+10($pop120), $pop22
+	i32.const	$push114=, 0
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push23=, $1, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$push111=, $pop23, $pop112
+	tee_local	$push110=, $1=, $pop111
+	i32.const	$push109=, 16
+	i32.shr_u	$push24=, $pop110, $pop109
+	i32.store8	sG+11($pop114), $pop24
+	i32.const	$push108=, 0
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push25=, $1, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$push105=, $pop25, $pop106
+	tee_local	$push104=, $1=, $pop105
+	i32.const	$push103=, 16
+	i32.shr_u	$push26=, $pop104, $pop103
+	i32.store8	sG+12($pop108), $pop26
+	i32.const	$push102=, 0
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push27=, $1, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$push99=, $pop27, $pop100
+	tee_local	$push98=, $1=, $pop99
+	i32.const	$push97=, 16
+	i32.shr_u	$push28=, $pop98, $pop97
+	i32.store8	sG+13($pop102), $pop28
+	i32.const	$push96=, 0
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push29=, $1, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$push93=, $pop29, $pop94
+	tee_local	$push92=, $1=, $pop93
+	i32.const	$push91=, 16
+	i32.shr_u	$push30=, $pop92, $pop91
+	i32.store8	sG+14($pop96), $pop30
+	i32.const	$push90=, 0
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push31=, $1, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$push87=, $pop31, $pop88
+	tee_local	$push86=, $1=, $pop87
+	i32.const	$push85=, 16
+	i32.shr_u	$push32=, $pop86, $pop85
+	i32.store8	sG+15($pop90), $pop32
+	i32.const	$push84=, 0
+	i32.const	$push83=, 1103515245
+	i32.mul 	$push33=, $1, $pop83
+	i32.const	$push82=, 12345
+	i32.add 	$push81=, $pop33, $pop82
+	tee_local	$push80=, $3=, $pop81
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push34=, $pop80, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop34, $pop78
+	tee_local	$push76=, $1=, $pop77
+	i32.store	myrnd.s($pop84), $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push73=, $3, $pop74
+	tee_local	$push72=, $3=, $pop73
+	i32.const	$push71=, 25
+	i32.shl 	$push35=, $pop72, $pop71
+	i32.const	$push70=, 0
+	i32.load	$push69=, sG($pop70)
+	tee_local	$push68=, $0=, $pop69
 	i32.const	$push67=, 33554431
-	i32.and 	$push66=, $0, $pop67
-	tee_local	$push65=, $3=, $pop66
+	i32.and 	$push66=, $pop68, $pop67
+	tee_local	$push65=, $2=, $pop66
 	i32.or  	$push64=, $pop35, $pop65
 	tee_local	$push63=, $4=, $pop64
-	i32.store	sG($pop72), $pop63
+	i32.store	sG($pop75), $pop63
 	block   	
 	i32.const	$push62=, 16
 	i32.shr_u	$push61=, $1, $pop62
 	tee_local	$push60=, $5=, $pop61
-	i32.add 	$push36=, $pop60, $2
+	i32.add 	$push36=, $pop60, $3
 	i32.const	$push37=, 127
 	i32.and 	$push38=, $pop36, $pop37
 	i32.const	$push59=, 25
@@ -1956,39 +1927,39 @@ testG:                                  # @testG
 	i32.ne  	$push42=, $pop38, $pop41
 	br_if   	0, $pop42       # 0: down to label3
 # BB#1:                                 # %if.end76
-	i32.const	$push198=, 0
+	i32.const	$push200=, 0
 	i32.const	$push43=, -2139243339
 	i32.mul 	$push44=, $1, $pop43
 	i32.const	$push45=, -1492899873
-	i32.add 	$push197=, $pop44, $pop45
-	tee_local	$push196=, $1=, $pop197
-	i32.const	$push195=, 1103515245
-	i32.mul 	$push46=, $pop196, $pop195
-	i32.const	$push194=, 12345
-	i32.add 	$push193=, $pop46, $pop194
-	tee_local	$push192=, $2=, $pop193
-	i32.store	myrnd.s($pop198), $pop192
-	i32.const	$push191=, 0
-	i32.const	$push190=, 16
-	i32.shr_u	$push189=, $2, $pop190
-	tee_local	$push188=, $2=, $pop189
-	i32.const	$push187=, 25
-	i32.shl 	$push49=, $pop188, $pop187
-	i32.const	$push186=, 16
-	i32.shr_u	$push185=, $1, $pop186
-	tee_local	$push184=, $4=, $pop185
-	i32.const	$push183=, 25
-	i32.shl 	$push47=, $pop184, $pop183
-	i32.or  	$push48=, $pop47, $3
-	i32.add 	$push182=, $pop49, $pop48
-	tee_local	$push181=, $1=, $pop182
-	i32.store	sG($pop191), $pop181
+	i32.add 	$push199=, $pop44, $pop45
+	tee_local	$push198=, $1=, $pop199
+	i32.const	$push197=, 1103515245
+	i32.mul 	$push46=, $pop198, $pop197
+	i32.const	$push196=, 12345
+	i32.add 	$push195=, $pop46, $pop196
+	tee_local	$push194=, $3=, $pop195
+	i32.store	myrnd.s($pop200), $pop194
+	i32.const	$push193=, 0
+	i32.const	$push192=, 16
+	i32.shr_u	$push191=, $3, $pop192
+	tee_local	$push190=, $3=, $pop191
+	i32.const	$push189=, 25
+	i32.shl 	$push49=, $pop190, $pop189
+	i32.const	$push188=, 16
+	i32.shr_u	$push187=, $1, $pop188
+	tee_local	$push186=, $4=, $pop187
+	i32.const	$push185=, 25
+	i32.shl 	$push47=, $pop186, $pop185
+	i32.or  	$push48=, $pop47, $2
+	i32.add 	$push184=, $pop49, $pop48
+	tee_local	$push183=, $1=, $pop184
+	i32.store	sG($pop193), $pop183
 	i32.xor 	$push50=, $1, $0
-	i32.const	$push180=, 33554431
-	i32.and 	$push51=, $pop50, $pop180
+	i32.const	$push182=, 33554431
+	i32.and 	$push51=, $pop50, $pop182
 	br_if   	0, $pop51       # 0: down to label3
 # BB#2:                                 # %lor.lhs.false109
-	i32.add 	$push54=, $2, $4
+	i32.add 	$push54=, $3, $4
 	i32.const	$push55=, 127
 	i32.and 	$push56=, $pop54, $pop55
 	i32.const	$push52=, 25
@@ -1997,16 +1968,16 @@ testG:                                  # @testG
 	br_if   	0, $pop57       # 0: down to label3
 # BB#3:                                 # %if.end115
 	return
-.LBB42_4:                               # %if.then114
+.LBB42_4:                               # %if.then
 	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end42:
 	.size	testG, .Lfunc_end42-testG
-
+                                        # -- End function
 	.section	.text.retmeH,"ax",@progbits
-	.hidden	retmeH
+	.hidden	retmeH                  # -- Begin function retmeH
 	.globl	retmeH
 	.type	retmeH,@function
 retmeH:                                 # @retmeH
@@ -2024,9 +1995,9 @@ retmeH:                                 # @retmeH
 	.endfunc
 .Lfunc_end43:
 	.size	retmeH, .Lfunc_end43-retmeH
-
+                                        # -- End function
 	.section	.text.fn1H,"ax",@progbits
-	.hidden	fn1H
+	.hidden	fn1H                    # -- Begin function fn1H
 	.globl	fn1H
 	.type	fn1H,@function
 fn1H:                                   # @fn1H
@@ -2044,9 +2015,9 @@ fn1H:                                   # @fn1H
 	.endfunc
 .Lfunc_end44:
 	.size	fn1H, .Lfunc_end44-fn1H
-
+                                        # -- End function
 	.section	.text.fn2H,"ax",@progbits
-	.hidden	fn2H
+	.hidden	fn2H                    # -- Begin function fn2H
 	.globl	fn2H
 	.type	fn2H,@function
 fn2H:                                   # @fn2H
@@ -2066,9 +2037,9 @@ fn2H:                                   # @fn2H
 	.endfunc
 .Lfunc_end45:
 	.size	fn2H, .Lfunc_end45-fn2H
-
+                                        # -- End function
 	.section	.text.retitH,"ax",@progbits
-	.hidden	retitH
+	.hidden	retitH                  # -- Begin function retitH
 	.globl	retitH
 	.type	retitH,@function
 retitH:                                 # @retitH
@@ -2082,9 +2053,9 @@ retitH:                                 # @retitH
 	.endfunc
 .Lfunc_end46:
 	.size	retitH, .Lfunc_end46-retitH
-
+                                        # -- End function
 	.section	.text.fn3H,"ax",@progbits
-	.hidden	fn3H
+	.hidden	fn3H                    # -- Begin function fn3H
 	.globl	fn3H
 	.type	fn3H,@function
 fn3H:                                   # @fn3H
@@ -2105,191 +2076,192 @@ fn3H:                                   # @fn3H
 	.endfunc
 .Lfunc_end47:
 	.size	fn3H, .Lfunc_end47-fn3H
-
+                                        # -- End function
 	.section	.text.testH,"ax",@progbits
-	.hidden	testH
+	.hidden	testH                   # -- Begin function testH
 	.globl	testH
 	.type	testH,@function
 testH:                                  # @testH
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push179=, 0
-	i32.const	$push178=, 0
-	i32.load	$push0=, myrnd.s($pop178)
-	i32.const	$push177=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop177
-	i32.const	$push176=, 12345
-	i32.add 	$push175=, $pop1, $pop176
-	tee_local	$push174=, $0=, $pop175
-	i32.const	$push173=, 16
-	i32.shr_u	$push2=, $pop174, $pop173
-	i32.store8	sH($pop179), $pop2
-	i32.const	$push172=, 0
-	i32.const	$push171=, 1103515245
-	i32.mul 	$push3=, $0, $pop171
-	i32.const	$push170=, 12345
-	i32.add 	$push169=, $pop3, $pop170
-	tee_local	$push168=, $0=, $pop169
-	i32.const	$push167=, 16
-	i32.shr_u	$push4=, $pop168, $pop167
-	i32.store8	sH+1($pop172), $pop4
-	i32.const	$push166=, 0
-	i32.const	$push165=, 1103515245
-	i32.mul 	$push5=, $0, $pop165
-	i32.const	$push164=, 12345
-	i32.add 	$push163=, $pop5, $pop164
-	tee_local	$push162=, $0=, $pop163
-	i32.const	$push161=, 16
-	i32.shr_u	$push6=, $pop162, $pop161
-	i32.store8	sH+2($pop166), $pop6
-	i32.const	$push160=, 0
-	i32.const	$push159=, 1103515245
-	i32.mul 	$push7=, $0, $pop159
-	i32.const	$push158=, 12345
-	i32.add 	$push157=, $pop7, $pop158
-	tee_local	$push156=, $0=, $pop157
-	i32.const	$push155=, 16
-	i32.shr_u	$push8=, $pop156, $pop155
-	i32.store8	sH+3($pop160), $pop8
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push9=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop9, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push10=, $pop150, $pop149
-	i32.store8	sH+4($pop154), $pop10
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push11=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop11, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push12=, $pop144, $pop143
-	i32.store8	sH+5($pop148), $pop12
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push13=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop13, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push14=, $pop138, $pop137
-	i32.store8	sH+6($pop142), $pop14
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push15=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop15, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push16=, $pop132, $pop131
-	i32.store8	sH+7($pop136), $pop16
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push17=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop17, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push18=, $pop126, $pop125
-	i32.store8	sH+8($pop130), $pop18
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push19=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop19, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push20=, $pop120, $pop119
-	i32.store8	sH+9($pop124), $pop20
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push21=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop21, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push22=, $pop114, $pop113
-	i32.store8	sH+10($pop118), $pop22
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push23=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop23, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push24=, $pop108, $pop107
-	i32.store8	sH+11($pop112), $pop24
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push25=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop25, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push26=, $pop102, $pop101
-	i32.store8	sH+12($pop106), $pop26
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push27=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop27, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push28=, $pop96, $pop95
-	i32.store8	sH+13($pop100), $pop28
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push29=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop29, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push30=, $pop90, $pop89
-	i32.store8	sH+14($pop94), $pop30
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push31=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop31, $pop86
-	tee_local	$push84=, $1=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push32=, $pop84, $pop83
-	i32.store8	sH+15($pop88), $pop32
-	i32.const	$push82=, 0
-	i32.load	$0=, sH($pop82)
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push33=, $1, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop33, $pop79
-	tee_local	$push77=, $2=, $pop78
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push34=, $pop77, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop34, $pop75
-	tee_local	$push73=, $1=, $pop74
-	i32.store	myrnd.s($pop81), $pop73
-	i32.const	$push72=, 0
-	i32.const	$push71=, 16
-	i32.shr_u	$push70=, $2, $pop71
-	tee_local	$push69=, $2=, $pop70
-	i32.const	$push68=, 23
-	i32.shl 	$push35=, $pop69, $pop68
+	i32.const	$push181=, 0
+	i32.const	$push180=, 0
+	i32.load	$push0=, myrnd.s($pop180)
+	i32.const	$push179=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop179
+	i32.const	$push178=, 12345
+	i32.add 	$push177=, $pop1, $pop178
+	tee_local	$push176=, $1=, $pop177
+	i32.const	$push175=, 16
+	i32.shr_u	$push2=, $pop176, $pop175
+	i32.store8	sH($pop181), $pop2
+	i32.const	$push174=, 0
+	i32.const	$push173=, 1103515245
+	i32.mul 	$push3=, $1, $pop173
+	i32.const	$push172=, 12345
+	i32.add 	$push171=, $pop3, $pop172
+	tee_local	$push170=, $1=, $pop171
+	i32.const	$push169=, 16
+	i32.shr_u	$push4=, $pop170, $pop169
+	i32.store8	sH+1($pop174), $pop4
+	i32.const	$push168=, 0
+	i32.const	$push167=, 1103515245
+	i32.mul 	$push5=, $1, $pop167
+	i32.const	$push166=, 12345
+	i32.add 	$push165=, $pop5, $pop166
+	tee_local	$push164=, $1=, $pop165
+	i32.const	$push163=, 16
+	i32.shr_u	$push6=, $pop164, $pop163
+	i32.store8	sH+2($pop168), $pop6
+	i32.const	$push162=, 0
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push7=, $1, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$push159=, $pop7, $pop160
+	tee_local	$push158=, $1=, $pop159
+	i32.const	$push157=, 16
+	i32.shr_u	$push8=, $pop158, $pop157
+	i32.store8	sH+3($pop162), $pop8
+	i32.const	$push156=, 0
+	i32.const	$push155=, 1103515245
+	i32.mul 	$push9=, $1, $pop155
+	i32.const	$push154=, 12345
+	i32.add 	$push153=, $pop9, $pop154
+	tee_local	$push152=, $1=, $pop153
+	i32.const	$push151=, 16
+	i32.shr_u	$push10=, $pop152, $pop151
+	i32.store8	sH+4($pop156), $pop10
+	i32.const	$push150=, 0
+	i32.const	$push149=, 1103515245
+	i32.mul 	$push11=, $1, $pop149
+	i32.const	$push148=, 12345
+	i32.add 	$push147=, $pop11, $pop148
+	tee_local	$push146=, $1=, $pop147
+	i32.const	$push145=, 16
+	i32.shr_u	$push12=, $pop146, $pop145
+	i32.store8	sH+5($pop150), $pop12
+	i32.const	$push144=, 0
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push13=, $1, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$push141=, $pop13, $pop142
+	tee_local	$push140=, $1=, $pop141
+	i32.const	$push139=, 16
+	i32.shr_u	$push14=, $pop140, $pop139
+	i32.store8	sH+6($pop144), $pop14
+	i32.const	$push138=, 0
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push15=, $1, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$push135=, $pop15, $pop136
+	tee_local	$push134=, $1=, $pop135
+	i32.const	$push133=, 16
+	i32.shr_u	$push16=, $pop134, $pop133
+	i32.store8	sH+7($pop138), $pop16
+	i32.const	$push132=, 0
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push17=, $1, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$push129=, $pop17, $pop130
+	tee_local	$push128=, $1=, $pop129
+	i32.const	$push127=, 16
+	i32.shr_u	$push18=, $pop128, $pop127
+	i32.store8	sH+8($pop132), $pop18
+	i32.const	$push126=, 0
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push19=, $1, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$push123=, $pop19, $pop124
+	tee_local	$push122=, $1=, $pop123
+	i32.const	$push121=, 16
+	i32.shr_u	$push20=, $pop122, $pop121
+	i32.store8	sH+9($pop126), $pop20
+	i32.const	$push120=, 0
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push21=, $1, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$push117=, $pop21, $pop118
+	tee_local	$push116=, $1=, $pop117
+	i32.const	$push115=, 16
+	i32.shr_u	$push22=, $pop116, $pop115
+	i32.store8	sH+10($pop120), $pop22
+	i32.const	$push114=, 0
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push23=, $1, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$push111=, $pop23, $pop112
+	tee_local	$push110=, $1=, $pop111
+	i32.const	$push109=, 16
+	i32.shr_u	$push24=, $pop110, $pop109
+	i32.store8	sH+11($pop114), $pop24
+	i32.const	$push108=, 0
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push25=, $1, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$push105=, $pop25, $pop106
+	tee_local	$push104=, $1=, $pop105
+	i32.const	$push103=, 16
+	i32.shr_u	$push26=, $pop104, $pop103
+	i32.store8	sH+12($pop108), $pop26
+	i32.const	$push102=, 0
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push27=, $1, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$push99=, $pop27, $pop100
+	tee_local	$push98=, $1=, $pop99
+	i32.const	$push97=, 16
+	i32.shr_u	$push28=, $pop98, $pop97
+	i32.store8	sH+13($pop102), $pop28
+	i32.const	$push96=, 0
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push29=, $1, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$push93=, $pop29, $pop94
+	tee_local	$push92=, $1=, $pop93
+	i32.const	$push91=, 16
+	i32.shr_u	$push30=, $pop92, $pop91
+	i32.store8	sH+14($pop96), $pop30
+	i32.const	$push90=, 0
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push31=, $1, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$push87=, $pop31, $pop88
+	tee_local	$push86=, $1=, $pop87
+	i32.const	$push85=, 16
+	i32.shr_u	$push32=, $pop86, $pop85
+	i32.store8	sH+15($pop90), $pop32
+	i32.const	$push84=, 0
+	i32.const	$push83=, 1103515245
+	i32.mul 	$push33=, $1, $pop83
+	i32.const	$push82=, 12345
+	i32.add 	$push81=, $pop33, $pop82
+	tee_local	$push80=, $3=, $pop81
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push34=, $pop80, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop34, $pop78
+	tee_local	$push76=, $1=, $pop77
+	i32.store	myrnd.s($pop84), $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push73=, $3, $pop74
+	tee_local	$push72=, $3=, $pop73
+	i32.const	$push71=, 23
+	i32.shl 	$push35=, $pop72, $pop71
+	i32.const	$push70=, 0
+	i32.load	$push69=, sH($pop70)
+	tee_local	$push68=, $0=, $pop69
 	i32.const	$push67=, 8388607
-	i32.and 	$push66=, $0, $pop67
-	tee_local	$push65=, $3=, $pop66
+	i32.and 	$push66=, $pop68, $pop67
+	tee_local	$push65=, $2=, $pop66
 	i32.or  	$push64=, $pop35, $pop65
 	tee_local	$push63=, $4=, $pop64
-	i32.store	sH($pop72), $pop63
+	i32.store	sH($pop75), $pop63
 	block   	
 	i32.const	$push62=, 16
 	i32.shr_u	$push61=, $1, $pop62
 	tee_local	$push60=, $5=, $pop61
-	i32.add 	$push36=, $pop60, $2
+	i32.add 	$push36=, $pop60, $3
 	i32.const	$push37=, 511
 	i32.and 	$push38=, $pop36, $pop37
 	i32.const	$push59=, 23
@@ -2300,39 +2272,39 @@ testH:                                  # @testH
 	i32.ne  	$push42=, $pop38, $pop41
 	br_if   	0, $pop42       # 0: down to label4
 # BB#1:                                 # %if.end76
-	i32.const	$push198=, 0
+	i32.const	$push200=, 0
 	i32.const	$push43=, -2139243339
 	i32.mul 	$push44=, $1, $pop43
 	i32.const	$push45=, -1492899873
-	i32.add 	$push197=, $pop44, $pop45
-	tee_local	$push196=, $1=, $pop197
-	i32.const	$push195=, 1103515245
-	i32.mul 	$push46=, $pop196, $pop195
-	i32.const	$push194=, 12345
-	i32.add 	$push193=, $pop46, $pop194
-	tee_local	$push192=, $2=, $pop193
-	i32.store	myrnd.s($pop198), $pop192
-	i32.const	$push191=, 0
-	i32.const	$push190=, 16
-	i32.shr_u	$push189=, $2, $pop190
-	tee_local	$push188=, $2=, $pop189
-	i32.const	$push187=, 23
-	i32.shl 	$push49=, $pop188, $pop187
-	i32.const	$push186=, 16
-	i32.shr_u	$push185=, $1, $pop186
-	tee_local	$push184=, $4=, $pop185
-	i32.const	$push183=, 23
-	i32.shl 	$push47=, $pop184, $pop183
-	i32.or  	$push48=, $pop47, $3
-	i32.add 	$push182=, $pop49, $pop48
-	tee_local	$push181=, $1=, $pop182
-	i32.store	sH($pop191), $pop181
+	i32.add 	$push199=, $pop44, $pop45
+	tee_local	$push198=, $1=, $pop199
+	i32.const	$push197=, 1103515245
+	i32.mul 	$push46=, $pop198, $pop197
+	i32.const	$push196=, 12345
+	i32.add 	$push195=, $pop46, $pop196
+	tee_local	$push194=, $3=, $pop195
+	i32.store	myrnd.s($pop200), $pop194
+	i32.const	$push193=, 0
+	i32.const	$push192=, 16
+	i32.shr_u	$push191=, $3, $pop192
+	tee_local	$push190=, $3=, $pop191
+	i32.const	$push189=, 23
+	i32.shl 	$push49=, $pop190, $pop189
+	i32.const	$push188=, 16
+	i32.shr_u	$push187=, $1, $pop188
+	tee_local	$push186=, $4=, $pop187
+	i32.const	$push185=, 23
+	i32.shl 	$push47=, $pop186, $pop185
+	i32.or  	$push48=, $pop47, $2
+	i32.add 	$push184=, $pop49, $pop48
+	tee_local	$push183=, $1=, $pop184
+	i32.store	sH($pop193), $pop183
 	i32.xor 	$push50=, $1, $0
-	i32.const	$push180=, 8388607
-	i32.and 	$push51=, $pop50, $pop180
+	i32.const	$push182=, 8388607
+	i32.and 	$push51=, $pop50, $pop182
 	br_if   	0, $pop51       # 0: down to label4
 # BB#2:                                 # %lor.lhs.false109
-	i32.add 	$push54=, $2, $4
+	i32.add 	$push54=, $3, $4
 	i32.const	$push55=, 511
 	i32.and 	$push56=, $pop54, $pop55
 	i32.const	$push52=, 23
@@ -2341,16 +2313,16 @@ testH:                                  # @testH
 	br_if   	0, $pop57       # 0: down to label4
 # BB#3:                                 # %if.end115
 	return
-.LBB48_4:                               # %if.then114
+.LBB48_4:                               # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end48:
 	.size	testH, .Lfunc_end48-testH
-
+                                        # -- End function
 	.section	.text.retmeI,"ax",@progbits
-	.hidden	retmeI
+	.hidden	retmeI                  # -- Begin function retmeI
 	.globl	retmeI
 	.type	retmeI,@function
 retmeI:                                 # @retmeI
@@ -2368,9 +2340,9 @@ retmeI:                                 # @retmeI
 	.endfunc
 .Lfunc_end49:
 	.size	retmeI, .Lfunc_end49-retmeI
-
+                                        # -- End function
 	.section	.text.fn1I,"ax",@progbits
-	.hidden	fn1I
+	.hidden	fn1I                    # -- Begin function fn1I
 	.globl	fn1I
 	.type	fn1I,@function
 fn1I:                                   # @fn1I
@@ -2388,9 +2360,9 @@ fn1I:                                   # @fn1I
 	.endfunc
 .Lfunc_end50:
 	.size	fn1I, .Lfunc_end50-fn1I
-
+                                        # -- End function
 	.section	.text.fn2I,"ax",@progbits
-	.hidden	fn2I
+	.hidden	fn2I                    # -- Begin function fn2I
 	.globl	fn2I
 	.type	fn2I,@function
 fn2I:                                   # @fn2I
@@ -2410,9 +2382,9 @@ fn2I:                                   # @fn2I
 	.endfunc
 .Lfunc_end51:
 	.size	fn2I, .Lfunc_end51-fn2I
-
+                                        # -- End function
 	.section	.text.retitI,"ax",@progbits
-	.hidden	retitI
+	.hidden	retitI                  # -- Begin function retitI
 	.globl	retitI
 	.type	retitI,@function
 retitI:                                 # @retitI
@@ -2426,9 +2398,9 @@ retitI:                                 # @retitI
 	.endfunc
 .Lfunc_end52:
 	.size	retitI, .Lfunc_end52-retitI
-
+                                        # -- End function
 	.section	.text.fn3I,"ax",@progbits
-	.hidden	fn3I
+	.hidden	fn3I                    # -- Begin function fn3I
 	.globl	fn3I
 	.type	fn3I,@function
 fn3I:                                   # @fn3I
@@ -2456,193 +2428,211 @@ fn3I:                                   # @fn3I
 	.endfunc
 .Lfunc_end53:
 	.size	fn3I, .Lfunc_end53-fn3I
-
+                                        # -- End function
 	.section	.text.testI,"ax",@progbits
-	.hidden	testI
+	.hidden	testI                   # -- Begin function testI
 	.globl	testI
 	.type	testI,@function
 testI:                                  # @testI
 	.local  	i32, i32, i32
-# BB#0:                                 # %if.end136
+# BB#0:                                 # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push152=, 0
-	i32.load	$push1=, myrnd.s($pop152)
+	i32.const	$push164=, 0
+	i32.load	$push1=, myrnd.s($pop164)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push151=, $pop3, $pop4
-	tee_local	$push150=, $0=, $pop151
+	i32.add 	$push163=, $pop3, $pop4
+	tee_local	$push162=, $0=, $pop163
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop150, $pop5
+	i32.shr_u	$push6=, $pop162, $pop5
 	i32.store8	sI($pop0), $pop6
+	i32.const	$push161=, 0
+	i32.const	$push160=, 1103515245
+	i32.mul 	$push7=, $0, $pop160
+	i32.const	$push159=, 12345
+	i32.add 	$push158=, $pop7, $pop159
+	tee_local	$push157=, $0=, $pop158
+	i32.const	$push156=, 16
+	i32.shr_u	$push8=, $pop157, $pop156
+	i32.store8	sI+1($pop161), $pop8
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push9=, $0, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop9, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push10=, $pop151, $pop150
+	i32.store8	sI+2($pop155), $pop10
 	i32.const	$push149=, 0
 	i32.const	$push148=, 1103515245
-	i32.mul 	$push7=, $0, $pop148
+	i32.mul 	$push11=, $0, $pop148
 	i32.const	$push147=, 12345
-	i32.add 	$push146=, $pop7, $pop147
+	i32.add 	$push146=, $pop11, $pop147
 	tee_local	$push145=, $0=, $pop146
 	i32.const	$push144=, 16
-	i32.shr_u	$push8=, $pop145, $pop144
-	i32.store8	sI+1($pop149), $pop8
+	i32.shr_u	$push12=, $pop145, $pop144
+	i32.store8	sI+3($pop149), $pop12
 	i32.const	$push143=, 0
 	i32.const	$push142=, 1103515245
-	i32.mul 	$push9=, $0, $pop142
+	i32.mul 	$push13=, $0, $pop142
 	i32.const	$push141=, 12345
-	i32.add 	$push140=, $pop9, $pop141
+	i32.add 	$push140=, $pop13, $pop141
 	tee_local	$push139=, $0=, $pop140
 	i32.const	$push138=, 16
-	i32.shr_u	$push10=, $pop139, $pop138
-	i32.store8	sI+2($pop143), $pop10
+	i32.shr_u	$push14=, $pop139, $pop138
+	i32.store8	sI+4($pop143), $pop14
 	i32.const	$push137=, 0
 	i32.const	$push136=, 1103515245
-	i32.mul 	$push11=, $0, $pop136
+	i32.mul 	$push15=, $0, $pop136
 	i32.const	$push135=, 12345
-	i32.add 	$push134=, $pop11, $pop135
+	i32.add 	$push134=, $pop15, $pop135
 	tee_local	$push133=, $0=, $pop134
 	i32.const	$push132=, 16
-	i32.shr_u	$push12=, $pop133, $pop132
-	i32.store8	sI+3($pop137), $pop12
+	i32.shr_u	$push16=, $pop133, $pop132
+	i32.store8	sI+5($pop137), $pop16
 	i32.const	$push131=, 0
 	i32.const	$push130=, 1103515245
-	i32.mul 	$push13=, $0, $pop130
+	i32.mul 	$push17=, $0, $pop130
 	i32.const	$push129=, 12345
-	i32.add 	$push128=, $pop13, $pop129
+	i32.add 	$push128=, $pop17, $pop129
 	tee_local	$push127=, $0=, $pop128
 	i32.const	$push126=, 16
-	i32.shr_u	$push14=, $pop127, $pop126
-	i32.store8	sI+4($pop131), $pop14
+	i32.shr_u	$push18=, $pop127, $pop126
+	i32.store8	sI+6($pop131), $pop18
 	i32.const	$push125=, 0
 	i32.const	$push124=, 1103515245
-	i32.mul 	$push15=, $0, $pop124
+	i32.mul 	$push19=, $0, $pop124
 	i32.const	$push123=, 12345
-	i32.add 	$push122=, $pop15, $pop123
+	i32.add 	$push122=, $pop19, $pop123
 	tee_local	$push121=, $0=, $pop122
 	i32.const	$push120=, 16
-	i32.shr_u	$push16=, $pop121, $pop120
-	i32.store8	sI+5($pop125), $pop16
+	i32.shr_u	$push20=, $pop121, $pop120
+	i32.store8	sI+7($pop125), $pop20
 	i32.const	$push119=, 0
 	i32.const	$push118=, 1103515245
-	i32.mul 	$push17=, $0, $pop118
+	i32.mul 	$push21=, $0, $pop118
 	i32.const	$push117=, 12345
-	i32.add 	$push116=, $pop17, $pop117
+	i32.add 	$push116=, $pop21, $pop117
 	tee_local	$push115=, $0=, $pop116
 	i32.const	$push114=, 16
-	i32.shr_u	$push18=, $pop115, $pop114
-	i32.store8	sI+6($pop119), $pop18
+	i32.shr_u	$push22=, $pop115, $pop114
+	i32.store8	sI+8($pop119), $pop22
 	i32.const	$push113=, 0
 	i32.const	$push112=, 1103515245
-	i32.mul 	$push19=, $0, $pop112
+	i32.mul 	$push23=, $0, $pop112
 	i32.const	$push111=, 12345
-	i32.add 	$push110=, $pop19, $pop111
+	i32.add 	$push110=, $pop23, $pop111
 	tee_local	$push109=, $0=, $pop110
 	i32.const	$push108=, 16
-	i32.shr_u	$push20=, $pop109, $pop108
-	i32.store8	sI+7($pop113), $pop20
+	i32.shr_u	$push24=, $pop109, $pop108
+	i32.store8	sI+9($pop113), $pop24
 	i32.const	$push107=, 0
 	i32.const	$push106=, 1103515245
-	i32.mul 	$push21=, $0, $pop106
+	i32.mul 	$push25=, $0, $pop106
 	i32.const	$push105=, 12345
-	i32.add 	$push104=, $pop21, $pop105
+	i32.add 	$push104=, $pop25, $pop105
 	tee_local	$push103=, $0=, $pop104
 	i32.const	$push102=, 16
-	i32.shr_u	$push22=, $pop103, $pop102
-	i32.store8	sI+8($pop107), $pop22
+	i32.shr_u	$push26=, $pop103, $pop102
+	i32.store8	sI+10($pop107), $pop26
 	i32.const	$push101=, 0
 	i32.const	$push100=, 1103515245
-	i32.mul 	$push23=, $0, $pop100
+	i32.mul 	$push27=, $0, $pop100
 	i32.const	$push99=, 12345
-	i32.add 	$push98=, $pop23, $pop99
+	i32.add 	$push98=, $pop27, $pop99
 	tee_local	$push97=, $0=, $pop98
 	i32.const	$push96=, 16
-	i32.shr_u	$push24=, $pop97, $pop96
-	i32.store8	sI+9($pop101), $pop24
+	i32.shr_u	$push28=, $pop97, $pop96
+	i32.store8	sI+11($pop101), $pop28
 	i32.const	$push95=, 0
 	i32.const	$push94=, 1103515245
-	i32.mul 	$push25=, $0, $pop94
+	i32.mul 	$push29=, $0, $pop94
 	i32.const	$push93=, 12345
-	i32.add 	$push92=, $pop25, $pop93
+	i32.add 	$push92=, $pop29, $pop93
 	tee_local	$push91=, $0=, $pop92
 	i32.const	$push90=, 16
-	i32.shr_u	$push26=, $pop91, $pop90
-	i32.store8	sI+10($pop95), $pop26
+	i32.shr_u	$push30=, $pop91, $pop90
+	i32.store8	sI+12($pop95), $pop30
 	i32.const	$push89=, 0
 	i32.const	$push88=, 1103515245
-	i32.mul 	$push27=, $0, $pop88
+	i32.mul 	$push31=, $0, $pop88
 	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop27, $pop87
+	i32.add 	$push86=, $pop31, $pop87
 	tee_local	$push85=, $0=, $pop86
 	i32.const	$push84=, 16
-	i32.shr_u	$push28=, $pop85, $pop84
-	i32.store8	sI+11($pop89), $pop28
+	i32.shr_u	$push32=, $pop85, $pop84
+	i32.store8	sI+13($pop89), $pop32
 	i32.const	$push83=, 0
 	i32.const	$push82=, 1103515245
-	i32.mul 	$push29=, $0, $pop82
+	i32.mul 	$push33=, $0, $pop82
 	i32.const	$push81=, 12345
-	i32.add 	$push80=, $pop29, $pop81
+	i32.add 	$push80=, $pop33, $pop81
 	tee_local	$push79=, $0=, $pop80
 	i32.const	$push78=, 16
-	i32.shr_u	$push30=, $pop79, $pop78
-	i32.store8	sI+12($pop83), $pop30
+	i32.shr_u	$push34=, $pop79, $pop78
+	i32.store8	sI+14($pop83), $pop34
 	i32.const	$push77=, 0
 	i32.const	$push76=, 1103515245
-	i32.mul 	$push31=, $0, $pop76
+	i32.mul 	$push35=, $0, $pop76
 	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop31, $pop75
+	i32.add 	$push74=, $pop35, $pop75
 	tee_local	$push73=, $0=, $pop74
 	i32.const	$push72=, 16
-	i32.shr_u	$push32=, $pop73, $pop72
-	i32.store8	sI+13($pop77), $pop32
+	i32.shr_u	$push36=, $pop73, $pop72
+	i32.store8	sI+15($pop77), $pop36
 	i32.const	$push71=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push33=, $0, $pop70
-	i32.const	$push69=, 12345
-	i32.add 	$push68=, $pop33, $pop69
-	tee_local	$push67=, $0=, $pop68
-	i32.const	$push66=, 16
-	i32.shr_u	$push34=, $pop67, $pop66
-	i32.store8	sI+14($pop71), $pop34
-	i32.const	$push65=, 0
-	i32.const	$push64=, 1103515245
-	i32.mul 	$push35=, $0, $pop64
-	i32.const	$push63=, 12345
-	i32.add 	$push62=, $pop35, $pop63
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 16
-	i32.shr_u	$push36=, $pop61, $pop60
-	i32.store8	sI+15($pop65), $pop36
-	i32.const	$push59=, 0
-	i32.load16_u	$2=, sI($pop59)
-	i32.const	$push58=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push57=, $pop38, $pop39
-	tee_local	$push56=, $0=, $pop57
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push40=, $pop56, $pop55
-	i32.const	$push54=, 12345
-	i32.add 	$push53=, $pop40, $pop54
-	tee_local	$push52=, $1=, $pop53
-	i32.store	myrnd.s($pop58), $pop52
-	i32.const	$push51=, 0
-	i32.const	$push50=, 16
-	i32.shr_u	$push42=, $1, $pop50
-	i32.const	$push49=, 16
-	i32.shr_u	$push41=, $0, $pop49
-	i32.add 	$push43=, $pop42, $pop41
-	i32.const	$push44=, 7
-	i32.shl 	$push45=, $pop43, $pop44
-	i32.const	$push46=, 127
-	i32.and 	$push47=, $2, $pop46
-	i32.or  	$push48=, $pop45, $pop47
-	i32.store16	sI($pop51), $pop48
-                                        # fallthrough-return
+	i32.add 	$push70=, $pop38, $pop39
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push40=, $pop69, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$push66=, $pop40, $pop67
+	tee_local	$push65=, $1=, $pop66
+	i32.store	myrnd.s($pop71), $pop65
+	i32.const	$push64=, 0
+	i32.const	$push63=, 16
+	i32.shr_u	$push62=, $1, $pop63
+	tee_local	$push61=, $1=, $pop62
+	i32.const	$push43=, 2047
+	i32.and 	$push44=, $pop61, $pop43
+	i32.const	$push60=, 16
+	i32.shr_u	$push59=, $0, $pop60
+	tee_local	$push58=, $0=, $pop59
+	i32.const	$push41=, 511
+	i32.and 	$push42=, $pop58, $pop41
+	i32.add 	$push57=, $pop44, $pop42
+	tee_local	$push56=, $2=, $pop57
+	i32.const	$push45=, 7
+	i32.shl 	$push46=, $pop56, $pop45
+	i32.const	$push55=, 0
+	i32.load16_u	$push47=, sI($pop55)
+	i32.const	$push48=, 127
+	i32.and 	$push49=, $pop47, $pop48
+	i32.or  	$push50=, $pop46, $pop49
+	i32.store16	sI($pop64), $pop50
+	block   	
+	i32.add 	$push51=, $1, $0
+	i32.xor 	$push52=, $pop51, $2
+	i32.const	$push54=, 511
+	i32.and 	$push53=, $pop52, $pop54
+	br_if   	0, $pop53       # 0: down to label5
+# BB#1:                                 # %if.end136
+	return
+.LBB54_2:                               # %if.then135
+	end_block                       # label5:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end54:
 	.size	testI, .Lfunc_end54-testI
-
+                                        # -- End function
 	.section	.text.retmeJ,"ax",@progbits
-	.hidden	retmeJ
+	.hidden	retmeJ                  # -- Begin function retmeJ
 	.globl	retmeJ
 	.type	retmeJ,@function
 retmeJ:                                 # @retmeJ
@@ -2654,9 +2644,9 @@ retmeJ:                                 # @retmeJ
 	.endfunc
 .Lfunc_end55:
 	.size	retmeJ, .Lfunc_end55-retmeJ
-
+                                        # -- End function
 	.section	.text.fn1J,"ax",@progbits
-	.hidden	fn1J
+	.hidden	fn1J                    # -- Begin function fn1J
 	.globl	fn1J
 	.type	fn1J,@function
 fn1J:                                   # @fn1J
@@ -2674,9 +2664,9 @@ fn1J:                                   # @fn1J
 	.endfunc
 .Lfunc_end56:
 	.size	fn1J, .Lfunc_end56-fn1J
-
+                                        # -- End function
 	.section	.text.fn2J,"ax",@progbits
-	.hidden	fn2J
+	.hidden	fn2J                    # -- Begin function fn2J
 	.globl	fn2J
 	.type	fn2J,@function
 fn2J:                                   # @fn2J
@@ -2696,9 +2686,9 @@ fn2J:                                   # @fn2J
 	.endfunc
 .Lfunc_end57:
 	.size	fn2J, .Lfunc_end57-fn2J
-
+                                        # -- End function
 	.section	.text.retitJ,"ax",@progbits
-	.hidden	retitJ
+	.hidden	retitJ                  # -- Begin function retitJ
 	.globl	retitJ
 	.type	retitJ,@function
 retitJ:                                 # @retitJ
@@ -2712,9 +2702,9 @@ retitJ:                                 # @retitJ
 	.endfunc
 .Lfunc_end58:
 	.size	retitJ, .Lfunc_end58-retitJ
-
+                                        # -- End function
 	.section	.text.fn3J,"ax",@progbits
-	.hidden	fn3J
+	.hidden	fn3J                    # -- Begin function fn3J
 	.globl	fn3J
 	.type	fn3J,@function
 fn3J:                                   # @fn3J
@@ -2742,127 +2732,138 @@ fn3J:                                   # @fn3J
 	.endfunc
 .Lfunc_end59:
 	.size	fn3J, .Lfunc_end59-fn3J
-
+                                        # -- End function
 	.section	.text.testJ,"ax",@progbits
-	.hidden	testJ
+	.hidden	testJ                   # -- Begin function testJ
 	.globl	testJ
 	.type	testJ,@function
 testJ:                                  # @testJ
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push78=, 0
-	i32.const	$push77=, 0
-	i32.load	$push0=, myrnd.s($pop77)
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop1, $pop75
-	tee_local	$push73=, $0=, $pop74
-	i32.const	$push72=, 16
-	i32.shr_u	$push2=, $pop73, $pop72
-	i32.store8	sJ($pop78), $pop2
-	i32.const	$push71=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push3=, $0, $pop70
-	i32.const	$push69=, 12345
-	i32.add 	$push68=, $pop3, $pop69
-	tee_local	$push67=, $0=, $pop68
-	i32.const	$push66=, 16
-	i32.shr_u	$push4=, $pop67, $pop66
-	i32.store8	sJ+1($pop71), $pop4
-	i32.const	$push65=, 0
-	i32.const	$push64=, 1103515245
-	i32.mul 	$push5=, $0, $pop64
-	i32.const	$push63=, 12345
-	i32.add 	$push62=, $pop5, $pop63
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 16
-	i32.shr_u	$push6=, $pop61, $pop60
-	i32.store8	sJ+2($pop65), $pop6
-	i32.const	$push59=, 0
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push7=, $0, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop7, $pop57
-	tee_local	$push55=, $0=, $pop56
-	i32.const	$push54=, 16
-	i32.shr_u	$push8=, $pop55, $pop54
-	i32.store8	sJ+3($pop59), $pop8
-	i32.const	$push53=, 0
-	i32.const	$push52=, 1103515245
-	i32.mul 	$push11=, $0, $pop52
-	i32.const	$push51=, 12345
-	i32.add 	$push50=, $pop11, $pop51
-	tee_local	$push49=, $0=, $pop50
-	i32.const	$push48=, 16
-	i32.shr_u	$push47=, $pop49, $pop48
-	tee_local	$push46=, $1=, $pop47
-	i32.const	$push45=, 9
-	i32.shl 	$push12=, $pop46, $pop45
-	i32.const	$push44=, 0
-	i32.load16_u	$push9=, sJ($pop44)
-	i32.const	$push43=, 511
-	i32.and 	$push10=, $pop9, $pop43
-	i32.or  	$push13=, $pop12, $pop10
-	i32.store16	sJ($pop53), $pop13
-	i32.const	$push42=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push14=, $0, $pop41
-	i32.const	$push40=, 12345
-	i32.add 	$push39=, $pop14, $pop40
-	tee_local	$push38=, $0=, $pop39
-	i32.store	myrnd.s($pop42), $pop38
+	i32.const	$push80=, 0
+	i32.const	$push79=, 0
+	i32.load	$push0=, myrnd.s($pop79)
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop1, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push2=, $pop75, $pop74
+	i32.store8	sJ($pop80), $pop2
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push3=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop3, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push4=, $pop69, $pop68
+	i32.store8	sJ+1($pop73), $pop4
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push5=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop5, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push6=, $pop63, $pop62
+	i32.store8	sJ+2($pop67), $pop6
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push7=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop7, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push8=, $pop57, $pop56
+	i32.store8	sJ+3($pop61), $pop8
+	i32.const	$push55=, 0
+	i32.const	$push54=, 0
+	i32.load16_u	$push9=, sJ($pop54)
+	i32.const	$push10=, 511
+	i32.and 	$push53=, $pop9, $pop10
+	tee_local	$push52=, $1=, $pop53
+	i32.const	$push51=, 1103515245
+	i32.mul 	$push11=, $0, $pop51
+	i32.const	$push50=, 12345
+	i32.add 	$push49=, $pop11, $pop50
+	tee_local	$push48=, $0=, $pop49
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $pop48, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.const	$push44=, 9
+	i32.shl 	$push12=, $pop45, $pop44
+	i32.or  	$push13=, $pop52, $pop12
+	i32.store16	sJ($pop55), $pop13
+	i32.const	$push43=, 0
+	i32.const	$push42=, 1103515245
+	i32.mul 	$push14=, $0, $pop42
+	i32.const	$push41=, 12345
+	i32.add 	$push40=, $pop14, $pop41
+	tee_local	$push39=, $0=, $pop40
+	i32.store	myrnd.s($pop43), $pop39
 	block   	
-	i32.const	$push37=, 16
-	i32.shr_u	$push36=, $0, $pop37
-	tee_local	$push35=, $2=, $pop36
-	i32.add 	$push15=, $pop35, $1
-	i32.const	$push34=, 0
-	i32.load	$push33=, sJ($pop34)
-	tee_local	$push32=, $1=, $pop33
-	i32.const	$push31=, 9
-	i32.shr_u	$push16=, $pop32, $pop31
-	i32.add 	$push17=, $pop16, $2
-	i32.xor 	$push18=, $pop15, $pop17
-	i32.const	$push19=, 127
-	i32.and 	$push20=, $pop18, $pop19
-	br_if   	0, $pop20       # 0: down to label5
-# BB#1:                                 # %if.end142
-	i32.const	$push90=, 0
+	i32.const	$push38=, 16
+	i32.shr_u	$push37=, $0, $pop38
+	tee_local	$push36=, $3=, $pop37
+	i32.add 	$push15=, $pop36, $2
+	i32.const	$push35=, 0
+	i32.load	$push16=, sJ($pop35)
+	i32.const	$push34=, 9
+	i32.shr_u	$push17=, $pop16, $pop34
+	i32.add 	$push18=, $3, $pop17
+	i32.xor 	$push19=, $pop15, $pop18
+	i32.const	$push33=, 127
+	i32.and 	$push20=, $pop19, $pop33
+	br_if   	0, $pop20       # 0: down to label6
+# BB#1:                                 # %lor.lhs.false136
+	i32.const	$push99=, 0
 	i32.const	$push21=, -2139243339
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, -1492899873
-	i32.add 	$push89=, $pop22, $pop23
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push24=, $pop88, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop24, $pop86
-	tee_local	$push84=, $2=, $pop85
-	i32.store	myrnd.s($pop90), $pop84
-	i32.const	$push83=, 0
-	i32.const	$push82=, 16
-	i32.shr_u	$push26=, $2, $pop82
-	i32.const	$push81=, 16
-	i32.shr_u	$push25=, $0, $pop81
-	i32.add 	$push27=, $pop26, $pop25
-	i32.const	$push80=, 9
-	i32.shl 	$push28=, $pop27, $pop80
-	i32.const	$push79=, 511
-	i32.and 	$push29=, $1, $pop79
-	i32.or  	$push30=, $pop28, $pop29
-	i32.store16	sJ($pop83), $pop30
+	i32.add 	$push98=, $pop22, $pop23
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push24=, $pop97, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop24, $pop95
+	tee_local	$push93=, $2=, $pop94
+	i32.store	myrnd.s($pop99), $pop93
+	i32.const	$push92=, 0
+	i32.const	$push91=, 16
+	i32.shr_u	$push90=, $2, $pop91
+	tee_local	$push89=, $2=, $pop90
+	i32.const	$push26=, 2047
+	i32.and 	$push27=, $pop89, $pop26
+	i32.const	$push88=, 16
+	i32.shr_u	$push87=, $0, $pop88
+	tee_local	$push86=, $0=, $pop87
+	i32.const	$push85=, 127
+	i32.and 	$push25=, $pop86, $pop85
+	i32.add 	$push84=, $pop27, $pop25
+	tee_local	$push83=, $3=, $pop84
+	i32.const	$push82=, 9
+	i32.shl 	$push28=, $pop83, $pop82
+	i32.or  	$push29=, $pop28, $1
+	i32.store16	sJ($pop92), $pop29
+	i32.add 	$push30=, $2, $0
+	i32.xor 	$push31=, $pop30, $3
+	i32.const	$push81=, 127
+	i32.and 	$push32=, $pop31, $pop81
+	br_if   	0, $pop32       # 0: down to label6
+# BB#2:                                 # %if.end142
 	return
-.LBB60_2:                               # %if.then
-	end_block                       # label5:
+.LBB60_3:                               # %if.then
+	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end60:
 	.size	testJ, .Lfunc_end60-testJ
-
+                                        # -- End function
 	.section	.text.retmeK,"ax",@progbits
-	.hidden	retmeK
+	.hidden	retmeK                  # -- Begin function retmeK
 	.globl	retmeK
 	.type	retmeK,@function
 retmeK:                                 # @retmeK
@@ -2874,9 +2875,9 @@ retmeK:                                 # @retmeK
 	.endfunc
 .Lfunc_end61:
 	.size	retmeK, .Lfunc_end61-retmeK
-
+                                        # -- End function
 	.section	.text.fn1K,"ax",@progbits
-	.hidden	fn1K
+	.hidden	fn1K                    # -- Begin function fn1K
 	.globl	fn1K
 	.type	fn1K,@function
 fn1K:                                   # @fn1K
@@ -2892,9 +2893,9 @@ fn1K:                                   # @fn1K
 	.endfunc
 .Lfunc_end62:
 	.size	fn1K, .Lfunc_end62-fn1K
-
+                                        # -- End function
 	.section	.text.fn2K,"ax",@progbits
-	.hidden	fn2K
+	.hidden	fn2K                    # -- Begin function fn2K
 	.globl	fn2K
 	.type	fn2K,@function
 fn2K:                                   # @fn2K
@@ -2912,9 +2913,9 @@ fn2K:                                   # @fn2K
 	.endfunc
 .Lfunc_end63:
 	.size	fn2K, .Lfunc_end63-fn2K
-
+                                        # -- End function
 	.section	.text.retitK,"ax",@progbits
-	.hidden	retitK
+	.hidden	retitK                  # -- Begin function retitK
 	.globl	retitK
 	.type	retitK,@function
 retitK:                                 # @retitK
@@ -2928,9 +2929,9 @@ retitK:                                 # @retitK
 	.endfunc
 .Lfunc_end64:
 	.size	retitK, .Lfunc_end64-retitK
-
+                                        # -- End function
 	.section	.text.fn3K,"ax",@progbits
-	.hidden	fn3K
+	.hidden	fn3K                    # -- Begin function fn3K
 	.globl	fn3K
 	.type	fn3K,@function
 fn3K:                                   # @fn3K
@@ -2955,9 +2956,9 @@ fn3K:                                   # @fn3K
 	.endfunc
 .Lfunc_end65:
 	.size	fn3K, .Lfunc_end65-fn3K
-
+                                        # -- End function
 	.section	.text.testK,"ax",@progbits
-	.hidden	testK
+	.hidden	testK                   # -- Begin function testK
 	.globl	testK
 	.type	testK,@function
 testK:                                  # @testK
@@ -3031,9 +3032,9 @@ testK:                                  # @testK
 	.endfunc
 .Lfunc_end66:
 	.size	testK, .Lfunc_end66-testK
-
+                                        # -- End function
 	.section	.text.retmeL,"ax",@progbits
-	.hidden	retmeL
+	.hidden	retmeL                  # -- Begin function retmeL
 	.globl	retmeL
 	.type	retmeL,@function
 retmeL:                                 # @retmeL
@@ -3045,9 +3046,9 @@ retmeL:                                 # @retmeL
 	.endfunc
 .Lfunc_end67:
 	.size	retmeL, .Lfunc_end67-retmeL
-
+                                        # -- End function
 	.section	.text.fn1L,"ax",@progbits
-	.hidden	fn1L
+	.hidden	fn1L                    # -- Begin function fn1L
 	.globl	fn1L
 	.type	fn1L,@function
 fn1L:                                   # @fn1L
@@ -3063,9 +3064,9 @@ fn1L:                                   # @fn1L
 	.endfunc
 .Lfunc_end68:
 	.size	fn1L, .Lfunc_end68-fn1L
-
+                                        # -- End function
 	.section	.text.fn2L,"ax",@progbits
-	.hidden	fn2L
+	.hidden	fn2L                    # -- Begin function fn2L
 	.globl	fn2L
 	.type	fn2L,@function
 fn2L:                                   # @fn2L
@@ -3083,9 +3084,9 @@ fn2L:                                   # @fn2L
 	.endfunc
 .Lfunc_end69:
 	.size	fn2L, .Lfunc_end69-fn2L
-
+                                        # -- End function
 	.section	.text.retitL,"ax",@progbits
-	.hidden	retitL
+	.hidden	retitL                  # -- Begin function retitL
 	.globl	retitL
 	.type	retitL,@function
 retitL:                                 # @retitL
@@ -3099,9 +3100,9 @@ retitL:                                 # @retitL
 	.endfunc
 .Lfunc_end70:
 	.size	retitL, .Lfunc_end70-retitL
-
+                                        # -- End function
 	.section	.text.fn3L,"ax",@progbits
-	.hidden	fn3L
+	.hidden	fn3L                    # -- Begin function fn3L
 	.globl	fn3L
 	.type	fn3L,@function
 fn3L:                                   # @fn3L
@@ -3126,159 +3127,158 @@ fn3L:                                   # @fn3L
 	.endfunc
 .Lfunc_end71:
 	.size	fn3L, .Lfunc_end71-fn3L
-
+                                        # -- End function
 	.section	.text.testL,"ax",@progbits
-	.hidden	testL
+	.hidden	testL                   # -- Begin function testL
 	.globl	testL
 	.type	testL,@function
 testL:                                  # @testL
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push106=, 0
 	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.load	$push0=, myrnd.s($pop104)
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop1, $pop102
-	tee_local	$push100=, $0=, $pop101
-	i32.const	$push99=, 16
-	i32.shr_u	$push2=, $pop100, $pop99
-	i32.store8	sL($pop105), $pop2
-	i32.const	$push98=, 0
-	i32.const	$push97=, 1103515245
-	i32.mul 	$push3=, $0, $pop97
-	i32.const	$push96=, 12345
-	i32.add 	$push95=, $pop3, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 16
-	i32.shr_u	$push4=, $pop94, $pop93
-	i32.store8	sL+1($pop98), $pop4
-	i32.const	$push92=, 0
-	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $0, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 16
-	i32.shr_u	$push6=, $pop88, $pop87
-	i32.store8	sL+2($pop92), $pop6
-	i32.const	$push86=, 0
-	i32.const	$push85=, 1103515245
-	i32.mul 	$push7=, $0, $pop85
-	i32.const	$push84=, 12345
-	i32.add 	$push83=, $pop7, $pop84
-	tee_local	$push82=, $0=, $pop83
-	i32.const	$push81=, 16
-	i32.shr_u	$push8=, $pop82, $pop81
-	i32.store8	sL+3($pop86), $pop8
-	i32.const	$push80=, 0
-	i32.const	$push79=, 1103515245
-	i32.mul 	$push9=, $0, $pop79
-	i32.const	$push78=, 12345
-	i32.add 	$push77=, $pop9, $pop78
-	tee_local	$push76=, $0=, $pop77
-	i32.const	$push75=, 16
-	i32.shr_u	$push10=, $pop76, $pop75
-	i32.store8	sL+4($pop80), $pop10
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push11=, $0, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop11, $pop72
-	tee_local	$push70=, $0=, $pop71
-	i32.const	$push69=, 16
-	i32.shr_u	$push12=, $pop70, $pop69
-	i32.store8	sL+5($pop74), $pop12
-	i32.const	$push68=, 0
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $0, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $0=, $pop65
-	i32.const	$push63=, 16
-	i32.shr_u	$push14=, $pop64, $pop63
-	i32.store8	sL+6($pop68), $pop14
-	i32.const	$push62=, 0
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push15=, $0, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop15, $pop60
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 16
-	i32.shr_u	$push16=, $pop58, $pop57
-	i32.store8	sL+7($pop62), $pop16
-	i32.const	$push56=, 0
-	i32.load	$1=, sL($pop56)
-	i32.const	$push55=, 0
-	i32.const	$push54=, 1103515245
-	i32.mul 	$push17=, $0, $pop54
-	i32.const	$push53=, 12345
-	i32.add 	$push52=, $pop17, $pop53
-	tee_local	$push51=, $2=, $pop52
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push18=, $pop51, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop18, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.store	myrnd.s($pop55), $pop47
-	i32.const	$push46=, 0
-	i32.const	$push45=, 16
-	i32.shr_u	$push44=, $2, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.const	$push42=, 63
-	i32.and 	$push20=, $pop43, $pop42
-	i32.const	$push41=, -64
-	i32.and 	$push19=, $1, $pop41
-	i32.or  	$push40=, $pop20, $pop19
-	tee_local	$push39=, $1=, $pop40
-	i32.store	sL($pop46), $pop39
+	i32.load	$push0=, myrnd.s($pop105)
+	i32.const	$push104=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop104
+	i32.const	$push103=, 12345
+	i32.add 	$push102=, $pop1, $pop103
+	tee_local	$push101=, $0=, $pop102
+	i32.const	$push100=, 16
+	i32.shr_u	$push2=, $pop101, $pop100
+	i32.store8	sL($pop106), $pop2
+	i32.const	$push99=, 0
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push3=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop3, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.const	$push94=, 16
+	i32.shr_u	$push4=, $pop95, $pop94
+	i32.store8	sL+1($pop99), $pop4
+	i32.const	$push93=, 0
+	i32.const	$push92=, 1103515245
+	i32.mul 	$push5=, $0, $pop92
+	i32.const	$push91=, 12345
+	i32.add 	$push90=, $pop5, $pop91
+	tee_local	$push89=, $0=, $pop90
+	i32.const	$push88=, 16
+	i32.shr_u	$push6=, $pop89, $pop88
+	i32.store8	sL+2($pop93), $pop6
+	i32.const	$push87=, 0
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push7=, $0, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$push84=, $pop7, $pop85
+	tee_local	$push83=, $0=, $pop84
+	i32.const	$push82=, 16
+	i32.shr_u	$push8=, $pop83, $pop82
+	i32.store8	sL+3($pop87), $pop8
+	i32.const	$push81=, 0
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push9=, $0, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$push78=, $pop9, $pop79
+	tee_local	$push77=, $0=, $pop78
+	i32.const	$push76=, 16
+	i32.shr_u	$push10=, $pop77, $pop76
+	i32.store8	sL+4($pop81), $pop10
+	i32.const	$push75=, 0
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push11=, $0, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$push72=, $pop11, $pop73
+	tee_local	$push71=, $0=, $pop72
+	i32.const	$push70=, 16
+	i32.shr_u	$push12=, $pop71, $pop70
+	i32.store8	sL+5($pop75), $pop12
+	i32.const	$push69=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push13=, $0, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$push66=, $pop13, $pop67
+	tee_local	$push65=, $0=, $pop66
+	i32.const	$push64=, 16
+	i32.shr_u	$push14=, $pop65, $pop64
+	i32.store8	sL+6($pop69), $pop14
+	i32.const	$push63=, 0
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push15=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop15, $pop61
+	tee_local	$push59=, $0=, $pop60
+	i32.const	$push58=, 16
+	i32.shr_u	$push16=, $pop59, $pop58
+	i32.store8	sL+7($pop63), $pop16
+	i32.const	$push57=, 0
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $0, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$push54=, $pop17, $pop55
+	tee_local	$push53=, $2=, $pop54
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push18=, $pop53, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$push50=, $pop18, $pop51
+	tee_local	$push49=, $0=, $pop50
+	i32.store	myrnd.s($pop57), $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $2, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.const	$push44=, 63
+	i32.and 	$push21=, $pop45, $pop44
+	i32.const	$push43=, 0
+	i32.load	$push19=, sL($pop43)
+	i32.const	$push20=, -64
+	i32.and 	$push42=, $pop19, $pop20
+	tee_local	$push41=, $1=, $pop42
+	i32.or  	$push40=, $pop21, $pop41
+	tee_local	$push39=, $3=, $pop40
+	i32.store	sL($pop48), $pop39
 	block   	
 	i32.const	$push38=, 16
 	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.add 	$push22=, $pop36, $2
-	i32.add 	$push21=, $1, $3
-	i32.xor 	$push23=, $pop22, $pop21
+	tee_local	$push36=, $4=, $pop37
+	i32.add 	$push23=, $pop36, $2
+	i32.add 	$push22=, $4, $3
+	i32.xor 	$push24=, $pop23, $pop22
 	i32.const	$push35=, 63
-	i32.and 	$push24=, $pop23, $pop35
-	br_if   	0, $pop24       # 0: down to label6
-# BB#1:                                 # %if.end75
+	i32.and 	$push25=, $pop24, $pop35
+	br_if   	0, $pop25       # 0: down to label7
+# BB#1:                                 # %if.end113
 	i32.const	$push117=, 0
-	i32.const	$push25=, -2139243339
-	i32.mul 	$push26=, $0, $pop25
-	i32.const	$push27=, -1492899873
-	i32.add 	$push116=, $pop26, $pop27
+	i32.const	$push26=, -2139243339
+	i32.mul 	$push27=, $0, $pop26
+	i32.const	$push28=, -1492899873
+	i32.add 	$push116=, $pop27, $pop28
 	tee_local	$push115=, $0=, $pop116
 	i32.const	$push114=, 1103515245
-	i32.mul 	$push28=, $pop115, $pop114
+	i32.mul 	$push29=, $pop115, $pop114
 	i32.const	$push113=, 12345
-	i32.add 	$push112=, $pop28, $pop113
+	i32.add 	$push112=, $pop29, $pop113
 	tee_local	$push111=, $2=, $pop112
 	i32.store	myrnd.s($pop117), $pop111
 	i32.const	$push110=, 0
 	i32.const	$push109=, 16
-	i32.shr_u	$push30=, $2, $pop109
+	i32.shr_u	$push31=, $2, $pop109
 	i32.const	$push108=, 16
-	i32.shr_u	$push29=, $0, $pop108
-	i32.add 	$push31=, $pop30, $pop29
+	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$push32=, $pop31, $pop30
 	i32.const	$push107=, 63
-	i32.and 	$push32=, $pop31, $pop107
-	i32.const	$push106=, -64
-	i32.and 	$push33=, $1, $pop106
-	i32.or  	$push34=, $pop32, $pop33
+	i32.and 	$push33=, $pop32, $pop107
+	i32.or  	$push34=, $pop33, $1
 	i32.store	sL($pop110), $pop34
 	return
 .LBB72_2:                               # %if.then
-	end_block                       # label6:
+	end_block                       # label7:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end72:
 	.size	testL, .Lfunc_end72-testL
-
+                                        # -- End function
 	.section	.text.retmeM,"ax",@progbits
-	.hidden	retmeM
+	.hidden	retmeM                  # -- Begin function retmeM
 	.globl	retmeM
 	.type	retmeM,@function
 retmeM:                                 # @retmeM
@@ -3290,9 +3290,9 @@ retmeM:                                 # @retmeM
 	.endfunc
 .Lfunc_end73:
 	.size	retmeM, .Lfunc_end73-retmeM
-
+                                        # -- End function
 	.section	.text.fn1M,"ax",@progbits
-	.hidden	fn1M
+	.hidden	fn1M                    # -- Begin function fn1M
 	.globl	fn1M
 	.type	fn1M,@function
 fn1M:                                   # @fn1M
@@ -3308,9 +3308,9 @@ fn1M:                                   # @fn1M
 	.endfunc
 .Lfunc_end74:
 	.size	fn1M, .Lfunc_end74-fn1M
-
+                                        # -- End function
 	.section	.text.fn2M,"ax",@progbits
-	.hidden	fn2M
+	.hidden	fn2M                    # -- Begin function fn2M
 	.globl	fn2M
 	.type	fn2M,@function
 fn2M:                                   # @fn2M
@@ -3328,9 +3328,9 @@ fn2M:                                   # @fn2M
 	.endfunc
 .Lfunc_end75:
 	.size	fn2M, .Lfunc_end75-fn2M
-
+                                        # -- End function
 	.section	.text.retitM,"ax",@progbits
-	.hidden	retitM
+	.hidden	retitM                  # -- Begin function retitM
 	.globl	retitM
 	.type	retitM,@function
 retitM:                                 # @retitM
@@ -3344,9 +3344,9 @@ retitM:                                 # @retitM
 	.endfunc
 .Lfunc_end76:
 	.size	retitM, .Lfunc_end76-retitM
-
+                                        # -- End function
 	.section	.text.fn3M,"ax",@progbits
-	.hidden	fn3M
+	.hidden	fn3M                    # -- Begin function fn3M
 	.globl	fn3M
 	.type	fn3M,@function
 fn3M:                                   # @fn3M
@@ -3371,158 +3371,158 @@ fn3M:                                   # @fn3M
 	.endfunc
 .Lfunc_end77:
 	.size	fn3M, .Lfunc_end77-fn3M
-
+                                        # -- End function
 	.section	.text.testM,"ax",@progbits
-	.hidden	testM
+	.hidden	testM                   # -- Begin function testM
 	.globl	testM
 	.type	testM,@function
 testM:                                  # @testM
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push106=, 0
 	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.load	$push0=, myrnd.s($pop104)
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop1, $pop102
-	tee_local	$push100=, $0=, $pop101
-	i32.const	$push99=, 16
-	i32.shr_u	$push2=, $pop100, $pop99
-	i32.store8	sM($pop105), $pop2
-	i32.const	$push98=, 0
-	i32.const	$push97=, 1103515245
-	i32.mul 	$push3=, $0, $pop97
-	i32.const	$push96=, 12345
-	i32.add 	$push95=, $pop3, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 16
-	i32.shr_u	$push4=, $pop94, $pop93
-	i32.store8	sM+1($pop98), $pop4
-	i32.const	$push92=, 0
-	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $0, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 16
-	i32.shr_u	$push6=, $pop88, $pop87
-	i32.store8	sM+2($pop92), $pop6
-	i32.const	$push86=, 0
-	i32.const	$push85=, 1103515245
-	i32.mul 	$push7=, $0, $pop85
-	i32.const	$push84=, 12345
-	i32.add 	$push83=, $pop7, $pop84
-	tee_local	$push82=, $0=, $pop83
-	i32.const	$push81=, 16
-	i32.shr_u	$push8=, $pop82, $pop81
-	i32.store8	sM+3($pop86), $pop8
-	i32.const	$push80=, 0
-	i32.const	$push79=, 1103515245
-	i32.mul 	$push9=, $0, $pop79
-	i32.const	$push78=, 12345
-	i32.add 	$push77=, $pop9, $pop78
-	tee_local	$push76=, $0=, $pop77
-	i32.const	$push75=, 16
-	i32.shr_u	$push10=, $pop76, $pop75
-	i32.store8	sM+4($pop80), $pop10
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push11=, $0, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop11, $pop72
-	tee_local	$push70=, $0=, $pop71
-	i32.const	$push69=, 16
-	i32.shr_u	$push12=, $pop70, $pop69
-	i32.store8	sM+5($pop74), $pop12
-	i32.const	$push68=, 0
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $0, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $0=, $pop65
-	i32.const	$push63=, 16
-	i32.shr_u	$push14=, $pop64, $pop63
-	i32.store8	sM+6($pop68), $pop14
-	i32.const	$push62=, 0
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push15=, $0, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop15, $pop60
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 16
-	i32.shr_u	$push16=, $pop58, $pop57
-	i32.store8	sM+7($pop62), $pop16
-	i32.const	$push56=, 0
-	i32.load	$3=, sM+4($pop56)
-	i32.const	$push55=, 0
-	i32.const	$push54=, 1103515245
-	i32.mul 	$push17=, $0, $pop54
-	i32.const	$push53=, 12345
-	i32.add 	$push52=, $pop17, $pop53
-	tee_local	$push51=, $2=, $pop52
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push18=, $pop51, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop18, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.store	myrnd.s($pop55), $pop47
-	i32.const	$push46=, 0
-	i32.const	$push45=, 16
-	i32.shr_u	$push44=, $2, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.const	$push42=, 63
-	i32.and 	$push20=, $pop43, $pop42
-	i32.const	$push19=, -64
-	i32.and 	$push41=, $3, $pop19
-	tee_local	$push40=, $1=, $pop41
-	i32.or  	$push39=, $pop20, $pop40
-	tee_local	$push38=, $3=, $pop39
-	i32.store	sM+4($pop46), $pop38
+	i32.load	$push0=, myrnd.s($pop105)
+	i32.const	$push104=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop104
+	i32.const	$push103=, 12345
+	i32.add 	$push102=, $pop1, $pop103
+	tee_local	$push101=, $0=, $pop102
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push2=, $pop101, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop2, $pop99
+	tee_local	$push97=, $1=, $pop98
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push3=, $pop97, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop3, $pop95
+	tee_local	$push93=, $2=, $pop94
+	i32.const	$push92=, 1103515245
+	i32.mul 	$push4=, $pop93, $pop92
+	i32.const	$push91=, 12345
+	i32.add 	$push90=, $pop4, $pop91
+	tee_local	$push89=, $3=, $pop90
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push5=, $pop89, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop5, $pop87
+	tee_local	$push85=, $4=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push6=, $pop85, $pop84
+	i32.store8	sM+4($pop106), $pop6
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push7=, $4, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop7, $pop81
+	tee_local	$push79=, $4=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push8=, $pop79, $pop78
+	i32.store8	sM+5($pop83), $pop8
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push9=, $4, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop9, $pop75
+	tee_local	$push73=, $4=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push10=, $pop73, $pop72
+	i32.store8	sM+6($pop77), $pop10
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push11=, $4, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop11, $pop69
+	tee_local	$push67=, $4=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push12=, $pop67, $pop66
+	i32.store8	sM+7($pop71), $pop12
+	i32.const	$push65=, 0
+	i32.const	$push64=, 16
+	i32.shr_u	$push13=, $0, $pop64
+	i32.store8	sM($pop65), $pop13
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push14=, $1, $pop62
+	i32.store8	sM+1($pop63), $pop14
+	i32.const	$push61=, 0
+	i32.const	$push60=, 16
+	i32.shr_u	$push15=, $2, $pop60
+	i32.store8	sM+2($pop61), $pop15
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push16=, $3, $pop58
+	i32.store8	sM+3($pop59), $pop16
+	i32.const	$push57=, 0
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $4, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$push54=, $pop17, $pop55
+	tee_local	$push53=, $1=, $pop54
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push18=, $pop53, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$push50=, $pop18, $pop51
+	tee_local	$push49=, $0=, $pop50
+	i32.store	myrnd.s($pop57), $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $1, $pop47
+	tee_local	$push45=, $1=, $pop46
+	i32.const	$push44=, 63
+	i32.and 	$push21=, $pop45, $pop44
+	i32.const	$push43=, 0
+	i32.load	$push19=, sM+4($pop43)
+	i32.const	$push20=, -64
+	i32.and 	$push42=, $pop19, $pop20
+	tee_local	$push41=, $2=, $pop42
+	i32.or  	$push40=, $pop21, $pop41
+	tee_local	$push39=, $3=, $pop40
+	i32.store	sM+4($pop48), $pop39
 	block   	
-	i32.const	$push37=, 16
-	i32.shr_u	$push36=, $0, $pop37
-	tee_local	$push35=, $4=, $pop36
-	i32.add 	$push22=, $3, $pop35
-	i32.add 	$push21=, $4, $2
-	i32.xor 	$push23=, $pop22, $pop21
-	i32.const	$push34=, 63
-	i32.and 	$push24=, $pop23, $pop34
-	br_if   	0, $pop24       # 0: down to label7
-# BB#1:                                 # %if.end79
-	i32.const	$push116=, 0
-	i32.const	$push25=, -2139243339
-	i32.mul 	$push26=, $0, $pop25
-	i32.const	$push27=, -1492899873
-	i32.add 	$push115=, $pop26, $pop27
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 1103515245
-	i32.mul 	$push28=, $pop114, $pop113
-	i32.const	$push112=, 12345
-	i32.add 	$push111=, $pop28, $pop112
-	tee_local	$push110=, $3=, $pop111
-	i32.store	myrnd.s($pop116), $pop110
-	i32.const	$push109=, 0
+	i32.const	$push38=, 16
+	i32.shr_u	$push37=, $0, $pop38
+	tee_local	$push36=, $4=, $pop37
+	i32.add 	$push23=, $pop36, $1
+	i32.add 	$push22=, $4, $3
+	i32.xor 	$push24=, $pop23, $pop22
+	i32.const	$push35=, 63
+	i32.and 	$push25=, $pop24, $pop35
+	br_if   	0, $pop25       # 0: down to label8
+# BB#1:                                 # %if.end119
+	i32.const	$push117=, 0
+	i32.const	$push26=, -2139243339
+	i32.mul 	$push27=, $0, $pop26
+	i32.const	$push28=, -1492899873
+	i32.add 	$push116=, $pop27, $pop28
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push29=, $pop115, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop29, $pop113
+	tee_local	$push111=, $1=, $pop112
+	i32.store	myrnd.s($pop117), $pop111
+	i32.const	$push110=, 0
+	i32.const	$push109=, 16
+	i32.shr_u	$push31=, $1, $pop109
 	i32.const	$push108=, 16
-	i32.shr_u	$push30=, $3, $pop108
-	i32.const	$push107=, 16
-	i32.shr_u	$push29=, $0, $pop107
-	i32.add 	$push31=, $pop30, $pop29
-	i32.const	$push106=, 63
-	i32.and 	$push32=, $pop31, $pop106
-	i32.or  	$push33=, $pop32, $1
-	i32.store	sM+4($pop109), $pop33
+	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$push32=, $pop31, $pop30
+	i32.const	$push107=, 63
+	i32.and 	$push33=, $pop32, $pop107
+	i32.or  	$push34=, $pop33, $2
+	i32.store	sM+4($pop110), $pop34
 	return
 .LBB78_2:                               # %if.then
-	end_block                       # label7:
+	end_block                       # label8:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end78:
 	.size	testM, .Lfunc_end78-testM
-
+                                        # -- End function
 	.section	.text.retmeN,"ax",@progbits
-	.hidden	retmeN
+	.hidden	retmeN                  # -- Begin function retmeN
 	.globl	retmeN
 	.type	retmeN,@function
 retmeN:                                 # @retmeN
@@ -3534,9 +3534,9 @@ retmeN:                                 # @retmeN
 	.endfunc
 .Lfunc_end79:
 	.size	retmeN, .Lfunc_end79-retmeN
-
+                                        # -- End function
 	.section	.text.fn1N,"ax",@progbits
-	.hidden	fn1N
+	.hidden	fn1N                    # -- Begin function fn1N
 	.globl	fn1N
 	.type	fn1N,@function
 fn1N:                                   # @fn1N
@@ -3554,9 +3554,9 @@ fn1N:                                   # @fn1N
 	.endfunc
 .Lfunc_end80:
 	.size	fn1N, .Lfunc_end80-fn1N
-
+                                        # -- End function
 	.section	.text.fn2N,"ax",@progbits
-	.hidden	fn2N
+	.hidden	fn2N                    # -- Begin function fn2N
 	.globl	fn2N
 	.type	fn2N,@function
 fn2N:                                   # @fn2N
@@ -3576,9 +3576,9 @@ fn2N:                                   # @fn2N
 	.endfunc
 .Lfunc_end81:
 	.size	fn2N, .Lfunc_end81-fn2N
-
+                                        # -- End function
 	.section	.text.retitN,"ax",@progbits
-	.hidden	retitN
+	.hidden	retitN                  # -- Begin function retitN
 	.globl	retitN
 	.type	retitN,@function
 retitN:                                 # @retitN
@@ -3594,9 +3594,9 @@ retitN:                                 # @retitN
 	.endfunc
 .Lfunc_end82:
 	.size	retitN, .Lfunc_end82-retitN
-
+                                        # -- End function
 	.section	.text.fn3N,"ax",@progbits
-	.hidden	fn3N
+	.hidden	fn3N                    # -- Begin function fn3N
 	.globl	fn3N
 	.type	fn3N,@function
 fn3N:                                   # @fn3N
@@ -3605,249 +3605,301 @@ fn3N:                                   # @fn3N
 	.local  	i64
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sN($pop16)
-	tee_local	$push14=, $1=, $pop15
-	i32.wrap/i64	$push3=, $pop14
-	i32.const	$push4=, 6
-	i32.shr_u	$push5=, $pop3, $pop4
-	i32.add 	$push6=, $pop5, $0
-	i32.const	$push7=, 63
-	i32.and 	$push13=, $pop6, $pop7
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push8=, $pop12
-	i64.const	$push9=, 6
-	i64.shl 	$push10=, $pop8, $pop9
+	i32.const	$push18=, 0
+	i64.load	$push17=, sN($pop18)
+	tee_local	$push16=, $1=, $pop17
 	i64.const	$push1=, -4033
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push11=, $pop10, $pop2
+	i64.and 	$push2=, $pop16, $pop1
+	i64.const	$push3=, 6
+	i64.shr_u	$push4=, $1, $pop3
+	i32.wrap/i64	$push5=, $pop4
+	i32.add 	$push15=, $pop5, $0
+	tee_local	$push14=, $0=, $pop15
+	i32.const	$push6=, 6
+	i32.shl 	$push7=, $pop14, $pop6
+	i32.const	$push8=, 4032
+	i32.and 	$push9=, $pop7, $pop8
+	i64.extend_u/i32	$push10=, $pop9
+	i64.or  	$push11=, $pop2, $pop10
 	i64.store	sN($pop0), $pop11
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	i32.const	$push12=, 63
+	i32.and 	$push13=, $0, $pop12
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end83:
 	.size	fn3N, .Lfunc_end83-fn3N
-
+                                        # -- End function
 	.section	.text.testN,"ax",@progbits
-	.hidden	testN
+	.hidden	testN                   # -- Begin function testN
 	.globl	testN
 	.type	testN,@function
 testN:                                  # @testN
-	.local  	i64, i32, i32, i32, i32, i64
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push140=, 0
-	i32.load	$push1=, myrnd.s($pop140)
-	i32.const	$push2=, 1103515245
-	i32.mul 	$push3=, $pop1, $pop2
-	i32.const	$push4=, 12345
-	i32.add 	$push139=, $pop3, $pop4
-	tee_local	$push138=, $2=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push5=, $pop138, $pop137
-	i32.store8	sN($pop0), $pop5
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push6=, $2, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop6, $pop134
-	tee_local	$push132=, $2=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push7=, $pop132, $pop131
-	i32.store8	sN+1($pop136), $pop7
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push8=, $2, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop8, $pop128
-	tee_local	$push126=, $2=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push9=, $pop126, $pop125
-	i32.store8	sN+2($pop130), $pop9
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push10=, $2, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop10, $pop122
-	tee_local	$push120=, $2=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push11=, $pop120, $pop119
-	i32.store8	sN+3($pop124), $pop11
+	.local  	i64, i32, i32, i32, i64, i64, i32, i32, i32, i64
+# BB#0:                                 # %lor.lhs.false
+	i32.const	$push3=, 0
+	i32.const	$push173=, 0
+	i32.load	$push4=, myrnd.s($pop173)
+	i32.const	$push5=, 1103515245
+	i32.mul 	$push6=, $pop4, $pop5
+	i32.const	$push7=, 12345
+	i32.add 	$push172=, $pop6, $pop7
+	tee_local	$push171=, $8=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push8=, $pop171, $pop170
+	i32.store8	sN($pop3), $pop8
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push9=, $8, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop9, $pop167
+	tee_local	$push165=, $8=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push10=, $pop165, $pop164
+	i32.store8	sN+1($pop169), $pop10
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push11=, $8, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop11, $pop161
+	tee_local	$push159=, $8=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push12=, $pop159, $pop158
+	i32.store8	sN+2($pop163), $pop12
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push13=, $8, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop13, $pop155
+	tee_local	$push153=, $8=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push14=, $pop153, $pop152
+	i32.store8	sN+3($pop157), $pop14
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push15=, $8, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop15, $pop149
+	tee_local	$push147=, $8=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push16=, $pop147, $pop146
+	i32.store8	sN+4($pop151), $pop16
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push17=, $8, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop17, $pop143
+	tee_local	$push141=, $8=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push18=, $pop141, $pop140
+	i32.store8	sN+5($pop145), $pop18
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push19=, $8, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop19, $pop137
+	tee_local	$push135=, $8=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push20=, $pop135, $pop134
+	i32.store8	sN+6($pop139), $pop20
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push21=, $8, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop21, $pop131
+	tee_local	$push129=, $8=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push22=, $pop129, $pop128
+	i32.store8	sN+7($pop133), $pop22
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push23=, $8, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop23, $pop125
+	tee_local	$push123=, $8=, $pop124
+	i32.const	$push122=, 1103515245
+	i32.mul 	$push24=, $pop123, $pop122
+	i32.const	$push121=, 12345
+	i32.add 	$push120=, $pop24, $pop121
+	tee_local	$push119=, $1=, $pop120
+	i32.store	myrnd.s($pop127), $pop119
 	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push12=, $2, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop12, $pop116
-	tee_local	$push114=, $2=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push13=, $pop114, $pop113
-	i32.store8	sN+4($pop118), $pop13
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push14=, $2, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop14, $pop110
-	tee_local	$push108=, $2=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push15=, $pop108, $pop107
-	i32.store8	sN+5($pop112), $pop15
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push16=, $2, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop16, $pop104
-	tee_local	$push102=, $2=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push17=, $pop102, $pop101
-	i32.store8	sN+6($pop106), $pop17
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push18=, $2, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop18, $pop98
-	tee_local	$push96=, $2=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push19=, $pop96, $pop95
-	i32.store8	sN+7($pop100), $pop19
-	i32.const	$push94=, 0
-	i64.load	$0=, sN($pop94)
-	i32.const	$push93=, 0
-	i32.const	$push92=, 1103515245
-	i32.mul 	$push20=, $2, $pop92
-	i32.const	$push91=, 12345
-	i32.add 	$push90=, $pop20, $pop91
-	tee_local	$push89=, $4=, $pop90
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push21=, $pop89, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop21, $pop87
-	tee_local	$push85=, $2=, $pop86
-	i32.store	myrnd.s($pop93), $pop85
-	i32.const	$push84=, 0
-	i32.const	$push83=, 16
-	i32.shr_u	$push82=, $4, $pop83
-	tee_local	$push81=, $1=, $pop82
-	i32.const	$push80=, 63
-	i32.and 	$push79=, $pop81, $pop80
-	tee_local	$push78=, $4=, $pop79
-	i64.extend_u/i32	$push24=, $pop78
-	i64.const	$push25=, 6
-	i64.shl 	$push26=, $pop24, $pop25
-	i64.const	$push22=, -4033
-	i64.and 	$push23=, $0, $pop22
-	i64.or  	$push77=, $pop26, $pop23
-	tee_local	$push76=, $5=, $pop77
-	i64.store	sN($pop84), $pop76
+	i32.const	$push117=, 0
+	i64.load	$push116=, sN($pop117)
+	tee_local	$push115=, $0=, $pop116
+	i64.const	$push25=, -4033
+	i64.and 	$push114=, $pop115, $pop25
+	tee_local	$push113=, $4=, $pop114
+	i32.const	$push26=, 10
+	i32.shr_u	$push27=, $8, $pop26
+	i32.const	$push28=, 4032
+	i32.and 	$push112=, $pop27, $pop28
+	tee_local	$push111=, $3=, $pop112
+	i64.extend_u/i32	$push29=, $pop111
+	i64.or  	$push110=, $pop113, $pop29
+	tee_local	$push109=, $5=, $pop110
+	i64.store	sN($pop118), $pop109
 	block   	
-	i64.const	$push75=, 6
-	i64.shr_u	$push27=, $5, $pop75
-	i32.wrap/i64	$push74=, $pop27
-	tee_local	$push73=, $3=, $pop74
-	i32.const	$push72=, 63
-	i32.and 	$push28=, $pop73, $pop72
-	i32.ne  	$push29=, $4, $pop28
-	br_if   	0, $pop29       # 0: down to label8
-# BB#1:                                 # %lor.lhs.false49
-	i32.const	$push144=, 16
-	i32.shr_u	$push143=, $2, $pop144
-	tee_local	$push142=, $4=, $pop143
-	i32.add 	$push31=, $3, $pop142
-	i32.add 	$push30=, $4, $1
-	i32.xor 	$push32=, $pop31, $pop30
-	i32.const	$push141=, 63
-	i32.and 	$push33=, $pop32, $pop141
-	br_if   	0, $pop33       # 0: down to label8
-# BB#2:                                 # %if.end
-	i32.const	$push38=, 0
-	i32.const	$push34=, 1103515245
-	i32.mul 	$push35=, $2, $pop34
-	i32.const	$push36=, 12345
-	i32.add 	$push163=, $pop35, $pop36
-	tee_local	$push162=, $4=, $pop163
-	i32.const	$push161=, 1103515245
-	i32.mul 	$push37=, $pop162, $pop161
-	i32.const	$push160=, 12345
-	i32.add 	$push159=, $pop37, $pop160
-	tee_local	$push158=, $2=, $pop159
-	i32.store	myrnd.s($pop38), $pop158
-	i32.const	$push157=, 0
-	i32.const	$push156=, 16
-	i32.shr_u	$push155=, $4, $pop156
-	tee_local	$push154=, $1=, $pop155
-	i32.const	$push153=, 63
-	i32.and 	$push152=, $pop154, $pop153
-	tee_local	$push151=, $4=, $pop152
-	i64.extend_u/i32	$push41=, $pop151
-	i64.const	$push42=, 6
-	i64.shl 	$push43=, $pop41, $pop42
-	i64.const	$push39=, -4033
-	i64.and 	$push40=, $0, $pop39
-	i64.or  	$push150=, $pop43, $pop40
-	tee_local	$push149=, $5=, $pop150
-	i64.store	sN($pop157), $pop149
-	i64.const	$push148=, 6
-	i64.shr_u	$push44=, $5, $pop148
-	i32.wrap/i64	$push147=, $pop44
-	tee_local	$push146=, $3=, $pop147
-	i32.const	$push145=, 63
-	i32.and 	$push45=, $pop146, $pop145
-	i32.ne  	$push46=, $4, $pop45
-	br_if   	0, $pop46       # 0: down to label8
-# BB#3:                                 # %lor.lhs.false100
-	i32.const	$push169=, 16
-	i32.shr_u	$push168=, $2, $pop169
-	tee_local	$push167=, $4=, $pop168
-	i32.add 	$push51=, $pop167, $1
-	i32.const	$push166=, 63
-	i32.and 	$push52=, $pop51, $pop166
-	i32.const	$push49=, 15
-	i32.rem_u	$push53=, $pop52, $pop49
-	i32.add 	$push47=, $3, $4
-	i32.const	$push165=, 63
-	i32.and 	$push48=, $pop47, $pop165
-	i32.const	$push164=, 15
-	i32.rem_u	$push50=, $pop48, $pop164
-	i32.ne  	$push54=, $pop53, $pop50
-	br_if   	0, $pop54       # 0: down to label8
-# BB#4:                                 # %if.end158
-	i32.const	$push59=, 0
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push56=, $2, $pop55
-	i32.const	$push57=, 12345
-	i32.add 	$push177=, $pop56, $pop57
-	tee_local	$push176=, $2=, $pop177
-	i32.const	$push175=, 1103515245
-	i32.mul 	$push58=, $pop176, $pop175
-	i32.const	$push174=, 12345
-	i32.add 	$push173=, $pop58, $pop174
-	tee_local	$push172=, $4=, $pop173
-	i32.store	myrnd.s($pop59), $pop172
-	i32.const	$push171=, 0
-	i32.const	$push60=, 16
-	i32.shr_u	$push62=, $4, $pop60
-	i32.const	$push170=, 16
-	i32.shr_u	$push61=, $2, $pop170
-	i32.add 	$push63=, $pop62, $pop61
-	i32.const	$push64=, 63
-	i32.and 	$push65=, $pop63, $pop64
-	i64.extend_u/i32	$push66=, $pop65
-	i64.const	$push67=, 6
-	i64.shl 	$push68=, $pop66, $pop67
-	i64.const	$push69=, -4033
-	i64.and 	$push70=, $0, $pop69
-	i64.or  	$push71=, $pop68, $pop70
-	i64.store	sN($pop171), $pop71
+	i64.const	$push32=, 4032
+	i64.or  	$push33=, $0, $pop32
+	i64.xor 	$push108=, $5, $pop33
+	tee_local	$push107=, $9=, $pop108
+	i64.const	$push34=, 34359734272
+	i64.and 	$push35=, $pop107, $pop34
+	i64.const	$push106=, 0
+	i64.ne  	$push36=, $pop35, $pop106
+	br_if   	0, $pop36       # 0: down to label9
+# BB#1:                                 # %lor.lhs.false29
+	i64.const	$push41=, 63
+	i64.and 	$push42=, $9, $pop41
+	i64.const	$push174=, 0
+	i64.ne  	$push43=, $pop42, $pop174
+	br_if   	0, $pop43       # 0: down to label9
+# BB#2:                                 # %lor.lhs.false29
+	i32.const	$push40=, 6
+	i32.shr_u	$push37=, $3, $pop40
+	i64.const	$push30=, 6
+	i64.shr_u	$push31=, $5, $pop30
+	i32.wrap/i64	$push176=, $pop31
+	tee_local	$push175=, $3=, $pop176
+	i32.const	$push39=, 63
+	i32.and 	$push38=, $pop175, $pop39
+	i32.ne  	$push44=, $pop37, $pop38
+	br_if   	0, $pop44       # 0: down to label9
+# BB#3:                                 # %lor.lhs.false49
+	i32.const	$push181=, 16
+	i32.shr_u	$push180=, $1, $pop181
+	tee_local	$push179=, $2=, $pop180
+	i32.add 	$push1=, $pop179, $3
+	i32.const	$push178=, 16
+	i32.shr_u	$push0=, $8, $pop178
+	i32.add 	$push45=, $2, $pop0
+	i32.xor 	$push46=, $pop1, $pop45
+	i32.const	$push177=, 63
+	i32.and 	$push47=, $pop46, $pop177
+	br_if   	0, $pop47       # 0: down to label9
+# BB#4:                                 # %lor.lhs.false69
+	i32.const	$push52=, 0
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push49=, $1, $pop48
+	i32.const	$push50=, 12345
+	i32.add 	$push201=, $pop49, $pop50
+	tee_local	$push200=, $8=, $pop201
+	i32.const	$push199=, 1103515245
+	i32.mul 	$push51=, $pop200, $pop199
+	i32.const	$push198=, 12345
+	i32.add 	$push197=, $pop51, $pop198
+	tee_local	$push196=, $1=, $pop197
+	i32.store	myrnd.s($pop52), $pop196
+	i32.const	$push195=, 0
+	i32.const	$push53=, 10
+	i32.shr_u	$push54=, $8, $pop53
+	i32.const	$push55=, 4032
+	i32.and 	$push194=, $pop54, $pop55
+	tee_local	$push193=, $3=, $pop194
+	i64.extend_u/i32	$push56=, $pop193
+	i64.or  	$push192=, $4, $pop56
+	tee_local	$push191=, $9=, $pop192
+	i64.store	sN($pop195), $pop191
+	i32.const	$push190=, 16
+	i32.shr_u	$push189=, $1, $pop190
+	tee_local	$push188=, $2=, $pop189
+	i64.const	$push57=, 6
+	i64.shr_u	$push58=, $9, $pop57
+	i32.wrap/i64	$push187=, $pop58
+	tee_local	$push186=, $6=, $pop187
+	i32.add 	$push59=, $pop188, $pop186
+	i32.const	$push185=, 63
+	i32.and 	$push60=, $pop59, $pop185
+	i32.const	$push61=, 15
+	i32.rem_u	$7=, $pop60, $pop61
+	i64.xor 	$push184=, $9, $5
+	tee_local	$push183=, $5=, $pop184
+	i64.const	$push62=, 34359734272
+	i64.and 	$push63=, $pop183, $pop62
+	i64.const	$push182=, 0
+	i64.ne  	$push64=, $pop63, $pop182
+	br_if   	0, $pop64       # 0: down to label9
+# BB#5:                                 # %lor.lhs.false80
+	i64.const	$push69=, 63
+	i64.and 	$push70=, $5, $pop69
+	i64.const	$push202=, 0
+	i64.ne  	$push71=, $pop70, $pop202
+	br_if   	0, $pop71       # 0: down to label9
+# BB#6:                                 # %lor.lhs.false80
+	i32.const	$push68=, 6
+	i32.shr_u	$push65=, $3, $pop68
+	i32.const	$push67=, 63
+	i32.and 	$push66=, $6, $pop67
+	i32.ne  	$push72=, $pop65, $pop66
+	br_if   	0, $pop72       # 0: down to label9
+# BB#7:                                 # %lor.lhs.false100
+	i32.const	$push204=, 16
+	i32.shr_u	$push2=, $8, $pop204
+	i32.add 	$push73=, $2, $pop2
+	i32.const	$push203=, 63
+	i32.and 	$push74=, $pop73, $pop203
+	i32.const	$push75=, 15
+	i32.rem_u	$push76=, $pop74, $pop75
+	i32.ne  	$push77=, $pop76, $7
+	br_if   	0, $pop77       # 0: down to label9
+# BB#8:                                 # %lor.lhs.false125
+	i32.const	$push82=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push79=, $1, $pop78
+	i32.const	$push80=, 12345
+	i32.add 	$push218=, $pop79, $pop80
+	tee_local	$push217=, $8=, $pop218
+	i32.const	$push216=, 1103515245
+	i32.mul 	$push81=, $pop217, $pop216
+	i32.const	$push215=, 12345
+	i32.add 	$push214=, $pop81, $pop215
+	tee_local	$push213=, $1=, $pop214
+	i32.store	myrnd.s($pop82), $pop213
+	i32.const	$push212=, 0
+	i32.const	$push94=, 16
+	i32.shr_u	$push211=, $1, $pop94
+	tee_local	$push210=, $1=, $pop211
+	i32.const	$push95=, 2047
+	i32.and 	$push96=, $pop210, $pop95
+	i64.const	$push83=, 274877902848
+	i64.and 	$push84=, $0, $pop83
+	i32.const	$push85=, 10
+	i32.shr_u	$push86=, $8, $pop85
+	i32.const	$push87=, 4032
+	i32.and 	$push88=, $pop86, $pop87
+	i64.extend_u/i32	$push89=, $pop88
+	i64.or  	$push90=, $pop84, $pop89
+	i64.const	$push91=, 6
+	i64.shr_u	$push92=, $pop90, $pop91
+	i32.wrap/i64	$push93=, $pop92
+	i32.add 	$push209=, $pop96, $pop93
+	tee_local	$push208=, $3=, $pop209
+	i32.const	$push97=, 6
+	i32.shl 	$push98=, $pop208, $pop97
+	i32.const	$push207=, 4032
+	i32.and 	$push99=, $pop98, $pop207
+	i64.extend_u/i32	$push100=, $pop99
+	i64.or  	$push101=, $4, $pop100
+	i64.store	sN($pop212), $pop101
+	i32.const	$push206=, 16
+	i32.shr_u	$push102=, $8, $pop206
+	i32.add 	$push103=, $1, $pop102
+	i32.xor 	$push104=, $pop103, $3
+	i32.const	$push205=, 63
+	i32.and 	$push105=, $pop104, $pop205
+	br_if   	0, $pop105      # 0: down to label9
+# BB#9:                                 # %if.end158
 	return
-.LBB84_5:                               # %if.then106
-	end_block                       # label8:
+.LBB84_10:                              # %if.then
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end84:
 	.size	testN, .Lfunc_end84-testN
-
+                                        # -- End function
 	.section	.text.retmeO,"ax",@progbits
-	.hidden	retmeO
+	.hidden	retmeO                  # -- Begin function retmeO
 	.globl	retmeO
 	.type	retmeO,@function
 retmeO:                                 # @retmeO
@@ -3865,9 +3917,9 @@ retmeO:                                 # @retmeO
 	.endfunc
 .Lfunc_end85:
 	.size	retmeO, .Lfunc_end85-retmeO
-
+                                        # -- End function
 	.section	.text.fn1O,"ax",@progbits
-	.hidden	fn1O
+	.hidden	fn1O                    # -- Begin function fn1O
 	.globl	fn1O
 	.type	fn1O,@function
 fn1O:                                   # @fn1O
@@ -3883,9 +3935,9 @@ fn1O:                                   # @fn1O
 	.endfunc
 .Lfunc_end86:
 	.size	fn1O, .Lfunc_end86-fn1O
-
+                                        # -- End function
 	.section	.text.fn2O,"ax",@progbits
-	.hidden	fn2O
+	.hidden	fn2O                    # -- Begin function fn2O
 	.globl	fn2O
 	.type	fn2O,@function
 fn2O:                                   # @fn2O
@@ -3903,9 +3955,9 @@ fn2O:                                   # @fn2O
 	.endfunc
 .Lfunc_end87:
 	.size	fn2O, .Lfunc_end87-fn2O
-
+                                        # -- End function
 	.section	.text.retitO,"ax",@progbits
-	.hidden	retitO
+	.hidden	retitO                  # -- Begin function retitO
 	.globl	retitO
 	.type	retitO,@function
 retitO:                                 # @retitO
@@ -3919,9 +3971,9 @@ retitO:                                 # @retitO
 	.endfunc
 .Lfunc_end88:
 	.size	retitO, .Lfunc_end88-retitO
-
+                                        # -- End function
 	.section	.text.fn3O,"ax",@progbits
-	.hidden	fn3O
+	.hidden	fn3O                    # -- Begin function fn3O
 	.globl	fn3O
 	.type	fn3O,@function
 fn3O:                                   # @fn3O
@@ -3933,306 +3985,303 @@ fn3O:                                   # @fn3O
 	i32.const	$push12=, 0
 	i64.load	$push11=, sO+8($pop12)
 	tee_local	$push10=, $1=, $pop11
-	i32.wrap/i64	$push3=, $pop10
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $pop10, $pop1
+	i32.wrap/i64	$push3=, $1
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 4095
 	i32.and 	$push9=, $pop4, $pop5
 	tee_local	$push8=, $0=, $pop9
 	i64.extend_u/i32	$push6=, $pop8
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push7=, $pop6, $pop2
+	i64.or  	$push7=, $pop2, $pop6
 	i64.store	sO+8($pop0), $pop7
 	copy_local	$push13=, $0
                                         # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end89:
 	.size	fn3O, .Lfunc_end89-fn3O
-
+                                        # -- End function
 	.section	.text.testO,"ax",@progbits
-	.hidden	testO
+	.hidden	testO                   # -- Begin function testO
 	.globl	testO
 	.type	testO,@function
 testO:                                  # @testO
-	.local  	i64, i32, i32, i64, i32, i32
+	.local  	i32, i64, i32, i64, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push2=, 0
-	i32.const	$push199=, 0
-	i32.load	$push3=, myrnd.s($pop199)
+	i32.const	$push197=, 0
+	i32.load	$push3=, myrnd.s($pop197)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	i32.add 	$push198=, $pop5, $pop6
-	tee_local	$push197=, $2=, $pop198
-	i32.const	$push196=, 16
-	i32.shr_u	$push7=, $pop197, $pop196
+	i32.add 	$push196=, $pop5, $pop6
+	tee_local	$push195=, $0=, $pop196
+	i32.const	$push194=, 16
+	i32.shr_u	$push7=, $pop195, $pop194
 	i32.store8	sO($pop2), $pop7
-	i32.const	$push195=, 0
-	i32.const	$push194=, 1103515245
-	i32.mul 	$push8=, $2, $pop194
-	i32.const	$push193=, 12345
-	i32.add 	$push192=, $pop8, $pop193
-	tee_local	$push191=, $2=, $pop192
-	i32.const	$push190=, 16
-	i32.shr_u	$push9=, $pop191, $pop190
-	i32.store8	sO+1($pop195), $pop9
-	i32.const	$push189=, 0
-	i32.const	$push188=, 1103515245
-	i32.mul 	$push10=, $2, $pop188
-	i32.const	$push187=, 12345
-	i32.add 	$push186=, $pop10, $pop187
-	tee_local	$push185=, $2=, $pop186
-	i32.const	$push184=, 16
-	i32.shr_u	$push11=, $pop185, $pop184
-	i32.store8	sO+2($pop189), $pop11
-	i32.const	$push183=, 0
-	i32.const	$push182=, 1103515245
-	i32.mul 	$push12=, $2, $pop182
-	i32.const	$push181=, 12345
-	i32.add 	$push180=, $pop12, $pop181
-	tee_local	$push179=, $2=, $pop180
-	i32.const	$push178=, 16
-	i32.shr_u	$push13=, $pop179, $pop178
-	i32.store8	sO+3($pop183), $pop13
-	i32.const	$push177=, 0
-	i32.const	$push176=, 1103515245
-	i32.mul 	$push14=, $2, $pop176
-	i32.const	$push175=, 12345
-	i32.add 	$push174=, $pop14, $pop175
-	tee_local	$push173=, $2=, $pop174
-	i32.const	$push172=, 16
-	i32.shr_u	$push15=, $pop173, $pop172
-	i32.store8	sO+4($pop177), $pop15
-	i32.const	$push171=, 0
-	i32.const	$push170=, 1103515245
-	i32.mul 	$push16=, $2, $pop170
-	i32.const	$push169=, 12345
-	i32.add 	$push168=, $pop16, $pop169
-	tee_local	$push167=, $2=, $pop168
-	i32.const	$push166=, 16
-	i32.shr_u	$push17=, $pop167, $pop166
-	i32.store8	sO+5($pop171), $pop17
-	i32.const	$push165=, 0
-	i32.const	$push164=, 1103515245
-	i32.mul 	$push18=, $2, $pop164
-	i32.const	$push163=, 12345
-	i32.add 	$push162=, $pop18, $pop163
-	tee_local	$push161=, $2=, $pop162
-	i32.const	$push160=, 16
-	i32.shr_u	$push19=, $pop161, $pop160
-	i32.store8	sO+6($pop165), $pop19
-	i32.const	$push159=, 0
-	i32.const	$push158=, 1103515245
-	i32.mul 	$push20=, $2, $pop158
-	i32.const	$push157=, 12345
-	i32.add 	$push156=, $pop20, $pop157
-	tee_local	$push155=, $2=, $pop156
-	i32.const	$push154=, 16
-	i32.shr_u	$push21=, $pop155, $pop154
-	i32.store8	sO+7($pop159), $pop21
-	i32.const	$push153=, 0
-	i32.const	$push152=, 1103515245
-	i32.mul 	$push22=, $2, $pop152
-	i32.const	$push151=, 12345
-	i32.add 	$push150=, $pop22, $pop151
-	tee_local	$push149=, $2=, $pop150
-	i32.const	$push148=, 16
-	i32.shr_u	$push23=, $pop149, $pop148
-	i32.store8	sO+8($pop153), $pop23
-	i32.const	$push147=, 0
-	i32.const	$push146=, 1103515245
-	i32.mul 	$push24=, $2, $pop146
-	i32.const	$push145=, 12345
-	i32.add 	$push144=, $pop24, $pop145
-	tee_local	$push143=, $2=, $pop144
-	i32.const	$push142=, 16
-	i32.shr_u	$push25=, $pop143, $pop142
-	i32.store8	sO+9($pop147), $pop25
-	i32.const	$push141=, 0
-	i32.const	$push140=, 1103515245
-	i32.mul 	$push26=, $2, $pop140
-	i32.const	$push139=, 12345
-	i32.add 	$push138=, $pop26, $pop139
-	tee_local	$push137=, $2=, $pop138
-	i32.const	$push136=, 16
-	i32.shr_u	$push27=, $pop137, $pop136
-	i32.store8	sO+10($pop141), $pop27
-	i32.const	$push135=, 0
-	i32.const	$push134=, 1103515245
-	i32.mul 	$push28=, $2, $pop134
-	i32.const	$push133=, 12345
-	i32.add 	$push132=, $pop28, $pop133
-	tee_local	$push131=, $2=, $pop132
-	i32.const	$push130=, 16
-	i32.shr_u	$push29=, $pop131, $pop130
-	i32.store8	sO+11($pop135), $pop29
-	i32.const	$push129=, 0
-	i32.const	$push128=, 1103515245
-	i32.mul 	$push30=, $2, $pop128
-	i32.const	$push127=, 12345
-	i32.add 	$push126=, $pop30, $pop127
-	tee_local	$push125=, $2=, $pop126
-	i32.const	$push124=, 16
-	i32.shr_u	$push31=, $pop125, $pop124
-	i32.store8	sO+12($pop129), $pop31
-	i32.const	$push123=, 0
-	i32.const	$push122=, 1103515245
-	i32.mul 	$push32=, $2, $pop122
-	i32.const	$push121=, 12345
-	i32.add 	$push120=, $pop32, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.const	$push118=, 16
-	i32.shr_u	$push33=, $pop119, $pop118
-	i32.store8	sO+13($pop123), $pop33
-	i32.const	$push117=, 0
-	i32.const	$push116=, 1103515245
-	i32.mul 	$push34=, $2, $pop116
-	i32.const	$push115=, 12345
-	i32.add 	$push114=, $pop34, $pop115
-	tee_local	$push113=, $2=, $pop114
-	i32.const	$push112=, 16
-	i32.shr_u	$push35=, $pop113, $pop112
-	i32.store8	sO+14($pop117), $pop35
-	i32.const	$push111=, 0
-	i32.const	$push110=, 1103515245
-	i32.mul 	$push36=, $2, $pop110
-	i32.const	$push109=, 12345
-	i32.add 	$push108=, $pop36, $pop109
-	tee_local	$push107=, $2=, $pop108
-	i32.const	$push106=, 16
-	i32.shr_u	$push37=, $pop107, $pop106
-	i32.store8	sO+15($pop111), $pop37
-	i32.const	$push105=, 0
-	i64.load	$0=, sO+8($pop105)
-	i32.const	$push104=, 0
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push38=, $2, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop38, $pop102
-	tee_local	$push100=, $2=, $pop101
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push39=, $pop100, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop39, $pop98
-	tee_local	$push96=, $1=, $pop97
-	i32.store	myrnd.s($pop104), $pop96
-	i32.const	$push95=, 0
-	i32.const	$push94=, 16
-	i32.shr_u	$push42=, $2, $pop94
-	i32.const	$push93=, 2047
-	i32.and 	$push92=, $pop42, $pop93
-	tee_local	$push91=, $2=, $pop92
-	i64.extend_u/i32	$push43=, $pop91
-	i64.const	$push40=, -4096
-	i64.and 	$push41=, $0, $pop40
-	i64.or  	$push90=, $pop43, $pop41
-	tee_local	$push89=, $3=, $pop90
-	i64.store	sO+8($pop95), $pop89
+	i32.const	$push193=, 0
+	i32.const	$push192=, 1103515245
+	i32.mul 	$push8=, $0, $pop192
+	i32.const	$push191=, 12345
+	i32.add 	$push190=, $pop8, $pop191
+	tee_local	$push189=, $0=, $pop190
+	i32.const	$push188=, 16
+	i32.shr_u	$push9=, $pop189, $pop188
+	i32.store8	sO+1($pop193), $pop9
+	i32.const	$push187=, 0
+	i32.const	$push186=, 1103515245
+	i32.mul 	$push10=, $0, $pop186
+	i32.const	$push185=, 12345
+	i32.add 	$push184=, $pop10, $pop185
+	tee_local	$push183=, $0=, $pop184
+	i32.const	$push182=, 16
+	i32.shr_u	$push11=, $pop183, $pop182
+	i32.store8	sO+2($pop187), $pop11
+	i32.const	$push181=, 0
+	i32.const	$push180=, 1103515245
+	i32.mul 	$push12=, $0, $pop180
+	i32.const	$push179=, 12345
+	i32.add 	$push178=, $pop12, $pop179
+	tee_local	$push177=, $0=, $pop178
+	i32.const	$push176=, 16
+	i32.shr_u	$push13=, $pop177, $pop176
+	i32.store8	sO+3($pop181), $pop13
+	i32.const	$push175=, 0
+	i32.const	$push174=, 1103515245
+	i32.mul 	$push14=, $0, $pop174
+	i32.const	$push173=, 12345
+	i32.add 	$push172=, $pop14, $pop173
+	tee_local	$push171=, $0=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push15=, $pop171, $pop170
+	i32.store8	sO+4($pop175), $pop15
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push16=, $0, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop16, $pop167
+	tee_local	$push165=, $0=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push17=, $pop165, $pop164
+	i32.store8	sO+5($pop169), $pop17
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push18=, $0, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop18, $pop161
+	tee_local	$push159=, $0=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push19=, $pop159, $pop158
+	i32.store8	sO+6($pop163), $pop19
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push20=, $0, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop20, $pop155
+	tee_local	$push153=, $0=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push21=, $pop153, $pop152
+	i32.store8	sO+7($pop157), $pop21
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push22=, $0, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop22, $pop149
+	tee_local	$push147=, $0=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push23=, $pop147, $pop146
+	i32.store8	sO+8($pop151), $pop23
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push24=, $0, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop24, $pop143
+	tee_local	$push141=, $0=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push25=, $pop141, $pop140
+	i32.store8	sO+9($pop145), $pop25
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push26=, $0, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop26, $pop137
+	tee_local	$push135=, $0=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push27=, $pop135, $pop134
+	i32.store8	sO+10($pop139), $pop27
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push28=, $0, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop28, $pop131
+	tee_local	$push129=, $0=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push29=, $pop129, $pop128
+	i32.store8	sO+11($pop133), $pop29
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push30=, $0, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop30, $pop125
+	tee_local	$push123=, $0=, $pop124
+	i32.const	$push122=, 16
+	i32.shr_u	$push31=, $pop123, $pop122
+	i32.store8	sO+12($pop127), $pop31
+	i32.const	$push121=, 0
+	i32.const	$push120=, 1103515245
+	i32.mul 	$push32=, $0, $pop120
+	i32.const	$push119=, 12345
+	i32.add 	$push118=, $pop32, $pop119
+	tee_local	$push117=, $0=, $pop118
+	i32.const	$push116=, 16
+	i32.shr_u	$push33=, $pop117, $pop116
+	i32.store8	sO+13($pop121), $pop33
+	i32.const	$push115=, 0
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push34=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop34, $pop113
+	tee_local	$push111=, $0=, $pop112
+	i32.const	$push110=, 16
+	i32.shr_u	$push35=, $pop111, $pop110
+	i32.store8	sO+14($pop115), $pop35
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push36=, $0, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop36, $pop107
+	tee_local	$push105=, $0=, $pop106
+	i32.const	$push104=, 16
+	i32.shr_u	$push37=, $pop105, $pop104
+	i32.store8	sO+15($pop109), $pop37
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push38=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop38, $pop101
+	tee_local	$push99=, $2=, $pop100
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push39=, $pop99, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop39, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.store	myrnd.s($pop103), $pop95
+	i32.const	$push94=, 0
+	i32.const	$push93=, 0
+	i64.load	$push40=, sO+8($pop93)
+	i64.const	$push41=, -4096
+	i64.and 	$push92=, $pop40, $pop41
+	tee_local	$push91=, $1=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push42=, $2, $pop90
+	i32.const	$push89=, 2047
+	i32.and 	$push88=, $pop42, $pop89
+	tee_local	$push87=, $2=, $pop88
+	i64.extend_u/i32	$push43=, $pop87
+	i64.or  	$push86=, $pop91, $pop43
+	tee_local	$push85=, $3=, $pop86
+	i64.store	sO+8($pop94), $pop85
 	block   	
-	i32.wrap/i64	$push88=, $3
-	tee_local	$push87=, $5=, $pop88
-	i32.const	$push86=, 2047
-	i32.and 	$push47=, $pop87, $pop86
+	i32.wrap/i64	$push84=, $3
+	tee_local	$push83=, $5=, $pop84
+	i32.const	$push82=, 2047
+	i32.and 	$push47=, $pop83, $pop82
 	i32.ne  	$push48=, $2, $pop47
-	br_if   	0, $pop48       # 0: down to label9
+	br_if   	0, $pop48       # 0: down to label10
 # BB#1:                                 # %entry
-	i32.const	$push203=, 16
-	i32.shr_u	$push44=, $1, $pop203
-	i32.const	$push202=, 2047
-	i32.and 	$push201=, $pop44, $pop202
-	tee_local	$push200=, $4=, $pop201
-	i32.add 	$push0=, $pop200, $2
-	i32.add 	$push45=, $5, $4
+	i32.const	$push201=, 16
+	i32.shr_u	$push44=, $0, $pop201
+	i32.const	$push200=, 2047
+	i32.and 	$push199=, $pop44, $pop200
+	tee_local	$push198=, $4=, $pop199
+	i32.add 	$push0=, $pop198, $2
+	i32.add 	$push45=, $4, $5
 	i32.const	$push46=, 4095
 	i32.and 	$push1=, $pop45, $pop46
 	i32.ne  	$push49=, $pop0, $pop1
-	br_if   	0, $pop49       # 0: down to label9
+	br_if   	0, $pop49       # 0: down to label10
 # BB#2:                                 # %if.end
 	i32.const	$push54=, 0
 	i32.const	$push50=, 1103515245
-	i32.mul 	$push51=, $1, $pop50
+	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	i32.add 	$push219=, $pop51, $pop52
-	tee_local	$push218=, $2=, $pop219
-	i32.const	$push217=, 1103515245
-	i32.mul 	$push53=, $pop218, $pop217
-	i32.const	$push216=, 12345
-	i32.add 	$push215=, $pop53, $pop216
-	tee_local	$push214=, $1=, $pop215
-	i32.store	myrnd.s($pop54), $pop214
-	i32.const	$push213=, 0
-	i32.const	$push212=, 16
-	i32.shr_u	$push57=, $2, $pop212
-	i32.const	$push211=, 2047
-	i32.and 	$push210=, $pop57, $pop211
-	tee_local	$push209=, $2=, $pop210
-	i64.extend_u/i32	$push58=, $pop209
-	i64.const	$push55=, -4096
-	i64.and 	$push56=, $0, $pop55
-	i64.or  	$push208=, $pop58, $pop56
-	tee_local	$push207=, $3=, $pop208
-	i64.store	sO+8($pop213), $pop207
-	i32.wrap/i64	$push206=, $3
-	tee_local	$push205=, $5=, $pop206
-	i32.const	$push204=, 2047
-	i32.and 	$push59=, $pop205, $pop204
-	i32.ne  	$push60=, $2, $pop59
-	br_if   	0, $pop60       # 0: down to label9
+	i32.add 	$push217=, $pop51, $pop52
+	tee_local	$push216=, $2=, $pop217
+	i32.const	$push215=, 1103515245
+	i32.mul 	$push53=, $pop216, $pop215
+	i32.const	$push214=, 12345
+	i32.add 	$push213=, $pop53, $pop214
+	tee_local	$push212=, $0=, $pop213
+	i32.store	myrnd.s($pop54), $pop212
+	i32.const	$push211=, 0
+	i32.const	$push210=, 16
+	i32.shr_u	$push55=, $2, $pop210
+	i32.const	$push209=, 2047
+	i32.and 	$push208=, $pop55, $pop209
+	tee_local	$push207=, $2=, $pop208
+	i64.extend_u/i32	$push56=, $pop207
+	i64.or  	$push206=, $1, $pop56
+	tee_local	$push205=, $3=, $pop206
+	i64.store	sO+8($pop211), $pop205
+	i32.wrap/i64	$push204=, $3
+	tee_local	$push203=, $5=, $pop204
+	i32.const	$push202=, 2047
+	i32.and 	$push57=, $pop203, $pop202
+	i32.ne  	$push58=, $2, $pop57
+	br_if   	0, $pop58       # 0: down to label10
 # BB#3:                                 # %lor.lhs.false87
+	i32.const	$push222=, 16
+	i32.shr_u	$push59=, $0, $pop222
+	i32.const	$push221=, 2047
+	i32.and 	$push220=, $pop59, $pop221
+	tee_local	$push219=, $4=, $pop220
+	i32.add 	$push60=, $pop219, $2
+	i32.const	$push61=, 15
+	i32.rem_u	$push62=, $pop60, $pop61
+	i32.add 	$push63=, $4, $5
+	i32.const	$push64=, 4095
+	i32.and 	$push65=, $pop63, $pop64
+	i32.const	$push218=, 15
+	i32.rem_u	$push66=, $pop65, $pop218
+	i32.ne  	$push67=, $pop62, $pop66
+	br_if   	0, $pop67       # 0: down to label10
+# BB#4:                                 # %if.end140
+	i32.const	$push72=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push69=, $0, $pop68
+	i32.const	$push70=, 12345
+	i32.add 	$push231=, $pop69, $pop70
+	tee_local	$push230=, $0=, $pop231
+	i32.const	$push229=, 1103515245
+	i32.mul 	$push71=, $pop230, $pop229
+	i32.const	$push228=, 12345
+	i32.add 	$push227=, $pop71, $pop228
+	tee_local	$push226=, $2=, $pop227
+	i32.store	myrnd.s($pop72), $pop226
+	i32.const	$push225=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push77=, $2, $pop73
+	i32.const	$push75=, 2047
+	i32.and 	$push78=, $pop77, $pop75
 	i32.const	$push224=, 16
-	i32.shr_u	$push61=, $1, $pop224
+	i32.shr_u	$push74=, $0, $pop224
 	i32.const	$push223=, 2047
-	i32.and 	$push222=, $pop61, $pop223
-	tee_local	$push221=, $4=, $pop222
-	i32.add 	$push62=, $pop221, $2
-	i32.const	$push63=, 15
-	i32.rem_u	$push64=, $pop62, $pop63
-	i32.add 	$push65=, $5, $4
-	i32.const	$push66=, 4095
-	i32.and 	$push67=, $pop65, $pop66
-	i32.const	$push220=, 15
-	i32.rem_u	$push68=, $pop67, $pop220
-	i32.ne  	$push69=, $pop64, $pop68
-	br_if   	0, $pop69       # 0: down to label9
-# BB#4:                                 # %if.end140
-	i32.const	$push74=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push71=, $1, $pop70
-	i32.const	$push72=, 12345
-	i32.add 	$push233=, $pop71, $pop72
-	tee_local	$push232=, $2=, $pop233
-	i32.const	$push231=, 1103515245
-	i32.mul 	$push73=, $pop232, $pop231
-	i32.const	$push230=, 12345
-	i32.add 	$push229=, $pop73, $pop230
-	tee_local	$push228=, $1=, $pop229
-	i32.store	myrnd.s($pop74), $pop228
-	i32.const	$push227=, 0
-	i32.const	$push75=, 16
-	i32.shr_u	$push79=, $1, $pop75
-	i32.const	$push77=, 2047
-	i32.and 	$push80=, $pop79, $pop77
-	i32.const	$push226=, 16
-	i32.shr_u	$push76=, $2, $pop226
-	i32.const	$push225=, 2047
-	i32.and 	$push78=, $pop76, $pop225
-	i32.add 	$push81=, $pop80, $pop78
-	i64.extend_u/i32	$push82=, $pop81
-	i64.const	$push83=, -4096
-	i64.and 	$push84=, $0, $pop83
-	i64.or  	$push85=, $pop82, $pop84
-	i64.store	sO+8($pop227), $pop85
+	i32.and 	$push76=, $pop74, $pop223
+	i32.add 	$push79=, $pop78, $pop76
+	i64.extend_u/i32	$push80=, $pop79
+	i64.or  	$push81=, $1, $pop80
+	i64.store	sO+8($pop225), $pop81
 	return
-.LBB90_5:                               # %if.then93
-	end_block                       # label9:
+.LBB90_5:                               # %if.then
+	end_block                       # label10:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end90:
 	.size	testO, .Lfunc_end90-testO
-
+                                        # -- End function
 	.section	.text.retmeP,"ax",@progbits
-	.hidden	retmeP
+	.hidden	retmeP                  # -- Begin function retmeP
 	.globl	retmeP
 	.type	retmeP,@function
 retmeP:                                 # @retmeP
@@ -4250,9 +4299,9 @@ retmeP:                                 # @retmeP
 	.endfunc
 .Lfunc_end91:
 	.size	retmeP, .Lfunc_end91-retmeP
-
+                                        # -- End function
 	.section	.text.fn1P,"ax",@progbits
-	.hidden	fn1P
+	.hidden	fn1P                    # -- Begin function fn1P
 	.globl	fn1P
 	.type	fn1P,@function
 fn1P:                                   # @fn1P
@@ -4268,9 +4317,9 @@ fn1P:                                   # @fn1P
 	.endfunc
 .Lfunc_end92:
 	.size	fn1P, .Lfunc_end92-fn1P
-
+                                        # -- End function
 	.section	.text.fn2P,"ax",@progbits
-	.hidden	fn2P
+	.hidden	fn2P                    # -- Begin function fn2P
 	.globl	fn2P
 	.type	fn2P,@function
 fn2P:                                   # @fn2P
@@ -4288,9 +4337,9 @@ fn2P:                                   # @fn2P
 	.endfunc
 .Lfunc_end93:
 	.size	fn2P, .Lfunc_end93-fn2P
-
+                                        # -- End function
 	.section	.text.retitP,"ax",@progbits
-	.hidden	retitP
+	.hidden	retitP                  # -- Begin function retitP
 	.globl	retitP
 	.type	retitP,@function
 retitP:                                 # @retitP
@@ -4304,9 +4353,9 @@ retitP:                                 # @retitP
 	.endfunc
 .Lfunc_end94:
 	.size	retitP, .Lfunc_end94-retitP
-
+                                        # -- End function
 	.section	.text.fn3P,"ax",@progbits
-	.hidden	fn3P
+	.hidden	fn3P                    # -- Begin function fn3P
 	.globl	fn3P
 	.type	fn3P,@function
 fn3P:                                   # @fn3P
@@ -4318,306 +4367,303 @@ fn3P:                                   # @fn3P
 	i32.const	$push12=, 0
 	i64.load	$push11=, sP($pop12)
 	tee_local	$push10=, $1=, $pop11
-	i32.wrap/i64	$push3=, $pop10
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $pop10, $pop1
+	i32.wrap/i64	$push3=, $1
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 4095
 	i32.and 	$push9=, $pop4, $pop5
 	tee_local	$push8=, $0=, $pop9
 	i64.extend_u/i32	$push6=, $pop8
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push7=, $pop6, $pop2
+	i64.or  	$push7=, $pop2, $pop6
 	i64.store	sP($pop0), $pop7
 	copy_local	$push13=, $0
                                         # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end95:
 	.size	fn3P, .Lfunc_end95-fn3P
-
+                                        # -- End function
 	.section	.text.testP,"ax",@progbits
-	.hidden	testP
+	.hidden	testP                   # -- Begin function testP
 	.globl	testP
 	.type	testP,@function
 testP:                                  # @testP
-	.local  	i64, i32, i32, i64, i32, i32
+	.local  	i32, i64, i32, i64, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push2=, 0
-	i32.const	$push199=, 0
-	i32.load	$push3=, myrnd.s($pop199)
+	i32.const	$push197=, 0
+	i32.load	$push3=, myrnd.s($pop197)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	i32.add 	$push198=, $pop5, $pop6
-	tee_local	$push197=, $2=, $pop198
-	i32.const	$push196=, 16
-	i32.shr_u	$push7=, $pop197, $pop196
+	i32.add 	$push196=, $pop5, $pop6
+	tee_local	$push195=, $0=, $pop196
+	i32.const	$push194=, 16
+	i32.shr_u	$push7=, $pop195, $pop194
 	i32.store8	sP($pop2), $pop7
-	i32.const	$push195=, 0
-	i32.const	$push194=, 1103515245
-	i32.mul 	$push8=, $2, $pop194
-	i32.const	$push193=, 12345
-	i32.add 	$push192=, $pop8, $pop193
-	tee_local	$push191=, $2=, $pop192
-	i32.const	$push190=, 16
-	i32.shr_u	$push9=, $pop191, $pop190
-	i32.store8	sP+1($pop195), $pop9
-	i32.const	$push189=, 0
-	i32.const	$push188=, 1103515245
-	i32.mul 	$push10=, $2, $pop188
-	i32.const	$push187=, 12345
-	i32.add 	$push186=, $pop10, $pop187
-	tee_local	$push185=, $2=, $pop186
-	i32.const	$push184=, 16
-	i32.shr_u	$push11=, $pop185, $pop184
-	i32.store8	sP+2($pop189), $pop11
-	i32.const	$push183=, 0
-	i32.const	$push182=, 1103515245
-	i32.mul 	$push12=, $2, $pop182
-	i32.const	$push181=, 12345
-	i32.add 	$push180=, $pop12, $pop181
-	tee_local	$push179=, $2=, $pop180
-	i32.const	$push178=, 16
-	i32.shr_u	$push13=, $pop179, $pop178
-	i32.store8	sP+3($pop183), $pop13
-	i32.const	$push177=, 0
-	i32.const	$push176=, 1103515245
-	i32.mul 	$push14=, $2, $pop176
-	i32.const	$push175=, 12345
-	i32.add 	$push174=, $pop14, $pop175
-	tee_local	$push173=, $2=, $pop174
-	i32.const	$push172=, 16
-	i32.shr_u	$push15=, $pop173, $pop172
-	i32.store8	sP+4($pop177), $pop15
-	i32.const	$push171=, 0
-	i32.const	$push170=, 1103515245
-	i32.mul 	$push16=, $2, $pop170
-	i32.const	$push169=, 12345
-	i32.add 	$push168=, $pop16, $pop169
-	tee_local	$push167=, $2=, $pop168
-	i32.const	$push166=, 16
-	i32.shr_u	$push17=, $pop167, $pop166
-	i32.store8	sP+5($pop171), $pop17
-	i32.const	$push165=, 0
-	i32.const	$push164=, 1103515245
-	i32.mul 	$push18=, $2, $pop164
-	i32.const	$push163=, 12345
-	i32.add 	$push162=, $pop18, $pop163
-	tee_local	$push161=, $2=, $pop162
-	i32.const	$push160=, 16
-	i32.shr_u	$push19=, $pop161, $pop160
-	i32.store8	sP+6($pop165), $pop19
-	i32.const	$push159=, 0
-	i32.const	$push158=, 1103515245
-	i32.mul 	$push20=, $2, $pop158
-	i32.const	$push157=, 12345
-	i32.add 	$push156=, $pop20, $pop157
-	tee_local	$push155=, $2=, $pop156
-	i32.const	$push154=, 16
-	i32.shr_u	$push21=, $pop155, $pop154
-	i32.store8	sP+7($pop159), $pop21
-	i32.const	$push153=, 0
-	i32.const	$push152=, 1103515245
-	i32.mul 	$push22=, $2, $pop152
-	i32.const	$push151=, 12345
-	i32.add 	$push150=, $pop22, $pop151
-	tee_local	$push149=, $2=, $pop150
-	i32.const	$push148=, 16
-	i32.shr_u	$push23=, $pop149, $pop148
-	i32.store8	sP+8($pop153), $pop23
-	i32.const	$push147=, 0
-	i32.const	$push146=, 1103515245
-	i32.mul 	$push24=, $2, $pop146
-	i32.const	$push145=, 12345
-	i32.add 	$push144=, $pop24, $pop145
-	tee_local	$push143=, $2=, $pop144
-	i32.const	$push142=, 16
-	i32.shr_u	$push25=, $pop143, $pop142
-	i32.store8	sP+9($pop147), $pop25
-	i32.const	$push141=, 0
-	i32.const	$push140=, 1103515245
-	i32.mul 	$push26=, $2, $pop140
-	i32.const	$push139=, 12345
-	i32.add 	$push138=, $pop26, $pop139
-	tee_local	$push137=, $2=, $pop138
-	i32.const	$push136=, 16
-	i32.shr_u	$push27=, $pop137, $pop136
-	i32.store8	sP+10($pop141), $pop27
-	i32.const	$push135=, 0
-	i32.const	$push134=, 1103515245
-	i32.mul 	$push28=, $2, $pop134
-	i32.const	$push133=, 12345
-	i32.add 	$push132=, $pop28, $pop133
-	tee_local	$push131=, $2=, $pop132
-	i32.const	$push130=, 16
-	i32.shr_u	$push29=, $pop131, $pop130
-	i32.store8	sP+11($pop135), $pop29
-	i32.const	$push129=, 0
-	i32.const	$push128=, 1103515245
-	i32.mul 	$push30=, $2, $pop128
-	i32.const	$push127=, 12345
-	i32.add 	$push126=, $pop30, $pop127
-	tee_local	$push125=, $2=, $pop126
-	i32.const	$push124=, 16
-	i32.shr_u	$push31=, $pop125, $pop124
-	i32.store8	sP+12($pop129), $pop31
-	i32.const	$push123=, 0
-	i32.const	$push122=, 1103515245
-	i32.mul 	$push32=, $2, $pop122
-	i32.const	$push121=, 12345
-	i32.add 	$push120=, $pop32, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.const	$push118=, 16
-	i32.shr_u	$push33=, $pop119, $pop118
-	i32.store8	sP+13($pop123), $pop33
-	i32.const	$push117=, 0
-	i32.const	$push116=, 1103515245
-	i32.mul 	$push34=, $2, $pop116
-	i32.const	$push115=, 12345
-	i32.add 	$push114=, $pop34, $pop115
-	tee_local	$push113=, $2=, $pop114
-	i32.const	$push112=, 16
-	i32.shr_u	$push35=, $pop113, $pop112
-	i32.store8	sP+14($pop117), $pop35
-	i32.const	$push111=, 0
-	i32.const	$push110=, 1103515245
-	i32.mul 	$push36=, $2, $pop110
-	i32.const	$push109=, 12345
-	i32.add 	$push108=, $pop36, $pop109
-	tee_local	$push107=, $2=, $pop108
-	i32.const	$push106=, 16
-	i32.shr_u	$push37=, $pop107, $pop106
-	i32.store8	sP+15($pop111), $pop37
-	i32.const	$push105=, 0
-	i64.load	$0=, sP($pop105)
-	i32.const	$push104=, 0
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push38=, $2, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop38, $pop102
-	tee_local	$push100=, $2=, $pop101
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push39=, $pop100, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop39, $pop98
-	tee_local	$push96=, $1=, $pop97
-	i32.store	myrnd.s($pop104), $pop96
-	i32.const	$push95=, 0
-	i32.const	$push94=, 16
-	i32.shr_u	$push42=, $2, $pop94
-	i32.const	$push93=, 2047
-	i32.and 	$push92=, $pop42, $pop93
-	tee_local	$push91=, $2=, $pop92
-	i64.extend_u/i32	$push43=, $pop91
-	i64.const	$push40=, -4096
-	i64.and 	$push41=, $0, $pop40
-	i64.or  	$push90=, $pop43, $pop41
-	tee_local	$push89=, $3=, $pop90
-	i64.store	sP($pop95), $pop89
+	i32.const	$push193=, 0
+	i32.const	$push192=, 1103515245
+	i32.mul 	$push8=, $0, $pop192
+	i32.const	$push191=, 12345
+	i32.add 	$push190=, $pop8, $pop191
+	tee_local	$push189=, $0=, $pop190
+	i32.const	$push188=, 16
+	i32.shr_u	$push9=, $pop189, $pop188
+	i32.store8	sP+1($pop193), $pop9
+	i32.const	$push187=, 0
+	i32.const	$push186=, 1103515245
+	i32.mul 	$push10=, $0, $pop186
+	i32.const	$push185=, 12345
+	i32.add 	$push184=, $pop10, $pop185
+	tee_local	$push183=, $0=, $pop184
+	i32.const	$push182=, 16
+	i32.shr_u	$push11=, $pop183, $pop182
+	i32.store8	sP+2($pop187), $pop11
+	i32.const	$push181=, 0
+	i32.const	$push180=, 1103515245
+	i32.mul 	$push12=, $0, $pop180
+	i32.const	$push179=, 12345
+	i32.add 	$push178=, $pop12, $pop179
+	tee_local	$push177=, $0=, $pop178
+	i32.const	$push176=, 16
+	i32.shr_u	$push13=, $pop177, $pop176
+	i32.store8	sP+3($pop181), $pop13
+	i32.const	$push175=, 0
+	i32.const	$push174=, 1103515245
+	i32.mul 	$push14=, $0, $pop174
+	i32.const	$push173=, 12345
+	i32.add 	$push172=, $pop14, $pop173
+	tee_local	$push171=, $0=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push15=, $pop171, $pop170
+	i32.store8	sP+4($pop175), $pop15
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push16=, $0, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop16, $pop167
+	tee_local	$push165=, $0=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push17=, $pop165, $pop164
+	i32.store8	sP+5($pop169), $pop17
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push18=, $0, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop18, $pop161
+	tee_local	$push159=, $0=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push19=, $pop159, $pop158
+	i32.store8	sP+6($pop163), $pop19
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push20=, $0, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop20, $pop155
+	tee_local	$push153=, $0=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push21=, $pop153, $pop152
+	i32.store8	sP+7($pop157), $pop21
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push22=, $0, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop22, $pop149
+	tee_local	$push147=, $0=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push23=, $pop147, $pop146
+	i32.store8	sP+8($pop151), $pop23
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push24=, $0, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop24, $pop143
+	tee_local	$push141=, $0=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push25=, $pop141, $pop140
+	i32.store8	sP+9($pop145), $pop25
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push26=, $0, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop26, $pop137
+	tee_local	$push135=, $0=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push27=, $pop135, $pop134
+	i32.store8	sP+10($pop139), $pop27
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push28=, $0, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop28, $pop131
+	tee_local	$push129=, $0=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push29=, $pop129, $pop128
+	i32.store8	sP+11($pop133), $pop29
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push30=, $0, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop30, $pop125
+	tee_local	$push123=, $0=, $pop124
+	i32.const	$push122=, 16
+	i32.shr_u	$push31=, $pop123, $pop122
+	i32.store8	sP+12($pop127), $pop31
+	i32.const	$push121=, 0
+	i32.const	$push120=, 1103515245
+	i32.mul 	$push32=, $0, $pop120
+	i32.const	$push119=, 12345
+	i32.add 	$push118=, $pop32, $pop119
+	tee_local	$push117=, $0=, $pop118
+	i32.const	$push116=, 16
+	i32.shr_u	$push33=, $pop117, $pop116
+	i32.store8	sP+13($pop121), $pop33
+	i32.const	$push115=, 0
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push34=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop34, $pop113
+	tee_local	$push111=, $0=, $pop112
+	i32.const	$push110=, 16
+	i32.shr_u	$push35=, $pop111, $pop110
+	i32.store8	sP+14($pop115), $pop35
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push36=, $0, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop36, $pop107
+	tee_local	$push105=, $0=, $pop106
+	i32.const	$push104=, 16
+	i32.shr_u	$push37=, $pop105, $pop104
+	i32.store8	sP+15($pop109), $pop37
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push38=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop38, $pop101
+	tee_local	$push99=, $2=, $pop100
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push39=, $pop99, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop39, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.store	myrnd.s($pop103), $pop95
+	i32.const	$push94=, 0
+	i32.const	$push93=, 0
+	i64.load	$push40=, sP($pop93)
+	i64.const	$push41=, -4096
+	i64.and 	$push92=, $pop40, $pop41
+	tee_local	$push91=, $1=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push42=, $2, $pop90
+	i32.const	$push89=, 2047
+	i32.and 	$push88=, $pop42, $pop89
+	tee_local	$push87=, $2=, $pop88
+	i64.extend_u/i32	$push43=, $pop87
+	i64.or  	$push86=, $pop91, $pop43
+	tee_local	$push85=, $3=, $pop86
+	i64.store	sP($pop94), $pop85
 	block   	
-	i32.wrap/i64	$push88=, $3
-	tee_local	$push87=, $5=, $pop88
-	i32.const	$push86=, 2047
-	i32.and 	$push47=, $pop87, $pop86
+	i32.wrap/i64	$push84=, $3
+	tee_local	$push83=, $5=, $pop84
+	i32.const	$push82=, 2047
+	i32.and 	$push47=, $pop83, $pop82
 	i32.ne  	$push48=, $2, $pop47
-	br_if   	0, $pop48       # 0: down to label10
+	br_if   	0, $pop48       # 0: down to label11
 # BB#1:                                 # %entry
-	i32.const	$push203=, 16
-	i32.shr_u	$push44=, $1, $pop203
-	i32.const	$push202=, 2047
-	i32.and 	$push201=, $pop44, $pop202
-	tee_local	$push200=, $4=, $pop201
-	i32.add 	$push0=, $pop200, $2
-	i32.add 	$push45=, $5, $4
+	i32.const	$push201=, 16
+	i32.shr_u	$push44=, $0, $pop201
+	i32.const	$push200=, 2047
+	i32.and 	$push199=, $pop44, $pop200
+	tee_local	$push198=, $4=, $pop199
+	i32.add 	$push0=, $pop198, $2
+	i32.add 	$push45=, $4, $5
 	i32.const	$push46=, 4095
 	i32.and 	$push1=, $pop45, $pop46
 	i32.ne  	$push49=, $pop0, $pop1
-	br_if   	0, $pop49       # 0: down to label10
+	br_if   	0, $pop49       # 0: down to label11
 # BB#2:                                 # %if.end
 	i32.const	$push54=, 0
 	i32.const	$push50=, 1103515245
-	i32.mul 	$push51=, $1, $pop50
+	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	i32.add 	$push219=, $pop51, $pop52
-	tee_local	$push218=, $2=, $pop219
-	i32.const	$push217=, 1103515245
-	i32.mul 	$push53=, $pop218, $pop217
-	i32.const	$push216=, 12345
-	i32.add 	$push215=, $pop53, $pop216
-	tee_local	$push214=, $1=, $pop215
-	i32.store	myrnd.s($pop54), $pop214
-	i32.const	$push213=, 0
-	i32.const	$push212=, 16
-	i32.shr_u	$push57=, $2, $pop212
-	i32.const	$push211=, 2047
-	i32.and 	$push210=, $pop57, $pop211
-	tee_local	$push209=, $2=, $pop210
-	i64.extend_u/i32	$push58=, $pop209
-	i64.const	$push55=, -4096
-	i64.and 	$push56=, $0, $pop55
-	i64.or  	$push208=, $pop58, $pop56
-	tee_local	$push207=, $3=, $pop208
-	i64.store	sP($pop213), $pop207
-	i32.wrap/i64	$push206=, $3
-	tee_local	$push205=, $5=, $pop206
-	i32.const	$push204=, 2047
-	i32.and 	$push59=, $pop205, $pop204
-	i32.ne  	$push60=, $2, $pop59
-	br_if   	0, $pop60       # 0: down to label10
+	i32.add 	$push217=, $pop51, $pop52
+	tee_local	$push216=, $2=, $pop217
+	i32.const	$push215=, 1103515245
+	i32.mul 	$push53=, $pop216, $pop215
+	i32.const	$push214=, 12345
+	i32.add 	$push213=, $pop53, $pop214
+	tee_local	$push212=, $0=, $pop213
+	i32.store	myrnd.s($pop54), $pop212
+	i32.const	$push211=, 0
+	i32.const	$push210=, 16
+	i32.shr_u	$push55=, $2, $pop210
+	i32.const	$push209=, 2047
+	i32.and 	$push208=, $pop55, $pop209
+	tee_local	$push207=, $2=, $pop208
+	i64.extend_u/i32	$push56=, $pop207
+	i64.or  	$push206=, $1, $pop56
+	tee_local	$push205=, $3=, $pop206
+	i64.store	sP($pop211), $pop205
+	i32.wrap/i64	$push204=, $3
+	tee_local	$push203=, $5=, $pop204
+	i32.const	$push202=, 2047
+	i32.and 	$push57=, $pop203, $pop202
+	i32.ne  	$push58=, $2, $pop57
+	br_if   	0, $pop58       # 0: down to label11
 # BB#3:                                 # %lor.lhs.false83
+	i32.const	$push222=, 16
+	i32.shr_u	$push59=, $0, $pop222
+	i32.const	$push221=, 2047
+	i32.and 	$push220=, $pop59, $pop221
+	tee_local	$push219=, $4=, $pop220
+	i32.add 	$push60=, $pop219, $2
+	i32.const	$push61=, 15
+	i32.rem_u	$push62=, $pop60, $pop61
+	i32.add 	$push63=, $4, $5
+	i32.const	$push64=, 4095
+	i32.and 	$push65=, $pop63, $pop64
+	i32.const	$push218=, 15
+	i32.rem_u	$push66=, $pop65, $pop218
+	i32.ne  	$push67=, $pop62, $pop66
+	br_if   	0, $pop67       # 0: down to label11
+# BB#4:                                 # %if.end134
+	i32.const	$push72=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push69=, $0, $pop68
+	i32.const	$push70=, 12345
+	i32.add 	$push231=, $pop69, $pop70
+	tee_local	$push230=, $0=, $pop231
+	i32.const	$push229=, 1103515245
+	i32.mul 	$push71=, $pop230, $pop229
+	i32.const	$push228=, 12345
+	i32.add 	$push227=, $pop71, $pop228
+	tee_local	$push226=, $2=, $pop227
+	i32.store	myrnd.s($pop72), $pop226
+	i32.const	$push225=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push77=, $2, $pop73
+	i32.const	$push75=, 2047
+	i32.and 	$push78=, $pop77, $pop75
 	i32.const	$push224=, 16
-	i32.shr_u	$push61=, $1, $pop224
+	i32.shr_u	$push74=, $0, $pop224
 	i32.const	$push223=, 2047
-	i32.and 	$push222=, $pop61, $pop223
-	tee_local	$push221=, $4=, $pop222
-	i32.add 	$push62=, $pop221, $2
-	i32.const	$push63=, 15
-	i32.rem_u	$push64=, $pop62, $pop63
-	i32.add 	$push65=, $5, $4
-	i32.const	$push66=, 4095
-	i32.and 	$push67=, $pop65, $pop66
-	i32.const	$push220=, 15
-	i32.rem_u	$push68=, $pop67, $pop220
-	i32.ne  	$push69=, $pop64, $pop68
-	br_if   	0, $pop69       # 0: down to label10
-# BB#4:                                 # %if.end134
-	i32.const	$push74=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push71=, $1, $pop70
-	i32.const	$push72=, 12345
-	i32.add 	$push233=, $pop71, $pop72
-	tee_local	$push232=, $2=, $pop233
-	i32.const	$push231=, 1103515245
-	i32.mul 	$push73=, $pop232, $pop231
-	i32.const	$push230=, 12345
-	i32.add 	$push229=, $pop73, $pop230
-	tee_local	$push228=, $1=, $pop229
-	i32.store	myrnd.s($pop74), $pop228
-	i32.const	$push227=, 0
-	i32.const	$push75=, 16
-	i32.shr_u	$push79=, $1, $pop75
-	i32.const	$push77=, 2047
-	i32.and 	$push80=, $pop79, $pop77
-	i32.const	$push226=, 16
-	i32.shr_u	$push76=, $2, $pop226
-	i32.const	$push225=, 2047
-	i32.and 	$push78=, $pop76, $pop225
-	i32.add 	$push81=, $pop80, $pop78
-	i64.extend_u/i32	$push82=, $pop81
-	i64.const	$push83=, -4096
-	i64.and 	$push84=, $0, $pop83
-	i64.or  	$push85=, $pop82, $pop84
-	i64.store	sP($pop227), $pop85
+	i32.and 	$push76=, $pop74, $pop223
+	i32.add 	$push79=, $pop78, $pop76
+	i64.extend_u/i32	$push80=, $pop79
+	i64.or  	$push81=, $1, $pop80
+	i64.store	sP($pop225), $pop81
 	return
-.LBB96_5:                               # %if.then89
-	end_block                       # label10:
+.LBB96_5:                               # %if.then
+	end_block                       # label11:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end96:
 	.size	testP, .Lfunc_end96-testP
-
+                                        # -- End function
 	.section	.text.retmeQ,"ax",@progbits
-	.hidden	retmeQ
+	.hidden	retmeQ                  # -- Begin function retmeQ
 	.globl	retmeQ
 	.type	retmeQ,@function
 retmeQ:                                 # @retmeQ
@@ -4635,9 +4681,9 @@ retmeQ:                                 # @retmeQ
 	.endfunc
 .Lfunc_end97:
 	.size	retmeQ, .Lfunc_end97-retmeQ
-
+                                        # -- End function
 	.section	.text.fn1Q,"ax",@progbits
-	.hidden	fn1Q
+	.hidden	fn1Q                    # -- Begin function fn1Q
 	.globl	fn1Q
 	.type	fn1Q,@function
 fn1Q:                                   # @fn1Q
@@ -4653,9 +4699,9 @@ fn1Q:                                   # @fn1Q
 	.endfunc
 .Lfunc_end98:
 	.size	fn1Q, .Lfunc_end98-fn1Q
-
+                                        # -- End function
 	.section	.text.fn2Q,"ax",@progbits
-	.hidden	fn2Q
+	.hidden	fn2Q                    # -- Begin function fn2Q
 	.globl	fn2Q
 	.type	fn2Q,@function
 fn2Q:                                   # @fn2Q
@@ -4673,9 +4719,9 @@ fn2Q:                                   # @fn2Q
 	.endfunc
 .Lfunc_end99:
 	.size	fn2Q, .Lfunc_end99-fn2Q
-
+                                        # -- End function
 	.section	.text.retitQ,"ax",@progbits
-	.hidden	retitQ
+	.hidden	retitQ                  # -- Begin function retitQ
 	.globl	retitQ
 	.type	retitQ,@function
 retitQ:                                 # @retitQ
@@ -4689,9 +4735,9 @@ retitQ:                                 # @retitQ
 	.endfunc
 .Lfunc_end100:
 	.size	retitQ, .Lfunc_end100-retitQ
-
+                                        # -- End function
 	.section	.text.fn3Q,"ax",@progbits
-	.hidden	fn3Q
+	.hidden	fn3Q                    # -- Begin function fn3Q
 	.globl	fn3Q
 	.type	fn3Q,@function
 fn3Q:                                   # @fn3Q
@@ -4716,195 +4762,195 @@ fn3Q:                                   # @fn3Q
 	.endfunc
 .Lfunc_end101:
 	.size	fn3Q, .Lfunc_end101-fn3Q
-
+                                        # -- End function
 	.section	.text.testQ,"ax",@progbits
-	.hidden	testQ
+	.hidden	testQ                   # -- Begin function testQ
 	.globl	testQ
 	.type	testQ,@function
 testQ:                                  # @testQ
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %if.end75
 	i32.const	$push0=, 0
-	i32.const	$push154=, 0
-	i32.load	$push1=, myrnd.s($pop154)
+	i32.const	$push155=, 0
+	i32.load	$push1=, myrnd.s($pop155)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push153=, $pop3, $pop4
-	tee_local	$push152=, $0=, $pop153
+	i32.add 	$push154=, $pop3, $pop4
+	tee_local	$push153=, $0=, $pop154
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop152, $pop5
+	i32.shr_u	$push6=, $pop153, $pop5
 	i32.store8	sQ($pop0), $pop6
-	i32.const	$push151=, 0
-	i32.const	$push150=, 1103515245
-	i32.mul 	$push7=, $0, $pop150
-	i32.const	$push149=, 12345
-	i32.add 	$push148=, $pop7, $pop149
-	tee_local	$push147=, $0=, $pop148
-	i32.const	$push146=, 16
-	i32.shr_u	$push8=, $pop147, $pop146
-	i32.store8	sQ+1($pop151), $pop8
-	i32.const	$push145=, 0
-	i32.const	$push144=, 1103515245
-	i32.mul 	$push9=, $0, $pop144
-	i32.const	$push143=, 12345
-	i32.add 	$push142=, $pop9, $pop143
-	tee_local	$push141=, $0=, $pop142
-	i32.const	$push140=, 16
-	i32.shr_u	$push10=, $pop141, $pop140
-	i32.store8	sQ+2($pop145), $pop10
-	i32.const	$push139=, 0
-	i32.const	$push138=, 1103515245
-	i32.mul 	$push11=, $0, $pop138
-	i32.const	$push137=, 12345
-	i32.add 	$push136=, $pop11, $pop137
-	tee_local	$push135=, $0=, $pop136
-	i32.const	$push134=, 16
-	i32.shr_u	$push12=, $pop135, $pop134
-	i32.store8	sQ+3($pop139), $pop12
-	i32.const	$push133=, 0
-	i32.const	$push132=, 1103515245
-	i32.mul 	$push13=, $0, $pop132
-	i32.const	$push131=, 12345
-	i32.add 	$push130=, $pop13, $pop131
-	tee_local	$push129=, $0=, $pop130
-	i32.const	$push128=, 16
-	i32.shr_u	$push14=, $pop129, $pop128
-	i32.store8	sQ+4($pop133), $pop14
-	i32.const	$push127=, 0
-	i32.const	$push126=, 1103515245
-	i32.mul 	$push15=, $0, $pop126
-	i32.const	$push125=, 12345
-	i32.add 	$push124=, $pop15, $pop125
-	tee_local	$push123=, $0=, $pop124
-	i32.const	$push122=, 16
-	i32.shr_u	$push16=, $pop123, $pop122
-	i32.store8	sQ+5($pop127), $pop16
-	i32.const	$push121=, 0
-	i32.const	$push120=, 1103515245
-	i32.mul 	$push17=, $0, $pop120
-	i32.const	$push119=, 12345
-	i32.add 	$push118=, $pop17, $pop119
-	tee_local	$push117=, $0=, $pop118
-	i32.const	$push116=, 16
-	i32.shr_u	$push18=, $pop117, $pop116
-	i32.store8	sQ+6($pop121), $pop18
-	i32.const	$push115=, 0
-	i32.const	$push114=, 1103515245
-	i32.mul 	$push19=, $0, $pop114
-	i32.const	$push113=, 12345
-	i32.add 	$push112=, $pop19, $pop113
-	tee_local	$push111=, $0=, $pop112
-	i32.const	$push110=, 16
-	i32.shr_u	$push20=, $pop111, $pop110
-	i32.store8	sQ+7($pop115), $pop20
-	i32.const	$push109=, 0
-	i32.const	$push108=, 1103515245
-	i32.mul 	$push21=, $0, $pop108
-	i32.const	$push107=, 12345
-	i32.add 	$push106=, $pop21, $pop107
-	tee_local	$push105=, $0=, $pop106
-	i32.const	$push104=, 16
-	i32.shr_u	$push22=, $pop105, $pop104
-	i32.store8	sQ+8($pop109), $pop22
-	i32.const	$push103=, 0
-	i32.const	$push102=, 1103515245
-	i32.mul 	$push23=, $0, $pop102
-	i32.const	$push101=, 12345
-	i32.add 	$push100=, $pop23, $pop101
-	tee_local	$push99=, $0=, $pop100
-	i32.const	$push98=, 16
-	i32.shr_u	$push24=, $pop99, $pop98
-	i32.store8	sQ+9($pop103), $pop24
-	i32.const	$push97=, 0
-	i32.const	$push96=, 1103515245
-	i32.mul 	$push25=, $0, $pop96
-	i32.const	$push95=, 12345
-	i32.add 	$push94=, $pop25, $pop95
-	tee_local	$push93=, $0=, $pop94
-	i32.const	$push92=, 16
-	i32.shr_u	$push26=, $pop93, $pop92
-	i32.store8	sQ+10($pop97), $pop26
-	i32.const	$push91=, 0
-	i32.const	$push90=, 1103515245
-	i32.mul 	$push27=, $0, $pop90
-	i32.const	$push89=, 12345
-	i32.add 	$push88=, $pop27, $pop89
-	tee_local	$push87=, $0=, $pop88
-	i32.const	$push86=, 16
-	i32.shr_u	$push28=, $pop87, $pop86
-	i32.store8	sQ+11($pop91), $pop28
-	i32.const	$push85=, 0
-	i32.const	$push84=, 1103515245
-	i32.mul 	$push29=, $0, $pop84
-	i32.const	$push83=, 12345
-	i32.add 	$push82=, $pop29, $pop83
-	tee_local	$push81=, $0=, $pop82
-	i32.const	$push80=, 16
-	i32.shr_u	$push30=, $pop81, $pop80
-	i32.store8	sQ+12($pop85), $pop30
-	i32.const	$push79=, 0
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push31=, $0, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop31, $pop77
-	tee_local	$push75=, $0=, $pop76
-	i32.const	$push74=, 16
-	i32.shr_u	$push32=, $pop75, $pop74
-	i32.store8	sQ+13($pop79), $pop32
-	i32.const	$push73=, 0
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push33=, $0, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop33, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.const	$push68=, 16
-	i32.shr_u	$push34=, $pop69, $pop68
-	i32.store8	sQ+14($pop73), $pop34
-	i32.const	$push67=, 0
-	i32.const	$push66=, 1103515245
-	i32.mul 	$push35=, $0, $pop66
-	i32.const	$push65=, 12345
-	i32.add 	$push64=, $pop35, $pop65
-	tee_local	$push63=, $0=, $pop64
-	i32.const	$push62=, 16
-	i32.shr_u	$push36=, $pop63, $pop62
-	i32.store8	sQ+15($pop67), $pop36
-	i32.const	$push61=, 0
-	i32.load	$2=, sQ($pop61)
-	i32.const	$push60=, 0
+	i32.const	$push152=, 0
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push7=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$push149=, $pop7, $pop150
+	tee_local	$push148=, $0=, $pop149
+	i32.const	$push147=, 16
+	i32.shr_u	$push8=, $pop148, $pop147
+	i32.store8	sQ+1($pop152), $pop8
+	i32.const	$push146=, 0
+	i32.const	$push145=, 1103515245
+	i32.mul 	$push9=, $0, $pop145
+	i32.const	$push144=, 12345
+	i32.add 	$push143=, $pop9, $pop144
+	tee_local	$push142=, $0=, $pop143
+	i32.const	$push141=, 16
+	i32.shr_u	$push10=, $pop142, $pop141
+	i32.store8	sQ+2($pop146), $pop10
+	i32.const	$push140=, 0
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push11=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$push137=, $pop11, $pop138
+	tee_local	$push136=, $0=, $pop137
+	i32.const	$push135=, 16
+	i32.shr_u	$push12=, $pop136, $pop135
+	i32.store8	sQ+3($pop140), $pop12
+	i32.const	$push134=, 0
+	i32.const	$push133=, 1103515245
+	i32.mul 	$push13=, $0, $pop133
+	i32.const	$push132=, 12345
+	i32.add 	$push131=, $pop13, $pop132
+	tee_local	$push130=, $0=, $pop131
+	i32.const	$push129=, 16
+	i32.shr_u	$push14=, $pop130, $pop129
+	i32.store8	sQ+4($pop134), $pop14
+	i32.const	$push128=, 0
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push15=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$push125=, $pop15, $pop126
+	tee_local	$push124=, $0=, $pop125
+	i32.const	$push123=, 16
+	i32.shr_u	$push16=, $pop124, $pop123
+	i32.store8	sQ+5($pop128), $pop16
+	i32.const	$push122=, 0
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push17=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$push119=, $pop17, $pop120
+	tee_local	$push118=, $0=, $pop119
+	i32.const	$push117=, 16
+	i32.shr_u	$push18=, $pop118, $pop117
+	i32.store8	sQ+6($pop122), $pop18
+	i32.const	$push116=, 0
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push19=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$push113=, $pop19, $pop114
+	tee_local	$push112=, $0=, $pop113
+	i32.const	$push111=, 16
+	i32.shr_u	$push20=, $pop112, $pop111
+	i32.store8	sQ+7($pop116), $pop20
+	i32.const	$push110=, 0
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push21=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$push107=, $pop21, $pop108
+	tee_local	$push106=, $0=, $pop107
+	i32.const	$push105=, 16
+	i32.shr_u	$push22=, $pop106, $pop105
+	i32.store8	sQ+8($pop110), $pop22
+	i32.const	$push104=, 0
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push23=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$push101=, $pop23, $pop102
+	tee_local	$push100=, $0=, $pop101
+	i32.const	$push99=, 16
+	i32.shr_u	$push24=, $pop100, $pop99
+	i32.store8	sQ+9($pop104), $pop24
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push25=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop25, $pop96
+	tee_local	$push94=, $0=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push26=, $pop94, $pop93
+	i32.store8	sQ+10($pop98), $pop26
+	i32.const	$push92=, 0
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push27=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$push89=, $pop27, $pop90
+	tee_local	$push88=, $0=, $pop89
+	i32.const	$push87=, 16
+	i32.shr_u	$push28=, $pop88, $pop87
+	i32.store8	sQ+11($pop92), $pop28
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop29, $pop84
+	tee_local	$push82=, $0=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push30=, $pop82, $pop81
+	i32.store8	sQ+12($pop86), $pop30
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push31=, $0, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop31, $pop78
+	tee_local	$push76=, $0=, $pop77
+	i32.const	$push75=, 16
+	i32.shr_u	$push32=, $pop76, $pop75
+	i32.store8	sQ+13($pop80), $pop32
+	i32.const	$push74=, 0
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push33=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop33, $pop72
+	tee_local	$push70=, $0=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push34=, $pop70, $pop69
+	i32.store8	sQ+14($pop74), $pop34
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push35=, $0, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop35, $pop66
+	tee_local	$push64=, $0=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push36=, $pop64, $pop63
+	i32.store8	sQ+15($pop68), $pop36
+	i32.const	$push62=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push59=, $pop38, $pop39
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 1103515245
-	i32.mul 	$push40=, $pop58, $pop57
-	i32.const	$push56=, 12345
-	i32.add 	$push55=, $pop40, $pop56
-	tee_local	$push54=, $1=, $pop55
-	i32.store	myrnd.s($pop60), $pop54
-	i32.const	$push53=, 0
-	i32.const	$push52=, 16
-	i32.shr_u	$push44=, $1, $pop52
+	i32.add 	$push61=, $pop38, $pop39
+	tee_local	$push60=, $0=, $pop61
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push40=, $pop60, $pop59
+	i32.const	$push58=, 12345
+	i32.add 	$push57=, $pop40, $pop58
+	tee_local	$push56=, $1=, $pop57
+	i32.store	myrnd.s($pop62), $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push44=, $1, $pop54
 	i32.const	$push42=, 2047
 	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push51=, 16
-	i32.shr_u	$push41=, $0, $pop51
-	i32.const	$push50=, 2047
-	i32.and 	$push43=, $pop41, $pop50
+	i32.const	$push53=, 16
+	i32.shr_u	$push41=, $0, $pop53
+	i32.const	$push52=, 2047
+	i32.and 	$push43=, $pop41, $pop52
 	i32.add 	$push46=, $pop45, $pop43
-	i32.const	$push47=, -4096
-	i32.and 	$push48=, $2, $pop47
-	i32.or  	$push49=, $pop46, $pop48
-	i32.store	sQ($pop53), $pop49
+	i32.const	$push51=, 0
+	i32.load	$push47=, sQ($pop51)
+	i32.const	$push48=, -4096
+	i32.and 	$push49=, $pop47, $pop48
+	i32.or  	$push50=, $pop46, $pop49
+	i32.store	sQ($pop55), $pop50
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end102:
 	.size	testQ, .Lfunc_end102-testQ
-
+                                        # -- End function
 	.section	.text.retmeR,"ax",@progbits
-	.hidden	retmeR
+	.hidden	retmeR                  # -- Begin function retmeR
 	.globl	retmeR
 	.type	retmeR,@function
 retmeR:                                 # @retmeR
@@ -4922,9 +4968,9 @@ retmeR:                                 # @retmeR
 	.endfunc
 .Lfunc_end103:
 	.size	retmeR, .Lfunc_end103-retmeR
-
+                                        # -- End function
 	.section	.text.fn1R,"ax",@progbits
-	.hidden	fn1R
+	.hidden	fn1R                    # -- Begin function fn1R
 	.globl	fn1R
 	.type	fn1R,@function
 fn1R:                                   # @fn1R
@@ -4940,9 +4986,9 @@ fn1R:                                   # @fn1R
 	.endfunc
 .Lfunc_end104:
 	.size	fn1R, .Lfunc_end104-fn1R
-
+                                        # -- End function
 	.section	.text.fn2R,"ax",@progbits
-	.hidden	fn2R
+	.hidden	fn2R                    # -- Begin function fn2R
 	.globl	fn2R
 	.type	fn2R,@function
 fn2R:                                   # @fn2R
@@ -4960,9 +5006,9 @@ fn2R:                                   # @fn2R
 	.endfunc
 .Lfunc_end105:
 	.size	fn2R, .Lfunc_end105-fn2R
-
+                                        # -- End function
 	.section	.text.retitR,"ax",@progbits
-	.hidden	retitR
+	.hidden	retitR                  # -- Begin function retitR
 	.globl	retitR
 	.type	retitR,@function
 retitR:                                 # @retitR
@@ -4976,9 +5022,9 @@ retitR:                                 # @retitR
 	.endfunc
 .Lfunc_end106:
 	.size	retitR, .Lfunc_end106-retitR
-
+                                        # -- End function
 	.section	.text.fn3R,"ax",@progbits
-	.hidden	fn3R
+	.hidden	fn3R                    # -- Begin function fn3R
 	.globl	fn3R
 	.type	fn3R,@function
 fn3R:                                   # @fn3R
@@ -5003,15 +5049,300 @@ fn3R:                                   # @fn3R
 	.endfunc
 .Lfunc_end107:
 	.size	fn3R, .Lfunc_end107-fn3R
-
+                                        # -- End function
 	.section	.text.testR,"ax",@progbits
-	.hidden	testR
+	.hidden	testR                   # -- Begin function testR
 	.globl	testR
 	.type	testR,@function
 testR:                                  # @testR
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %if.end75
 	i32.const	$push0=, 0
+	i32.const	$push155=, 0
+	i32.load	$push1=, myrnd.s($pop155)
+	i32.const	$push2=, 1103515245
+	i32.mul 	$push3=, $pop1, $pop2
+	i32.const	$push4=, 12345
+	i32.add 	$push154=, $pop3, $pop4
+	tee_local	$push153=, $0=, $pop154
+	i32.const	$push5=, 16
+	i32.shr_u	$push6=, $pop153, $pop5
+	i32.store8	sR($pop0), $pop6
+	i32.const	$push152=, 0
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push7=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$push149=, $pop7, $pop150
+	tee_local	$push148=, $0=, $pop149
+	i32.const	$push147=, 16
+	i32.shr_u	$push8=, $pop148, $pop147
+	i32.store8	sR+1($pop152), $pop8
+	i32.const	$push146=, 0
+	i32.const	$push145=, 1103515245
+	i32.mul 	$push9=, $0, $pop145
+	i32.const	$push144=, 12345
+	i32.add 	$push143=, $pop9, $pop144
+	tee_local	$push142=, $0=, $pop143
+	i32.const	$push141=, 16
+	i32.shr_u	$push10=, $pop142, $pop141
+	i32.store8	sR+2($pop146), $pop10
+	i32.const	$push140=, 0
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push11=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$push137=, $pop11, $pop138
+	tee_local	$push136=, $0=, $pop137
+	i32.const	$push135=, 16
+	i32.shr_u	$push12=, $pop136, $pop135
+	i32.store8	sR+3($pop140), $pop12
+	i32.const	$push134=, 0
+	i32.const	$push133=, 1103515245
+	i32.mul 	$push13=, $0, $pop133
+	i32.const	$push132=, 12345
+	i32.add 	$push131=, $pop13, $pop132
+	tee_local	$push130=, $0=, $pop131
+	i32.const	$push129=, 16
+	i32.shr_u	$push14=, $pop130, $pop129
+	i32.store8	sR+4($pop134), $pop14
+	i32.const	$push128=, 0
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push15=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$push125=, $pop15, $pop126
+	tee_local	$push124=, $0=, $pop125
+	i32.const	$push123=, 16
+	i32.shr_u	$push16=, $pop124, $pop123
+	i32.store8	sR+5($pop128), $pop16
+	i32.const	$push122=, 0
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push17=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$push119=, $pop17, $pop120
+	tee_local	$push118=, $0=, $pop119
+	i32.const	$push117=, 16
+	i32.shr_u	$push18=, $pop118, $pop117
+	i32.store8	sR+6($pop122), $pop18
+	i32.const	$push116=, 0
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push19=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$push113=, $pop19, $pop114
+	tee_local	$push112=, $0=, $pop113
+	i32.const	$push111=, 16
+	i32.shr_u	$push20=, $pop112, $pop111
+	i32.store8	sR+7($pop116), $pop20
+	i32.const	$push110=, 0
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push21=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$push107=, $pop21, $pop108
+	tee_local	$push106=, $0=, $pop107
+	i32.const	$push105=, 16
+	i32.shr_u	$push22=, $pop106, $pop105
+	i32.store8	sR+8($pop110), $pop22
+	i32.const	$push104=, 0
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push23=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$push101=, $pop23, $pop102
+	tee_local	$push100=, $0=, $pop101
+	i32.const	$push99=, 16
+	i32.shr_u	$push24=, $pop100, $pop99
+	i32.store8	sR+9($pop104), $pop24
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push25=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop25, $pop96
+	tee_local	$push94=, $0=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push26=, $pop94, $pop93
+	i32.store8	sR+10($pop98), $pop26
+	i32.const	$push92=, 0
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push27=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$push89=, $pop27, $pop90
+	tee_local	$push88=, $0=, $pop89
+	i32.const	$push87=, 16
+	i32.shr_u	$push28=, $pop88, $pop87
+	i32.store8	sR+11($pop92), $pop28
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop29, $pop84
+	tee_local	$push82=, $0=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push30=, $pop82, $pop81
+	i32.store8	sR+12($pop86), $pop30
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push31=, $0, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop31, $pop78
+	tee_local	$push76=, $0=, $pop77
+	i32.const	$push75=, 16
+	i32.shr_u	$push32=, $pop76, $pop75
+	i32.store8	sR+13($pop80), $pop32
+	i32.const	$push74=, 0
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push33=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop33, $pop72
+	tee_local	$push70=, $0=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push34=, $pop70, $pop69
+	i32.store8	sR+14($pop74), $pop34
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push35=, $0, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop35, $pop66
+	tee_local	$push64=, $0=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push36=, $pop64, $pop63
+	i32.store8	sR+15($pop68), $pop36
+	i32.const	$push62=, 0
+	i32.const	$push37=, -341751747
+	i32.mul 	$push38=, $0, $pop37
+	i32.const	$push39=, 229283573
+	i32.add 	$push61=, $pop38, $pop39
+	tee_local	$push60=, $0=, $pop61
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push40=, $pop60, $pop59
+	i32.const	$push58=, 12345
+	i32.add 	$push57=, $pop40, $pop58
+	tee_local	$push56=, $1=, $pop57
+	i32.store	myrnd.s($pop62), $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push44=, $1, $pop54
+	i32.const	$push42=, 2047
+	i32.and 	$push45=, $pop44, $pop42
+	i32.const	$push53=, 16
+	i32.shr_u	$push41=, $0, $pop53
+	i32.const	$push52=, 2047
+	i32.and 	$push43=, $pop41, $pop52
+	i32.add 	$push46=, $pop45, $pop43
+	i32.const	$push51=, 0
+	i32.load	$push47=, sR($pop51)
+	i32.const	$push48=, -4096
+	i32.and 	$push49=, $pop47, $pop48
+	i32.or  	$push50=, $pop46, $pop49
+	i32.store	sR($pop55), $pop50
+                                        # fallthrough-return
+	.endfunc
+.Lfunc_end108:
+	.size	testR, .Lfunc_end108-testR
+                                        # -- End function
+	.section	.text.retmeS,"ax",@progbits
+	.hidden	retmeS                  # -- Begin function retmeS
+	.globl	retmeS
+	.type	retmeS,@function
+retmeS:                                 # @retmeS
+	.param  	i32, i32
+# BB#0:                                 # %entry
+	i64.load	$push0=, 0($1)
+	i64.store	0($0), $pop0
+	i32.const	$push1=, 8
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push5=, 8
+	i32.add 	$push3=, $1, $pop5
+	i64.load	$push4=, 0($pop3)
+	i64.store	0($pop2), $pop4
+                                        # fallthrough-return
+	.endfunc
+.Lfunc_end109:
+	.size	retmeS, .Lfunc_end109-retmeS
+                                        # -- End function
+	.section	.text.fn1S,"ax",@progbits
+	.hidden	fn1S                    # -- Begin function fn1S
+	.globl	fn1S
+	.type	fn1S,@function
+fn1S:                                   # @fn1S
+	.param  	i32
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 0
+	i32.load16_u	$push1=, sS($pop0)
+	i32.add 	$push2=, $pop1, $0
+	i32.const	$push3=, 1
+	i32.and 	$push4=, $pop2, $pop3
+                                        # fallthrough-return: $pop4
+	.endfunc
+.Lfunc_end110:
+	.size	fn1S, .Lfunc_end110-fn1S
+                                        # -- End function
+	.section	.text.fn2S,"ax",@progbits
+	.hidden	fn2S                    # -- Begin function fn2S
+	.globl	fn2S
+	.type	fn2S,@function
+fn2S:                                   # @fn2S
+	.param  	i32
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 0
+	i32.load16_u	$push1=, sS($pop0)
+	i32.add 	$push2=, $pop1, $0
+	i32.const	$push3=, 1
+	i32.and 	$push4=, $pop2, $pop3
+                                        # fallthrough-return: $pop4
+	.endfunc
+.Lfunc_end111:
+	.size	fn2S, .Lfunc_end111-fn2S
+                                        # -- End function
+	.section	.text.retitS,"ax",@progbits
+	.hidden	retitS                  # -- Begin function retitS
+	.globl	retitS
+	.type	retitS,@function
+retitS:                                 # @retitS
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 0
+	i32.load16_u	$push1=, sS($pop0)
+	i32.const	$push2=, 1
+	i32.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
+	.endfunc
+.Lfunc_end112:
+	.size	retitS, .Lfunc_end112-retitS
+                                        # -- End function
+	.section	.text.fn3S,"ax",@progbits
+	.hidden	fn3S                    # -- Begin function fn3S
+	.globl	fn3S
+	.type	fn3S,@function
+fn3S:                                   # @fn3S
+	.param  	i32
+	.result 	i32
+	.local  	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 0
+	i32.const	$push10=, 0
+	i32.load16_u	$push9=, sS($pop10)
+	tee_local	$push8=, $1=, $pop9
+	i32.add 	$push3=, $pop8, $0
+	i32.const	$push4=, 1
+	i32.and 	$push7=, $pop3, $pop4
+	tee_local	$push6=, $0=, $pop7
+	i32.const	$push1=, 65534
+	i32.and 	$push2=, $1, $pop1
+	i32.or  	$push5=, $pop6, $pop2
+	i32.store16	sS($pop0), $pop5
+	copy_local	$push11=, $0
+                                        # fallthrough-return: $pop11
+	.endfunc
+.Lfunc_end113:
+	.size	fn3S, .Lfunc_end113-fn3S
+                                        # -- End function
+	.section	.text.testS,"ax",@progbits
+	.hidden	testS                   # -- Begin function testS
+	.globl	testS
+	.type	testS,@function
+testS:                                  # @testS
+	.local  	i32, i32
+# BB#0:                                 # %if.end90
+	i32.const	$push0=, 0
 	i32.const	$push154=, 0
 	i32.load	$push1=, myrnd.s($pop154)
 	i32.const	$push2=, 1103515245
@@ -5021,7 +5352,7 @@ testR:                                  # @testR
 	tee_local	$push152=, $0=, $pop153
 	i32.const	$push5=, 16
 	i32.shr_u	$push6=, $pop152, $pop5
-	i32.store8	sR($pop0), $pop6
+	i32.store8	sS($pop0), $pop6
 	i32.const	$push151=, 0
 	i32.const	$push150=, 1103515245
 	i32.mul 	$push7=, $0, $pop150
@@ -5030,7 +5361,7 @@ testR:                                  # @testR
 	tee_local	$push147=, $0=, $pop148
 	i32.const	$push146=, 16
 	i32.shr_u	$push8=, $pop147, $pop146
-	i32.store8	sR+1($pop151), $pop8
+	i32.store8	sS+1($pop151), $pop8
 	i32.const	$push145=, 0
 	i32.const	$push144=, 1103515245
 	i32.mul 	$push9=, $0, $pop144
@@ -5039,7 +5370,7 @@ testR:                                  # @testR
 	tee_local	$push141=, $0=, $pop142
 	i32.const	$push140=, 16
 	i32.shr_u	$push10=, $pop141, $pop140
-	i32.store8	sR+2($pop145), $pop10
+	i32.store8	sS+2($pop145), $pop10
 	i32.const	$push139=, 0
 	i32.const	$push138=, 1103515245
 	i32.mul 	$push11=, $0, $pop138
@@ -5048,7 +5379,7 @@ testR:                                  # @testR
 	tee_local	$push135=, $0=, $pop136
 	i32.const	$push134=, 16
 	i32.shr_u	$push12=, $pop135, $pop134
-	i32.store8	sR+3($pop139), $pop12
+	i32.store8	sS+3($pop139), $pop12
 	i32.const	$push133=, 0
 	i32.const	$push132=, 1103515245
 	i32.mul 	$push13=, $0, $pop132
@@ -5057,7 +5388,7 @@ testR:                                  # @testR
 	tee_local	$push129=, $0=, $pop130
 	i32.const	$push128=, 16
 	i32.shr_u	$push14=, $pop129, $pop128
-	i32.store8	sR+4($pop133), $pop14
+	i32.store8	sS+4($pop133), $pop14
 	i32.const	$push127=, 0
 	i32.const	$push126=, 1103515245
 	i32.mul 	$push15=, $0, $pop126
@@ -5066,7 +5397,7 @@ testR:                                  # @testR
 	tee_local	$push123=, $0=, $pop124
 	i32.const	$push122=, 16
 	i32.shr_u	$push16=, $pop123, $pop122
-	i32.store8	sR+5($pop127), $pop16
+	i32.store8	sS+5($pop127), $pop16
 	i32.const	$push121=, 0
 	i32.const	$push120=, 1103515245
 	i32.mul 	$push17=, $0, $pop120
@@ -5075,7 +5406,7 @@ testR:                                  # @testR
 	tee_local	$push117=, $0=, $pop118
 	i32.const	$push116=, 16
 	i32.shr_u	$push18=, $pop117, $pop116
-	i32.store8	sR+6($pop121), $pop18
+	i32.store8	sS+6($pop121), $pop18
 	i32.const	$push115=, 0
 	i32.const	$push114=, 1103515245
 	i32.mul 	$push19=, $0, $pop114
@@ -5084,7 +5415,7 @@ testR:                                  # @testR
 	tee_local	$push111=, $0=, $pop112
 	i32.const	$push110=, 16
 	i32.shr_u	$push20=, $pop111, $pop110
-	i32.store8	sR+7($pop115), $pop20
+	i32.store8	sS+7($pop115), $pop20
 	i32.const	$push109=, 0
 	i32.const	$push108=, 1103515245
 	i32.mul 	$push21=, $0, $pop108
@@ -5093,7 +5424,7 @@ testR:                                  # @testR
 	tee_local	$push105=, $0=, $pop106
 	i32.const	$push104=, 16
 	i32.shr_u	$push22=, $pop105, $pop104
-	i32.store8	sR+8($pop109), $pop22
+	i32.store8	sS+8($pop109), $pop22
 	i32.const	$push103=, 0
 	i32.const	$push102=, 1103515245
 	i32.mul 	$push23=, $0, $pop102
@@ -5102,7 +5433,7 @@ testR:                                  # @testR
 	tee_local	$push99=, $0=, $pop100
 	i32.const	$push98=, 16
 	i32.shr_u	$push24=, $pop99, $pop98
-	i32.store8	sR+9($pop103), $pop24
+	i32.store8	sS+9($pop103), $pop24
 	i32.const	$push97=, 0
 	i32.const	$push96=, 1103515245
 	i32.mul 	$push25=, $0, $pop96
@@ -5111,7 +5442,7 @@ testR:                                  # @testR
 	tee_local	$push93=, $0=, $pop94
 	i32.const	$push92=, 16
 	i32.shr_u	$push26=, $pop93, $pop92
-	i32.store8	sR+10($pop97), $pop26
+	i32.store8	sS+10($pop97), $pop26
 	i32.const	$push91=, 0
 	i32.const	$push90=, 1103515245
 	i32.mul 	$push27=, $0, $pop90
@@ -5120,7 +5451,7 @@ testR:                                  # @testR
 	tee_local	$push87=, $0=, $pop88
 	i32.const	$push86=, 16
 	i32.shr_u	$push28=, $pop87, $pop86
-	i32.store8	sR+11($pop91), $pop28
+	i32.store8	sS+11($pop91), $pop28
 	i32.const	$push85=, 0
 	i32.const	$push84=, 1103515245
 	i32.mul 	$push29=, $0, $pop84
@@ -5129,7 +5460,7 @@ testR:                                  # @testR
 	tee_local	$push81=, $0=, $pop82
 	i32.const	$push80=, 16
 	i32.shr_u	$push30=, $pop81, $pop80
-	i32.store8	sR+12($pop85), $pop30
+	i32.store8	sS+12($pop85), $pop30
 	i32.const	$push79=, 0
 	i32.const	$push78=, 1103515245
 	i32.mul 	$push31=, $0, $pop78
@@ -5138,7 +5469,7 @@ testR:                                  # @testR
 	tee_local	$push75=, $0=, $pop76
 	i32.const	$push74=, 16
 	i32.shr_u	$push32=, $pop75, $pop74
-	i32.store8	sR+13($pop79), $pop32
+	i32.store8	sS+13($pop79), $pop32
 	i32.const	$push73=, 0
 	i32.const	$push72=, 1103515245
 	i32.mul 	$push33=, $0, $pop72
@@ -5147,7 +5478,7 @@ testR:                                  # @testR
 	tee_local	$push69=, $0=, $pop70
 	i32.const	$push68=, 16
 	i32.shr_u	$push34=, $pop69, $pop68
-	i32.store8	sR+14($pop73), $pop34
+	i32.store8	sS+14($pop73), $pop34
 	i32.const	$push67=, 0
 	i32.const	$push66=, 1103515245
 	i32.mul 	$push35=, $0, $pop66
@@ -5156,336 +5487,49 @@ testR:                                  # @testR
 	tee_local	$push63=, $0=, $pop64
 	i32.const	$push62=, 16
 	i32.shr_u	$push36=, $pop63, $pop62
-	i32.store8	sR+15($pop67), $pop36
+	i32.store8	sS+15($pop67), $pop36
 	i32.const	$push61=, 0
-	i32.load	$2=, sR($pop61)
-	i32.const	$push60=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push59=, $pop38, $pop39
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 1103515245
-	i32.mul 	$push40=, $pop58, $pop57
-	i32.const	$push56=, 12345
-	i32.add 	$push55=, $pop40, $pop56
-	tee_local	$push54=, $1=, $pop55
-	i32.store	myrnd.s($pop60), $pop54
-	i32.const	$push53=, 0
+	i32.add 	$push60=, $pop38, $pop39
+	tee_local	$push59=, $0=, $pop60
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push40=, $pop59, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$push56=, $pop40, $pop57
+	tee_local	$push55=, $1=, $pop56
+	i32.store	myrnd.s($pop61), $pop55
+	i32.const	$push54=, 0
+	i32.const	$push53=, 16
+	i32.shr_u	$push42=, $1, $pop53
 	i32.const	$push52=, 16
-	i32.shr_u	$push44=, $1, $pop52
-	i32.const	$push42=, 2047
-	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push51=, 16
-	i32.shr_u	$push41=, $0, $pop51
-	i32.const	$push50=, 2047
-	i32.and 	$push43=, $pop41, $pop50
-	i32.add 	$push46=, $pop45, $pop43
-	i32.const	$push47=, -4096
-	i32.and 	$push48=, $2, $pop47
-	i32.or  	$push49=, $pop46, $pop48
-	i32.store	sR($pop53), $pop49
-                                        # fallthrough-return
-	.endfunc
-.Lfunc_end108:
-	.size	testR, .Lfunc_end108-testR
-
-	.section	.text.retmeS,"ax",@progbits
-	.hidden	retmeS
-	.globl	retmeS
-	.type	retmeS,@function
-retmeS:                                 # @retmeS
-	.param  	i32, i32
-# BB#0:                                 # %entry
-	i64.load	$push0=, 0($1)
-	i64.store	0($0), $pop0
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push5=, 8
-	i32.add 	$push3=, $1, $pop5
-	i64.load	$push4=, 0($pop3)
-	i64.store	0($pop2), $pop4
-                                        # fallthrough-return
-	.endfunc
-.Lfunc_end109:
-	.size	retmeS, .Lfunc_end109-retmeS
-
-	.section	.text.fn1S,"ax",@progbits
-	.hidden	fn1S
-	.globl	fn1S
-	.type	fn1S,@function
-fn1S:                                   # @fn1S
-	.param  	i32
-	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load16_u	$push1=, sS($pop0)
-	i32.add 	$push2=, $pop1, $0
-	i32.const	$push3=, 1
-	i32.and 	$push4=, $pop2, $pop3
-                                        # fallthrough-return: $pop4
-	.endfunc
-.Lfunc_end110:
-	.size	fn1S, .Lfunc_end110-fn1S
-
-	.section	.text.fn2S,"ax",@progbits
-	.hidden	fn2S
-	.globl	fn2S
-	.type	fn2S,@function
-fn2S:                                   # @fn2S
-	.param  	i32
-	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load16_u	$push1=, sS($pop0)
-	i32.add 	$push2=, $pop1, $0
-	i32.const	$push3=, 1
-	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
-	.endfunc
-.Lfunc_end111:
-	.size	fn2S, .Lfunc_end111-fn2S
-
-	.section	.text.retitS,"ax",@progbits
-	.hidden	retitS
-	.globl	retitS
-	.type	retitS,@function
-retitS:                                 # @retitS
-	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load16_u	$push1=, sS($pop0)
-	i32.const	$push2=, 1
-	i32.and 	$push3=, $pop1, $pop2
-                                        # fallthrough-return: $pop3
-	.endfunc
-.Lfunc_end112:
-	.size	retitS, .Lfunc_end112-retitS
-
-	.section	.text.fn3S,"ax",@progbits
-	.hidden	fn3S
-	.globl	fn3S
-	.type	fn3S,@function
-fn3S:                                   # @fn3S
-	.param  	i32
-	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load16_u	$push9=, sS($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
-	i32.const	$push4=, 1
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.const	$push1=, 65534
-	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store16	sS($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
-	.endfunc
-.Lfunc_end113:
-	.size	fn3S, .Lfunc_end113-fn3S
-
-	.section	.text.testS,"ax",@progbits
-	.hidden	testS
-	.globl	testS
-	.type	testS,@function
-testS:                                  # @testS
-	.local  	i32, i32, i32
-# BB#0:                                 # %if.end90
-	i32.const	$push0=, 0
-	i32.const	$push153=, 0
-	i32.load	$push1=, myrnd.s($pop153)
-	i32.const	$push2=, 1103515245
-	i32.mul 	$push3=, $pop1, $pop2
-	i32.const	$push4=, 12345
-	i32.add 	$push152=, $pop3, $pop4
-	tee_local	$push151=, $0=, $pop152
-	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop151, $pop5
-	i32.store8	sS($pop0), $pop6
-	i32.const	$push150=, 0
-	i32.const	$push149=, 1103515245
-	i32.mul 	$push7=, $0, $pop149
-	i32.const	$push148=, 12345
-	i32.add 	$push147=, $pop7, $pop148
-	tee_local	$push146=, $0=, $pop147
-	i32.const	$push145=, 16
-	i32.shr_u	$push8=, $pop146, $pop145
-	i32.store8	sS+1($pop150), $pop8
-	i32.const	$push144=, 0
-	i32.const	$push143=, 1103515245
-	i32.mul 	$push9=, $0, $pop143
-	i32.const	$push142=, 12345
-	i32.add 	$push141=, $pop9, $pop142
-	tee_local	$push140=, $0=, $pop141
-	i32.const	$push139=, 16
-	i32.shr_u	$push10=, $pop140, $pop139
-	i32.store8	sS+2($pop144), $pop10
-	i32.const	$push138=, 0
-	i32.const	$push137=, 1103515245
-	i32.mul 	$push11=, $0, $pop137
-	i32.const	$push136=, 12345
-	i32.add 	$push135=, $pop11, $pop136
-	tee_local	$push134=, $0=, $pop135
-	i32.const	$push133=, 16
-	i32.shr_u	$push12=, $pop134, $pop133
-	i32.store8	sS+3($pop138), $pop12
-	i32.const	$push132=, 0
-	i32.const	$push131=, 1103515245
-	i32.mul 	$push13=, $0, $pop131
-	i32.const	$push130=, 12345
-	i32.add 	$push129=, $pop13, $pop130
-	tee_local	$push128=, $0=, $pop129
-	i32.const	$push127=, 16
-	i32.shr_u	$push14=, $pop128, $pop127
-	i32.store8	sS+4($pop132), $pop14
-	i32.const	$push126=, 0
-	i32.const	$push125=, 1103515245
-	i32.mul 	$push15=, $0, $pop125
-	i32.const	$push124=, 12345
-	i32.add 	$push123=, $pop15, $pop124
-	tee_local	$push122=, $0=, $pop123
-	i32.const	$push121=, 16
-	i32.shr_u	$push16=, $pop122, $pop121
-	i32.store8	sS+5($pop126), $pop16
-	i32.const	$push120=, 0
-	i32.const	$push119=, 1103515245
-	i32.mul 	$push17=, $0, $pop119
-	i32.const	$push118=, 12345
-	i32.add 	$push117=, $pop17, $pop118
-	tee_local	$push116=, $0=, $pop117
-	i32.const	$push115=, 16
-	i32.shr_u	$push18=, $pop116, $pop115
-	i32.store8	sS+6($pop120), $pop18
-	i32.const	$push114=, 0
-	i32.const	$push113=, 1103515245
-	i32.mul 	$push19=, $0, $pop113
-	i32.const	$push112=, 12345
-	i32.add 	$push111=, $pop19, $pop112
-	tee_local	$push110=, $0=, $pop111
-	i32.const	$push109=, 16
-	i32.shr_u	$push20=, $pop110, $pop109
-	i32.store8	sS+7($pop114), $pop20
-	i32.const	$push108=, 0
-	i32.const	$push107=, 1103515245
-	i32.mul 	$push21=, $0, $pop107
-	i32.const	$push106=, 12345
-	i32.add 	$push105=, $pop21, $pop106
-	tee_local	$push104=, $0=, $pop105
-	i32.const	$push103=, 16
-	i32.shr_u	$push22=, $pop104, $pop103
-	i32.store8	sS+8($pop108), $pop22
-	i32.const	$push102=, 0
-	i32.const	$push101=, 1103515245
-	i32.mul 	$push23=, $0, $pop101
-	i32.const	$push100=, 12345
-	i32.add 	$push99=, $pop23, $pop100
-	tee_local	$push98=, $0=, $pop99
-	i32.const	$push97=, 16
-	i32.shr_u	$push24=, $pop98, $pop97
-	i32.store8	sS+9($pop102), $pop24
-	i32.const	$push96=, 0
-	i32.const	$push95=, 1103515245
-	i32.mul 	$push25=, $0, $pop95
-	i32.const	$push94=, 12345
-	i32.add 	$push93=, $pop25, $pop94
-	tee_local	$push92=, $0=, $pop93
-	i32.const	$push91=, 16
-	i32.shr_u	$push26=, $pop92, $pop91
-	i32.store8	sS+10($pop96), $pop26
-	i32.const	$push90=, 0
-	i32.const	$push89=, 1103515245
-	i32.mul 	$push27=, $0, $pop89
-	i32.const	$push88=, 12345
-	i32.add 	$push87=, $pop27, $pop88
-	tee_local	$push86=, $0=, $pop87
-	i32.const	$push85=, 16
-	i32.shr_u	$push28=, $pop86, $pop85
-	i32.store8	sS+11($pop90), $pop28
-	i32.const	$push84=, 0
-	i32.const	$push83=, 1103515245
-	i32.mul 	$push29=, $0, $pop83
-	i32.const	$push82=, 12345
-	i32.add 	$push81=, $pop29, $pop82
-	tee_local	$push80=, $0=, $pop81
-	i32.const	$push79=, 16
-	i32.shr_u	$push30=, $pop80, $pop79
-	i32.store8	sS+12($pop84), $pop30
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push31=, $0, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop31, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 16
-	i32.shr_u	$push32=, $pop74, $pop73
-	i32.store8	sS+13($pop78), $pop32
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push33=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop33, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 16
-	i32.shr_u	$push34=, $pop68, $pop67
-	i32.store8	sS+14($pop72), $pop34
-	i32.const	$push66=, 0
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push35=, $0, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop35, $pop64
-	tee_local	$push62=, $0=, $pop63
-	i32.const	$push61=, 16
-	i32.shr_u	$push36=, $pop62, $pop61
-	i32.store8	sS+15($pop66), $pop36
-	i32.const	$push60=, 0
-	i32.load16_u	$2=, sS($pop60)
-	i32.const	$push59=, 0
-	i32.const	$push37=, -341751747
-	i32.mul 	$push38=, $0, $pop37
-	i32.const	$push39=, 229283573
-	i32.add 	$push58=, $pop38, $pop39
-	tee_local	$push57=, $0=, $pop58
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push40=, $pop57, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop40, $pop55
-	tee_local	$push53=, $1=, $pop54
-	i32.store	myrnd.s($pop59), $pop53
-	i32.const	$push52=, 0
-	i32.const	$push51=, 16
-	i32.shr_u	$push42=, $1, $pop51
-	i32.const	$push50=, 16
-	i32.shr_u	$push41=, $0, $pop50
+	i32.shr_u	$push41=, $0, $pop52
 	i32.add 	$push43=, $pop42, $pop41
 	i32.const	$push44=, 1
 	i32.and 	$push45=, $pop43, $pop44
-	i32.const	$push46=, 65534
-	i32.and 	$push47=, $2, $pop46
-	i32.or  	$push48=, $pop45, $pop47
-	i32.store16	sS($pop52), $pop48
+	i32.const	$push51=, 0
+	i32.load16_u	$push46=, sS($pop51)
+	i32.const	$push47=, 65534
+	i32.and 	$push48=, $pop46, $pop47
+	i32.or  	$push49=, $pop45, $pop48
+	i32.store16	sS($pop54), $pop49
 	block   	
-	i32.const	$push49=, 1
-	i32.eqz 	$push154=, $pop49
-	br_if   	0, $pop154      # 0: down to label11
+	i32.const	$push50=, 1
+	i32.eqz 	$push155=, $pop50
+	br_if   	0, $pop155      # 0: down to label12
 # BB#1:                                 # %if.end134
 	return
 .LBB114_2:                              # %if.then133
-	end_block                       # label11:
+	end_block                       # label12:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end114:
 	.size	testS, .Lfunc_end114-testS
-
+                                        # -- End function
 	.section	.text.retmeT,"ax",@progbits
-	.hidden	retmeT
+	.hidden	retmeT                  # -- Begin function retmeT
 	.globl	retmeT
 	.type	retmeT,@function
 retmeT:                                 # @retmeT
@@ -5497,9 +5541,9 @@ retmeT:                                 # @retmeT
 	.endfunc
 .Lfunc_end115:
 	.size	retmeT, .Lfunc_end115-retmeT
-
+                                        # -- End function
 	.section	.text.fn1T,"ax",@progbits
-	.hidden	fn1T
+	.hidden	fn1T                    # -- Begin function fn1T
 	.globl	fn1T
 	.type	fn1T,@function
 fn1T:                                   # @fn1T
@@ -5515,9 +5559,9 @@ fn1T:                                   # @fn1T
 	.endfunc
 .Lfunc_end116:
 	.size	fn1T, .Lfunc_end116-fn1T
-
+                                        # -- End function
 	.section	.text.fn2T,"ax",@progbits
-	.hidden	fn2T
+	.hidden	fn2T                    # -- Begin function fn2T
 	.globl	fn2T
 	.type	fn2T,@function
 fn2T:                                   # @fn2T
@@ -5529,15 +5573,13 @@ fn2T:                                   # @fn2T
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 1
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end117:
 	.size	fn2T, .Lfunc_end117-fn2T
-
+                                        # -- End function
 	.section	.text.retitT,"ax",@progbits
-	.hidden	retitT
+	.hidden	retitT                  # -- Begin function retitT
 	.globl	retitT
 	.type	retitT,@function
 retitT:                                 # @retitT
@@ -5551,9 +5593,9 @@ retitT:                                 # @retitT
 	.endfunc
 .Lfunc_end118:
 	.size	retitT, .Lfunc_end118-retitT
-
+                                        # -- End function
 	.section	.text.fn3T,"ax",@progbits
-	.hidden	fn3T
+	.hidden	fn3T                    # -- Begin function fn3T
 	.globl	fn3T
 	.type	fn3T,@function
 fn3T:                                   # @fn3T
@@ -5578,129 +5620,127 @@ fn3T:                                   # @fn3T
 	.endfunc
 .Lfunc_end119:
 	.size	fn3T, .Lfunc_end119-fn3T
-
+                                        # -- End function
 	.section	.text.testT,"ax",@progbits
-	.hidden	testT
+	.hidden	testT                   # -- Begin function testT
 	.globl	testT
 	.type	testT,@function
 testT:                                  # @testT
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push76=, 0
 	i32.const	$push75=, 0
-	i32.load	$push0=, myrnd.s($pop75)
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop74
-	i32.const	$push73=, 12345
-	i32.add 	$push72=, $pop1, $pop73
-	tee_local	$push71=, $0=, $pop72
-	i32.const	$push70=, 16
-	i32.shr_u	$push2=, $pop71, $pop70
-	i32.store8	sT($pop76), $pop2
-	i32.const	$push69=, 0
-	i32.const	$push68=, 1103515245
-	i32.mul 	$push3=, $0, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop3, $pop67
-	tee_local	$push65=, $0=, $pop66
-	i32.const	$push64=, 16
-	i32.shr_u	$push4=, $pop65, $pop64
-	i32.store8	sT+1($pop69), $pop4
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push5=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop5, $pop61
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push58=, 16
-	i32.shr_u	$push6=, $pop59, $pop58
-	i32.store8	sT+2($pop63), $pop6
-	i32.const	$push57=, 0
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push7=, $0, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop7, $pop55
-	tee_local	$push53=, $0=, $pop54
-	i32.const	$push52=, 16
-	i32.shr_u	$push8=, $pop53, $pop52
-	i32.store8	sT+3($pop57), $pop8
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push11=, $0, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop11, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 16
-	i32.shr_u	$push45=, $pop47, $pop46
-	tee_local	$push44=, $1=, $pop45
-	i32.const	$push43=, 1
-	i32.and 	$push12=, $pop44, $pop43
-	i32.const	$push42=, 0
-	i32.load16_u	$push9=, sT($pop42)
-	i32.const	$push41=, 65534
-	i32.and 	$push10=, $pop9, $pop41
-	i32.or  	$push13=, $pop12, $pop10
-	i32.store16	sT($pop51), $pop13
-	i32.const	$push40=, 0
-	i32.const	$push39=, 1103515245
-	i32.mul 	$push14=, $0, $pop39
-	i32.const	$push38=, 12345
-	i32.add 	$push37=, $pop14, $pop38
-	tee_local	$push36=, $0=, $pop37
-	i32.store	myrnd.s($pop40), $pop36
+	i32.const	$push74=, 0
+	i32.load	$push0=, myrnd.s($pop74)
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop1, $pop72
+	tee_local	$push70=, $0=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push2=, $pop70, $pop69
+	i32.store8	sT($pop75), $pop2
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push3=, $0, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop3, $pop66
+	tee_local	$push64=, $0=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push4=, $pop64, $pop63
+	i32.store8	sT+1($pop68), $pop4
+	i32.const	$push62=, 0
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push5=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$push59=, $pop5, $pop60
+	tee_local	$push58=, $0=, $pop59
+	i32.const	$push57=, 16
+	i32.shr_u	$push6=, $pop58, $pop57
+	i32.store8	sT+2($pop62), $pop6
+	i32.const	$push56=, 0
+	i32.const	$push55=, 1103515245
+	i32.mul 	$push7=, $0, $pop55
+	i32.const	$push54=, 12345
+	i32.add 	$push53=, $pop7, $pop54
+	tee_local	$push52=, $0=, $pop53
+	i32.const	$push51=, 16
+	i32.shr_u	$push8=, $pop52, $pop51
+	i32.store8	sT+3($pop56), $pop8
+	i32.const	$push50=, 0
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push11=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$push47=, $pop11, $pop48
+	tee_local	$push46=, $0=, $pop47
+	i32.const	$push45=, 16
+	i32.shr_u	$push44=, $pop46, $pop45
+	tee_local	$push43=, $2=, $pop44
+	i32.const	$push42=, 1
+	i32.and 	$push12=, $pop43, $pop42
+	i32.const	$push41=, 0
+	i32.load16_u	$push9=, sT($pop41)
+	i32.const	$push10=, -2
+	i32.and 	$push40=, $pop9, $pop10
+	tee_local	$push39=, $1=, $pop40
+	i32.or  	$push13=, $pop12, $pop39
+	i32.store16	sT($pop50), $pop13
+	i32.const	$push38=, 0
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push14=, $0, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$push35=, $pop14, $pop36
+	tee_local	$push34=, $0=, $pop35
+	i32.store	myrnd.s($pop38), $pop34
 	block   	
-	i32.const	$push35=, 16
-	i32.shr_u	$push34=, $0, $pop35
-	tee_local	$push33=, $2=, $pop34
-	i32.add 	$push15=, $pop33, $1
-	i32.const	$push32=, 0
-	i32.load	$push31=, sT($pop32)
-	tee_local	$push30=, $1=, $pop31
-	i32.add 	$push16=, $2, $pop30
-	i32.xor 	$push17=, $pop15, $pop16
+	i32.const	$push33=, 16
+	i32.shr_u	$push32=, $0, $pop33
+	tee_local	$push31=, $3=, $pop32
+	i32.add 	$push15=, $pop31, $2
+	i32.const	$push30=, 0
+	i32.load	$push16=, sT($pop30)
+	i32.add 	$push17=, $3, $pop16
+	i32.xor 	$push18=, $pop15, $pop17
 	i32.const	$push29=, 1
-	i32.and 	$push18=, $pop17, $pop29
-	br_if   	0, $pop18       # 0: down to label12
+	i32.and 	$push19=, $pop18, $pop29
+	br_if   	0, $pop19       # 0: down to label13
 # BB#1:                                 # %if.end94
-	i32.const	$push89=, 0
-	i32.const	$push19=, -2139243339
-	i32.mul 	$push20=, $0, $pop19
-	i32.const	$push21=, -1492899873
-	i32.add 	$push88=, $pop20, $pop21
-	tee_local	$push87=, $0=, $pop88
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push22=, $pop87, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop22, $pop85
-	tee_local	$push83=, $2=, $pop84
-	i32.store	myrnd.s($pop89), $pop83
-	i32.const	$push82=, 0
-	i32.const	$push81=, 16
-	i32.shr_u	$push24=, $2, $pop81
-	i32.const	$push80=, 16
-	i32.shr_u	$push23=, $0, $pop80
-	i32.add 	$push25=, $pop24, $pop23
-	i32.const	$push79=, 1
-	i32.and 	$push26=, $pop25, $pop79
-	i32.const	$push78=, 65534
-	i32.and 	$push27=, $1, $pop78
-	i32.or  	$push28=, $pop26, $pop27
-	i32.store16	sT($pop82), $pop28
+	i32.const	$push87=, 0
+	i32.const	$push20=, -2139243339
+	i32.mul 	$push21=, $0, $pop20
+	i32.const	$push22=, -1492899873
+	i32.add 	$push86=, $pop21, $pop22
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push23=, $pop85, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop23, $pop83
+	tee_local	$push81=, $2=, $pop82
+	i32.store	myrnd.s($pop87), $pop81
+	i32.const	$push80=, 0
+	i32.const	$push79=, 16
+	i32.shr_u	$push25=, $2, $pop79
+	i32.const	$push78=, 16
+	i32.shr_u	$push24=, $0, $pop78
+	i32.add 	$push26=, $pop25, $pop24
 	i32.const	$push77=, 1
-	i32.eqz 	$push90=, $pop77
-	br_if   	0, $pop90       # 0: down to label12
+	i32.and 	$push27=, $pop26, $pop77
+	i32.or  	$push28=, $pop27, $1
+	i32.store16	sT($pop80), $pop28
+	i32.const	$push76=, 1
+	i32.eqz 	$push88=, $pop76
+	br_if   	0, $pop88       # 0: down to label13
 # BB#2:                                 # %if.end140
 	return
-.LBB120_3:                              # %if.then139
-	end_block                       # label12:
+.LBB120_3:                              # %if.then
+	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end120:
 	.size	testT, .Lfunc_end120-testT
-
+                                        # -- End function
 	.section	.text.retmeU,"ax",@progbits
-	.hidden	retmeU
+	.hidden	retmeU                  # -- Begin function retmeU
 	.globl	retmeU
 	.type	retmeU,@function
 retmeU:                                 # @retmeU
@@ -5718,9 +5758,9 @@ retmeU:                                 # @retmeU
 	.endfunc
 .Lfunc_end121:
 	.size	retmeU, .Lfunc_end121-retmeU
-
+                                        # -- End function
 	.section	.text.fn1U,"ax",@progbits
-	.hidden	fn1U
+	.hidden	fn1U                    # -- Begin function fn1U
 	.globl	fn1U
 	.type	fn1U,@function
 fn1U:                                   # @fn1U
@@ -5738,9 +5778,9 @@ fn1U:                                   # @fn1U
 	.endfunc
 .Lfunc_end122:
 	.size	fn1U, .Lfunc_end122-fn1U
-
+                                        # -- End function
 	.section	.text.fn2U,"ax",@progbits
-	.hidden	fn2U
+	.hidden	fn2U                    # -- Begin function fn2U
 	.globl	fn2U
 	.type	fn2U,@function
 fn2U:                                   # @fn2U
@@ -5754,15 +5794,13 @@ fn2U:                                   # @fn2U
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 15
-	i32.rem_u	$push8=, $pop6, $pop7
-                                        # fallthrough-return: $pop8
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end123:
 	.size	fn2U, .Lfunc_end123-fn2U
-
+                                        # -- End function
 	.section	.text.retitU,"ax",@progbits
-	.hidden	retitU
+	.hidden	retitU                  # -- Begin function retitU
 	.globl	retitU
 	.type	retitU,@function
 retitU:                                 # @retitU
@@ -5778,9 +5816,9 @@ retitU:                                 # @retitU
 	.endfunc
 .Lfunc_end124:
 	.size	retitU, .Lfunc_end124-retitU
-
+                                        # -- End function
 	.section	.text.fn3U,"ax",@progbits
-	.hidden	fn3U
+	.hidden	fn3U                    # -- Begin function fn3U
 	.globl	fn3U
 	.type	fn3U,@function
 fn3U:                                   # @fn3U
@@ -5810,162 +5848,160 @@ fn3U:                                   # @fn3U
 	.endfunc
 .Lfunc_end125:
 	.size	fn3U, .Lfunc_end125-fn3U
-
+                                        # -- End function
 	.section	.text.testU,"ax",@progbits
-	.hidden	testU
+	.hidden	testU                   # -- Begin function testU
 	.globl	testU
 	.type	testU,@function
 testU:                                  # @testU
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push214=, 0
-	i32.load	$push1=, myrnd.s($pop214)
+	i32.const	$push213=, 0
+	i32.load	$push1=, myrnd.s($pop213)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push213=, $pop3, $pop4
-	tee_local	$push212=, $2=, $pop213
-	i32.const	$push211=, 16
-	i32.shr_u	$push5=, $pop212, $pop211
+	i32.add 	$push212=, $pop3, $pop4
+	tee_local	$push211=, $2=, $pop212
+	i32.const	$push210=, 16
+	i32.shr_u	$push5=, $pop211, $pop210
 	i32.store8	sU($pop0), $pop5
-	i32.const	$push210=, 0
-	i32.const	$push209=, 1103515245
-	i32.mul 	$push6=, $2, $pop209
-	i32.const	$push208=, 12345
-	i32.add 	$push207=, $pop6, $pop208
-	tee_local	$push206=, $2=, $pop207
-	i32.const	$push205=, 16
-	i32.shr_u	$push7=, $pop206, $pop205
-	i32.store8	sU+1($pop210), $pop7
-	i32.const	$push204=, 0
-	i32.const	$push203=, 1103515245
-	i32.mul 	$push8=, $2, $pop203
-	i32.const	$push202=, 12345
-	i32.add 	$push201=, $pop8, $pop202
-	tee_local	$push200=, $2=, $pop201
-	i32.const	$push199=, 16
-	i32.shr_u	$push9=, $pop200, $pop199
-	i32.store8	sU+2($pop204), $pop9
-	i32.const	$push198=, 0
-	i32.const	$push197=, 1103515245
-	i32.mul 	$push10=, $2, $pop197
-	i32.const	$push196=, 12345
-	i32.add 	$push195=, $pop10, $pop196
-	tee_local	$push194=, $2=, $pop195
-	i32.const	$push193=, 16
-	i32.shr_u	$push11=, $pop194, $pop193
-	i32.store8	sU+3($pop198), $pop11
-	i32.const	$push192=, 0
-	i32.const	$push191=, 1103515245
-	i32.mul 	$push12=, $2, $pop191
-	i32.const	$push190=, 12345
-	i32.add 	$push189=, $pop12, $pop190
-	tee_local	$push188=, $2=, $pop189
-	i32.const	$push187=, 16
-	i32.shr_u	$push13=, $pop188, $pop187
-	i32.store8	sU+4($pop192), $pop13
-	i32.const	$push186=, 0
-	i32.const	$push185=, 1103515245
-	i32.mul 	$push14=, $2, $pop185
-	i32.const	$push184=, 12345
-	i32.add 	$push183=, $pop14, $pop184
-	tee_local	$push182=, $2=, $pop183
-	i32.const	$push181=, 16
-	i32.shr_u	$push15=, $pop182, $pop181
-	i32.store8	sU+5($pop186), $pop15
-	i32.const	$push180=, 0
-	i32.const	$push179=, 1103515245
-	i32.mul 	$push16=, $2, $pop179
-	i32.const	$push178=, 12345
-	i32.add 	$push177=, $pop16, $pop178
-	tee_local	$push176=, $2=, $pop177
-	i32.const	$push175=, 16
-	i32.shr_u	$push17=, $pop176, $pop175
-	i32.store8	sU+6($pop180), $pop17
-	i32.const	$push174=, 0
-	i32.const	$push173=, 1103515245
-	i32.mul 	$push18=, $2, $pop173
-	i32.const	$push172=, 12345
-	i32.add 	$push171=, $pop18, $pop172
-	tee_local	$push170=, $2=, $pop171
-	i32.const	$push169=, 16
-	i32.shr_u	$push19=, $pop170, $pop169
-	i32.store8	sU+7($pop174), $pop19
-	i32.const	$push168=, 0
-	i32.const	$push167=, 1103515245
-	i32.mul 	$push20=, $2, $pop167
-	i32.const	$push166=, 12345
-	i32.add 	$push165=, $pop20, $pop166
-	tee_local	$push164=, $2=, $pop165
-	i32.const	$push163=, 16
-	i32.shr_u	$push21=, $pop164, $pop163
-	i32.store8	sU+8($pop168), $pop21
-	i32.const	$push162=, 0
-	i32.const	$push161=, 1103515245
-	i32.mul 	$push22=, $2, $pop161
-	i32.const	$push160=, 12345
-	i32.add 	$push159=, $pop22, $pop160
-	tee_local	$push158=, $2=, $pop159
-	i32.const	$push157=, 16
-	i32.shr_u	$push23=, $pop158, $pop157
-	i32.store8	sU+9($pop162), $pop23
-	i32.const	$push156=, 0
-	i32.const	$push155=, 1103515245
-	i32.mul 	$push24=, $2, $pop155
-	i32.const	$push154=, 12345
-	i32.add 	$push153=, $pop24, $pop154
-	tee_local	$push152=, $2=, $pop153
-	i32.const	$push151=, 16
-	i32.shr_u	$push25=, $pop152, $pop151
-	i32.store8	sU+10($pop156), $pop25
-	i32.const	$push150=, 0
-	i32.const	$push149=, 1103515245
-	i32.mul 	$push26=, $2, $pop149
-	i32.const	$push148=, 12345
-	i32.add 	$push147=, $pop26, $pop148
-	tee_local	$push146=, $2=, $pop147
-	i32.const	$push145=, 16
-	i32.shr_u	$push27=, $pop146, $pop145
-	i32.store8	sU+11($pop150), $pop27
-	i32.const	$push144=, 0
-	i32.const	$push143=, 1103515245
-	i32.mul 	$push28=, $2, $pop143
-	i32.const	$push142=, 12345
-	i32.add 	$push141=, $pop28, $pop142
-	tee_local	$push140=, $2=, $pop141
-	i32.const	$push139=, 16
-	i32.shr_u	$push29=, $pop140, $pop139
-	i32.store8	sU+12($pop144), $pop29
-	i32.const	$push138=, 0
-	i32.const	$push137=, 1103515245
-	i32.mul 	$push30=, $2, $pop137
-	i32.const	$push136=, 12345
-	i32.add 	$push135=, $pop30, $pop136
-	tee_local	$push134=, $2=, $pop135
-	i32.const	$push133=, 16
-	i32.shr_u	$push31=, $pop134, $pop133
-	i32.store8	sU+13($pop138), $pop31
-	i32.const	$push132=, 0
-	i32.const	$push131=, 1103515245
-	i32.mul 	$push32=, $2, $pop131
-	i32.const	$push130=, 12345
-	i32.add 	$push129=, $pop32, $pop130
-	tee_local	$push128=, $2=, $pop129
-	i32.const	$push127=, 16
-	i32.shr_u	$push33=, $pop128, $pop127
-	i32.store8	sU+14($pop132), $pop33
-	i32.const	$push126=, 0
-	i32.const	$push125=, 1103515245
-	i32.mul 	$push34=, $2, $pop125
-	i32.const	$push124=, 12345
-	i32.add 	$push123=, $pop34, $pop124
-	tee_local	$push122=, $2=, $pop123
-	i32.const	$push121=, 16
-	i32.shr_u	$push35=, $pop122, $pop121
-	i32.store8	sU+15($pop126), $pop35
-	i32.const	$push120=, 0
-	i32.load16_u	$3=, sU($pop120)
+	i32.const	$push209=, 0
+	i32.const	$push208=, 1103515245
+	i32.mul 	$push6=, $2, $pop208
+	i32.const	$push207=, 12345
+	i32.add 	$push206=, $pop6, $pop207
+	tee_local	$push205=, $2=, $pop206
+	i32.const	$push204=, 16
+	i32.shr_u	$push7=, $pop205, $pop204
+	i32.store8	sU+1($pop209), $pop7
+	i32.const	$push203=, 0
+	i32.const	$push202=, 1103515245
+	i32.mul 	$push8=, $2, $pop202
+	i32.const	$push201=, 12345
+	i32.add 	$push200=, $pop8, $pop201
+	tee_local	$push199=, $2=, $pop200
+	i32.const	$push198=, 16
+	i32.shr_u	$push9=, $pop199, $pop198
+	i32.store8	sU+2($pop203), $pop9
+	i32.const	$push197=, 0
+	i32.const	$push196=, 1103515245
+	i32.mul 	$push10=, $2, $pop196
+	i32.const	$push195=, 12345
+	i32.add 	$push194=, $pop10, $pop195
+	tee_local	$push193=, $2=, $pop194
+	i32.const	$push192=, 16
+	i32.shr_u	$push11=, $pop193, $pop192
+	i32.store8	sU+3($pop197), $pop11
+	i32.const	$push191=, 0
+	i32.const	$push190=, 1103515245
+	i32.mul 	$push12=, $2, $pop190
+	i32.const	$push189=, 12345
+	i32.add 	$push188=, $pop12, $pop189
+	tee_local	$push187=, $2=, $pop188
+	i32.const	$push186=, 16
+	i32.shr_u	$push13=, $pop187, $pop186
+	i32.store8	sU+4($pop191), $pop13
+	i32.const	$push185=, 0
+	i32.const	$push184=, 1103515245
+	i32.mul 	$push14=, $2, $pop184
+	i32.const	$push183=, 12345
+	i32.add 	$push182=, $pop14, $pop183
+	tee_local	$push181=, $2=, $pop182
+	i32.const	$push180=, 16
+	i32.shr_u	$push15=, $pop181, $pop180
+	i32.store8	sU+5($pop185), $pop15
+	i32.const	$push179=, 0
+	i32.const	$push178=, 1103515245
+	i32.mul 	$push16=, $2, $pop178
+	i32.const	$push177=, 12345
+	i32.add 	$push176=, $pop16, $pop177
+	tee_local	$push175=, $2=, $pop176
+	i32.const	$push174=, 16
+	i32.shr_u	$push17=, $pop175, $pop174
+	i32.store8	sU+6($pop179), $pop17
+	i32.const	$push173=, 0
+	i32.const	$push172=, 1103515245
+	i32.mul 	$push18=, $2, $pop172
+	i32.const	$push171=, 12345
+	i32.add 	$push170=, $pop18, $pop171
+	tee_local	$push169=, $2=, $pop170
+	i32.const	$push168=, 16
+	i32.shr_u	$push19=, $pop169, $pop168
+	i32.store8	sU+7($pop173), $pop19
+	i32.const	$push167=, 0
+	i32.const	$push166=, 1103515245
+	i32.mul 	$push20=, $2, $pop166
+	i32.const	$push165=, 12345
+	i32.add 	$push164=, $pop20, $pop165
+	tee_local	$push163=, $2=, $pop164
+	i32.const	$push162=, 16
+	i32.shr_u	$push21=, $pop163, $pop162
+	i32.store8	sU+8($pop167), $pop21
+	i32.const	$push161=, 0
+	i32.const	$push160=, 1103515245
+	i32.mul 	$push22=, $2, $pop160
+	i32.const	$push159=, 12345
+	i32.add 	$push158=, $pop22, $pop159
+	tee_local	$push157=, $2=, $pop158
+	i32.const	$push156=, 16
+	i32.shr_u	$push23=, $pop157, $pop156
+	i32.store8	sU+9($pop161), $pop23
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push24=, $2, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop24, $pop153
+	tee_local	$push151=, $2=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push25=, $pop151, $pop150
+	i32.store8	sU+10($pop155), $pop25
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push26=, $2, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop26, $pop147
+	tee_local	$push145=, $2=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push27=, $pop145, $pop144
+	i32.store8	sU+11($pop149), $pop27
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push28=, $2, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop28, $pop141
+	tee_local	$push139=, $2=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push29=, $pop139, $pop138
+	i32.store8	sU+12($pop143), $pop29
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push30=, $2, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop30, $pop135
+	tee_local	$push133=, $2=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push31=, $pop133, $pop132
+	i32.store8	sU+13($pop137), $pop31
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push32=, $2, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop32, $pop129
+	tee_local	$push127=, $2=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push33=, $pop127, $pop126
+	i32.store8	sU+14($pop131), $pop33
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push34=, $2, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop34, $pop123
+	tee_local	$push121=, $2=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push35=, $pop121, $pop120
+	i32.store8	sU+15($pop125), $pop35
 	i32.const	$push119=, 0
 	i32.const	$push118=, 1103515245
 	i32.mul 	$push36=, $2, $pop118
@@ -5982,144 +6018,142 @@ testU:                                  # @testU
 	i32.const	$push109=, 16
 	i32.shr_u	$push108=, $2, $pop109
 	tee_local	$push107=, $0=, $pop108
-	i32.const	$push39=, 2047
-	i32.and 	$push106=, $pop107, $pop39
-	tee_local	$push105=, $4=, $pop106
-	i32.const	$push40=, 6
-	i32.shl 	$push41=, $pop105, $pop40
-	i32.const	$push42=, 64
-	i32.and 	$push43=, $pop41, $pop42
-	i32.const	$push38=, -65
-	i32.and 	$push104=, $3, $pop38
-	tee_local	$push103=, $2=, $pop104
-	i32.or  	$push102=, $pop43, $pop103
-	tee_local	$push101=, $3=, $pop102
-	i32.store16	sU($pop110), $pop101
+	i32.const	$push40=, 2047
+	i32.and 	$push106=, $pop107, $pop40
+	tee_local	$push105=, $3=, $pop106
+	i32.const	$push41=, 6
+	i32.shl 	$push42=, $pop105, $pop41
+	i32.const	$push43=, 64
+	i32.and 	$push44=, $pop42, $pop43
+	i32.const	$push104=, 0
+	i32.load16_u	$push38=, sU($pop104)
+	i32.const	$push39=, -65
+	i32.and 	$push103=, $pop38, $pop39
+	tee_local	$push102=, $2=, $pop103
+	i32.or  	$push101=, $pop44, $pop102
+	tee_local	$push100=, $4=, $pop101
+	i32.store16	sU($pop110), $pop100
 	block   	
-	i32.const	$push44=, 65472
-	i32.and 	$push45=, $3, $pop44
-	i32.const	$push100=, 6
-	i32.shr_u	$push99=, $pop45, $pop100
-	tee_local	$push98=, $3=, $pop99
-	i32.xor 	$push46=, $pop98, $4
-	i32.const	$push97=, 1
-	i32.and 	$push47=, $pop46, $pop97
-	br_if   	0, $pop47       # 0: down to label13
+	i32.const	$push45=, 65472
+	i32.and 	$push46=, $4, $pop45
+	i32.const	$push99=, 6
+	i32.shr_u	$push98=, $pop46, $pop99
+	tee_local	$push97=, $4=, $pop98
+	i32.xor 	$push47=, $pop97, $3
+	i32.const	$push96=, 1
+	i32.and 	$push48=, $pop47, $pop96
+	br_if   	0, $pop48       # 0: down to label14
 # BB#1:                                 # %lor.lhs.false41
-	i32.const	$push218=, 16
-	i32.shr_u	$push217=, $1, $pop218
-	tee_local	$push216=, $4=, $pop217
-	i32.add 	$push49=, $3, $pop216
-	i32.add 	$push48=, $4, $0
-	i32.xor 	$push50=, $pop49, $pop48
-	i32.const	$push215=, 1
-	i32.and 	$push51=, $pop50, $pop215
-	br_if   	0, $pop51       # 0: down to label13
+	i32.const	$push217=, 16
+	i32.shr_u	$push216=, $1, $pop217
+	tee_local	$push215=, $3=, $pop216
+	i32.add 	$push50=, $pop215, $4
+	i32.add 	$push49=, $3, $0
+	i32.xor 	$push51=, $pop50, $pop49
+	i32.const	$push214=, 1
+	i32.and 	$push52=, $pop51, $pop214
+	br_if   	0, $pop52       # 0: down to label14
 # BB#2:                                 # %if.end
-	i32.const	$push56=, 0
-	i32.const	$push52=, 1103515245
-	i32.mul 	$push53=, $1, $pop52
-	i32.const	$push54=, 12345
-	i32.add 	$push236=, $pop53, $pop54
-	tee_local	$push235=, $3=, $pop236
-	i32.const	$push234=, 1103515245
-	i32.mul 	$push55=, $pop235, $pop234
-	i32.const	$push233=, 12345
-	i32.add 	$push232=, $pop55, $pop233
-	tee_local	$push231=, $1=, $pop232
-	i32.store	myrnd.s($pop56), $pop231
-	i32.const	$push230=, 0
-	i32.const	$push229=, 16
-	i32.shr_u	$push228=, $3, $pop229
-	tee_local	$push227=, $0=, $pop228
-	i32.const	$push57=, 2047
-	i32.and 	$push226=, $pop227, $pop57
-	tee_local	$push225=, $3=, $pop226
-	i32.const	$push58=, 6
-	i32.shl 	$push59=, $pop225, $pop58
-	i32.const	$push60=, 64
-	i32.and 	$push61=, $pop59, $pop60
-	i32.or  	$push224=, $pop61, $2
-	tee_local	$push223=, $4=, $pop224
-	i32.store16	sU($pop230), $pop223
-	i32.const	$push62=, 65472
-	i32.and 	$push63=, $4, $pop62
-	i32.const	$push222=, 6
-	i32.shr_u	$push221=, $pop63, $pop222
-	tee_local	$push220=, $4=, $pop221
-	i32.xor 	$push64=, $pop220, $3
-	i32.const	$push219=, 1
-	i32.and 	$push65=, $pop64, $pop219
-	br_if   	0, $pop65       # 0: down to label13
+	i32.const	$push57=, 0
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push54=, $1, $pop53
+	i32.const	$push55=, 12345
+	i32.add 	$push235=, $pop54, $pop55
+	tee_local	$push234=, $0=, $pop235
+	i32.const	$push233=, 1103515245
+	i32.mul 	$push56=, $pop234, $pop233
+	i32.const	$push232=, 12345
+	i32.add 	$push231=, $pop56, $pop232
+	tee_local	$push230=, $1=, $pop231
+	i32.store	myrnd.s($pop57), $pop230
+	i32.const	$push229=, 0
+	i32.const	$push228=, 16
+	i32.shr_u	$push227=, $0, $pop228
+	tee_local	$push226=, $0=, $pop227
+	i32.const	$push58=, 2047
+	i32.and 	$push225=, $pop226, $pop58
+	tee_local	$push224=, $3=, $pop225
+	i32.const	$push59=, 6
+	i32.shl 	$push60=, $pop224, $pop59
+	i32.const	$push61=, 64
+	i32.and 	$push62=, $pop60, $pop61
+	i32.or  	$push223=, $pop62, $2
+	tee_local	$push222=, $4=, $pop223
+	i32.store16	sU($pop229), $pop222
+	i32.const	$push63=, 65472
+	i32.and 	$push64=, $4, $pop63
+	i32.const	$push221=, 6
+	i32.shr_u	$push220=, $pop64, $pop221
+	tee_local	$push219=, $4=, $pop220
+	i32.xor 	$push65=, $pop219, $3
+	i32.const	$push218=, 1
+	i32.and 	$push66=, $pop65, $pop218
+	br_if   	0, $pop66       # 0: down to label14
 # BB#3:                                 # %lor.lhs.false85
-	i32.const	$push242=, 16
-	i32.shr_u	$push241=, $1, $pop242
-	tee_local	$push240=, $3=, $pop241
-	i32.add 	$push70=, $pop240, $0
-	i32.const	$push239=, 1
-	i32.and 	$push71=, $pop70, $pop239
-	i32.const	$push68=, 15
-	i32.rem_u	$push72=, $pop71, $pop68
-	i32.add 	$push66=, $4, $3
-	i32.const	$push238=, 1
-	i32.and 	$push67=, $pop66, $pop238
-	i32.const	$push237=, 15
-	i32.rem_u	$push69=, $pop67, $pop237
-	i32.ne  	$push73=, $pop72, $pop69
-	br_if   	0, $pop73       # 0: down to label13
+	i32.const	$push239=, 16
+	i32.shr_u	$push238=, $1, $pop239
+	tee_local	$push237=, $3=, $pop238
+	i32.add 	$push68=, $pop237, $4
+	i32.add 	$push67=, $3, $0
+	i32.xor 	$push69=, $pop68, $pop67
+	i32.const	$push236=, 1
+	i32.and 	$push70=, $pop69, $pop236
+	br_if   	0, $pop70       # 0: down to label14
 # BB#4:                                 # %lor.lhs.false130
-	i32.const	$push78=, 0
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push75=, $1, $pop74
-	i32.const	$push76=, 12345
-	i32.add 	$push256=, $pop75, $pop76
-	tee_local	$push255=, $1=, $pop256
-	i32.const	$push254=, 1103515245
-	i32.mul 	$push77=, $pop255, $pop254
-	i32.const	$push253=, 12345
-	i32.add 	$push252=, $pop77, $pop253
-	tee_local	$push251=, $3=, $pop252
-	i32.store	myrnd.s($pop78), $pop251
-	i32.const	$push250=, 0
-	i32.const	$push80=, 10
-	i32.shr_u	$push81=, $1, $pop80
-	i32.const	$push82=, 64
-	i32.and 	$push83=, $pop81, $pop82
-	i32.or  	$push84=, $pop83, $2
-	i32.const	$push85=, 65472
-	i32.and 	$push86=, $pop84, $pop85
-	i32.const	$push87=, 6
-	i32.shr_u	$push88=, $pop86, $pop87
-	i32.const	$push79=, 16
-	i32.shr_u	$push249=, $3, $pop79
-	tee_local	$push248=, $3=, $pop249
-	i32.add 	$push247=, $pop88, $pop248
-	tee_local	$push246=, $4=, $pop247
-	i32.const	$push245=, 6
-	i32.shl 	$push89=, $pop246, $pop245
-	i32.const	$push244=, 64
-	i32.and 	$push90=, $pop89, $pop244
-	i32.or  	$push91=, $pop90, $2
-	i32.store16	sU($pop250), $pop91
-	i32.const	$push243=, 16
-	i32.shr_u	$push92=, $1, $pop243
-	i32.add 	$push93=, $3, $pop92
-	i32.xor 	$push94=, $pop93, $4
-	i32.const	$push95=, 1
-	i32.and 	$push96=, $pop94, $pop95
-	br_if   	0, $pop96       # 0: down to label13
+	i32.const	$push75=, 0
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push72=, $1, $pop71
+	i32.const	$push73=, 12345
+	i32.add 	$push253=, $pop72, $pop73
+	tee_local	$push252=, $1=, $pop253
+	i32.const	$push251=, 1103515245
+	i32.mul 	$push74=, $pop252, $pop251
+	i32.const	$push250=, 12345
+	i32.add 	$push249=, $pop74, $pop250
+	tee_local	$push248=, $0=, $pop249
+	i32.store	myrnd.s($pop75), $pop248
+	i32.const	$push247=, 0
+	i32.const	$push76=, 16
+	i32.shr_u	$push246=, $0, $pop76
+	tee_local	$push245=, $0=, $pop246
+	i32.const	$push77=, 2047
+	i32.and 	$push78=, $pop245, $pop77
+	i32.const	$push79=, 10
+	i32.shr_u	$push80=, $1, $pop79
+	i32.const	$push81=, 64
+	i32.and 	$push82=, $pop80, $pop81
+	i32.or  	$push83=, $pop82, $2
+	i32.const	$push84=, 65472
+	i32.and 	$push85=, $pop83, $pop84
+	i32.const	$push86=, 6
+	i32.shr_u	$push87=, $pop85, $pop86
+	i32.add 	$push244=, $pop78, $pop87
+	tee_local	$push243=, $3=, $pop244
+	i32.const	$push242=, 6
+	i32.shl 	$push88=, $pop243, $pop242
+	i32.const	$push241=, 64
+	i32.and 	$push89=, $pop88, $pop241
+	i32.or  	$push90=, $pop89, $2
+	i32.store16	sU($pop247), $pop90
+	i32.const	$push240=, 16
+	i32.shr_u	$push91=, $1, $pop240
+	i32.add 	$push92=, $0, $pop91
+	i32.xor 	$push93=, $pop92, $3
+	i32.const	$push94=, 1
+	i32.and 	$push95=, $pop93, $pop94
+	br_if   	0, $pop95       # 0: down to label14
 # BB#5:                                 # %if.end136
 	return
-.LBB126_6:                              # %if.then135
-	end_block                       # label13:
+.LBB126_6:                              # %if.then
+	end_block                       # label14:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end126:
 	.size	testU, .Lfunc_end126-testU
-
+                                        # -- End function
 	.section	.text.retmeV,"ax",@progbits
-	.hidden	retmeV
+	.hidden	retmeV                  # -- Begin function retmeV
 	.globl	retmeV
 	.type	retmeV,@function
 retmeV:                                 # @retmeV
@@ -6131,9 +6165,9 @@ retmeV:                                 # @retmeV
 	.endfunc
 .Lfunc_end127:
 	.size	retmeV, .Lfunc_end127-retmeV
-
+                                        # -- End function
 	.section	.text.fn1V,"ax",@progbits
-	.hidden	fn1V
+	.hidden	fn1V                    # -- Begin function fn1V
 	.globl	fn1V
 	.type	fn1V,@function
 fn1V:                                   # @fn1V
@@ -6151,9 +6185,9 @@ fn1V:                                   # @fn1V
 	.endfunc
 .Lfunc_end128:
 	.size	fn1V, .Lfunc_end128-fn1V
-
+                                        # -- End function
 	.section	.text.fn2V,"ax",@progbits
-	.hidden	fn2V
+	.hidden	fn2V                    # -- Begin function fn2V
 	.globl	fn2V
 	.type	fn2V,@function
 fn2V:                                   # @fn2V
@@ -6165,15 +6199,13 @@ fn2V:                                   # @fn2V
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 1
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end129:
 	.size	fn2V, .Lfunc_end129-fn2V
-
+                                        # -- End function
 	.section	.text.retitV,"ax",@progbits
-	.hidden	retitV
+	.hidden	retitV                  # -- Begin function retitV
 	.globl	retitV
 	.type	retitV,@function
 retitV:                                 # @retitV
@@ -6187,9 +6219,9 @@ retitV:                                 # @retitV
 	.endfunc
 .Lfunc_end130:
 	.size	retitV, .Lfunc_end130-retitV
-
+                                        # -- End function
 	.section	.text.fn3V,"ax",@progbits
-	.hidden	fn3V
+	.hidden	fn3V                    # -- Begin function fn3V
 	.globl	fn3V
 	.type	fn3V,@function
 fn3V:                                   # @fn3V
@@ -6219,200 +6251,193 @@ fn3V:                                   # @fn3V
 	.endfunc
 .Lfunc_end131:
 	.size	fn3V, .Lfunc_end131-fn3V
-
+                                        # -- End function
 	.section	.text.testV,"ax",@progbits
-	.hidden	testV
+	.hidden	testV                   # -- Begin function testV
 	.globl	testV
 	.type	testV,@function
 testV:                                  # @testV
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push107=, 0
-	i32.const	$push106=, 0
-	i32.load	$push0=, myrnd.s($pop106)
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop1, $pop104
-	tee_local	$push102=, $2=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push2=, $pop102, $pop101
-	i32.store8	sV($pop107), $pop2
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push3=, $2, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop3, $pop98
-	tee_local	$push96=, $2=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push4=, $pop96, $pop95
-	i32.store8	sV+1($pop100), $pop4
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push5=, $2, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop5, $pop92
-	tee_local	$push90=, $2=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push6=, $pop90, $pop89
-	i32.store8	sV+2($pop94), $pop6
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push7=, $2, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop7, $pop86
-	tee_local	$push84=, $2=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push8=, $pop84, $pop83
-	i32.store8	sV+3($pop88), $pop8
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push11=, $2, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop11, $pop80
-	tee_local	$push78=, $2=, $pop79
-	i32.const	$push77=, 8
-	i32.shr_u	$push12=, $pop78, $pop77
-	i32.const	$push76=, 256
-	i32.and 	$push13=, $pop12, $pop76
-	i32.const	$push75=, 0
-	i32.load16_u	$push9=, sV($pop75)
-	i32.const	$push74=, 65279
-	i32.and 	$push10=, $pop9, $pop74
-	i32.or  	$push14=, $pop13, $pop10
-	i32.store16	sV($pop82), $pop14
+	i32.const	$push105=, 0
+	i32.const	$push104=, 0
+	i32.load	$push0=, myrnd.s($pop104)
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$push101=, $pop1, $pop102
+	tee_local	$push100=, $1=, $pop101
+	i32.const	$push99=, 16
+	i32.shr_u	$push2=, $pop100, $pop99
+	i32.store8	sV($pop105), $pop2
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push3=, $1, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop3, $pop96
+	tee_local	$push94=, $1=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push4=, $pop94, $pop93
+	i32.store8	sV+1($pop98), $pop4
+	i32.const	$push92=, 0
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push5=, $1, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$push89=, $pop5, $pop90
+	tee_local	$push88=, $1=, $pop89
+	i32.const	$push87=, 16
+	i32.shr_u	$push6=, $pop88, $pop87
+	i32.store8	sV+2($pop92), $pop6
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push7=, $1, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop7, $pop84
+	tee_local	$push82=, $1=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push8=, $pop82, $pop81
+	i32.store8	sV+3($pop86), $pop8
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push11=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop11, $pop78
+	tee_local	$push76=, $2=, $pop77
+	i32.const	$push75=, 8
+	i32.shr_u	$push12=, $pop76, $pop75
+	i32.const	$push74=, 256
+	i32.and 	$push13=, $pop12, $pop74
 	i32.const	$push73=, 0
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push15=, $2, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop15, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.store	myrnd.s($pop73), $pop69
+	i32.load16_u	$push9=, sV($pop73)
+	i32.const	$push10=, -257
+	i32.and 	$push72=, $pop9, $pop10
+	tee_local	$push71=, $1=, $pop72
+	i32.or  	$push14=, $pop13, $pop71
+	i32.store16	sV($pop80), $pop14
+	i32.const	$push70=, 0
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push15=, $2, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$push67=, $pop15, $pop68
+	tee_local	$push66=, $0=, $pop67
+	i32.store	myrnd.s($pop70), $pop66
 	block   	
-	i32.const	$push68=, 16
-	i32.shr_u	$push67=, $0, $pop68
-	tee_local	$push66=, $3=, $pop67
 	i32.const	$push65=, 16
-	i32.shr_u	$push16=, $2, $pop65
-	i32.add 	$push17=, $pop66, $pop16
-	i32.const	$push64=, 0
-	i32.load	$push63=, sV($pop64)
-	tee_local	$push62=, $2=, $pop63
-	i32.const	$push61=, 8
-	i32.shr_u	$push18=, $pop62, $pop61
-	i32.add 	$push19=, $pop18, $3
-	i32.xor 	$push20=, $pop17, $pop19
-	i32.const	$push60=, 1
-	i32.and 	$push21=, $pop20, $pop60
-	br_if   	0, $pop21       # 0: down to label14
+	i32.shr_u	$push64=, $0, $pop65
+	tee_local	$push63=, $3=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push16=, $2, $pop62
+	i32.add 	$push17=, $pop63, $pop16
+	i32.const	$push61=, 0
+	i32.load	$push18=, sV($pop61)
+	i32.const	$push60=, 8
+	i32.shr_u	$push19=, $pop18, $pop60
+	i32.add 	$push20=, $3, $pop19
+	i32.xor 	$push21=, $pop17, $pop20
+	i32.const	$push59=, 1
+	i32.and 	$push22=, $pop21, $pop59
+	br_if   	0, $pop22       # 0: down to label15
 # BB#1:                                 # %if.end
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push22=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop22, $pop128
-	tee_local	$push126=, $3=, $pop127
-	i32.const	$push125=, 1103515245
-	i32.mul 	$push23=, $pop126, $pop125
-	i32.const	$push124=, 12345
-	i32.add 	$push123=, $pop23, $pop124
-	tee_local	$push122=, $0=, $pop123
-	i32.store	myrnd.s($pop130), $pop122
-	i32.const	$push121=, 0
-	i32.const	$push120=, 16
-	i32.shr_u	$push119=, $3, $pop120
-	tee_local	$push118=, $1=, $pop119
-	i32.const	$push26=, 2047
-	i32.and 	$push117=, $pop118, $pop26
-	tee_local	$push116=, $3=, $pop117
-	i32.const	$push115=, 8
-	i32.shl 	$push27=, $pop116, $pop115
-	i32.const	$push114=, 256
-	i32.and 	$push28=, $pop27, $pop114
-	i32.const	$push24=, -257
-	i32.and 	$push25=, $2, $pop24
-	i32.or  	$push113=, $pop28, $pop25
-	tee_local	$push112=, $4=, $pop113
-	i32.store16	sV($pop121), $pop112
-	i32.const	$push29=, 65280
-	i32.and 	$push30=, $4, $pop29
-	i32.const	$push111=, 8
-	i32.shr_u	$push110=, $pop30, $pop111
-	tee_local	$push109=, $4=, $pop110
-	i32.xor 	$push31=, $pop109, $3
-	i32.const	$push108=, 1
-	i32.and 	$push32=, $pop31, $pop108
-	br_if   	0, $pop32       # 0: down to label14
+	i32.const	$push128=, 0
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push23=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$push125=, $pop23, $pop126
+	tee_local	$push124=, $0=, $pop125
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push24=, $pop124, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$push121=, $pop24, $pop122
+	tee_local	$push120=, $2=, $pop121
+	i32.store	myrnd.s($pop128), $pop120
+	i32.const	$push119=, 0
+	i32.const	$push118=, 16
+	i32.shr_u	$push117=, $0, $pop118
+	tee_local	$push116=, $0=, $pop117
+	i32.const	$push25=, 2047
+	i32.and 	$push115=, $pop116, $pop25
+	tee_local	$push114=, $3=, $pop115
+	i32.const	$push113=, 8
+	i32.shl 	$push26=, $pop114, $pop113
+	i32.const	$push112=, 256
+	i32.and 	$push27=, $pop26, $pop112
+	i32.or  	$push111=, $pop27, $1
+	tee_local	$push110=, $4=, $pop111
+	i32.store16	sV($pop119), $pop110
+	i32.const	$push28=, 65280
+	i32.and 	$push29=, $4, $pop28
+	i32.const	$push109=, 8
+	i32.shr_u	$push108=, $pop29, $pop109
+	tee_local	$push107=, $4=, $pop108
+	i32.xor 	$push30=, $pop107, $3
+	i32.const	$push106=, 1
+	i32.and 	$push31=, $pop30, $pop106
+	br_if   	0, $pop31       # 0: down to label15
 # BB#2:                                 # %lor.lhs.false89
-	i32.const	$push136=, 16
-	i32.shr_u	$push135=, $0, $pop136
-	tee_local	$push134=, $3=, $pop135
-	i32.add 	$push37=, $pop134, $1
-	i32.const	$push133=, 1
-	i32.and 	$push38=, $pop37, $pop133
-	i32.const	$push35=, 15
-	i32.rem_u	$push39=, $pop38, $pop35
-	i32.add 	$push33=, $4, $3
-	i32.const	$push132=, 1
-	i32.and 	$push34=, $pop33, $pop132
-	i32.const	$push131=, 15
-	i32.rem_u	$push36=, $pop34, $pop131
-	i32.ne  	$push40=, $pop39, $pop36
-	br_if   	0, $pop40       # 0: down to label14
+	i32.const	$push132=, 16
+	i32.shr_u	$push131=, $2, $pop132
+	tee_local	$push130=, $3=, $pop131
+	i32.add 	$push33=, $pop130, $4
+	i32.add 	$push32=, $3, $0
+	i32.xor 	$push34=, $pop33, $pop32
+	i32.const	$push129=, 1
+	i32.and 	$push35=, $pop34, $pop129
+	br_if   	0, $pop35       # 0: down to label15
 # BB#3:                                 # %lor.lhs.false136
-	i32.const	$push45=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push42=, $0, $pop41
-	i32.const	$push43=, 12345
-	i32.add 	$push155=, $pop42, $pop43
-	tee_local	$push154=, $0=, $pop155
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push44=, $pop154, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop44, $pop152
-	tee_local	$push150=, $3=, $pop151
-	i32.store	myrnd.s($pop45), $pop150
-	i32.const	$push149=, 0
-	i32.const	$push47=, 8
-	i32.shr_u	$push48=, $0, $pop47
-	i32.const	$push49=, 256
+	i32.const	$push40=, 0
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push37=, $2, $pop36
+	i32.const	$push38=, 12345
+	i32.add 	$push148=, $pop37, $pop38
+	tee_local	$push147=, $2=, $pop148
+	i32.const	$push146=, 1103515245
+	i32.mul 	$push39=, $pop147, $pop146
+	i32.const	$push145=, 12345
+	i32.add 	$push144=, $pop39, $pop145
+	tee_local	$push143=, $0=, $pop144
+	i32.store	myrnd.s($pop40), $pop143
+	i32.const	$push142=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push141=, $0, $pop41
+	tee_local	$push140=, $0=, $pop141
+	i32.const	$push42=, 2047
+	i32.and 	$push43=, $pop140, $pop42
+	i32.const	$push44=, 8
+	i32.shr_u	$push45=, $2, $pop44
+	i32.const	$push46=, 256
+	i32.and 	$push47=, $pop45, $pop46
+	i32.or  	$push48=, $pop47, $1
+	i32.const	$push49=, 65280
 	i32.and 	$push50=, $pop48, $pop49
-	i32.const	$push148=, 65279
-	i32.and 	$push147=, $2, $pop148
-	tee_local	$push146=, $2=, $pop147
-	i32.or  	$push51=, $pop50, $pop146
-	i32.const	$push145=, 8
-	i32.shr_u	$push52=, $pop51, $pop145
-	i32.const	$push46=, 16
-	i32.shr_u	$push144=, $3, $pop46
-	tee_local	$push143=, $3=, $pop144
-	i32.add 	$push142=, $pop52, $pop143
-	tee_local	$push141=, $4=, $pop142
-	i32.const	$push140=, 8
-	i32.shl 	$push53=, $pop141, $pop140
-	i32.const	$push139=, 256
-	i32.and 	$push54=, $pop53, $pop139
-	i32.or  	$push55=, $pop54, $2
-	i32.store16	sV($pop149), $pop55
-	i32.const	$push138=, 16
-	i32.shr_u	$push56=, $0, $pop138
-	i32.add 	$push57=, $3, $pop56
-	i32.xor 	$push58=, $pop57, $4
-	i32.const	$push137=, 1
-	i32.and 	$push59=, $pop58, $pop137
-	br_if   	0, $pop59       # 0: down to label14
+	i32.const	$push139=, 8
+	i32.shr_u	$push51=, $pop50, $pop139
+	i32.add 	$push138=, $pop43, $pop51
+	tee_local	$push137=, $3=, $pop138
+	i32.const	$push136=, 8
+	i32.shl 	$push52=, $pop137, $pop136
+	i32.const	$push135=, 256
+	i32.and 	$push53=, $pop52, $pop135
+	i32.or  	$push54=, $pop53, $1
+	i32.store16	sV($pop142), $pop54
+	i32.const	$push134=, 16
+	i32.shr_u	$push55=, $2, $pop134
+	i32.add 	$push56=, $0, $pop55
+	i32.xor 	$push57=, $pop56, $3
+	i32.const	$push133=, 1
+	i32.and 	$push58=, $pop57, $pop133
+	br_if   	0, $pop58       # 0: down to label15
 # BB#4:                                 # %if.end142
 	return
-.LBB132_5:                              # %if.then141
-	end_block                       # label14:
+.LBB132_5:                              # %if.then
+	end_block                       # label15:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end132:
 	.size	testV, .Lfunc_end132-testV
-
+                                        # -- End function
 	.section	.text.retmeW,"ax",@progbits
-	.hidden	retmeW
+	.hidden	retmeW                  # -- Begin function retmeW
 	.globl	retmeW
 	.type	retmeW,@function
 retmeW:                                 # @retmeW
@@ -6442,9 +6467,9 @@ retmeW:                                 # @retmeW
 	.endfunc
 .Lfunc_end133:
 	.size	retmeW, .Lfunc_end133-retmeW
-
+                                        # -- End function
 	.section	.text.fn1W,"ax",@progbits
-	.hidden	fn1W
+	.hidden	fn1W                    # -- Begin function fn1W
 	.globl	fn1W
 	.type	fn1W,@function
 fn1W:                                   # @fn1W
@@ -6460,9 +6485,9 @@ fn1W:                                   # @fn1W
 	.endfunc
 .Lfunc_end134:
 	.size	fn1W, .Lfunc_end134-fn1W
-
+                                        # -- End function
 	.section	.text.fn2W,"ax",@progbits
-	.hidden	fn2W
+	.hidden	fn2W                    # -- Begin function fn2W
 	.globl	fn2W
 	.type	fn2W,@function
 fn2W:                                   # @fn2W
@@ -6480,9 +6505,9 @@ fn2W:                                   # @fn2W
 	.endfunc
 .Lfunc_end135:
 	.size	fn2W, .Lfunc_end135-fn2W
-
+                                        # -- End function
 	.section	.text.retitW,"ax",@progbits
-	.hidden	retitW
+	.hidden	retitW                  # -- Begin function retitW
 	.globl	retitW
 	.type	retitW,@function
 retitW:                                 # @retitW
@@ -6496,9 +6521,9 @@ retitW:                                 # @retitW
 	.endfunc
 .Lfunc_end136:
 	.size	retitW, .Lfunc_end136-retitW
-
+                                        # -- End function
 	.section	.text.fn3W,"ax",@progbits
-	.hidden	fn3W
+	.hidden	fn3W                    # -- Begin function fn3W
 	.globl	fn3W
 	.type	fn3W,@function
 fn3W:                                   # @fn3W
@@ -6523,120 +6548,77 @@ fn3W:                                   # @fn3W
 	.endfunc
 .Lfunc_end137:
 	.size	fn3W, .Lfunc_end137-fn3W
-
+                                        # -- End function
 	.section	.text.testW,"ax",@progbits
-	.hidden	testW
+	.hidden	testW                   # -- Begin function testW
 	.globl	testW
 	.type	testW,@function
 testW:                                  # @testW
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, -32
+	i32.const	$push0=, 0
+	i32.load	$1=, myrnd.s($pop0)
+	i32.const	$0=, -32
 .LBB138_1:                              # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label15:
+	loop    	                # label16:
+	i32.const	$push32=, sW+32
+	i32.add 	$push1=, $0, $pop32
+	i32.const	$push31=, 1103515245
+	i32.mul 	$push2=, $1, $pop31
+	i32.const	$push30=, 12345
+	i32.add 	$push29=, $pop2, $pop30
+	tee_local	$push28=, $1=, $pop29
+	i32.const	$push27=, 16
+	i32.shr_u	$push3=, $pop28, $pop27
+	i32.store8	0($pop1), $pop3
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $0, $pop26
+	tee_local	$push24=, $0=, $pop25
+	br_if   	0, $pop24       # 0: up to label16
+# BB#2:                                 # %if.end119
+	end_loop
+	i32.const	$push5=, 0
+	i64.const	$push4=, 4612055454334320640
+	i64.store	sW+8($pop5), $pop4
 	i32.const	$push42=, 0
+	i64.const	$push6=, 0
+	i64.store	sW($pop42), $pop6
 	i32.const	$push41=, 0
-	i32.load	$push0=, myrnd.s($pop41)
-	i32.const	$push40=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop40
-	i32.const	$push39=, 12345
-	i32.add 	$push38=, $pop1, $pop39
-	tee_local	$push37=, $0=, $pop38
-	i32.store	myrnd.s($pop42), $pop37
-	i32.const	$push36=, sW+32
-	i32.add 	$push2=, $2, $pop36
+	i32.const	$push7=, -341751747
+	i32.mul 	$push8=, $1, $pop7
+	i32.const	$push9=, 229283573
+	i32.add 	$push40=, $pop8, $pop9
+	tee_local	$push39=, $0=, $pop40
+	i32.const	$push10=, 1103515245
+	i32.mul 	$push11=, $pop39, $pop10
+	i32.const	$push12=, 12345
+	i32.add 	$push38=, $pop11, $pop12
+	tee_local	$push37=, $1=, $pop38
+	i32.store	myrnd.s($pop41), $pop37
+	i32.const	$push36=, 0
+	i32.const	$push13=, 16
+	i32.shr_u	$push17=, $1, $pop13
+	i32.const	$push15=, 2047
+	i32.and 	$push18=, $pop17, $pop15
 	i32.const	$push35=, 16
-	i32.shr_u	$push3=, $0, $pop35
-	i32.store8	0($pop2), $pop3
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $2, $pop34
-	tee_local	$push32=, $2=, $pop33
-	br_if   	0, $pop32       # 0: up to label15
-# BB#2:                                 # %for.end
-	end_loop
-	i32.const	$push4=, 0
-	i32.const	$push81=, 0
-	i32.load	$push5=, myrnd.s($pop81)
-	i32.const	$push6=, 1103515245
-	i32.mul 	$push7=, $pop5, $pop6
-	i32.const	$push8=, 12345
-	i32.add 	$push80=, $pop7, $pop8
-	tee_local	$push79=, $2=, $pop80
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push9=, $pop79, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop9, $pop77
-	tee_local	$push75=, $0=, $pop76
-	i32.store	myrnd.s($pop4), $pop75
-	i32.const	$push74=, 0
-	i64.const	$push10=, 4612055454334320640
-	i64.store	sW+8($pop74), $pop10
-	i32.const	$push73=, 0
-	i64.const	$push11=, 0
-	i64.store	sW($pop73), $pop11
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push12=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop12, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $pop68, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $1=, $pop65
-	i32.store	myrnd.s($pop72), $pop64
-	i32.const	$push63=, 0
-	i32.const	$push16=, 16
-	i32.shr_u	$push17=, $2, $pop16
-	i32.const	$push18=, 2047
-	i32.and 	$push19=, $pop17, $pop18
-	i32.const	$push62=, 0
-	i32.load	$push14=, sW+16($pop62)
-	i32.const	$push15=, -4096
-	i32.and 	$push61=, $pop14, $pop15
-	tee_local	$push60=, $2=, $pop61
-	i32.or  	$push20=, $pop19, $pop60
-	i32.store	sW+16($pop63), $pop20
-	i32.const	$push59=, 0
-	i32.const	$push58=, 16
-	i32.shr_u	$push21=, $0, $pop58
-	i32.const	$push57=, 2047
-	i32.and 	$push22=, $pop21, $pop57
-	i32.or  	$push23=, $pop22, $2
-	i32.store	sW+16($pop59), $pop23
-	i32.const	$push56=, 0
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push24=, $1, $pop55
-	i32.const	$push54=, 12345
-	i32.add 	$push53=, $pop24, $pop54
-	tee_local	$push52=, $0=, $pop53
-	i32.const	$push51=, 1103515245
-	i32.mul 	$push25=, $pop52, $pop51
-	i32.const	$push50=, 12345
-	i32.add 	$push49=, $pop25, $pop50
-	tee_local	$push48=, $1=, $pop49
-	i32.store	myrnd.s($pop56), $pop48
-	i32.const	$push47=, 0
-	i32.const	$push46=, 16
-	i32.shr_u	$push28=, $1, $pop46
-	i32.const	$push45=, 2047
-	i32.and 	$push29=, $pop28, $pop45
-	i32.const	$push44=, 16
-	i32.shr_u	$push26=, $0, $pop44
-	i32.const	$push43=, 2047
-	i32.and 	$push27=, $pop26, $pop43
-	i32.add 	$push30=, $pop29, $pop27
-	i32.or  	$push31=, $pop30, $2
-	i32.store	sW+16($pop47), $pop31
+	i32.shr_u	$push14=, $0, $pop35
+	i32.const	$push34=, 2047
+	i32.and 	$push16=, $pop14, $pop34
+	i32.add 	$push19=, $pop18, $pop16
+	i32.const	$push33=, 0
+	i32.load	$push20=, sW+16($pop33)
+	i32.const	$push21=, -4096
+	i32.and 	$push22=, $pop20, $pop21
+	i32.or  	$push23=, $pop19, $pop22
+	i32.store	sW+16($pop36), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end138:
 	.size	testW, .Lfunc_end138-testW
-
+                                        # -- End function
 	.section	.text.retmeX,"ax",@progbits
-	.hidden	retmeX
+	.hidden	retmeX                  # -- Begin function retmeX
 	.globl	retmeX
 	.type	retmeX,@function
 retmeX:                                 # @retmeX
@@ -6666,9 +6648,9 @@ retmeX:                                 # @retmeX
 	.endfunc
 .Lfunc_end139:
 	.size	retmeX, .Lfunc_end139-retmeX
-
+                                        # -- End function
 	.section	.text.fn1X,"ax",@progbits
-	.hidden	fn1X
+	.hidden	fn1X                    # -- Begin function fn1X
 	.globl	fn1X
 	.type	fn1X,@function
 fn1X:                                   # @fn1X
@@ -6684,9 +6666,9 @@ fn1X:                                   # @fn1X
 	.endfunc
 .Lfunc_end140:
 	.size	fn1X, .Lfunc_end140-fn1X
-
+                                        # -- End function
 	.section	.text.fn2X,"ax",@progbits
-	.hidden	fn2X
+	.hidden	fn2X                    # -- Begin function fn2X
 	.globl	fn2X
 	.type	fn2X,@function
 fn2X:                                   # @fn2X
@@ -6704,9 +6686,9 @@ fn2X:                                   # @fn2X
 	.endfunc
 .Lfunc_end141:
 	.size	fn2X, .Lfunc_end141-fn2X
-
+                                        # -- End function
 	.section	.text.retitX,"ax",@progbits
-	.hidden	retitX
+	.hidden	retitX                  # -- Begin function retitX
 	.globl	retitX
 	.type	retitX,@function
 retitX:                                 # @retitX
@@ -6720,9 +6702,9 @@ retitX:                                 # @retitX
 	.endfunc
 .Lfunc_end142:
 	.size	retitX, .Lfunc_end142-retitX
-
+                                        # -- End function
 	.section	.text.fn3X,"ax",@progbits
-	.hidden	fn3X
+	.hidden	fn3X                    # -- Begin function fn3X
 	.globl	fn3X
 	.type	fn3X,@function
 fn3X:                                   # @fn3X
@@ -6747,120 +6729,77 @@ fn3X:                                   # @fn3X
 	.endfunc
 .Lfunc_end143:
 	.size	fn3X, .Lfunc_end143-fn3X
-
+                                        # -- End function
 	.section	.text.testX,"ax",@progbits
-	.hidden	testX
+	.hidden	testX                   # -- Begin function testX
 	.globl	testX
 	.type	testX,@function
 testX:                                  # @testX
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, -32
+	i32.const	$push0=, 0
+	i32.load	$1=, myrnd.s($pop0)
+	i32.const	$0=, -32
 .LBB144_1:                              # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label16:
+	loop    	                # label17:
+	i32.const	$push32=, sX+32
+	i32.add 	$push1=, $0, $pop32
+	i32.const	$push31=, 1103515245
+	i32.mul 	$push2=, $1, $pop31
+	i32.const	$push30=, 12345
+	i32.add 	$push29=, $pop2, $pop30
+	tee_local	$push28=, $1=, $pop29
+	i32.const	$push27=, 16
+	i32.shr_u	$push3=, $pop28, $pop27
+	i32.store8	0($pop1), $pop3
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $0, $pop26
+	tee_local	$push24=, $0=, $pop25
+	br_if   	0, $pop24       # 0: up to label17
+# BB#2:                                 # %if.end113
+	end_loop
+	i32.const	$push5=, 0
+	i64.const	$push4=, 4612055454334320640
+	i64.store	sX+24($pop5), $pop4
 	i32.const	$push42=, 0
+	i64.const	$push6=, 0
+	i64.store	sX+16($pop42), $pop6
 	i32.const	$push41=, 0
-	i32.load	$push0=, myrnd.s($pop41)
-	i32.const	$push40=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop40
-	i32.const	$push39=, 12345
-	i32.add 	$push38=, $pop1, $pop39
-	tee_local	$push37=, $0=, $pop38
-	i32.store	myrnd.s($pop42), $pop37
-	i32.const	$push36=, sX+32
-	i32.add 	$push2=, $2, $pop36
+	i32.const	$push7=, -341751747
+	i32.mul 	$push8=, $1, $pop7
+	i32.const	$push9=, 229283573
+	i32.add 	$push40=, $pop8, $pop9
+	tee_local	$push39=, $0=, $pop40
+	i32.const	$push10=, 1103515245
+	i32.mul 	$push11=, $pop39, $pop10
+	i32.const	$push12=, 12345
+	i32.add 	$push38=, $pop11, $pop12
+	tee_local	$push37=, $1=, $pop38
+	i32.store	myrnd.s($pop41), $pop37
+	i32.const	$push36=, 0
+	i32.const	$push13=, 16
+	i32.shr_u	$push17=, $1, $pop13
+	i32.const	$push15=, 2047
+	i32.and 	$push18=, $pop17, $pop15
 	i32.const	$push35=, 16
-	i32.shr_u	$push3=, $0, $pop35
-	i32.store8	0($pop2), $pop3
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $2, $pop34
-	tee_local	$push32=, $2=, $pop33
-	br_if   	0, $pop32       # 0: up to label16
-# BB#2:                                 # %for.end
-	end_loop
-	i32.const	$push4=, 0
-	i32.const	$push81=, 0
-	i32.load	$push5=, myrnd.s($pop81)
-	i32.const	$push6=, 1103515245
-	i32.mul 	$push7=, $pop5, $pop6
-	i32.const	$push8=, 12345
-	i32.add 	$push80=, $pop7, $pop8
-	tee_local	$push79=, $2=, $pop80
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push9=, $pop79, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop9, $pop77
-	tee_local	$push75=, $0=, $pop76
-	i32.store	myrnd.s($pop4), $pop75
-	i32.const	$push74=, 0
-	i64.const	$push10=, 4612055454334320640
-	i64.store	sX+24($pop74), $pop10
-	i32.const	$push73=, 0
-	i64.const	$push11=, 0
-	i64.store	sX+16($pop73), $pop11
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push12=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop12, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $pop68, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $1=, $pop65
-	i32.store	myrnd.s($pop72), $pop64
-	i32.const	$push63=, 0
-	i32.const	$push16=, 16
-	i32.shr_u	$push17=, $2, $pop16
-	i32.const	$push18=, 2047
-	i32.and 	$push19=, $pop17, $pop18
-	i32.const	$push62=, 0
-	i32.load	$push14=, sX($pop62)
-	i32.const	$push15=, -4096
-	i32.and 	$push61=, $pop14, $pop15
-	tee_local	$push60=, $2=, $pop61
-	i32.or  	$push20=, $pop19, $pop60
-	i32.store	sX($pop63), $pop20
-	i32.const	$push59=, 0
-	i32.const	$push58=, 16
-	i32.shr_u	$push21=, $0, $pop58
-	i32.const	$push57=, 2047
-	i32.and 	$push22=, $pop21, $pop57
-	i32.or  	$push23=, $pop22, $2
-	i32.store	sX($pop59), $pop23
-	i32.const	$push56=, 0
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push24=, $1, $pop55
-	i32.const	$push54=, 12345
-	i32.add 	$push53=, $pop24, $pop54
-	tee_local	$push52=, $0=, $pop53
-	i32.const	$push51=, 1103515245
-	i32.mul 	$push25=, $pop52, $pop51
-	i32.const	$push50=, 12345
-	i32.add 	$push49=, $pop25, $pop50
-	tee_local	$push48=, $1=, $pop49
-	i32.store	myrnd.s($pop56), $pop48
-	i32.const	$push47=, 0
-	i32.const	$push46=, 16
-	i32.shr_u	$push28=, $1, $pop46
-	i32.const	$push45=, 2047
-	i32.and 	$push29=, $pop28, $pop45
-	i32.const	$push44=, 16
-	i32.shr_u	$push26=, $0, $pop44
-	i32.const	$push43=, 2047
-	i32.and 	$push27=, $pop26, $pop43
-	i32.add 	$push30=, $pop29, $pop27
-	i32.or  	$push31=, $pop30, $2
-	i32.store	sX($pop47), $pop31
+	i32.shr_u	$push14=, $0, $pop35
+	i32.const	$push34=, 2047
+	i32.and 	$push16=, $pop14, $pop34
+	i32.add 	$push19=, $pop18, $pop16
+	i32.const	$push33=, 0
+	i32.load	$push20=, sX($pop33)
+	i32.const	$push21=, -4096
+	i32.and 	$push22=, $pop20, $pop21
+	i32.or  	$push23=, $pop19, $pop22
+	i32.store	sX($pop36), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end144:
 	.size	testX, .Lfunc_end144-testX
-
+                                        # -- End function
 	.section	.text.retmeY,"ax",@progbits
-	.hidden	retmeY
+	.hidden	retmeY                  # -- Begin function retmeY
 	.globl	retmeY
 	.type	retmeY,@function
 retmeY:                                 # @retmeY
@@ -6890,9 +6829,9 @@ retmeY:                                 # @retmeY
 	.endfunc
 .Lfunc_end145:
 	.size	retmeY, .Lfunc_end145-retmeY
-
+                                        # -- End function
 	.section	.text.fn1Y,"ax",@progbits
-	.hidden	fn1Y
+	.hidden	fn1Y                    # -- Begin function fn1Y
 	.globl	fn1Y
 	.type	fn1Y,@function
 fn1Y:                                   # @fn1Y
@@ -6908,9 +6847,9 @@ fn1Y:                                   # @fn1Y
 	.endfunc
 .Lfunc_end146:
 	.size	fn1Y, .Lfunc_end146-fn1Y
-
+                                        # -- End function
 	.section	.text.fn2Y,"ax",@progbits
-	.hidden	fn2Y
+	.hidden	fn2Y                    # -- Begin function fn2Y
 	.globl	fn2Y
 	.type	fn2Y,@function
 fn2Y:                                   # @fn2Y
@@ -6928,9 +6867,9 @@ fn2Y:                                   # @fn2Y
 	.endfunc
 .Lfunc_end147:
 	.size	fn2Y, .Lfunc_end147-fn2Y
-
+                                        # -- End function
 	.section	.text.retitY,"ax",@progbits
-	.hidden	retitY
+	.hidden	retitY                  # -- Begin function retitY
 	.globl	retitY
 	.type	retitY,@function
 retitY:                                 # @retitY
@@ -6944,9 +6883,9 @@ retitY:                                 # @retitY
 	.endfunc
 .Lfunc_end148:
 	.size	retitY, .Lfunc_end148-retitY
-
+                                        # -- End function
 	.section	.text.fn3Y,"ax",@progbits
-	.hidden	fn3Y
+	.hidden	fn3Y                    # -- Begin function fn3Y
 	.globl	fn3Y
 	.type	fn3Y,@function
 fn3Y:                                   # @fn3Y
@@ -6971,120 +6910,77 @@ fn3Y:                                   # @fn3Y
 	.endfunc
 .Lfunc_end149:
 	.size	fn3Y, .Lfunc_end149-fn3Y
-
+                                        # -- End function
 	.section	.text.testY,"ax",@progbits
-	.hidden	testY
+	.hidden	testY                   # -- Begin function testY
 	.globl	testY
 	.type	testY,@function
 testY:                                  # @testY
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, -32
+	i32.const	$push0=, 0
+	i32.load	$1=, myrnd.s($pop0)
+	i32.const	$0=, -32
 .LBB150_1:                              # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label17:
+	loop    	                # label18:
+	i32.const	$push32=, sY+32
+	i32.add 	$push1=, $0, $pop32
+	i32.const	$push31=, 1103515245
+	i32.mul 	$push2=, $1, $pop31
+	i32.const	$push30=, 12345
+	i32.add 	$push29=, $pop2, $pop30
+	tee_local	$push28=, $1=, $pop29
+	i32.const	$push27=, 16
+	i32.shr_u	$push3=, $pop28, $pop27
+	i32.store8	0($pop1), $pop3
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $0, $pop26
+	tee_local	$push24=, $0=, $pop25
+	br_if   	0, $pop24       # 0: up to label18
+# BB#2:                                 # %if.end113
+	end_loop
+	i32.const	$push5=, 0
+	i64.const	$push4=, 4612055454334320640
+	i64.store	sY+24($pop5), $pop4
 	i32.const	$push42=, 0
+	i64.const	$push6=, 0
+	i64.store	sY+16($pop42), $pop6
 	i32.const	$push41=, 0
-	i32.load	$push0=, myrnd.s($pop41)
-	i32.const	$push40=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop40
-	i32.const	$push39=, 12345
-	i32.add 	$push38=, $pop1, $pop39
-	tee_local	$push37=, $0=, $pop38
-	i32.store	myrnd.s($pop42), $pop37
-	i32.const	$push36=, sY+32
-	i32.add 	$push2=, $2, $pop36
+	i32.const	$push7=, -341751747
+	i32.mul 	$push8=, $1, $pop7
+	i32.const	$push9=, 229283573
+	i32.add 	$push40=, $pop8, $pop9
+	tee_local	$push39=, $0=, $pop40
+	i32.const	$push10=, 1103515245
+	i32.mul 	$push11=, $pop39, $pop10
+	i32.const	$push12=, 12345
+	i32.add 	$push38=, $pop11, $pop12
+	tee_local	$push37=, $1=, $pop38
+	i32.store	myrnd.s($pop41), $pop37
+	i32.const	$push36=, 0
+	i32.const	$push13=, 16
+	i32.shr_u	$push17=, $1, $pop13
+	i32.const	$push15=, 2047
+	i32.and 	$push18=, $pop17, $pop15
 	i32.const	$push35=, 16
-	i32.shr_u	$push3=, $0, $pop35
-	i32.store8	0($pop2), $pop3
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $2, $pop34
-	tee_local	$push32=, $2=, $pop33
-	br_if   	0, $pop32       # 0: up to label17
-# BB#2:                                 # %for.end
-	end_loop
-	i32.const	$push4=, 0
-	i32.const	$push81=, 0
-	i32.load	$push5=, myrnd.s($pop81)
-	i32.const	$push6=, 1103515245
-	i32.mul 	$push7=, $pop5, $pop6
-	i32.const	$push8=, 12345
-	i32.add 	$push80=, $pop7, $pop8
-	tee_local	$push79=, $2=, $pop80
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push9=, $pop79, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop9, $pop77
-	tee_local	$push75=, $0=, $pop76
-	i32.store	myrnd.s($pop4), $pop75
-	i32.const	$push74=, 0
-	i64.const	$push10=, 4612055454334320640
-	i64.store	sY+24($pop74), $pop10
-	i32.const	$push73=, 0
-	i64.const	$push11=, 0
-	i64.store	sY+16($pop73), $pop11
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push12=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop12, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $pop68, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $1=, $pop65
-	i32.store	myrnd.s($pop72), $pop64
-	i32.const	$push63=, 0
-	i32.const	$push16=, 16
-	i32.shr_u	$push17=, $2, $pop16
-	i32.const	$push18=, 2047
-	i32.and 	$push19=, $pop17, $pop18
-	i32.const	$push62=, 0
-	i32.load	$push14=, sY($pop62)
-	i32.const	$push15=, -4096
-	i32.and 	$push61=, $pop14, $pop15
-	tee_local	$push60=, $2=, $pop61
-	i32.or  	$push20=, $pop19, $pop60
-	i32.store	sY($pop63), $pop20
-	i32.const	$push59=, 0
-	i32.const	$push58=, 16
-	i32.shr_u	$push21=, $0, $pop58
-	i32.const	$push57=, 2047
-	i32.and 	$push22=, $pop21, $pop57
-	i32.or  	$push23=, $pop22, $2
-	i32.store	sY($pop59), $pop23
-	i32.const	$push56=, 0
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push24=, $1, $pop55
-	i32.const	$push54=, 12345
-	i32.add 	$push53=, $pop24, $pop54
-	tee_local	$push52=, $0=, $pop53
-	i32.const	$push51=, 1103515245
-	i32.mul 	$push25=, $pop52, $pop51
-	i32.const	$push50=, 12345
-	i32.add 	$push49=, $pop25, $pop50
-	tee_local	$push48=, $1=, $pop49
-	i32.store	myrnd.s($pop56), $pop48
-	i32.const	$push47=, 0
-	i32.const	$push46=, 16
-	i32.shr_u	$push28=, $1, $pop46
-	i32.const	$push45=, 2047
-	i32.and 	$push29=, $pop28, $pop45
-	i32.const	$push44=, 16
-	i32.shr_u	$push26=, $0, $pop44
-	i32.const	$push43=, 2047
-	i32.and 	$push27=, $pop26, $pop43
-	i32.add 	$push30=, $pop29, $pop27
-	i32.or  	$push31=, $pop30, $2
-	i32.store	sY($pop47), $pop31
+	i32.shr_u	$push14=, $0, $pop35
+	i32.const	$push34=, 2047
+	i32.and 	$push16=, $pop14, $pop34
+	i32.add 	$push19=, $pop18, $pop16
+	i32.const	$push33=, 0
+	i32.load	$push20=, sY($pop33)
+	i32.const	$push21=, -4096
+	i32.and 	$push22=, $pop20, $pop21
+	i32.or  	$push23=, $pop19, $pop22
+	i32.store	sY($pop36), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end150:
 	.size	testY, .Lfunc_end150-testY
-
+                                        # -- End function
 	.section	.text.retmeZ,"ax",@progbits
-	.hidden	retmeZ
+	.hidden	retmeZ                  # -- Begin function retmeZ
 	.globl	retmeZ
 	.type	retmeZ,@function
 retmeZ:                                 # @retmeZ
@@ -7114,9 +7010,9 @@ retmeZ:                                 # @retmeZ
 	.endfunc
 .Lfunc_end151:
 	.size	retmeZ, .Lfunc_end151-retmeZ
-
+                                        # -- End function
 	.section	.text.fn1Z,"ax",@progbits
-	.hidden	fn1Z
+	.hidden	fn1Z                    # -- Begin function fn1Z
 	.globl	fn1Z
 	.type	fn1Z,@function
 fn1Z:                                   # @fn1Z
@@ -7134,9 +7030,9 @@ fn1Z:                                   # @fn1Z
 	.endfunc
 .Lfunc_end152:
 	.size	fn1Z, .Lfunc_end152-fn1Z
-
+                                        # -- End function
 	.section	.text.fn2Z,"ax",@progbits
-	.hidden	fn2Z
+	.hidden	fn2Z                    # -- Begin function fn2Z
 	.globl	fn2Z
 	.type	fn2Z,@function
 fn2Z:                                   # @fn2Z
@@ -7156,9 +7052,9 @@ fn2Z:                                   # @fn2Z
 	.endfunc
 .Lfunc_end153:
 	.size	fn2Z, .Lfunc_end153-fn2Z
-
+                                        # -- End function
 	.section	.text.retitZ,"ax",@progbits
-	.hidden	retitZ
+	.hidden	retitZ                  # -- Begin function retitZ
 	.globl	retitZ
 	.type	retitZ,@function
 retitZ:                                 # @retitZ
@@ -7172,9 +7068,9 @@ retitZ:                                 # @retitZ
 	.endfunc
 .Lfunc_end154:
 	.size	retitZ, .Lfunc_end154-retitZ
-
+                                        # -- End function
 	.section	.text.fn3Z,"ax",@progbits
-	.hidden	fn3Z
+	.hidden	fn3Z                    # -- Begin function fn3Z
 	.globl	fn3Z
 	.type	fn3Z,@function
 fn3Z:                                   # @fn3Z
@@ -7195,157 +7091,139 @@ fn3Z:                                   # @fn3Z
 	.endfunc
 .Lfunc_end155:
 	.size	fn3Z, .Lfunc_end155-fn3Z
-
+                                        # -- End function
 	.section	.text.testZ,"ax",@progbits
-	.hidden	testZ
+	.hidden	testZ                   # -- Begin function testZ
 	.globl	testZ
 	.type	testZ,@function
 testZ:                                  # @testZ
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push0=, 0
+	i32.load	$5=, myrnd.s($pop0)
 	i32.const	$4=, -32
 .LBB156_1:                              # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label18:
-	i32.const	$push52=, 0
-	i32.const	$push51=, 0
-	i32.load	$push1=, myrnd.s($pop51)
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push2=, $pop1, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop2, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.store	myrnd.s($pop52), $pop47
-	i32.const	$push46=, sZ+32
-	i32.add 	$push3=, $4, $pop46
-	i32.const	$push45=, 16
-	i32.shr_u	$push4=, $0, $pop45
-	i32.store8	0($pop3), $pop4
-	i32.const	$push44=, 1
-	i32.add 	$push43=, $4, $pop44
-	tee_local	$push42=, $4=, $pop43
-	br_if   	0, $pop42       # 0: up to label18
+	loop    	                # label19:
+	i32.const	$push38=, sZ+32
+	i32.add 	$push1=, $4, $pop38
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push2=, $5, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$push35=, $pop2, $pop36
+	tee_local	$push34=, $5=, $pop35
+	i32.const	$push33=, 16
+	i32.shr_u	$push3=, $pop34, $pop33
+	i32.store8	0($pop1), $pop3
+	i32.const	$push32=, 1
+	i32.add 	$push31=, $4, $pop32
+	tee_local	$push30=, $4=, $pop31
+	br_if   	0, $pop30       # 0: up to label19
 # BB#2:                                 # %for.end
 	end_loop
-	i32.const	$push81=, 0
-	i64.const	$push5=, 4612055454334320640
-	i64.store	sZ+8($pop81), $pop5
-	i32.const	$push80=, 0
-	i64.const	$push6=, 0
-	i64.store	sZ($pop80), $pop6
-	i32.const	$push79=, 0
-	i32.const	$push78=, 0
-	i32.load	$push7=, myrnd.s($pop78)
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push8=, $pop7, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop8, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push9=, $pop74, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop9, $pop72
-	tee_local	$push70=, $4=, $pop71
-	i32.store	myrnd.s($pop79), $pop70
 	i32.const	$push69=, 0
-	i32.const	$push68=, 16
-	i32.shr_u	$push11=, $0, $pop68
-	i32.const	$push67=, 2047
-	i32.and 	$push66=, $pop11, $pop67
-	tee_local	$push65=, $1=, $pop66
-	i32.const	$push64=, 20
-	i32.shl 	$push12=, $pop65, $pop64
-	i32.const	$push63=, 0
-	i32.load	$push0=, sZ+16($pop63)
-	i32.const	$push10=, 1048575
-	i32.and 	$push62=, $pop0, $pop10
-	tee_local	$push61=, $0=, $pop62
-	i32.or  	$push60=, $pop12, $pop61
-	tee_local	$push59=, $2=, $pop60
-	i32.store	sZ+16($pop69), $pop59
-	block   	
-	i32.const	$push58=, 16
-	i32.shr_u	$push13=, $4, $pop58
-	i32.const	$push57=, 2047
-	i32.and 	$push56=, $pop13, $pop57
-	tee_local	$push55=, $3=, $pop56
-	i32.add 	$push14=, $pop55, $1
-	i32.const	$push54=, 20
-	i32.shl 	$push15=, $3, $pop54
-	i32.add 	$push16=, $pop15, $2
+	i64.const	$push4=, 4612055454334320640
+	i64.store	sZ+8($pop69), $pop4
+	i32.const	$push68=, 0
+	i64.const	$push5=, 0
+	i64.store	sZ($pop68), $pop5
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push6=, $5, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop6, $pop65
+	tee_local	$push63=, $5=, $pop64
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push7=, $pop63, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop7, $pop61
+	tee_local	$push59=, $4=, $pop60
+	i32.store	myrnd.s($pop67), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push8=, $5, $pop57
+	i32.const	$push56=, 2047
+	i32.and 	$push55=, $pop8, $pop56
+	tee_local	$push54=, $5=, $pop55
 	i32.const	$push53=, 20
-	i32.shr_u	$push17=, $pop16, $pop53
-	i32.ne  	$push18=, $pop14, $pop17
-	br_if   	0, $pop18       # 0: down to label19
+	i32.shl 	$push9=, $pop54, $pop53
+	i32.const	$push52=, 0
+	i32.load	$push51=, sZ+16($pop52)
+	tee_local	$push50=, $0=, $pop51
+	i32.const	$push49=, 1048575
+	i32.and 	$push48=, $pop50, $pop49
+	tee_local	$push47=, $1=, $pop48
+	i32.or  	$push46=, $pop9, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.store	sZ+16($pop58), $pop45
+	block   	
+	i32.const	$push44=, 16
+	i32.shr_u	$push10=, $4, $pop44
+	i32.const	$push43=, 2047
+	i32.and 	$push42=, $pop10, $pop43
+	tee_local	$push41=, $3=, $pop42
+	i32.add 	$push11=, $pop41, $5
+	i32.const	$push40=, 20
+	i32.shl 	$push12=, $3, $pop40
+	i32.add 	$push13=, $pop12, $2
+	i32.const	$push39=, 20
+	i32.shr_u	$push14=, $pop13, $pop39
+	i32.ne  	$push15=, $pop11, $pop14
+	br_if   	0, $pop15       # 0: down to label20
 # BB#3:                                 # %if.end80
-	i32.const	$push107=, 0
-	i32.const	$push106=, 1103515245
-	i32.mul 	$push19=, $4, $pop106
-	i32.const	$push105=, 12345
-	i32.add 	$push104=, $pop19, $pop105
-	tee_local	$push103=, $1=, $pop104
-	i32.const	$push20=, -1029531031
-	i32.mul 	$push21=, $pop103, $pop20
-	i32.const	$push22=, -740551042
-	i32.add 	$push102=, $pop21, $pop22
-	tee_local	$push101=, $4=, $pop102
-	i32.const	$push100=, 1103515245
-	i32.mul 	$push23=, $pop101, $pop100
-	i32.const	$push99=, 12345
-	i32.add 	$push98=, $pop23, $pop99
-	tee_local	$push97=, $2=, $pop98
-	i32.store	myrnd.s($pop107), $pop97
-	i32.const	$push96=, 0
-	i32.const	$push95=, 16
-	i32.shr_u	$push27=, $2, $pop95
-	i32.const	$push94=, 2047
-	i32.and 	$push93=, $pop27, $pop94
-	tee_local	$push92=, $2=, $pop93
-	i32.const	$push91=, 20
-	i32.shl 	$push28=, $pop92, $pop91
-	i32.const	$push90=, 16
-	i32.shr_u	$push24=, $4, $pop90
-	i32.const	$push89=, 2047
-	i32.and 	$push88=, $pop24, $pop89
-	tee_local	$push87=, $3=, $pop88
-	i32.const	$push86=, 20
-	i32.shl 	$push25=, $pop87, $pop86
-	i32.or  	$push26=, $pop25, $0
-	i32.add 	$push85=, $pop28, $pop26
-	tee_local	$push84=, $4=, $pop85
-	i32.store	sZ+16($pop96), $pop84
-	i32.const	$push29=, 4
-	i32.shl 	$push30=, $1, $pop29
-	i32.const	$push31=, 2146435072
-	i32.and 	$push32=, $pop30, $pop31
-	i32.or  	$push33=, $pop32, $0
-	i32.xor 	$push83=, $4, $pop33
-	tee_local	$push82=, $0=, $pop83
-	i32.const	$push34=, 1040384
-	i32.and 	$push35=, $pop82, $pop34
-	br_if   	0, $pop35       # 0: down to label19
-# BB#4:                                 # %lor.lhs.false98
-	i32.add 	$push39=, $2, $3
-	i32.const	$push37=, 20
-	i32.shr_u	$push38=, $4, $pop37
-	i32.ne  	$push40=, $pop39, $pop38
-	br_if   	0, $pop40       # 0: down to label19
-# BB#5:                                 # %lor.lhs.false98
-	i32.const	$push41=, 8191
-	i32.and 	$push36=, $0, $pop41
-	br_if   	0, $pop36       # 0: down to label19
-# BB#6:                                 # %if.end121
+	i32.const	$push90=, 0
+	i32.const	$push17=, -2139243339
+	i32.mul 	$push18=, $4, $pop17
+	i32.const	$push19=, -1492899873
+	i32.add 	$push89=, $pop18, $pop19
+	tee_local	$push88=, $4=, $pop89
+	i32.const	$push87=, 1103515245
+	i32.mul 	$push20=, $pop88, $pop87
+	i32.const	$push86=, 12345
+	i32.add 	$push85=, $pop20, $pop86
+	tee_local	$push84=, $5=, $pop85
+	i32.store	myrnd.s($pop90), $pop84
+	i32.const	$push83=, 0
+	i32.const	$push82=, 16
+	i32.shr_u	$push24=, $5, $pop82
+	i32.const	$push81=, 2047
+	i32.and 	$push80=, $pop24, $pop81
+	tee_local	$push79=, $5=, $pop80
+	i32.const	$push78=, 20
+	i32.shl 	$push25=, $pop79, $pop78
+	i32.const	$push77=, 16
+	i32.shr_u	$push21=, $4, $pop77
+	i32.const	$push76=, 2047
+	i32.and 	$push75=, $pop21, $pop76
+	tee_local	$push74=, $2=, $pop75
+	i32.const	$push73=, 20
+	i32.shl 	$push22=, $pop74, $pop73
+	i32.or  	$push23=, $pop22, $1
+	i32.add 	$push72=, $pop25, $pop23
+	tee_local	$push71=, $4=, $pop72
+	i32.store	sZ+16($pop83), $pop71
+	i32.add 	$push26=, $5, $2
+	i32.const	$push70=, 20
+	i32.shr_u	$push27=, $4, $pop70
+	i32.ne  	$push28=, $pop26, $pop27
+	br_if   	0, $pop28       # 0: down to label20
+# BB#4:                                 # %if.end80
+	i32.xor 	$push29=, $4, $0
+	i32.const	$push91=, 1048575
+	i32.and 	$push16=, $pop29, $pop91
+	br_if   	0, $pop16       # 0: down to label20
+# BB#5:                                 # %if.end121
 	return
-.LBB156_7:                              # %if.then120
-	end_block                       # label19:
+.LBB156_6:                              # %if.then
+	end_block                       # label20:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end156:
 	.size	testZ, .Lfunc_end156-testZ
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -7383,7 +7261,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end157:
 	.size	main, .Lfunc_end157-main
-
+                                        # -- End function
 	.type	myrnd.s,@object         # @myrnd.s
 	.section	.data.myrnd.s,"aw",@progbits
 	.p2align	2
@@ -7626,6 +7504,6 @@ sZ:
 	.size	sZ, 32
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040709-2.c.s b/test/torture-s/20040709-2.c.s
index adfea89cf..26d60e208 100644
--- a/test/torture-s/20040709-2.c.s
+++ b/test/torture-s/20040709-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040709-2.c"
+	.file	"20040709-2.c"
 	.section	.text.myrnd,"ax",@progbits
-	.hidden	myrnd
+	.hidden	myrnd                   # -- Begin function myrnd
 	.globl	myrnd
 	.type	myrnd,@function
 myrnd:                                  # @myrnd
@@ -25,9 +25,9 @@ myrnd:                                  # @myrnd
 	.endfunc
 .Lfunc_end0:
 	.size	myrnd, .Lfunc_end0-myrnd
-
+                                        # -- End function
 	.section	.text.retmeA,"ax",@progbits
-	.hidden	retmeA
+	.hidden	retmeA                  # -- Begin function retmeA
 	.globl	retmeA
 	.type	retmeA,@function
 retmeA:                                 # @retmeA
@@ -39,9 +39,9 @@ retmeA:                                 # @retmeA
 	.endfunc
 .Lfunc_end1:
 	.size	retmeA, .Lfunc_end1-retmeA
-
+                                        # -- End function
 	.section	.text.fn1A,"ax",@progbits
-	.hidden	fn1A
+	.hidden	fn1A                    # -- Begin function fn1A
 	.globl	fn1A
 	.type	fn1A,@function
 fn1A:                                   # @fn1A
@@ -59,9 +59,9 @@ fn1A:                                   # @fn1A
 	.endfunc
 .Lfunc_end2:
 	.size	fn1A, .Lfunc_end2-fn1A
-
+                                        # -- End function
 	.section	.text.fn2A,"ax",@progbits
-	.hidden	fn2A
+	.hidden	fn2A                    # -- Begin function fn2A
 	.globl	fn2A
 	.type	fn2A,@function
 fn2A:                                   # @fn2A
@@ -81,9 +81,9 @@ fn2A:                                   # @fn2A
 	.endfunc
 .Lfunc_end3:
 	.size	fn2A, .Lfunc_end3-fn2A
-
+                                        # -- End function
 	.section	.text.retitA,"ax",@progbits
-	.hidden	retitA
+	.hidden	retitA                  # -- Begin function retitA
 	.globl	retitA
 	.type	retitA,@function
 retitA:                                 # @retitA
@@ -97,9 +97,9 @@ retitA:                                 # @retitA
 	.endfunc
 .Lfunc_end4:
 	.size	retitA, .Lfunc_end4-retitA
-
+                                        # -- End function
 	.section	.text.fn3A,"ax",@progbits
-	.hidden	fn3A
+	.hidden	fn3A                    # -- Begin function fn3A
 	.globl	fn3A
 	.type	fn3A,@function
 fn3A:                                   # @fn3A
@@ -127,67 +127,85 @@ fn3A:                                   # @fn3A
 	.endfunc
 .Lfunc_end5:
 	.size	fn3A, .Lfunc_end5-fn3A
-
+                                        # -- End function
 	.section	.text.testA,"ax",@progbits
-	.hidden	testA
+	.hidden	testA                   # -- Begin function testA
 	.globl	testA
 	.type	testA,@function
 testA:                                  # @testA
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %if.end106
 	i32.const	$push0=, 0
-	i32.const	$push41=, 0
-	i32.load	$push1=, myrnd.s($pop41)
+	i32.const	$push52=, 0
+	i32.load	$push1=, myrnd.s($pop52)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push40=, $pop3, $pop4
-	tee_local	$push39=, $0=, $pop40
+	i32.add 	$push51=, $pop3, $pop4
+	tee_local	$push50=, $0=, $pop51
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop39, $pop5
+	i32.shr_u	$push6=, $pop50, $pop5
 	i32.store8	sA($pop0), $pop6
-	i32.const	$push38=, 0
-	i32.const	$push37=, 1103515245
-	i32.mul 	$push7=, $0, $pop37
-	i32.const	$push36=, 12345
-	i32.add 	$push35=, $pop7, $pop36
-	tee_local	$push34=, $0=, $pop35
-	i32.const	$push33=, 16
-	i32.shr_u	$push8=, $pop34, $pop33
-	i32.store8	sA+1($pop38), $pop8
-	i32.const	$push32=, 0
+	i32.const	$push49=, 0
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push7=, $0, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$push46=, $pop7, $pop47
+	tee_local	$push45=, $0=, $pop46
+	i32.const	$push44=, 16
+	i32.shr_u	$push8=, $pop45, $pop44
+	i32.store8	sA+1($pop49), $pop8
+	i32.const	$push43=, 0
 	i32.const	$push9=, -341751747
 	i32.mul 	$push10=, $0, $pop9
 	i32.const	$push11=, 229283573
-	i32.add 	$push31=, $pop10, $pop11
+	i32.add 	$push42=, $pop10, $pop11
+	tee_local	$push41=, $0=, $pop42
+	i32.const	$push40=, 1103515245
+	i32.mul 	$push12=, $pop41, $pop40
+	i32.const	$push39=, 12345
+	i32.add 	$push38=, $pop12, $pop39
+	tee_local	$push37=, $1=, $pop38
+	i32.store	myrnd.s($pop43), $pop37
+	i32.const	$push36=, 0
+	i32.const	$push35=, 16
+	i32.shr_u	$push34=, $1, $pop35
+	tee_local	$push33=, $1=, $pop34
+	i32.const	$push13=, 2047
+	i32.and 	$push15=, $pop33, $pop13
+	i32.const	$push32=, 16
+	i32.shr_u	$push31=, $0, $pop32
 	tee_local	$push30=, $0=, $pop31
-	i32.const	$push29=, 1103515245
-	i32.mul 	$push12=, $pop30, $pop29
-	i32.const	$push28=, 12345
-	i32.add 	$push27=, $pop12, $pop28
-	tee_local	$push26=, $1=, $pop27
-	i32.store	myrnd.s($pop32), $pop26
-	i32.const	$push25=, 0
-	i32.const	$push24=, 16
-	i32.shr_u	$push14=, $1, $pop24
-	i32.const	$push23=, 16
-	i32.shr_u	$push13=, $0, $pop23
-	i32.add 	$push15=, $pop14, $pop13
+	i32.const	$push29=, 2047
+	i32.and 	$push14=, $pop30, $pop29
+	i32.add 	$push28=, $pop15, $pop14
+	tee_local	$push27=, $2=, $pop28
 	i32.const	$push16=, 5
-	i32.shl 	$push17=, $pop15, $pop16
-	i32.const	$push22=, 0
-	i32.load16_u	$push18=, sA($pop22)
+	i32.shl 	$push17=, $pop27, $pop16
+	i32.const	$push26=, 0
+	i32.load16_u	$push18=, sA($pop26)
 	i32.const	$push19=, 31
 	i32.and 	$push20=, $pop18, $pop19
 	i32.or  	$push21=, $pop17, $pop20
-	i32.store16	sA($pop25), $pop21
-                                        # fallthrough-return
+	i32.store16	sA($pop36), $pop21
+	block   	
+	i32.add 	$push22=, $1, $0
+	i32.xor 	$push23=, $pop22, $2
+	i32.const	$push25=, 2047
+	i32.and 	$push24=, $pop23, $pop25
+	br_if   	0, $pop24       # 0: down to label0
+# BB#1:                                 # %if.end158
+	return
+.LBB6_2:                                # %if.then157
+	end_block                       # label0:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	testA, .Lfunc_end6-testA
-
+                                        # -- End function
 	.section	.text.retmeB,"ax",@progbits
-	.hidden	retmeB
+	.hidden	retmeB                  # -- Begin function retmeB
 	.globl	retmeB
 	.type	retmeB,@function
 retmeB:                                 # @retmeB
@@ -205,9 +223,9 @@ retmeB:                                 # @retmeB
 	.endfunc
 .Lfunc_end7:
 	.size	retmeB, .Lfunc_end7-retmeB
-
+                                        # -- End function
 	.section	.text.fn1B,"ax",@progbits
-	.hidden	fn1B
+	.hidden	fn1B                    # -- Begin function fn1B
 	.globl	fn1B
 	.type	fn1B,@function
 fn1B:                                   # @fn1B
@@ -225,9 +243,9 @@ fn1B:                                   # @fn1B
 	.endfunc
 .Lfunc_end8:
 	.size	fn1B, .Lfunc_end8-fn1B
-
+                                        # -- End function
 	.section	.text.fn2B,"ax",@progbits
-	.hidden	fn2B
+	.hidden	fn2B                    # -- Begin function fn2B
 	.globl	fn2B
 	.type	fn2B,@function
 fn2B:                                   # @fn2B
@@ -247,9 +265,9 @@ fn2B:                                   # @fn2B
 	.endfunc
 .Lfunc_end9:
 	.size	fn2B, .Lfunc_end9-fn2B
-
+                                        # -- End function
 	.section	.text.retitB,"ax",@progbits
-	.hidden	retitB
+	.hidden	retitB                  # -- Begin function retitB
 	.globl	retitB
 	.type	retitB,@function
 retitB:                                 # @retitB
@@ -263,9 +281,9 @@ retitB:                                 # @retitB
 	.endfunc
 .Lfunc_end10:
 	.size	retitB, .Lfunc_end10-retitB
-
+                                        # -- End function
 	.section	.text.fn3B,"ax",@progbits
-	.hidden	fn3B
+	.hidden	fn3B                    # -- Begin function fn3B
 	.globl	fn3B
 	.type	fn3B,@function
 fn3B:                                   # @fn3B
@@ -293,103 +311,121 @@ fn3B:                                   # @fn3B
 	.endfunc
 .Lfunc_end11:
 	.size	fn3B, .Lfunc_end11-fn3B
-
+                                        # -- End function
 	.section	.text.testB,"ax",@progbits
-	.hidden	testB
+	.hidden	testB                   # -- Begin function testB
 	.globl	testB
 	.type	testB,@function
 testB:                                  # @testB
 	.local  	i32, i32, i32
-# BB#0:                                 # %if.end136
+# BB#0:                                 # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push72=, 0
-	i32.load	$push1=, myrnd.s($pop72)
+	i32.const	$push84=, 0
+	i32.load	$push1=, myrnd.s($pop84)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push71=, $pop3, $pop4
-	tee_local	$push70=, $0=, $pop71
+	i32.add 	$push83=, $pop3, $pop4
+	tee_local	$push82=, $0=, $pop83
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop70, $pop5
+	i32.shr_u	$push6=, $pop82, $pop5
 	i32.store8	sB($pop0), $pop6
+	i32.const	$push81=, 0
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push7=, $0, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$push78=, $pop7, $pop79
+	tee_local	$push77=, $0=, $pop78
+	i32.const	$push76=, 16
+	i32.shr_u	$push8=, $pop77, $pop76
+	i32.store8	sB+1($pop81), $pop8
+	i32.const	$push75=, 0
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push9=, $0, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$push72=, $pop9, $pop73
+	tee_local	$push71=, $0=, $pop72
+	i32.const	$push70=, 16
+	i32.shr_u	$push10=, $pop71, $pop70
+	i32.store8	sB+2($pop75), $pop10
 	i32.const	$push69=, 0
 	i32.const	$push68=, 1103515245
-	i32.mul 	$push7=, $0, $pop68
+	i32.mul 	$push11=, $0, $pop68
 	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop7, $pop67
+	i32.add 	$push66=, $pop11, $pop67
 	tee_local	$push65=, $0=, $pop66
 	i32.const	$push64=, 16
-	i32.shr_u	$push8=, $pop65, $pop64
-	i32.store8	sB+1($pop69), $pop8
+	i32.shr_u	$push12=, $pop65, $pop64
+	i32.store8	sB+3($pop69), $pop12
 	i32.const	$push63=, 0
 	i32.const	$push62=, 1103515245
-	i32.mul 	$push9=, $0, $pop62
+	i32.mul 	$push13=, $0, $pop62
 	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop9, $pop61
+	i32.add 	$push60=, $pop13, $pop61
 	tee_local	$push59=, $0=, $pop60
 	i32.const	$push58=, 16
-	i32.shr_u	$push10=, $pop59, $pop58
-	i32.store8	sB+2($pop63), $pop10
+	i32.shr_u	$push14=, $pop59, $pop58
+	i32.store8	sB+4($pop63), $pop14
 	i32.const	$push57=, 0
 	i32.const	$push56=, 1103515245
-	i32.mul 	$push11=, $0, $pop56
+	i32.mul 	$push15=, $0, $pop56
 	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop11, $pop55
+	i32.add 	$push54=, $pop15, $pop55
 	tee_local	$push53=, $0=, $pop54
 	i32.const	$push52=, 16
-	i32.shr_u	$push12=, $pop53, $pop52
-	i32.store8	sB+3($pop57), $pop12
+	i32.shr_u	$push16=, $pop53, $pop52
+	i32.store8	sB+5($pop57), $pop16
 	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push13=, $0, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop13, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 16
-	i32.shr_u	$push14=, $pop47, $pop46
-	i32.store8	sB+4($pop51), $pop14
-	i32.const	$push45=, 0
-	i32.const	$push44=, 1103515245
-	i32.mul 	$push15=, $0, $pop44
-	i32.const	$push43=, 12345
-	i32.add 	$push42=, $pop15, $pop43
-	tee_local	$push41=, $0=, $pop42
-	i32.const	$push40=, 16
-	i32.shr_u	$push16=, $pop41, $pop40
-	i32.store8	sB+5($pop45), $pop16
-	i32.const	$push39=, 0
-	i32.load16_u	$2=, sB($pop39)
-	i32.const	$push38=, 0
 	i32.const	$push17=, -341751747
 	i32.mul 	$push18=, $0, $pop17
 	i32.const	$push19=, 229283573
-	i32.add 	$push37=, $pop18, $pop19
-	tee_local	$push36=, $0=, $pop37
-	i32.const	$push35=, 1103515245
-	i32.mul 	$push20=, $pop36, $pop35
-	i32.const	$push34=, 12345
-	i32.add 	$push33=, $pop20, $pop34
-	tee_local	$push32=, $1=, $pop33
-	i32.store	myrnd.s($pop38), $pop32
-	i32.const	$push31=, 0
-	i32.const	$push30=, 16
-	i32.shr_u	$push22=, $1, $pop30
-	i32.const	$push29=, 16
-	i32.shr_u	$push21=, $0, $pop29
-	i32.add 	$push23=, $pop22, $pop21
+	i32.add 	$push50=, $pop18, $pop19
+	tee_local	$push49=, $0=, $pop50
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push20=, $pop49, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$push46=, $pop20, $pop47
+	tee_local	$push45=, $1=, $pop46
+	i32.store	myrnd.s($pop51), $pop45
+	i32.const	$push44=, 0
+	i32.const	$push43=, 16
+	i32.shr_u	$push42=, $1, $pop43
+	tee_local	$push41=, $1=, $pop42
+	i32.const	$push21=, 2047
+	i32.and 	$push23=, $pop41, $pop21
+	i32.const	$push40=, 16
+	i32.shr_u	$push39=, $0, $pop40
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 2047
+	i32.and 	$push22=, $pop38, $pop37
+	i32.add 	$push36=, $pop23, $pop22
+	tee_local	$push35=, $2=, $pop36
 	i32.const	$push24=, 5
-	i32.shl 	$push25=, $pop23, $pop24
-	i32.const	$push26=, 31
-	i32.and 	$push27=, $2, $pop26
-	i32.or  	$push28=, $pop25, $pop27
-	i32.store16	sB($pop31), $pop28
-                                        # fallthrough-return
+	i32.shl 	$push25=, $pop35, $pop24
+	i32.const	$push34=, 0
+	i32.load16_u	$push26=, sB($pop34)
+	i32.const	$push27=, 31
+	i32.and 	$push28=, $pop26, $pop27
+	i32.or  	$push29=, $pop25, $pop28
+	i32.store16	sB($pop44), $pop29
+	block   	
+	i32.add 	$push30=, $1, $0
+	i32.xor 	$push31=, $pop30, $2
+	i32.const	$push33=, 2047
+	i32.and 	$push32=, $pop31, $pop33
+	br_if   	0, $pop32       # 0: down to label1
+# BB#1:                                 # %if.end136
+	return
+.LBB12_2:                               # %if.then135
+	end_block                       # label1:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	testB, .Lfunc_end12-testB
-
+                                        # -- End function
 	.section	.text.retmeC,"ax",@progbits
-	.hidden	retmeC
+	.hidden	retmeC                  # -- Begin function retmeC
 	.globl	retmeC
 	.type	retmeC,@function
 retmeC:                                 # @retmeC
@@ -407,9 +443,9 @@ retmeC:                                 # @retmeC
 	.endfunc
 .Lfunc_end13:
 	.size	retmeC, .Lfunc_end13-retmeC
-
+                                        # -- End function
 	.section	.text.fn1C,"ax",@progbits
-	.hidden	fn1C
+	.hidden	fn1C                    # -- Begin function fn1C
 	.globl	fn1C
 	.type	fn1C,@function
 fn1C:                                   # @fn1C
@@ -427,9 +463,9 @@ fn1C:                                   # @fn1C
 	.endfunc
 .Lfunc_end14:
 	.size	fn1C, .Lfunc_end14-fn1C
-
+                                        # -- End function
 	.section	.text.fn2C,"ax",@progbits
-	.hidden	fn2C
+	.hidden	fn2C                    # -- Begin function fn2C
 	.globl	fn2C
 	.type	fn2C,@function
 fn2C:                                   # @fn2C
@@ -449,9 +485,9 @@ fn2C:                                   # @fn2C
 	.endfunc
 .Lfunc_end15:
 	.size	fn2C, .Lfunc_end15-fn2C
-
+                                        # -- End function
 	.section	.text.retitC,"ax",@progbits
-	.hidden	retitC
+	.hidden	retitC                  # -- Begin function retitC
 	.globl	retitC
 	.type	retitC,@function
 retitC:                                 # @retitC
@@ -465,9 +501,9 @@ retitC:                                 # @retitC
 	.endfunc
 .Lfunc_end16:
 	.size	retitC, .Lfunc_end16-retitC
-
+                                        # -- End function
 	.section	.text.fn3C,"ax",@progbits
-	.hidden	fn3C
+	.hidden	fn3C                    # -- Begin function fn3C
 	.globl	fn3C
 	.type	fn3C,@function
 fn3C:                                   # @fn3C
@@ -495,103 +531,121 @@ fn3C:                                   # @fn3C
 	.endfunc
 .Lfunc_end17:
 	.size	fn3C, .Lfunc_end17-fn3C
-
+                                        # -- End function
 	.section	.text.testC,"ax",@progbits
-	.hidden	testC
+	.hidden	testC                   # -- Begin function testC
 	.globl	testC
 	.type	testC,@function
 testC:                                  # @testC
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %if.end142
+# BB#0:                                 # %lor.lhs.false136
 	i32.const	$push0=, 0
-	i32.const	$push72=, 0
-	i32.load	$push1=, myrnd.s($pop72)
+	i32.const	$push84=, 0
+	i32.load	$push1=, myrnd.s($pop84)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push71=, $pop3, $pop4
-	tee_local	$push70=, $0=, $pop71
+	i32.add 	$push83=, $pop3, $pop4
+	tee_local	$push82=, $0=, $pop83
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push5=, $pop82, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$push79=, $pop5, $pop80
+	tee_local	$push78=, $1=, $pop79
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push6=, $pop78, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$push75=, $pop6, $pop76
+	tee_local	$push74=, $2=, $pop75
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push7=, $pop74, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop7, $pop72
+	tee_local	$push70=, $3=, $pop71
 	i32.const	$push69=, 1103515245
-	i32.mul 	$push5=, $pop70, $pop69
+	i32.mul 	$push8=, $pop70, $pop69
 	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop5, $pop68
-	tee_local	$push66=, $1=, $pop67
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push6=, $pop66, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop6, $pop64
-	tee_local	$push62=, $2=, $pop63
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push7=, $pop62, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop7, $pop60
-	tee_local	$push58=, $3=, $pop59
-	i32.const	$push57=, 1103515245
-	i32.mul 	$push8=, $pop58, $pop57
-	i32.const	$push56=, 12345
-	i32.add 	$push55=, $pop8, $pop56
-	tee_local	$push54=, $4=, $pop55
+	i32.add 	$push67=, $pop8, $pop68
+	tee_local	$push66=, $4=, $pop67
 	i32.const	$push9=, 16
-	i32.shr_u	$push10=, $pop54, $pop9
+	i32.shr_u	$push10=, $pop66, $pop9
 	i32.store8	sC+4($pop0), $pop10
+	i32.const	$push65=, 0
+	i32.const	$push64=, 1103515245
+	i32.mul 	$push11=, $4, $pop64
+	i32.const	$push63=, 12345
+	i32.add 	$push62=, $pop11, $pop63
+	tee_local	$push61=, $4=, $pop62
+	i32.const	$push60=, 16
+	i32.shr_u	$push12=, $pop61, $pop60
+	i32.store8	sC+5($pop65), $pop12
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push13=, $0, $pop58
+	i32.store8	sC($pop59), $pop13
+	i32.const	$push57=, 0
+	i32.const	$push56=, 16
+	i32.shr_u	$push14=, $1, $pop56
+	i32.store8	sC+1($pop57), $pop14
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push15=, $2, $pop54
+	i32.store8	sC+2($pop55), $pop15
 	i32.const	$push53=, 0
-	i32.const	$push52=, 1103515245
-	i32.mul 	$push11=, $4, $pop52
-	i32.const	$push51=, 12345
-	i32.add 	$push50=, $pop11, $pop51
-	tee_local	$push49=, $4=, $pop50
-	i32.const	$push48=, 16
-	i32.shr_u	$push12=, $pop49, $pop48
-	i32.store8	sC+5($pop53), $pop12
-	i32.const	$push47=, 0
-	i32.const	$push46=, 16
-	i32.shr_u	$push13=, $0, $pop46
-	i32.store8	sC($pop47), $pop13
-	i32.const	$push45=, 0
-	i32.const	$push44=, 16
-	i32.shr_u	$push14=, $1, $pop44
-	i32.store8	sC+1($pop45), $pop14
-	i32.const	$push43=, 0
-	i32.const	$push42=, 16
-	i32.shr_u	$push15=, $2, $pop42
-	i32.store8	sC+2($pop43), $pop15
-	i32.const	$push41=, 0
-	i32.const	$push40=, 16
-	i32.shr_u	$push16=, $3, $pop40
-	i32.store8	sC+3($pop41), $pop16
-	i32.const	$push39=, 0
-	i32.load16_u	$0=, sC+4($pop39)
-	i32.const	$push38=, 0
+	i32.const	$push52=, 16
+	i32.shr_u	$push16=, $3, $pop52
+	i32.store8	sC+3($pop53), $pop16
+	i32.const	$push51=, 0
 	i32.const	$push17=, -341751747
 	i32.mul 	$push18=, $4, $pop17
 	i32.const	$push19=, 229283573
-	i32.add 	$push37=, $pop18, $pop19
-	tee_local	$push36=, $1=, $pop37
-	i32.const	$push35=, 1103515245
-	i32.mul 	$push20=, $pop36, $pop35
-	i32.const	$push34=, 12345
-	i32.add 	$push33=, $pop20, $pop34
-	tee_local	$push32=, $2=, $pop33
-	i32.store	myrnd.s($pop38), $pop32
-	i32.const	$push31=, 0
-	i32.const	$push30=, 16
-	i32.shr_u	$push22=, $2, $pop30
-	i32.const	$push29=, 16
-	i32.shr_u	$push21=, $1, $pop29
-	i32.add 	$push23=, $pop22, $pop21
+	i32.add 	$push50=, $pop18, $pop19
+	tee_local	$push49=, $0=, $pop50
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push20=, $pop49, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$push46=, $pop20, $pop47
+	tee_local	$push45=, $1=, $pop46
+	i32.store	myrnd.s($pop51), $pop45
+	i32.const	$push44=, 0
+	i32.const	$push43=, 16
+	i32.shr_u	$push42=, $1, $pop43
+	tee_local	$push41=, $1=, $pop42
+	i32.const	$push21=, 2047
+	i32.and 	$push23=, $pop41, $pop21
+	i32.const	$push40=, 16
+	i32.shr_u	$push39=, $0, $pop40
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 2047
+	i32.and 	$push22=, $pop38, $pop37
+	i32.add 	$push36=, $pop23, $pop22
+	tee_local	$push35=, $2=, $pop36
 	i32.const	$push24=, 5
-	i32.shl 	$push25=, $pop23, $pop24
-	i32.const	$push26=, 31
-	i32.and 	$push27=, $0, $pop26
-	i32.or  	$push28=, $pop25, $pop27
-	i32.store16	sC+4($pop31), $pop28
-                                        # fallthrough-return
+	i32.shl 	$push25=, $pop35, $pop24
+	i32.const	$push34=, 0
+	i32.load16_u	$push26=, sC+4($pop34)
+	i32.const	$push27=, 31
+	i32.and 	$push28=, $pop26, $pop27
+	i32.or  	$push29=, $pop25, $pop28
+	i32.store16	sC+4($pop44), $pop29
+	block   	
+	i32.add 	$push30=, $1, $0
+	i32.xor 	$push31=, $pop30, $2
+	i32.const	$push33=, 2047
+	i32.and 	$push32=, $pop31, $pop33
+	br_if   	0, $pop32       # 0: down to label2
+# BB#1:                                 # %if.end142
+	return
+.LBB18_2:                               # %if.then141
+	end_block                       # label2:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end18:
 	.size	testC, .Lfunc_end18-testC
-
+                                        # -- End function
 	.section	.text.retmeD,"ax",@progbits
-	.hidden	retmeD
+	.hidden	retmeD                  # -- Begin function retmeD
 	.globl	retmeD
 	.type	retmeD,@function
 retmeD:                                 # @retmeD
@@ -603,9 +657,9 @@ retmeD:                                 # @retmeD
 	.endfunc
 .Lfunc_end19:
 	.size	retmeD, .Lfunc_end19-retmeD
-
+                                        # -- End function
 	.section	.text.fn1D,"ax",@progbits
-	.hidden	fn1D
+	.hidden	fn1D                    # -- Begin function fn1D
 	.globl	fn1D
 	.type	fn1D,@function
 fn1D:                                   # @fn1D
@@ -624,9 +678,9 @@ fn1D:                                   # @fn1D
 	.endfunc
 .Lfunc_end20:
 	.size	fn1D, .Lfunc_end20-fn1D
-
+                                        # -- End function
 	.section	.text.fn2D,"ax",@progbits
-	.hidden	fn2D
+	.hidden	fn2D                    # -- Begin function fn2D
 	.globl	fn2D
 	.type	fn2D,@function
 fn2D:                                   # @fn2D
@@ -647,9 +701,9 @@ fn2D:                                   # @fn2D
 	.endfunc
 .Lfunc_end21:
 	.size	fn2D, .Lfunc_end21-fn2D
-
+                                        # -- End function
 	.section	.text.retitD,"ax",@progbits
-	.hidden	retitD
+	.hidden	retitD                  # -- Begin function retitD
 	.globl	retitD
 	.type	retitD,@function
 retitD:                                 # @retitD
@@ -664,9 +718,9 @@ retitD:                                 # @retitD
 	.endfunc
 .Lfunc_end22:
 	.size	retitD, .Lfunc_end22-retitD
-
+                                        # -- End function
 	.section	.text.fn3D,"ax",@progbits
-	.hidden	fn3D
+	.hidden	fn3D                    # -- Begin function fn3D
 	.globl	fn3D
 	.type	fn3D,@function
 fn3D:                                   # @fn3D
@@ -696,126 +750,126 @@ fn3D:                                   # @fn3D
 	.endfunc
 .Lfunc_end23:
 	.size	fn3D, .Lfunc_end23-fn3D
-
+                                        # -- End function
 	.section	.text.testD,"ax",@progbits
-	.hidden	testD
+	.hidden	testD                   # -- Begin function testD
 	.globl	testD
 	.type	testD,@function
 testD:                                  # @testD
-	.local  	i32, i32, i64
+	.local  	i32, i32
 # BB#0:                                 # %if.end158
 	i32.const	$push0=, 0
-	i32.const	$push93=, 0
-	i32.load	$push1=, myrnd.s($pop93)
+	i32.const	$push94=, 0
+	i32.load	$push1=, myrnd.s($pop94)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push92=, $pop3, $pop4
-	tee_local	$push91=, $0=, $pop92
+	i32.add 	$push93=, $pop3, $pop4
+	tee_local	$push92=, $0=, $pop93
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop91, $pop5
+	i32.shr_u	$push6=, $pop92, $pop5
 	i32.store8	sD($pop0), $pop6
-	i32.const	$push90=, 0
-	i32.const	$push89=, 1103515245
-	i32.mul 	$push7=, $0, $pop89
-	i32.const	$push88=, 12345
-	i32.add 	$push87=, $pop7, $pop88
-	tee_local	$push86=, $0=, $pop87
-	i32.const	$push85=, 16
-	i32.shr_u	$push8=, $pop86, $pop85
-	i32.store8	sD+1($pop90), $pop8
-	i32.const	$push84=, 0
-	i32.const	$push83=, 1103515245
-	i32.mul 	$push9=, $0, $pop83
-	i32.const	$push82=, 12345
-	i32.add 	$push81=, $pop9, $pop82
-	tee_local	$push80=, $0=, $pop81
-	i32.const	$push79=, 16
-	i32.shr_u	$push10=, $pop80, $pop79
-	i32.store8	sD+2($pop84), $pop10
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push11=, $0, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop11, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 16
-	i32.shr_u	$push12=, $pop74, $pop73
-	i32.store8	sD+3($pop78), $pop12
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push13=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop13, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 16
-	i32.shr_u	$push14=, $pop68, $pop67
-	i32.store8	sD+4($pop72), $pop14
-	i32.const	$push66=, 0
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push15=, $0, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop15, $pop64
-	tee_local	$push62=, $0=, $pop63
-	i32.const	$push61=, 16
-	i32.shr_u	$push16=, $pop62, $pop61
-	i32.store8	sD+5($pop66), $pop16
-	i32.const	$push60=, 0
-	i32.const	$push59=, 1103515245
-	i32.mul 	$push17=, $0, $pop59
-	i32.const	$push58=, 12345
-	i32.add 	$push57=, $pop17, $pop58
-	tee_local	$push56=, $0=, $pop57
-	i32.const	$push55=, 16
-	i32.shr_u	$push18=, $pop56, $pop55
-	i32.store8	sD+6($pop60), $pop18
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push19=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop19, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push20=, $pop50, $pop49
-	i32.store8	sD+7($pop54), $pop20
-	i32.const	$push48=, 0
-	i64.load	$2=, sD($pop48)
-	i32.const	$push47=, 0
+	i32.const	$push91=, 0
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push7=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$push88=, $pop7, $pop89
+	tee_local	$push87=, $0=, $pop88
+	i32.const	$push86=, 16
+	i32.shr_u	$push8=, $pop87, $pop86
+	i32.store8	sD+1($pop91), $pop8
+	i32.const	$push85=, 0
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push9=, $0, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop9, $pop83
+	tee_local	$push81=, $0=, $pop82
+	i32.const	$push80=, 16
+	i32.shr_u	$push10=, $pop81, $pop80
+	i32.store8	sD+2($pop85), $pop10
+	i32.const	$push79=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push11=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop11, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push12=, $pop75, $pop74
+	i32.store8	sD+3($pop79), $pop12
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push13=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop13, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push14=, $pop69, $pop68
+	i32.store8	sD+4($pop73), $pop14
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push15=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop15, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push16=, $pop63, $pop62
+	i32.store8	sD+5($pop67), $pop16
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push17=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop17, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push18=, $pop57, $pop56
+	i32.store8	sD+6($pop61), $pop18
+	i32.const	$push55=, 0
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push19=, $0, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$push52=, $pop19, $pop53
+	tee_local	$push51=, $0=, $pop52
+	i32.const	$push50=, 16
+	i32.shr_u	$push20=, $pop51, $pop50
+	i32.store8	sD+7($pop55), $pop20
+	i32.const	$push49=, 0
 	i32.const	$push21=, -341751747
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, 229283573
-	i32.add 	$push46=, $pop22, $pop23
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, 1103515245
-	i32.mul 	$push24=, $pop45, $pop44
-	i32.const	$push43=, 12345
-	i32.add 	$push42=, $pop24, $pop43
-	tee_local	$push41=, $1=, $pop42
-	i32.store	myrnd.s($pop47), $pop41
-	i32.const	$push40=, 0
-	i32.const	$push39=, 16
-	i32.shr_u	$push28=, $1, $pop39
+	i32.add 	$push48=, $pop22, $pop23
+	tee_local	$push47=, $0=, $pop48
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push24=, $pop47, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$push44=, $pop24, $pop45
+	tee_local	$push43=, $1=, $pop44
+	i32.store	myrnd.s($pop49), $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push28=, $1, $pop41
 	i32.const	$push26=, 2047
 	i32.and 	$push29=, $pop28, $pop26
-	i32.const	$push38=, 16
-	i32.shr_u	$push25=, $0, $pop38
-	i32.const	$push37=, 2047
-	i32.and 	$push27=, $pop25, $pop37
+	i32.const	$push40=, 16
+	i32.shr_u	$push25=, $0, $pop40
+	i32.const	$push39=, 2047
+	i32.and 	$push27=, $pop25, $pop39
 	i32.add 	$push30=, $pop29, $pop27
 	i64.extend_u/i32	$push31=, $pop30
 	i64.const	$push32=, 35
 	i64.shl 	$push33=, $pop31, $pop32
-	i64.const	$push34=, 34359738367
-	i64.and 	$push35=, $2, $pop34
-	i64.or  	$push36=, $pop33, $pop35
-	i64.store	sD($pop40), $pop36
+	i32.const	$push38=, 0
+	i64.load	$push34=, sD($pop38)
+	i64.const	$push35=, 34359738367
+	i64.and 	$push36=, $pop34, $pop35
+	i64.or  	$push37=, $pop33, $pop36
+	i64.store	sD($pop42), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end24:
 	.size	testD, .Lfunc_end24-testD
-
+                                        # -- End function
 	.section	.text.retmeE,"ax",@progbits
-	.hidden	retmeE
+	.hidden	retmeE                  # -- Begin function retmeE
 	.globl	retmeE
 	.type	retmeE,@function
 retmeE:                                 # @retmeE
@@ -833,9 +887,9 @@ retmeE:                                 # @retmeE
 	.endfunc
 .Lfunc_end25:
 	.size	retmeE, .Lfunc_end25-retmeE
-
+                                        # -- End function
 	.section	.text.fn1E,"ax",@progbits
-	.hidden	fn1E
+	.hidden	fn1E                    # -- Begin function fn1E
 	.globl	fn1E
 	.type	fn1E,@function
 fn1E:                                   # @fn1E
@@ -854,9 +908,9 @@ fn1E:                                   # @fn1E
 	.endfunc
 .Lfunc_end26:
 	.size	fn1E, .Lfunc_end26-fn1E
-
+                                        # -- End function
 	.section	.text.fn2E,"ax",@progbits
-	.hidden	fn2E
+	.hidden	fn2E                    # -- Begin function fn2E
 	.globl	fn2E
 	.type	fn2E,@function
 fn2E:                                   # @fn2E
@@ -877,9 +931,9 @@ fn2E:                                   # @fn2E
 	.endfunc
 .Lfunc_end27:
 	.size	fn2E, .Lfunc_end27-fn2E
-
+                                        # -- End function
 	.section	.text.retitE,"ax",@progbits
-	.hidden	retitE
+	.hidden	retitE                  # -- Begin function retitE
 	.globl	retitE
 	.type	retitE,@function
 retitE:                                 # @retitE
@@ -894,9 +948,9 @@ retitE:                                 # @retitE
 	.endfunc
 .Lfunc_end28:
 	.size	retitE, .Lfunc_end28-retitE
-
+                                        # -- End function
 	.section	.text.fn3E,"ax",@progbits
-	.hidden	fn3E
+	.hidden	fn3E                    # -- Begin function fn3E
 	.globl	fn3E
 	.type	fn3E,@function
 fn3E:                                   # @fn3E
@@ -926,198 +980,198 @@ fn3E:                                   # @fn3E
 	.endfunc
 .Lfunc_end29:
 	.size	fn3E, .Lfunc_end29-fn3E
-
+                                        # -- End function
 	.section	.text.testE,"ax",@progbits
-	.hidden	testE
+	.hidden	testE                   # -- Begin function testE
 	.globl	testE
 	.type	testE,@function
 testE:                                  # @testE
-	.local  	i32, i32, i64
-# BB#0:                                 # %if.end142
+	.local  	i32, i32
+# BB#0:                                 # %if.end95
 	i32.const	$push0=, 0
-	i32.const	$push157=, 0
-	i32.load	$push1=, myrnd.s($pop157)
+	i32.const	$push158=, 0
+	i32.load	$push1=, myrnd.s($pop158)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push156=, $pop3, $pop4
-	tee_local	$push155=, $0=, $pop156
+	i32.add 	$push157=, $pop3, $pop4
+	tee_local	$push156=, $0=, $pop157
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop155, $pop5
+	i32.shr_u	$push6=, $pop156, $pop5
 	i32.store8	sE($pop0), $pop6
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push7=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop7, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push8=, $pop150, $pop149
-	i32.store8	sE+1($pop154), $pop8
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push9=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop9, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push10=, $pop144, $pop143
-	i32.store8	sE+2($pop148), $pop10
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push11=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop11, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push12=, $pop138, $pop137
-	i32.store8	sE+3($pop142), $pop12
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push13=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop13, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push14=, $pop132, $pop131
-	i32.store8	sE+4($pop136), $pop14
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push15=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop15, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push16=, $pop126, $pop125
-	i32.store8	sE+5($pop130), $pop16
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push17=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop17, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push18=, $pop120, $pop119
-	i32.store8	sE+6($pop124), $pop18
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push19=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop19, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push20=, $pop114, $pop113
-	i32.store8	sE+7($pop118), $pop20
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push21=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop21, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push22=, $pop108, $pop107
-	i32.store8	sE+8($pop112), $pop22
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push23=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop23, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push24=, $pop102, $pop101
-	i32.store8	sE+9($pop106), $pop24
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push25=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop25, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push26=, $pop96, $pop95
-	i32.store8	sE+10($pop100), $pop26
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push27=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop27, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push28=, $pop90, $pop89
-	i32.store8	sE+11($pop94), $pop28
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push29=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop29, $pop86
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push30=, $pop84, $pop83
-	i32.store8	sE+12($pop88), $pop30
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push31=, $0, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop31, $pop80
-	tee_local	$push78=, $0=, $pop79
-	i32.const	$push77=, 16
-	i32.shr_u	$push32=, $pop78, $pop77
-	i32.store8	sE+13($pop82), $pop32
-	i32.const	$push76=, 0
-	i32.const	$push75=, 1103515245
-	i32.mul 	$push33=, $0, $pop75
-	i32.const	$push74=, 12345
-	i32.add 	$push73=, $pop33, $pop74
-	tee_local	$push72=, $0=, $pop73
-	i32.const	$push71=, 16
-	i32.shr_u	$push34=, $pop72, $pop71
-	i32.store8	sE+14($pop76), $pop34
-	i32.const	$push70=, 0
-	i32.const	$push69=, 1103515245
-	i32.mul 	$push35=, $0, $pop69
-	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop35, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.const	$push65=, 16
-	i32.shr_u	$push36=, $pop66, $pop65
-	i32.store8	sE+15($pop70), $pop36
-	i32.const	$push64=, 0
-	i64.load	$2=, sE+8($pop64)
-	i32.const	$push63=, 0
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push7=, $0, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop7, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push8=, $pop151, $pop150
+	i32.store8	sE+1($pop155), $pop8
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push9=, $0, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop9, $pop147
+	tee_local	$push145=, $0=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push10=, $pop145, $pop144
+	i32.store8	sE+2($pop149), $pop10
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push11=, $0, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop11, $pop141
+	tee_local	$push139=, $0=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push12=, $pop139, $pop138
+	i32.store8	sE+3($pop143), $pop12
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push13=, $0, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop13, $pop135
+	tee_local	$push133=, $0=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push14=, $pop133, $pop132
+	i32.store8	sE+4($pop137), $pop14
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push15=, $0, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop15, $pop129
+	tee_local	$push127=, $0=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $pop127, $pop126
+	i32.store8	sE+5($pop131), $pop16
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push17=, $0, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop17, $pop123
+	tee_local	$push121=, $0=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push18=, $pop121, $pop120
+	i32.store8	sE+6($pop125), $pop18
+	i32.const	$push119=, 0
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push19=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$push116=, $pop19, $pop117
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 16
+	i32.shr_u	$push20=, $pop115, $pop114
+	i32.store8	sE+7($pop119), $pop20
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1103515245
+	i32.mul 	$push21=, $0, $pop112
+	i32.const	$push111=, 12345
+	i32.add 	$push110=, $pop21, $pop111
+	tee_local	$push109=, $0=, $pop110
+	i32.const	$push108=, 16
+	i32.shr_u	$push22=, $pop109, $pop108
+	i32.store8	sE+8($pop113), $pop22
+	i32.const	$push107=, 0
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push23=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$push104=, $pop23, $pop105
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 16
+	i32.shr_u	$push24=, $pop103, $pop102
+	i32.store8	sE+9($pop107), $pop24
+	i32.const	$push101=, 0
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push25=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop25, $pop99
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 16
+	i32.shr_u	$push26=, $pop97, $pop96
+	i32.store8	sE+10($pop101), $pop26
+	i32.const	$push95=, 0
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push27=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$push92=, $pop27, $pop93
+	tee_local	$push91=, $0=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push28=, $pop91, $pop90
+	i32.store8	sE+11($pop95), $pop28
+	i32.const	$push89=, 0
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push29=, $0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop29, $pop87
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push30=, $pop85, $pop84
+	i32.store8	sE+12($pop89), $pop30
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push31=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop31, $pop81
+	tee_local	$push79=, $0=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push32=, $pop79, $pop78
+	i32.store8	sE+13($pop83), $pop32
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push33=, $0, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop33, $pop75
+	tee_local	$push73=, $0=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push34=, $pop73, $pop72
+	i32.store8	sE+14($pop77), $pop34
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push35=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop35, $pop69
+	tee_local	$push67=, $0=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push36=, $pop67, $pop66
+	i32.store8	sE+15($pop71), $pop36
+	i32.const	$push65=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push62=, $pop38, $pop39
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 1103515245
-	i32.mul 	$push40=, $pop61, $pop60
-	i32.const	$push59=, 12345
-	i32.add 	$push58=, $pop40, $pop59
-	tee_local	$push57=, $1=, $pop58
-	i32.store	myrnd.s($pop63), $pop57
-	i32.const	$push56=, 0
-	i32.const	$push55=, 16
-	i32.shr_u	$push44=, $1, $pop55
+	i32.add 	$push64=, $pop38, $pop39
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push40=, $pop63, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop40, $pop61
+	tee_local	$push59=, $1=, $pop60
+	i32.store	myrnd.s($pop65), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push44=, $1, $pop57
 	i32.const	$push42=, 2047
 	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push54=, 16
-	i32.shr_u	$push41=, $0, $pop54
-	i32.const	$push53=, 2047
-	i32.and 	$push43=, $pop41, $pop53
+	i32.const	$push56=, 16
+	i32.shr_u	$push41=, $0, $pop56
+	i32.const	$push55=, 2047
+	i32.and 	$push43=, $pop41, $pop55
 	i32.add 	$push46=, $pop45, $pop43
 	i64.extend_u/i32	$push47=, $pop46
 	i64.const	$push48=, 35
 	i64.shl 	$push49=, $pop47, $pop48
-	i64.const	$push50=, 34359738367
-	i64.and 	$push51=, $2, $pop50
-	i64.or  	$push52=, $pop49, $pop51
-	i64.store	sE+8($pop56), $pop52
+	i32.const	$push54=, 0
+	i64.load	$push50=, sE+8($pop54)
+	i64.const	$push51=, 34359738367
+	i64.and 	$push52=, $pop50, $pop51
+	i64.or  	$push53=, $pop49, $pop52
+	i64.store	sE+8($pop58), $pop53
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end30:
 	.size	testE, .Lfunc_end30-testE
-
+                                        # -- End function
 	.section	.text.retmeF,"ax",@progbits
-	.hidden	retmeF
+	.hidden	retmeF                  # -- Begin function retmeF
 	.globl	retmeF
 	.type	retmeF,@function
 retmeF:                                 # @retmeF
@@ -1135,9 +1189,9 @@ retmeF:                                 # @retmeF
 	.endfunc
 .Lfunc_end31:
 	.size	retmeF, .Lfunc_end31-retmeF
-
+                                        # -- End function
 	.section	.text.fn1F,"ax",@progbits
-	.hidden	fn1F
+	.hidden	fn1F                    # -- Begin function fn1F
 	.globl	fn1F
 	.type	fn1F,@function
 fn1F:                                   # @fn1F
@@ -1156,9 +1210,9 @@ fn1F:                                   # @fn1F
 	.endfunc
 .Lfunc_end32:
 	.size	fn1F, .Lfunc_end32-fn1F
-
+                                        # -- End function
 	.section	.text.fn2F,"ax",@progbits
-	.hidden	fn2F
+	.hidden	fn2F                    # -- Begin function fn2F
 	.globl	fn2F
 	.type	fn2F,@function
 fn2F:                                   # @fn2F
@@ -1179,9 +1233,9 @@ fn2F:                                   # @fn2F
 	.endfunc
 .Lfunc_end33:
 	.size	fn2F, .Lfunc_end33-fn2F
-
+                                        # -- End function
 	.section	.text.retitF,"ax",@progbits
-	.hidden	retitF
+	.hidden	retitF                  # -- Begin function retitF
 	.globl	retitF
 	.type	retitF,@function
 retitF:                                 # @retitF
@@ -1196,9 +1250,9 @@ retitF:                                 # @retitF
 	.endfunc
 .Lfunc_end34:
 	.size	retitF, .Lfunc_end34-retitF
-
+                                        # -- End function
 	.section	.text.fn3F,"ax",@progbits
-	.hidden	fn3F
+	.hidden	fn3F                    # -- Begin function fn3F
 	.globl	fn3F
 	.type	fn3F,@function
 fn3F:                                   # @fn3F
@@ -1228,198 +1282,198 @@ fn3F:                                   # @fn3F
 	.endfunc
 .Lfunc_end35:
 	.size	fn3F, .Lfunc_end35-fn3F
-
+                                        # -- End function
 	.section	.text.testF,"ax",@progbits
-	.hidden	testF
+	.hidden	testF                   # -- Begin function testF
 	.globl	testF
 	.type	testF,@function
 testF:                                  # @testF
-	.local  	i32, i32, i64
-# BB#0:                                 # %if.end136
+	.local  	i32, i32
+# BB#0:                                 # %if.end91
 	i32.const	$push0=, 0
-	i32.const	$push157=, 0
-	i32.load	$push1=, myrnd.s($pop157)
+	i32.const	$push158=, 0
+	i32.load	$push1=, myrnd.s($pop158)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push156=, $pop3, $pop4
-	tee_local	$push155=, $0=, $pop156
+	i32.add 	$push157=, $pop3, $pop4
+	tee_local	$push156=, $0=, $pop157
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop155, $pop5
+	i32.shr_u	$push6=, $pop156, $pop5
 	i32.store8	sF($pop0), $pop6
-	i32.const	$push154=, 0
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push7=, $0, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop7, $pop152
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 16
-	i32.shr_u	$push8=, $pop150, $pop149
-	i32.store8	sF+1($pop154), $pop8
-	i32.const	$push148=, 0
-	i32.const	$push147=, 1103515245
-	i32.mul 	$push9=, $0, $pop147
-	i32.const	$push146=, 12345
-	i32.add 	$push145=, $pop9, $pop146
-	tee_local	$push144=, $0=, $pop145
-	i32.const	$push143=, 16
-	i32.shr_u	$push10=, $pop144, $pop143
-	i32.store8	sF+2($pop148), $pop10
-	i32.const	$push142=, 0
-	i32.const	$push141=, 1103515245
-	i32.mul 	$push11=, $0, $pop141
-	i32.const	$push140=, 12345
-	i32.add 	$push139=, $pop11, $pop140
-	tee_local	$push138=, $0=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push12=, $pop138, $pop137
-	i32.store8	sF+3($pop142), $pop12
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push13=, $0, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop13, $pop134
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push14=, $pop132, $pop131
-	i32.store8	sF+4($pop136), $pop14
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push15=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop15, $pop128
-	tee_local	$push126=, $0=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push16=, $pop126, $pop125
-	i32.store8	sF+5($pop130), $pop16
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push17=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop17, $pop122
-	tee_local	$push120=, $0=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push18=, $pop120, $pop119
-	i32.store8	sF+6($pop124), $pop18
-	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push19=, $0, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop19, $pop116
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push20=, $pop114, $pop113
-	i32.store8	sF+7($pop118), $pop20
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push21=, $0, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop21, $pop110
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push22=, $pop108, $pop107
-	i32.store8	sF+8($pop112), $pop22
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push23=, $0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop23, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push24=, $pop102, $pop101
-	i32.store8	sF+9($pop106), $pop24
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push25=, $0, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop25, $pop98
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push26=, $pop96, $pop95
-	i32.store8	sF+10($pop100), $pop26
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push27=, $0, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop27, $pop92
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push28=, $pop90, $pop89
-	i32.store8	sF+11($pop94), $pop28
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push29=, $0, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop29, $pop86
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push30=, $pop84, $pop83
-	i32.store8	sF+12($pop88), $pop30
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push31=, $0, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop31, $pop80
-	tee_local	$push78=, $0=, $pop79
-	i32.const	$push77=, 16
-	i32.shr_u	$push32=, $pop78, $pop77
-	i32.store8	sF+13($pop82), $pop32
-	i32.const	$push76=, 0
-	i32.const	$push75=, 1103515245
-	i32.mul 	$push33=, $0, $pop75
-	i32.const	$push74=, 12345
-	i32.add 	$push73=, $pop33, $pop74
-	tee_local	$push72=, $0=, $pop73
-	i32.const	$push71=, 16
-	i32.shr_u	$push34=, $pop72, $pop71
-	i32.store8	sF+14($pop76), $pop34
-	i32.const	$push70=, 0
-	i32.const	$push69=, 1103515245
-	i32.mul 	$push35=, $0, $pop69
-	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop35, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.const	$push65=, 16
-	i32.shr_u	$push36=, $pop66, $pop65
-	i32.store8	sF+15($pop70), $pop36
-	i32.const	$push64=, 0
-	i64.load	$2=, sF($pop64)
-	i32.const	$push63=, 0
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push7=, $0, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop7, $pop153
+	tee_local	$push151=, $0=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push8=, $pop151, $pop150
+	i32.store8	sF+1($pop155), $pop8
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push9=, $0, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop9, $pop147
+	tee_local	$push145=, $0=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push10=, $pop145, $pop144
+	i32.store8	sF+2($pop149), $pop10
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push11=, $0, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop11, $pop141
+	tee_local	$push139=, $0=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push12=, $pop139, $pop138
+	i32.store8	sF+3($pop143), $pop12
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push13=, $0, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop13, $pop135
+	tee_local	$push133=, $0=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push14=, $pop133, $pop132
+	i32.store8	sF+4($pop137), $pop14
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push15=, $0, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop15, $pop129
+	tee_local	$push127=, $0=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $pop127, $pop126
+	i32.store8	sF+5($pop131), $pop16
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push17=, $0, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop17, $pop123
+	tee_local	$push121=, $0=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push18=, $pop121, $pop120
+	i32.store8	sF+6($pop125), $pop18
+	i32.const	$push119=, 0
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push19=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$push116=, $pop19, $pop117
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 16
+	i32.shr_u	$push20=, $pop115, $pop114
+	i32.store8	sF+7($pop119), $pop20
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1103515245
+	i32.mul 	$push21=, $0, $pop112
+	i32.const	$push111=, 12345
+	i32.add 	$push110=, $pop21, $pop111
+	tee_local	$push109=, $0=, $pop110
+	i32.const	$push108=, 16
+	i32.shr_u	$push22=, $pop109, $pop108
+	i32.store8	sF+8($pop113), $pop22
+	i32.const	$push107=, 0
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push23=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$push104=, $pop23, $pop105
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 16
+	i32.shr_u	$push24=, $pop103, $pop102
+	i32.store8	sF+9($pop107), $pop24
+	i32.const	$push101=, 0
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push25=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop25, $pop99
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 16
+	i32.shr_u	$push26=, $pop97, $pop96
+	i32.store8	sF+10($pop101), $pop26
+	i32.const	$push95=, 0
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push27=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$push92=, $pop27, $pop93
+	tee_local	$push91=, $0=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push28=, $pop91, $pop90
+	i32.store8	sF+11($pop95), $pop28
+	i32.const	$push89=, 0
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push29=, $0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop29, $pop87
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push30=, $pop85, $pop84
+	i32.store8	sF+12($pop89), $pop30
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push31=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop31, $pop81
+	tee_local	$push79=, $0=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push32=, $pop79, $pop78
+	i32.store8	sF+13($pop83), $pop32
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push33=, $0, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop33, $pop75
+	tee_local	$push73=, $0=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push34=, $pop73, $pop72
+	i32.store8	sF+14($pop77), $pop34
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push35=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop35, $pop69
+	tee_local	$push67=, $0=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push36=, $pop67, $pop66
+	i32.store8	sF+15($pop71), $pop36
+	i32.const	$push65=, 0
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	i32.add 	$push62=, $pop38, $pop39
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 1103515245
-	i32.mul 	$push40=, $pop61, $pop60
-	i32.const	$push59=, 12345
-	i32.add 	$push58=, $pop40, $pop59
-	tee_local	$push57=, $1=, $pop58
-	i32.store	myrnd.s($pop63), $pop57
-	i32.const	$push56=, 0
-	i32.const	$push55=, 16
-	i32.shr_u	$push44=, $1, $pop55
+	i32.add 	$push64=, $pop38, $pop39
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push40=, $pop63, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop40, $pop61
+	tee_local	$push59=, $1=, $pop60
+	i32.store	myrnd.s($pop65), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push44=, $1, $pop57
 	i32.const	$push42=, 2047
 	i32.and 	$push45=, $pop44, $pop42
-	i32.const	$push54=, 16
-	i32.shr_u	$push41=, $0, $pop54
-	i32.const	$push53=, 2047
-	i32.and 	$push43=, $pop41, $pop53
+	i32.const	$push56=, 16
+	i32.shr_u	$push41=, $0, $pop56
+	i32.const	$push55=, 2047
+	i32.and 	$push43=, $pop41, $pop55
 	i32.add 	$push46=, $pop45, $pop43
 	i64.extend_u/i32	$push47=, $pop46
 	i64.const	$push48=, 35
 	i64.shl 	$push49=, $pop47, $pop48
-	i64.const	$push50=, 34359738367
-	i64.and 	$push51=, $2, $pop50
-	i64.or  	$push52=, $pop49, $pop51
-	i64.store	sF($pop56), $pop52
+	i32.const	$push54=, 0
+	i64.load	$push50=, sF($pop54)
+	i64.const	$push51=, 34359738367
+	i64.and 	$push52=, $pop50, $pop51
+	i64.or  	$push53=, $pop49, $pop52
+	i64.store	sF($pop58), $pop53
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end36:
 	.size	testF, .Lfunc_end36-testF
-
+                                        # -- End function
 	.section	.text.retmeG,"ax",@progbits
-	.hidden	retmeG
+	.hidden	retmeG                  # -- Begin function retmeG
 	.globl	retmeG
 	.type	retmeG,@function
 retmeG:                                 # @retmeG
@@ -1437,9 +1491,9 @@ retmeG:                                 # @retmeG
 	.endfunc
 .Lfunc_end37:
 	.size	retmeG, .Lfunc_end37-retmeG
-
+                                        # -- End function
 	.section	.text.fn1G,"ax",@progbits
-	.hidden	fn1G
+	.hidden	fn1G                    # -- Begin function fn1G
 	.globl	fn1G
 	.type	fn1G,@function
 fn1G:                                   # @fn1G
@@ -1457,9 +1511,9 @@ fn1G:                                   # @fn1G
 	.endfunc
 .Lfunc_end38:
 	.size	fn1G, .Lfunc_end38-fn1G
-
+                                        # -- End function
 	.section	.text.fn2G,"ax",@progbits
-	.hidden	fn2G
+	.hidden	fn2G                    # -- Begin function fn2G
 	.globl	fn2G
 	.type	fn2G,@function
 fn2G:                                   # @fn2G
@@ -1479,9 +1533,9 @@ fn2G:                                   # @fn2G
 	.endfunc
 .Lfunc_end39:
 	.size	fn2G, .Lfunc_end39-fn2G
-
+                                        # -- End function
 	.section	.text.retitG,"ax",@progbits
-	.hidden	retitG
+	.hidden	retitG                  # -- Begin function retitG
 	.globl	retitG
 	.type	retitG,@function
 retitG:                                 # @retitG
@@ -1495,9 +1549,9 @@ retitG:                                 # @retitG
 	.endfunc
 .Lfunc_end40:
 	.size	retitG, .Lfunc_end40-retitG
-
+                                        # -- End function
 	.section	.text.fn3G,"ax",@progbits
-	.hidden	fn3G
+	.hidden	fn3G                    # -- Begin function fn3G
 	.globl	fn3G
 	.type	fn3G,@function
 fn3G:                                   # @fn3G
@@ -1525,126 +1579,144 @@ fn3G:                                   # @fn3G
 	.endfunc
 .Lfunc_end41:
 	.size	fn3G, .Lfunc_end41-fn3G
-
+                                        # -- End function
 	.section	.text.testG,"ax",@progbits
-	.hidden	testG
+	.hidden	testG                   # -- Begin function testG
 	.globl	testG
 	.type	testG,@function
 testG:                                  # @testG
-	.local  	i32, i32, i32
-# BB#0:                                 # %if.end155
+	.local  	i32, i32, i32, i32
+# BB#0:                                 # %lor.lhs.false149
 	i32.const	$push0=, 0
-	i32.const	$push94=, 0
-	i32.load	$push1=, myrnd.s($pop94)
+	i32.const	$push105=, 0
+	i32.load	$push1=, myrnd.s($pop105)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push93=, $pop3, $pop4
-	tee_local	$push92=, $0=, $pop93
+	i32.add 	$push104=, $pop3, $pop4
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push5=, $pop103, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop5, $pop101
+	tee_local	$push99=, $1=, $pop100
+	i32.const	$push6=, 16
+	i32.shr_u	$push7=, $pop99, $pop6
+	i32.store8	sG+1($pop0), $pop7
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push8=, $1, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop8, $pop96
+	tee_local	$push94=, $1=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push9=, $pop94, $pop93
+	i32.store8	sG+2($pop98), $pop9
+	i32.const	$push92=, 0
 	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $pop92, $pop91
+	i32.mul 	$push10=, $1, $pop91
 	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
+	i32.add 	$push89=, $pop10, $pop90
 	tee_local	$push88=, $1=, $pop89
-	i32.const	$push6=, 16
-	i32.shr_u	$push7=, $pop88, $pop6
-	i32.store8	sG+1($pop0), $pop7
-	i32.const	$push87=, 0
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push8=, $1, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop8, $pop85
-	tee_local	$push83=, $1=, $pop84
-	i32.const	$push82=, 16
-	i32.shr_u	$push9=, $pop83, $pop82
-	i32.store8	sG+2($pop87), $pop9
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push10=, $1, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop10, $pop79
-	tee_local	$push77=, $1=, $pop78
-	i32.const	$push76=, 16
-	i32.shr_u	$push11=, $pop77, $pop76
-	i32.store8	sG+3($pop81), $pop11
-	i32.const	$push75=, 0
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push12=, $1, $pop74
-	i32.const	$push73=, 12345
-	i32.add 	$push72=, $pop12, $pop73
-	tee_local	$push71=, $1=, $pop72
-	i32.const	$push70=, 16
-	i32.shr_u	$push13=, $pop71, $pop70
-	i32.store8	sG+4($pop75), $pop13
-	i32.const	$push69=, 0
-	i32.const	$push68=, 1103515245
-	i32.mul 	$push14=, $1, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop14, $pop67
-	tee_local	$push65=, $1=, $pop66
-	i32.const	$push64=, 16
-	i32.shr_u	$push15=, $pop65, $pop64
-	i32.store8	sG+5($pop69), $pop15
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push16=, $1, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop16, $pop61
-	tee_local	$push59=, $1=, $pop60
-	i32.const	$push58=, 16
-	i32.shr_u	$push17=, $pop59, $pop58
-	i32.store8	sG+6($pop63), $pop17
-	i32.const	$push57=, 0
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push18=, $1, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop18, $pop55
-	tee_local	$push53=, $1=, $pop54
-	i32.const	$push52=, 16
-	i32.shr_u	$push19=, $pop53, $pop52
-	i32.store8	sG+7($pop57), $pop19
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push20=, $1, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop20, $pop49
-	tee_local	$push47=, $1=, $pop48
-	i32.const	$push46=, 16
-	i32.shr_u	$push21=, $pop47, $pop46
-	i32.store8	sG+8($pop51), $pop21
-	i32.const	$push45=, 0
+	i32.const	$push87=, 16
+	i32.shr_u	$push11=, $pop88, $pop87
+	i32.store8	sG+3($pop92), $pop11
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push12=, $1, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop12, $pop84
+	tee_local	$push82=, $1=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push13=, $pop82, $pop81
+	i32.store8	sG+4($pop86), $pop13
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push14=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop14, $pop78
+	tee_local	$push76=, $1=, $pop77
+	i32.const	$push75=, 16
+	i32.shr_u	$push15=, $pop76, $pop75
+	i32.store8	sG+5($pop80), $pop15
+	i32.const	$push74=, 0
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push16=, $1, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop16, $pop72
+	tee_local	$push70=, $1=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push17=, $pop70, $pop69
+	i32.store8	sG+6($pop74), $pop17
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push18=, $1, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop18, $pop66
+	tee_local	$push64=, $1=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push19=, $pop64, $pop63
+	i32.store8	sG+7($pop68), $pop19
+	i32.const	$push62=, 0
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push20=, $1, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$push59=, $pop20, $pop60
+	tee_local	$push58=, $1=, $pop59
+	i32.const	$push57=, 16
+	i32.shr_u	$push21=, $pop58, $pop57
+	i32.store8	sG+8($pop62), $pop21
+	i32.const	$push56=, 0
 	i32.const	$push22=, -341751747
 	i32.mul 	$push23=, $1, $pop22
 	i32.const	$push24=, 229283573
-	i32.add 	$push44=, $pop23, $pop24
+	i32.add 	$push55=, $pop23, $pop24
+	tee_local	$push54=, $1=, $pop55
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push25=, $pop54, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$push51=, $pop25, $pop52
+	tee_local	$push50=, $2=, $pop51
+	i32.store	myrnd.s($pop56), $pop50
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push47=, $2, $pop48
+	tee_local	$push46=, $2=, $pop47
+	i32.const	$push28=, 2047
+	i32.and 	$push29=, $pop46, $pop28
+	i32.const	$push45=, 16
+	i32.shr_u	$push44=, $1, $pop45
 	tee_local	$push43=, $1=, $pop44
-	i32.const	$push42=, 1103515245
-	i32.mul 	$push25=, $pop43, $pop42
-	i32.const	$push41=, 12345
-	i32.add 	$push40=, $pop25, $pop41
-	tee_local	$push39=, $2=, $pop40
-	i32.store	myrnd.s($pop45), $pop39
-	i32.const	$push38=, 0
-	i32.const	$push37=, 16
-	i32.shr_u	$push27=, $2, $pop37
-	i32.const	$push36=, 16
-	i32.shr_u	$push26=, $1, $pop36
-	i32.add 	$push28=, $pop27, $pop26
-	i32.const	$push29=, 2
-	i32.shl 	$push30=, $pop28, $pop29
-	i32.const	$push35=, 16
-	i32.shr_u	$push31=, $0, $pop35
-	i32.const	$push32=, 3
-	i32.and 	$push33=, $pop31, $pop32
-	i32.or  	$push34=, $pop30, $pop33
-	i32.store8	sG($pop38), $pop34
-                                        # fallthrough-return
+	i32.const	$push26=, 63
+	i32.and 	$push27=, $pop43, $pop26
+	i32.add 	$push42=, $pop29, $pop27
+	tee_local	$push41=, $3=, $pop42
+	i32.const	$push30=, 2
+	i32.shl 	$push31=, $pop41, $pop30
+	i32.const	$push40=, 16
+	i32.shr_u	$push32=, $0, $pop40
+	i32.const	$push33=, 3
+	i32.and 	$push34=, $pop32, $pop33
+	i32.or  	$push35=, $pop31, $pop34
+	i32.store8	sG($pop49), $pop35
+	block   	
+	i32.add 	$push36=, $2, $1
+	i32.xor 	$push37=, $pop36, $3
+	i32.const	$push39=, 63
+	i32.and 	$push38=, $pop37, $pop39
+	br_if   	0, $pop38       # 0: down to label3
+# BB#1:                                 # %if.end155
+	return
+.LBB42_2:                               # %if.then154
+	end_block                       # label3:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end42:
 	.size	testG, .Lfunc_end42-testG
-
+                                        # -- End function
 	.section	.text.retmeH,"ax",@progbits
-	.hidden	retmeH
+	.hidden	retmeH                  # -- Begin function retmeH
 	.globl	retmeH
 	.type	retmeH,@function
 retmeH:                                 # @retmeH
@@ -1662,9 +1734,9 @@ retmeH:                                 # @retmeH
 	.endfunc
 .Lfunc_end43:
 	.size	retmeH, .Lfunc_end43-retmeH
-
+                                        # -- End function
 	.section	.text.fn1H,"ax",@progbits
-	.hidden	fn1H
+	.hidden	fn1H                    # -- Begin function fn1H
 	.globl	fn1H
 	.type	fn1H,@function
 fn1H:                                   # @fn1H
@@ -1680,9 +1752,9 @@ fn1H:                                   # @fn1H
 	.endfunc
 .Lfunc_end44:
 	.size	fn1H, .Lfunc_end44-fn1H
-
+                                        # -- End function
 	.section	.text.fn2H,"ax",@progbits
-	.hidden	fn2H
+	.hidden	fn2H                    # -- Begin function fn2H
 	.globl	fn2H
 	.type	fn2H,@function
 fn2H:                                   # @fn2H
@@ -1700,9 +1772,9 @@ fn2H:                                   # @fn2H
 	.endfunc
 .Lfunc_end45:
 	.size	fn2H, .Lfunc_end45-fn2H
-
+                                        # -- End function
 	.section	.text.retitH,"ax",@progbits
-	.hidden	retitH
+	.hidden	retitH                  # -- Begin function retitH
 	.globl	retitH
 	.type	retitH,@function
 retitH:                                 # @retitH
@@ -1714,9 +1786,9 @@ retitH:                                 # @retitH
 	.endfunc
 .Lfunc_end46:
 	.size	retitH, .Lfunc_end46-retitH
-
+                                        # -- End function
 	.section	.text.fn3H,"ax",@progbits
-	.hidden	fn3H
+	.hidden	fn3H                    # -- Begin function fn3H
 	.globl	fn3H
 	.type	fn3H,@function
 fn3H:                                   # @fn3H
@@ -1735,132 +1807,141 @@ fn3H:                                   # @fn3H
 	.endfunc
 .Lfunc_end47:
 	.size	fn3H, .Lfunc_end47-fn3H
-
+                                        # -- End function
 	.section	.text.testH,"ax",@progbits
-	.hidden	testH
+	.hidden	testH                   # -- Begin function testH
 	.globl	testH
 	.type	testH,@function
 testH:                                  # @testH
-	.local  	i32, i32
-# BB#0:                                 # %if.end136
+	.local  	i32, i32, i32
+# BB#0:                                 # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push98=, 0
-	i32.load	$push1=, myrnd.s($pop98)
+	i32.const	$push101=, 0
+	i32.load	$push1=, myrnd.s($pop101)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push97=, $pop3, $pop4
-	tee_local	$push96=, $0=, $pop97
+	i32.add 	$push100=, $pop3, $pop4
+	tee_local	$push99=, $0=, $pop100
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop96, $pop5
+	i32.shr_u	$push6=, $pop99, $pop5
 	i32.store8	sH($pop0), $pop6
-	i32.const	$push95=, 0
-	i32.const	$push94=, 1103515245
-	i32.mul 	$push7=, $0, $pop94
-	i32.const	$push93=, 12345
-	i32.add 	$push92=, $pop7, $pop93
-	tee_local	$push91=, $0=, $pop92
-	i32.const	$push90=, 16
-	i32.shr_u	$push8=, $pop91, $pop90
-	i32.store8	sH+1($pop95), $pop8
-	i32.const	$push89=, 0
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push9=, $0, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop9, $pop87
-	tee_local	$push85=, $0=, $pop86
-	i32.const	$push84=, 16
-	i32.shr_u	$push10=, $pop85, $pop84
-	i32.store8	sH+2($pop89), $pop10
-	i32.const	$push83=, 0
-	i32.const	$push82=, 1103515245
-	i32.mul 	$push11=, $0, $pop82
-	i32.const	$push81=, 12345
-	i32.add 	$push80=, $pop11, $pop81
-	tee_local	$push79=, $0=, $pop80
-	i32.const	$push78=, 16
-	i32.shr_u	$push12=, $pop79, $pop78
-	i32.store8	sH+3($pop83), $pop12
-	i32.const	$push77=, 0
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push13=, $0, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop13, $pop75
-	tee_local	$push73=, $0=, $pop74
-	i32.const	$push72=, 16
-	i32.shr_u	$push14=, $pop73, $pop72
-	i32.store8	sH+4($pop77), $pop14
-	i32.const	$push71=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push15=, $0, $pop70
-	i32.const	$push69=, 12345
-	i32.add 	$push68=, $pop15, $pop69
-	tee_local	$push67=, $0=, $pop68
-	i32.const	$push66=, 16
-	i32.shr_u	$push16=, $pop67, $pop66
-	i32.store8	sH+5($pop71), $pop16
-	i32.const	$push65=, 0
-	i32.const	$push64=, 1103515245
-	i32.mul 	$push17=, $0, $pop64
-	i32.const	$push63=, 12345
-	i32.add 	$push62=, $pop17, $pop63
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 16
-	i32.shr_u	$push18=, $pop61, $pop60
-	i32.store8	sH+6($pop65), $pop18
-	i32.const	$push59=, 0
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push19=, $0, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop19, $pop57
-	tee_local	$push55=, $0=, $pop56
-	i32.const	$push54=, 16
-	i32.shr_u	$push20=, $pop55, $pop54
-	i32.store8	sH+7($pop59), $pop20
-	i32.const	$push53=, 0
-	i32.const	$push52=, 1103515245
-	i32.mul 	$push21=, $0, $pop52
-	i32.const	$push51=, 12345
-	i32.add 	$push50=, $pop21, $pop51
-	tee_local	$push49=, $0=, $pop50
-	i32.const	$push48=, 16
-	i32.shr_u	$push22=, $pop49, $pop48
-	i32.store8	sH+8($pop53), $pop22
-	i32.const	$push47=, 0
-	i32.const	$push46=, 1103515245
-	i32.mul 	$push23=, $0, $pop46
-	i32.const	$push45=, 12345
-	i32.add 	$push44=, $pop23, $pop45
-	tee_local	$push43=, $0=, $pop44
-	i32.const	$push42=, 16
-	i32.shr_u	$push24=, $pop43, $pop42
-	i32.store8	sH+9($pop47), $pop24
-	i32.const	$push41=, 0
+	i32.const	$push98=, 0
+	i32.const	$push7=, -1029531031
+	i32.mul 	$push8=, $0, $pop7
+	i32.const	$push9=, -740551042
+	i32.add 	$push97=, $pop8, $pop9
+	tee_local	$push96=, $0=, $pop97
+	i32.const	$push95=, 16
+	i32.shr_u	$push10=, $pop96, $pop95
+	i32.store8	sH+2($pop98), $pop10
+	i32.const	$push94=, 0
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push11=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$push91=, $pop11, $pop92
+	tee_local	$push90=, $0=, $pop91
+	i32.const	$push89=, 16
+	i32.shr_u	$push12=, $pop90, $pop89
+	i32.store8	sH+3($pop94), $pop12
+	i32.const	$push88=, 0
+	i32.const	$push87=, 1103515245
+	i32.mul 	$push13=, $0, $pop87
+	i32.const	$push86=, 12345
+	i32.add 	$push85=, $pop13, $pop86
+	tee_local	$push84=, $0=, $pop85
+	i32.const	$push83=, 16
+	i32.shr_u	$push14=, $pop84, $pop83
+	i32.store8	sH+4($pop88), $pop14
+	i32.const	$push82=, 0
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push15=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$push79=, $pop15, $pop80
+	tee_local	$push78=, $0=, $pop79
+	i32.const	$push77=, 16
+	i32.shr_u	$push16=, $pop78, $pop77
+	i32.store8	sH+5($pop82), $pop16
+	i32.const	$push76=, 0
+	i32.const	$push75=, 1103515245
+	i32.mul 	$push17=, $0, $pop75
+	i32.const	$push74=, 12345
+	i32.add 	$push73=, $pop17, $pop74
+	tee_local	$push72=, $0=, $pop73
+	i32.const	$push71=, 16
+	i32.shr_u	$push18=, $pop72, $pop71
+	i32.store8	sH+6($pop76), $pop18
+	i32.const	$push70=, 0
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push19=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$push67=, $pop19, $pop68
+	tee_local	$push66=, $0=, $pop67
+	i32.const	$push65=, 16
+	i32.shr_u	$push20=, $pop66, $pop65
+	i32.store8	sH+7($pop70), $pop20
+	i32.const	$push64=, 0
+	i32.const	$push63=, 1103515245
+	i32.mul 	$push21=, $0, $pop63
+	i32.const	$push62=, 12345
+	i32.add 	$push61=, $pop21, $pop62
+	tee_local	$push60=, $0=, $pop61
+	i32.const	$push59=, 16
+	i32.shr_u	$push22=, $pop60, $pop59
+	i32.store8	sH+8($pop64), $pop22
+	i32.const	$push58=, 0
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push23=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$push55=, $pop23, $pop56
+	tee_local	$push54=, $0=, $pop55
+	i32.const	$push53=, 16
+	i32.shr_u	$push24=, $pop54, $pop53
+	i32.store8	sH+9($pop58), $pop24
+	i32.const	$push52=, 0
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	i32.add 	$push40=, $pop26, $pop27
+	i32.add 	$push51=, $pop26, $pop27
+	tee_local	$push50=, $0=, $pop51
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push28=, $pop50, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$push47=, $pop28, $pop48
+	tee_local	$push46=, $1=, $pop47
+	i32.store	myrnd.s($pop52), $pop46
+	i32.const	$push45=, 0
+	i32.const	$push44=, 16
+	i32.shr_u	$push43=, $1, $pop44
+	tee_local	$push42=, $1=, $pop43
+	i32.const	$push31=, 2047
+	i32.and 	$push32=, $pop42, $pop31
+	i32.const	$push41=, 16
+	i32.shr_u	$push40=, $0, $pop41
 	tee_local	$push39=, $0=, $pop40
-	i32.const	$push38=, 1103515245
-	i32.mul 	$push28=, $pop39, $pop38
-	i32.const	$push37=, 12345
-	i32.add 	$push36=, $pop28, $pop37
-	tee_local	$push35=, $1=, $pop36
-	i32.store	myrnd.s($pop41), $pop35
-	i32.const	$push34=, 0
-	i32.const	$push33=, 16
-	i32.shr_u	$push30=, $1, $pop33
-	i32.const	$push32=, 16
-	i32.shr_u	$push29=, $0, $pop32
-	i32.add 	$push31=, $pop30, $pop29
-	i32.store8	sH+1($pop34), $pop31
-                                        # fallthrough-return
+	i32.const	$push29=, 255
+	i32.and 	$push30=, $pop39, $pop29
+	i32.add 	$push38=, $pop32, $pop30
+	tee_local	$push37=, $2=, $pop38
+	i32.store8	sH+1($pop45), $pop37
+	block   	
+	i32.add 	$push33=, $1, $0
+	i32.xor 	$push34=, $pop33, $2
+	i32.const	$push36=, 255
+	i32.and 	$push35=, $pop34, $pop36
+	br_if   	0, $pop35       # 0: down to label4
+# BB#1:                                 # %if.end136
+	return
+.LBB48_2:                               # %if.then135
+	end_block                       # label4:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end48:
 	.size	testH, .Lfunc_end48-testH
-
+                                        # -- End function
 	.section	.text.retmeI,"ax",@progbits
-	.hidden	retmeI
+	.hidden	retmeI                  # -- Begin function retmeI
 	.globl	retmeI
 	.type	retmeI,@function
 retmeI:                                 # @retmeI
@@ -1878,9 +1959,9 @@ retmeI:                                 # @retmeI
 	.endfunc
 .Lfunc_end49:
 	.size	retmeI, .Lfunc_end49-retmeI
-
+                                        # -- End function
 	.section	.text.fn1I,"ax",@progbits
-	.hidden	fn1I
+	.hidden	fn1I                    # -- Begin function fn1I
 	.globl	fn1I
 	.type	fn1I,@function
 fn1I:                                   # @fn1I
@@ -1898,9 +1979,9 @@ fn1I:                                   # @fn1I
 	.endfunc
 .Lfunc_end50:
 	.size	fn1I, .Lfunc_end50-fn1I
-
+                                        # -- End function
 	.section	.text.fn2I,"ax",@progbits
-	.hidden	fn2I
+	.hidden	fn2I                    # -- Begin function fn2I
 	.globl	fn2I
 	.type	fn2I,@function
 fn2I:                                   # @fn2I
@@ -1914,15 +1995,13 @@ fn2I:                                   # @fn2I
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 15
-	i32.rem_u	$push8=, $pop6, $pop7
-                                        # fallthrough-return: $pop8
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end51:
 	.size	fn2I, .Lfunc_end51-fn2I
-
+                                        # -- End function
 	.section	.text.retitI,"ax",@progbits
-	.hidden	retitI
+	.hidden	retitI                  # -- Begin function retitI
 	.globl	retitI
 	.type	retitI,@function
 retitI:                                 # @retitI
@@ -1936,9 +2015,9 @@ retitI:                                 # @retitI
 	.endfunc
 .Lfunc_end52:
 	.size	retitI, .Lfunc_end52-retitI
-
+                                        # -- End function
 	.section	.text.fn3I,"ax",@progbits
-	.hidden	fn3I
+	.hidden	fn3I                    # -- Begin function fn3I
 	.globl	fn3I
 	.type	fn3I,@function
 fn3I:                                   # @fn3I
@@ -1966,126 +2045,144 @@ fn3I:                                   # @fn3I
 	.endfunc
 .Lfunc_end53:
 	.size	fn3I, .Lfunc_end53-fn3I
-
+                                        # -- End function
 	.section	.text.testI,"ax",@progbits
-	.hidden	testI
+	.hidden	testI                   # -- Begin function testI
 	.globl	testI
 	.type	testI,@function
 testI:                                  # @testI
-	.local  	i32, i32, i32
-# BB#0:                                 # %if.end155
+	.local  	i32, i32, i32, i32
+# BB#0:                                 # %lor.lhs.false149
 	i32.const	$push0=, 0
-	i32.const	$push94=, 0
-	i32.load	$push1=, myrnd.s($pop94)
+	i32.const	$push105=, 0
+	i32.load	$push1=, myrnd.s($pop105)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push93=, $pop3, $pop4
-	tee_local	$push92=, $0=, $pop93
+	i32.add 	$push104=, $pop3, $pop4
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push5=, $pop103, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop5, $pop101
+	tee_local	$push99=, $1=, $pop100
+	i32.const	$push6=, 16
+	i32.shr_u	$push7=, $pop99, $pop6
+	i32.store8	sI+1($pop0), $pop7
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push8=, $1, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop8, $pop96
+	tee_local	$push94=, $1=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push9=, $pop94, $pop93
+	i32.store8	sI+2($pop98), $pop9
+	i32.const	$push92=, 0
 	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $pop92, $pop91
+	i32.mul 	$push10=, $1, $pop91
 	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
+	i32.add 	$push89=, $pop10, $pop90
 	tee_local	$push88=, $1=, $pop89
-	i32.const	$push6=, 16
-	i32.shr_u	$push7=, $pop88, $pop6
-	i32.store8	sI+1($pop0), $pop7
-	i32.const	$push87=, 0
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push8=, $1, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop8, $pop85
-	tee_local	$push83=, $1=, $pop84
-	i32.const	$push82=, 16
-	i32.shr_u	$push9=, $pop83, $pop82
-	i32.store8	sI+2($pop87), $pop9
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push10=, $1, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop10, $pop79
-	tee_local	$push77=, $1=, $pop78
-	i32.const	$push76=, 16
-	i32.shr_u	$push11=, $pop77, $pop76
-	i32.store8	sI+3($pop81), $pop11
-	i32.const	$push75=, 0
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push12=, $1, $pop74
-	i32.const	$push73=, 12345
-	i32.add 	$push72=, $pop12, $pop73
-	tee_local	$push71=, $1=, $pop72
-	i32.const	$push70=, 16
-	i32.shr_u	$push13=, $pop71, $pop70
-	i32.store8	sI+4($pop75), $pop13
-	i32.const	$push69=, 0
-	i32.const	$push68=, 1103515245
-	i32.mul 	$push14=, $1, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop14, $pop67
-	tee_local	$push65=, $1=, $pop66
-	i32.const	$push64=, 16
-	i32.shr_u	$push15=, $pop65, $pop64
-	i32.store8	sI+5($pop69), $pop15
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push16=, $1, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop16, $pop61
-	tee_local	$push59=, $1=, $pop60
-	i32.const	$push58=, 16
-	i32.shr_u	$push17=, $pop59, $pop58
-	i32.store8	sI+6($pop63), $pop17
-	i32.const	$push57=, 0
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push18=, $1, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop18, $pop55
-	tee_local	$push53=, $1=, $pop54
-	i32.const	$push52=, 16
-	i32.shr_u	$push19=, $pop53, $pop52
-	i32.store8	sI+7($pop57), $pop19
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push20=, $1, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop20, $pop49
-	tee_local	$push47=, $1=, $pop48
-	i32.const	$push46=, 16
-	i32.shr_u	$push21=, $pop47, $pop46
-	i32.store8	sI+8($pop51), $pop21
-	i32.const	$push45=, 0
+	i32.const	$push87=, 16
+	i32.shr_u	$push11=, $pop88, $pop87
+	i32.store8	sI+3($pop92), $pop11
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push12=, $1, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop12, $pop84
+	tee_local	$push82=, $1=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push13=, $pop82, $pop81
+	i32.store8	sI+4($pop86), $pop13
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push14=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop14, $pop78
+	tee_local	$push76=, $1=, $pop77
+	i32.const	$push75=, 16
+	i32.shr_u	$push15=, $pop76, $pop75
+	i32.store8	sI+5($pop80), $pop15
+	i32.const	$push74=, 0
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push16=, $1, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop16, $pop72
+	tee_local	$push70=, $1=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push17=, $pop70, $pop69
+	i32.store8	sI+6($pop74), $pop17
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push18=, $1, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop18, $pop66
+	tee_local	$push64=, $1=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push19=, $pop64, $pop63
+	i32.store8	sI+7($pop68), $pop19
+	i32.const	$push62=, 0
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push20=, $1, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$push59=, $pop20, $pop60
+	tee_local	$push58=, $1=, $pop59
+	i32.const	$push57=, 16
+	i32.shr_u	$push21=, $pop58, $pop57
+	i32.store8	sI+8($pop62), $pop21
+	i32.const	$push56=, 0
 	i32.const	$push22=, -341751747
 	i32.mul 	$push23=, $1, $pop22
 	i32.const	$push24=, 229283573
-	i32.add 	$push44=, $pop23, $pop24
+	i32.add 	$push55=, $pop23, $pop24
+	tee_local	$push54=, $1=, $pop55
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push25=, $pop54, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$push51=, $pop25, $pop52
+	tee_local	$push50=, $2=, $pop51
+	i32.store	myrnd.s($pop56), $pop50
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push47=, $2, $pop48
+	tee_local	$push46=, $2=, $pop47
+	i32.const	$push28=, 2047
+	i32.and 	$push29=, $pop46, $pop28
+	i32.const	$push45=, 16
+	i32.shr_u	$push44=, $1, $pop45
 	tee_local	$push43=, $1=, $pop44
-	i32.const	$push42=, 1103515245
-	i32.mul 	$push25=, $pop43, $pop42
-	i32.const	$push41=, 12345
-	i32.add 	$push40=, $pop25, $pop41
-	tee_local	$push39=, $2=, $pop40
-	i32.store	myrnd.s($pop45), $pop39
-	i32.const	$push38=, 0
-	i32.const	$push37=, 16
-	i32.shr_u	$push27=, $2, $pop37
-	i32.const	$push36=, 16
-	i32.shr_u	$push26=, $1, $pop36
-	i32.add 	$push28=, $pop27, $pop26
-	i32.const	$push29=, 7
-	i32.shl 	$push30=, $pop28, $pop29
-	i32.const	$push35=, 16
-	i32.shr_u	$push31=, $0, $pop35
-	i32.const	$push32=, 127
-	i32.and 	$push33=, $pop31, $pop32
-	i32.or  	$push34=, $pop30, $pop33
-	i32.store8	sI($pop38), $pop34
-                                        # fallthrough-return
+	i32.const	$push26=, 1
+	i32.and 	$push27=, $pop43, $pop26
+	i32.add 	$push42=, $pop29, $pop27
+	tee_local	$push41=, $3=, $pop42
+	i32.const	$push30=, 7
+	i32.shl 	$push31=, $pop41, $pop30
+	i32.const	$push40=, 16
+	i32.shr_u	$push32=, $0, $pop40
+	i32.const	$push33=, 127
+	i32.and 	$push34=, $pop32, $pop33
+	i32.or  	$push35=, $pop31, $pop34
+	i32.store8	sI($pop49), $pop35
+	block   	
+	i32.add 	$push36=, $2, $1
+	i32.xor 	$push37=, $pop36, $3
+	i32.const	$push39=, 1
+	i32.and 	$push38=, $pop37, $pop39
+	br_if   	0, $pop38       # 0: down to label5
+# BB#1:                                 # %if.end155
+	return
+.LBB54_2:                               # %if.then154
+	end_block                       # label5:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end54:
 	.size	testI, .Lfunc_end54-testI
-
+                                        # -- End function
 	.section	.text.retmeJ,"ax",@progbits
-	.hidden	retmeJ
+	.hidden	retmeJ                  # -- Begin function retmeJ
 	.globl	retmeJ
 	.type	retmeJ,@function
 retmeJ:                                 # @retmeJ
@@ -2097,9 +2194,9 @@ retmeJ:                                 # @retmeJ
 	.endfunc
 .Lfunc_end55:
 	.size	retmeJ, .Lfunc_end55-retmeJ
-
+                                        # -- End function
 	.section	.text.fn1J,"ax",@progbits
-	.hidden	fn1J
+	.hidden	fn1J                    # -- Begin function fn1J
 	.globl	fn1J
 	.type	fn1J,@function
 fn1J:                                   # @fn1J
@@ -2117,9 +2214,9 @@ fn1J:                                   # @fn1J
 	.endfunc
 .Lfunc_end56:
 	.size	fn1J, .Lfunc_end56-fn1J
-
+                                        # -- End function
 	.section	.text.fn2J,"ax",@progbits
-	.hidden	fn2J
+	.hidden	fn2J                    # -- Begin function fn2J
 	.globl	fn2J
 	.type	fn2J,@function
 fn2J:                                   # @fn2J
@@ -2139,9 +2236,9 @@ fn2J:                                   # @fn2J
 	.endfunc
 .Lfunc_end57:
 	.size	fn2J, .Lfunc_end57-fn2J
-
+                                        # -- End function
 	.section	.text.retitJ,"ax",@progbits
-	.hidden	retitJ
+	.hidden	retitJ                  # -- Begin function retitJ
 	.globl	retitJ
 	.type	retitJ,@function
 retitJ:                                 # @retitJ
@@ -2155,9 +2252,9 @@ retitJ:                                 # @retitJ
 	.endfunc
 .Lfunc_end58:
 	.size	retitJ, .Lfunc_end58-retitJ
-
+                                        # -- End function
 	.section	.text.fn3J,"ax",@progbits
-	.hidden	fn3J
+	.hidden	fn3J                    # -- Begin function fn3J
 	.globl	fn3J
 	.type	fn3J,@function
 fn3J:                                   # @fn3J
@@ -2185,127 +2282,138 @@ fn3J:                                   # @fn3J
 	.endfunc
 .Lfunc_end59:
 	.size	fn3J, .Lfunc_end59-fn3J
-
+                                        # -- End function
 	.section	.text.testJ,"ax",@progbits
-	.hidden	testJ
+	.hidden	testJ                   # -- Begin function testJ
 	.globl	testJ
 	.type	testJ,@function
 testJ:                                  # @testJ
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push78=, 0
-	i32.const	$push77=, 0
-	i32.load	$push0=, myrnd.s($pop77)
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop1, $pop75
-	tee_local	$push73=, $0=, $pop74
-	i32.const	$push72=, 16
-	i32.shr_u	$push2=, $pop73, $pop72
-	i32.store8	sJ($pop78), $pop2
-	i32.const	$push71=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push3=, $0, $pop70
-	i32.const	$push69=, 12345
-	i32.add 	$push68=, $pop3, $pop69
-	tee_local	$push67=, $0=, $pop68
-	i32.const	$push66=, 16
-	i32.shr_u	$push4=, $pop67, $pop66
-	i32.store8	sJ+1($pop71), $pop4
-	i32.const	$push65=, 0
-	i32.const	$push64=, 1103515245
-	i32.mul 	$push5=, $0, $pop64
-	i32.const	$push63=, 12345
-	i32.add 	$push62=, $pop5, $pop63
-	tee_local	$push61=, $0=, $pop62
-	i32.const	$push60=, 16
-	i32.shr_u	$push6=, $pop61, $pop60
-	i32.store8	sJ+2($pop65), $pop6
-	i32.const	$push59=, 0
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push7=, $0, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop7, $pop57
-	tee_local	$push55=, $0=, $pop56
-	i32.const	$push54=, 16
-	i32.shr_u	$push8=, $pop55, $pop54
-	i32.store8	sJ+3($pop59), $pop8
-	i32.const	$push53=, 0
-	i32.const	$push52=, 1103515245
-	i32.mul 	$push11=, $0, $pop52
-	i32.const	$push51=, 12345
-	i32.add 	$push50=, $pop11, $pop51
-	tee_local	$push49=, $0=, $pop50
-	i32.const	$push48=, 16
-	i32.shr_u	$push47=, $pop49, $pop48
-	tee_local	$push46=, $1=, $pop47
-	i32.const	$push45=, 9
-	i32.shl 	$push12=, $pop46, $pop45
-	i32.const	$push44=, 0
-	i32.load16_u	$push9=, sJ($pop44)
-	i32.const	$push43=, 511
-	i32.and 	$push10=, $pop9, $pop43
-	i32.or  	$push13=, $pop12, $pop10
-	i32.store16	sJ($pop53), $pop13
-	i32.const	$push42=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push14=, $0, $pop41
-	i32.const	$push40=, 12345
-	i32.add 	$push39=, $pop14, $pop40
-	tee_local	$push38=, $0=, $pop39
-	i32.store	myrnd.s($pop42), $pop38
+	i32.const	$push80=, 0
+	i32.const	$push79=, 0
+	i32.load	$push0=, myrnd.s($pop79)
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop1, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push2=, $pop75, $pop74
+	i32.store8	sJ($pop80), $pop2
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push3=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop3, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push4=, $pop69, $pop68
+	i32.store8	sJ+1($pop73), $pop4
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push5=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop5, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push6=, $pop63, $pop62
+	i32.store8	sJ+2($pop67), $pop6
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push7=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop7, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push8=, $pop57, $pop56
+	i32.store8	sJ+3($pop61), $pop8
+	i32.const	$push55=, 0
+	i32.const	$push54=, 0
+	i32.load16_u	$push9=, sJ($pop54)
+	i32.const	$push10=, 511
+	i32.and 	$push53=, $pop9, $pop10
+	tee_local	$push52=, $1=, $pop53
+	i32.const	$push51=, 1103515245
+	i32.mul 	$push11=, $0, $pop51
+	i32.const	$push50=, 12345
+	i32.add 	$push49=, $pop11, $pop50
+	tee_local	$push48=, $0=, $pop49
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $pop48, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.const	$push44=, 9
+	i32.shl 	$push12=, $pop45, $pop44
+	i32.or  	$push13=, $pop52, $pop12
+	i32.store16	sJ($pop55), $pop13
+	i32.const	$push43=, 0
+	i32.const	$push42=, 1103515245
+	i32.mul 	$push14=, $0, $pop42
+	i32.const	$push41=, 12345
+	i32.add 	$push40=, $pop14, $pop41
+	tee_local	$push39=, $0=, $pop40
+	i32.store	myrnd.s($pop43), $pop39
 	block   	
-	i32.const	$push37=, 16
-	i32.shr_u	$push36=, $0, $pop37
-	tee_local	$push35=, $2=, $pop36
-	i32.add 	$push15=, $pop35, $1
-	i32.const	$push34=, 0
-	i32.load	$push33=, sJ($pop34)
-	tee_local	$push32=, $1=, $pop33
-	i32.const	$push31=, 9
-	i32.shr_u	$push16=, $pop32, $pop31
-	i32.add 	$push17=, $pop16, $2
-	i32.xor 	$push18=, $pop15, $pop17
-	i32.const	$push19=, 127
-	i32.and 	$push20=, $pop18, $pop19
-	br_if   	0, $pop20       # 0: down to label0
-# BB#1:                                 # %if.end142
-	i32.const	$push90=, 0
+	i32.const	$push38=, 16
+	i32.shr_u	$push37=, $0, $pop38
+	tee_local	$push36=, $3=, $pop37
+	i32.add 	$push15=, $pop36, $2
+	i32.const	$push35=, 0
+	i32.load	$push16=, sJ($pop35)
+	i32.const	$push34=, 9
+	i32.shr_u	$push17=, $pop16, $pop34
+	i32.add 	$push18=, $3, $pop17
+	i32.xor 	$push19=, $pop15, $pop18
+	i32.const	$push33=, 127
+	i32.and 	$push20=, $pop19, $pop33
+	br_if   	0, $pop20       # 0: down to label6
+# BB#1:                                 # %lor.lhs.false136
+	i32.const	$push99=, 0
 	i32.const	$push21=, -2139243339
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, -1492899873
-	i32.add 	$push89=, $pop22, $pop23
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push24=, $pop88, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop24, $pop86
-	tee_local	$push84=, $2=, $pop85
-	i32.store	myrnd.s($pop90), $pop84
-	i32.const	$push83=, 0
-	i32.const	$push82=, 16
-	i32.shr_u	$push26=, $2, $pop82
-	i32.const	$push81=, 16
-	i32.shr_u	$push25=, $0, $pop81
-	i32.add 	$push27=, $pop26, $pop25
-	i32.const	$push80=, 9
-	i32.shl 	$push28=, $pop27, $pop80
-	i32.const	$push79=, 511
-	i32.and 	$push29=, $1, $pop79
-	i32.or  	$push30=, $pop28, $pop29
-	i32.store16	sJ($pop83), $pop30
+	i32.add 	$push98=, $pop22, $pop23
+	tee_local	$push97=, $0=, $pop98
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push24=, $pop97, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop24, $pop95
+	tee_local	$push93=, $2=, $pop94
+	i32.store	myrnd.s($pop99), $pop93
+	i32.const	$push92=, 0
+	i32.const	$push91=, 16
+	i32.shr_u	$push90=, $2, $pop91
+	tee_local	$push89=, $2=, $pop90
+	i32.const	$push26=, 2047
+	i32.and 	$push27=, $pop89, $pop26
+	i32.const	$push88=, 16
+	i32.shr_u	$push87=, $0, $pop88
+	tee_local	$push86=, $0=, $pop87
+	i32.const	$push85=, 127
+	i32.and 	$push25=, $pop86, $pop85
+	i32.add 	$push84=, $pop27, $pop25
+	tee_local	$push83=, $3=, $pop84
+	i32.const	$push82=, 9
+	i32.shl 	$push28=, $pop83, $pop82
+	i32.or  	$push29=, $pop28, $1
+	i32.store16	sJ($pop92), $pop29
+	i32.add 	$push30=, $2, $0
+	i32.xor 	$push31=, $pop30, $3
+	i32.const	$push81=, 127
+	i32.and 	$push32=, $pop31, $pop81
+	br_if   	0, $pop32       # 0: down to label6
+# BB#2:                                 # %if.end142
 	return
-.LBB60_2:                               # %if.then
-	end_block                       # label0:
+.LBB60_3:                               # %if.then
+	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end60:
 	.size	testJ, .Lfunc_end60-testJ
-
+                                        # -- End function
 	.section	.text.retmeK,"ax",@progbits
-	.hidden	retmeK
+	.hidden	retmeK                  # -- Begin function retmeK
 	.globl	retmeK
 	.type	retmeK,@function
 retmeK:                                 # @retmeK
@@ -2317,9 +2425,9 @@ retmeK:                                 # @retmeK
 	.endfunc
 .Lfunc_end61:
 	.size	retmeK, .Lfunc_end61-retmeK
-
+                                        # -- End function
 	.section	.text.fn1K,"ax",@progbits
-	.hidden	fn1K
+	.hidden	fn1K                    # -- Begin function fn1K
 	.globl	fn1K
 	.type	fn1K,@function
 fn1K:                                   # @fn1K
@@ -2335,9 +2443,9 @@ fn1K:                                   # @fn1K
 	.endfunc
 .Lfunc_end62:
 	.size	fn1K, .Lfunc_end62-fn1K
-
+                                        # -- End function
 	.section	.text.fn2K,"ax",@progbits
-	.hidden	fn2K
+	.hidden	fn2K                    # -- Begin function fn2K
 	.globl	fn2K
 	.type	fn2K,@function
 fn2K:                                   # @fn2K
@@ -2355,9 +2463,9 @@ fn2K:                                   # @fn2K
 	.endfunc
 .Lfunc_end63:
 	.size	fn2K, .Lfunc_end63-fn2K
-
+                                        # -- End function
 	.section	.text.retitK,"ax",@progbits
-	.hidden	retitK
+	.hidden	retitK                  # -- Begin function retitK
 	.globl	retitK
 	.type	retitK,@function
 retitK:                                 # @retitK
@@ -2371,9 +2479,9 @@ retitK:                                 # @retitK
 	.endfunc
 .Lfunc_end64:
 	.size	retitK, .Lfunc_end64-retitK
-
+                                        # -- End function
 	.section	.text.fn3K,"ax",@progbits
-	.hidden	fn3K
+	.hidden	fn3K                    # -- Begin function fn3K
 	.globl	fn3K
 	.type	fn3K,@function
 fn3K:                                   # @fn3K
@@ -2398,9 +2506,9 @@ fn3K:                                   # @fn3K
 	.endfunc
 .Lfunc_end65:
 	.size	fn3K, .Lfunc_end65-fn3K
-
+                                        # -- End function
 	.section	.text.testK,"ax",@progbits
-	.hidden	testK
+	.hidden	testK                   # -- Begin function testK
 	.globl	testK
 	.type	testK,@function
 testK:                                  # @testK
@@ -2474,9 +2582,9 @@ testK:                                  # @testK
 	.endfunc
 .Lfunc_end66:
 	.size	testK, .Lfunc_end66-testK
-
+                                        # -- End function
 	.section	.text.retmeL,"ax",@progbits
-	.hidden	retmeL
+	.hidden	retmeL                  # -- Begin function retmeL
 	.globl	retmeL
 	.type	retmeL,@function
 retmeL:                                 # @retmeL
@@ -2488,9 +2596,9 @@ retmeL:                                 # @retmeL
 	.endfunc
 .Lfunc_end67:
 	.size	retmeL, .Lfunc_end67-retmeL
-
+                                        # -- End function
 	.section	.text.fn1L,"ax",@progbits
-	.hidden	fn1L
+	.hidden	fn1L                    # -- Begin function fn1L
 	.globl	fn1L
 	.type	fn1L,@function
 fn1L:                                   # @fn1L
@@ -2506,9 +2614,9 @@ fn1L:                                   # @fn1L
 	.endfunc
 .Lfunc_end68:
 	.size	fn1L, .Lfunc_end68-fn1L
-
+                                        # -- End function
 	.section	.text.fn2L,"ax",@progbits
-	.hidden	fn2L
+	.hidden	fn2L                    # -- Begin function fn2L
 	.globl	fn2L
 	.type	fn2L,@function
 fn2L:                                   # @fn2L
@@ -2526,9 +2634,9 @@ fn2L:                                   # @fn2L
 	.endfunc
 .Lfunc_end69:
 	.size	fn2L, .Lfunc_end69-fn2L
-
+                                        # -- End function
 	.section	.text.retitL,"ax",@progbits
-	.hidden	retitL
+	.hidden	retitL                  # -- Begin function retitL
 	.globl	retitL
 	.type	retitL,@function
 retitL:                                 # @retitL
@@ -2542,9 +2650,9 @@ retitL:                                 # @retitL
 	.endfunc
 .Lfunc_end70:
 	.size	retitL, .Lfunc_end70-retitL
-
+                                        # -- End function
 	.section	.text.fn3L,"ax",@progbits
-	.hidden	fn3L
+	.hidden	fn3L                    # -- Begin function fn3L
 	.globl	fn3L
 	.type	fn3L,@function
 fn3L:                                   # @fn3L
@@ -2569,159 +2677,158 @@ fn3L:                                   # @fn3L
 	.endfunc
 .Lfunc_end71:
 	.size	fn3L, .Lfunc_end71-fn3L
-
+                                        # -- End function
 	.section	.text.testL,"ax",@progbits
-	.hidden	testL
+	.hidden	testL                   # -- Begin function testL
 	.globl	testL
 	.type	testL,@function
 testL:                                  # @testL
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push106=, 0
 	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.load	$push0=, myrnd.s($pop104)
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop1, $pop102
-	tee_local	$push100=, $0=, $pop101
-	i32.const	$push99=, 16
-	i32.shr_u	$push2=, $pop100, $pop99
-	i32.store8	sL($pop105), $pop2
-	i32.const	$push98=, 0
-	i32.const	$push97=, 1103515245
-	i32.mul 	$push3=, $0, $pop97
-	i32.const	$push96=, 12345
-	i32.add 	$push95=, $pop3, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 16
-	i32.shr_u	$push4=, $pop94, $pop93
-	i32.store8	sL+1($pop98), $pop4
-	i32.const	$push92=, 0
-	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $0, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 16
-	i32.shr_u	$push6=, $pop88, $pop87
-	i32.store8	sL+2($pop92), $pop6
-	i32.const	$push86=, 0
-	i32.const	$push85=, 1103515245
-	i32.mul 	$push7=, $0, $pop85
-	i32.const	$push84=, 12345
-	i32.add 	$push83=, $pop7, $pop84
-	tee_local	$push82=, $0=, $pop83
-	i32.const	$push81=, 16
-	i32.shr_u	$push8=, $pop82, $pop81
-	i32.store8	sL+3($pop86), $pop8
-	i32.const	$push80=, 0
-	i32.const	$push79=, 1103515245
-	i32.mul 	$push9=, $0, $pop79
-	i32.const	$push78=, 12345
-	i32.add 	$push77=, $pop9, $pop78
-	tee_local	$push76=, $0=, $pop77
-	i32.const	$push75=, 16
-	i32.shr_u	$push10=, $pop76, $pop75
-	i32.store8	sL+4($pop80), $pop10
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push11=, $0, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop11, $pop72
-	tee_local	$push70=, $0=, $pop71
-	i32.const	$push69=, 16
-	i32.shr_u	$push12=, $pop70, $pop69
-	i32.store8	sL+5($pop74), $pop12
-	i32.const	$push68=, 0
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $0, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $0=, $pop65
-	i32.const	$push63=, 16
-	i32.shr_u	$push14=, $pop64, $pop63
-	i32.store8	sL+6($pop68), $pop14
-	i32.const	$push62=, 0
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push15=, $0, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop15, $pop60
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 16
-	i32.shr_u	$push16=, $pop58, $pop57
-	i32.store8	sL+7($pop62), $pop16
-	i32.const	$push56=, 0
-	i32.load	$1=, sL($pop56)
-	i32.const	$push55=, 0
-	i32.const	$push54=, 1103515245
-	i32.mul 	$push17=, $0, $pop54
-	i32.const	$push53=, 12345
-	i32.add 	$push52=, $pop17, $pop53
-	tee_local	$push51=, $2=, $pop52
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push18=, $pop51, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop18, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.store	myrnd.s($pop55), $pop47
-	i32.const	$push46=, 0
-	i32.const	$push45=, 16
-	i32.shr_u	$push44=, $2, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.const	$push42=, 63
-	i32.and 	$push20=, $pop43, $pop42
-	i32.const	$push41=, -64
-	i32.and 	$push19=, $1, $pop41
-	i32.or  	$push40=, $pop20, $pop19
-	tee_local	$push39=, $1=, $pop40
-	i32.store	sL($pop46), $pop39
+	i32.load	$push0=, myrnd.s($pop105)
+	i32.const	$push104=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop104
+	i32.const	$push103=, 12345
+	i32.add 	$push102=, $pop1, $pop103
+	tee_local	$push101=, $0=, $pop102
+	i32.const	$push100=, 16
+	i32.shr_u	$push2=, $pop101, $pop100
+	i32.store8	sL($pop106), $pop2
+	i32.const	$push99=, 0
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push3=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop3, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.const	$push94=, 16
+	i32.shr_u	$push4=, $pop95, $pop94
+	i32.store8	sL+1($pop99), $pop4
+	i32.const	$push93=, 0
+	i32.const	$push92=, 1103515245
+	i32.mul 	$push5=, $0, $pop92
+	i32.const	$push91=, 12345
+	i32.add 	$push90=, $pop5, $pop91
+	tee_local	$push89=, $0=, $pop90
+	i32.const	$push88=, 16
+	i32.shr_u	$push6=, $pop89, $pop88
+	i32.store8	sL+2($pop93), $pop6
+	i32.const	$push87=, 0
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push7=, $0, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$push84=, $pop7, $pop85
+	tee_local	$push83=, $0=, $pop84
+	i32.const	$push82=, 16
+	i32.shr_u	$push8=, $pop83, $pop82
+	i32.store8	sL+3($pop87), $pop8
+	i32.const	$push81=, 0
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push9=, $0, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$push78=, $pop9, $pop79
+	tee_local	$push77=, $0=, $pop78
+	i32.const	$push76=, 16
+	i32.shr_u	$push10=, $pop77, $pop76
+	i32.store8	sL+4($pop81), $pop10
+	i32.const	$push75=, 0
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push11=, $0, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$push72=, $pop11, $pop73
+	tee_local	$push71=, $0=, $pop72
+	i32.const	$push70=, 16
+	i32.shr_u	$push12=, $pop71, $pop70
+	i32.store8	sL+5($pop75), $pop12
+	i32.const	$push69=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push13=, $0, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$push66=, $pop13, $pop67
+	tee_local	$push65=, $0=, $pop66
+	i32.const	$push64=, 16
+	i32.shr_u	$push14=, $pop65, $pop64
+	i32.store8	sL+6($pop69), $pop14
+	i32.const	$push63=, 0
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push15=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$push60=, $pop15, $pop61
+	tee_local	$push59=, $0=, $pop60
+	i32.const	$push58=, 16
+	i32.shr_u	$push16=, $pop59, $pop58
+	i32.store8	sL+7($pop63), $pop16
+	i32.const	$push57=, 0
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $0, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$push54=, $pop17, $pop55
+	tee_local	$push53=, $2=, $pop54
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push18=, $pop53, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$push50=, $pop18, $pop51
+	tee_local	$push49=, $0=, $pop50
+	i32.store	myrnd.s($pop57), $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $2, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.const	$push44=, 63
+	i32.and 	$push21=, $pop45, $pop44
+	i32.const	$push43=, 0
+	i32.load	$push19=, sL($pop43)
+	i32.const	$push20=, -64
+	i32.and 	$push42=, $pop19, $pop20
+	tee_local	$push41=, $1=, $pop42
+	i32.or  	$push40=, $pop21, $pop41
+	tee_local	$push39=, $3=, $pop40
+	i32.store	sL($pop48), $pop39
 	block   	
 	i32.const	$push38=, 16
 	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.add 	$push22=, $pop36, $2
-	i32.add 	$push21=, $1, $3
-	i32.xor 	$push23=, $pop22, $pop21
+	tee_local	$push36=, $4=, $pop37
+	i32.add 	$push23=, $pop36, $2
+	i32.add 	$push22=, $4, $3
+	i32.xor 	$push24=, $pop23, $pop22
 	i32.const	$push35=, 63
-	i32.and 	$push24=, $pop23, $pop35
-	br_if   	0, $pop24       # 0: down to label1
-# BB#1:                                 # %if.end75
+	i32.and 	$push25=, $pop24, $pop35
+	br_if   	0, $pop25       # 0: down to label7
+# BB#1:                                 # %if.end113
 	i32.const	$push117=, 0
-	i32.const	$push25=, -2139243339
-	i32.mul 	$push26=, $0, $pop25
-	i32.const	$push27=, -1492899873
-	i32.add 	$push116=, $pop26, $pop27
+	i32.const	$push26=, -2139243339
+	i32.mul 	$push27=, $0, $pop26
+	i32.const	$push28=, -1492899873
+	i32.add 	$push116=, $pop27, $pop28
 	tee_local	$push115=, $0=, $pop116
 	i32.const	$push114=, 1103515245
-	i32.mul 	$push28=, $pop115, $pop114
+	i32.mul 	$push29=, $pop115, $pop114
 	i32.const	$push113=, 12345
-	i32.add 	$push112=, $pop28, $pop113
+	i32.add 	$push112=, $pop29, $pop113
 	tee_local	$push111=, $2=, $pop112
 	i32.store	myrnd.s($pop117), $pop111
 	i32.const	$push110=, 0
 	i32.const	$push109=, 16
-	i32.shr_u	$push30=, $2, $pop109
+	i32.shr_u	$push31=, $2, $pop109
 	i32.const	$push108=, 16
-	i32.shr_u	$push29=, $0, $pop108
-	i32.add 	$push31=, $pop30, $pop29
+	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$push32=, $pop31, $pop30
 	i32.const	$push107=, 63
-	i32.and 	$push32=, $pop31, $pop107
-	i32.const	$push106=, -64
-	i32.and 	$push33=, $1, $pop106
-	i32.or  	$push34=, $pop32, $pop33
+	i32.and 	$push33=, $pop32, $pop107
+	i32.or  	$push34=, $pop33, $1
 	i32.store	sL($pop110), $pop34
 	return
 .LBB72_2:                               # %if.then
-	end_block                       # label1:
+	end_block                       # label7:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end72:
 	.size	testL, .Lfunc_end72-testL
-
+                                        # -- End function
 	.section	.text.retmeM,"ax",@progbits
-	.hidden	retmeM
+	.hidden	retmeM                  # -- Begin function retmeM
 	.globl	retmeM
 	.type	retmeM,@function
 retmeM:                                 # @retmeM
@@ -2733,9 +2840,9 @@ retmeM:                                 # @retmeM
 	.endfunc
 .Lfunc_end73:
 	.size	retmeM, .Lfunc_end73-retmeM
-
+                                        # -- End function
 	.section	.text.fn1M,"ax",@progbits
-	.hidden	fn1M
+	.hidden	fn1M                    # -- Begin function fn1M
 	.globl	fn1M
 	.type	fn1M,@function
 fn1M:                                   # @fn1M
@@ -2751,9 +2858,9 @@ fn1M:                                   # @fn1M
 	.endfunc
 .Lfunc_end74:
 	.size	fn1M, .Lfunc_end74-fn1M
-
+                                        # -- End function
 	.section	.text.fn2M,"ax",@progbits
-	.hidden	fn2M
+	.hidden	fn2M                    # -- Begin function fn2M
 	.globl	fn2M
 	.type	fn2M,@function
 fn2M:                                   # @fn2M
@@ -2771,9 +2878,9 @@ fn2M:                                   # @fn2M
 	.endfunc
 .Lfunc_end75:
 	.size	fn2M, .Lfunc_end75-fn2M
-
+                                        # -- End function
 	.section	.text.retitM,"ax",@progbits
-	.hidden	retitM
+	.hidden	retitM                  # -- Begin function retitM
 	.globl	retitM
 	.type	retitM,@function
 retitM:                                 # @retitM
@@ -2787,9 +2894,9 @@ retitM:                                 # @retitM
 	.endfunc
 .Lfunc_end76:
 	.size	retitM, .Lfunc_end76-retitM
-
+                                        # -- End function
 	.section	.text.fn3M,"ax",@progbits
-	.hidden	fn3M
+	.hidden	fn3M                    # -- Begin function fn3M
 	.globl	fn3M
 	.type	fn3M,@function
 fn3M:                                   # @fn3M
@@ -2814,158 +2921,158 @@ fn3M:                                   # @fn3M
 	.endfunc
 .Lfunc_end77:
 	.size	fn3M, .Lfunc_end77-fn3M
-
+                                        # -- End function
 	.section	.text.testM,"ax",@progbits
-	.hidden	testM
+	.hidden	testM                   # -- Begin function testM
 	.globl	testM
 	.type	testM,@function
 testM:                                  # @testM
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push106=, 0
 	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.load	$push0=, myrnd.s($pop104)
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop1, $pop102
-	tee_local	$push100=, $0=, $pop101
-	i32.const	$push99=, 16
-	i32.shr_u	$push2=, $pop100, $pop99
-	i32.store8	sM($pop105), $pop2
-	i32.const	$push98=, 0
-	i32.const	$push97=, 1103515245
-	i32.mul 	$push3=, $0, $pop97
-	i32.const	$push96=, 12345
-	i32.add 	$push95=, $pop3, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 16
-	i32.shr_u	$push4=, $pop94, $pop93
-	i32.store8	sM+1($pop98), $pop4
-	i32.const	$push92=, 0
-	i32.const	$push91=, 1103515245
-	i32.mul 	$push5=, $0, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop5, $pop90
-	tee_local	$push88=, $0=, $pop89
-	i32.const	$push87=, 16
-	i32.shr_u	$push6=, $pop88, $pop87
-	i32.store8	sM+2($pop92), $pop6
-	i32.const	$push86=, 0
-	i32.const	$push85=, 1103515245
-	i32.mul 	$push7=, $0, $pop85
-	i32.const	$push84=, 12345
-	i32.add 	$push83=, $pop7, $pop84
-	tee_local	$push82=, $0=, $pop83
-	i32.const	$push81=, 16
-	i32.shr_u	$push8=, $pop82, $pop81
-	i32.store8	sM+3($pop86), $pop8
-	i32.const	$push80=, 0
-	i32.const	$push79=, 1103515245
-	i32.mul 	$push9=, $0, $pop79
-	i32.const	$push78=, 12345
-	i32.add 	$push77=, $pop9, $pop78
-	tee_local	$push76=, $0=, $pop77
-	i32.const	$push75=, 16
-	i32.shr_u	$push10=, $pop76, $pop75
-	i32.store8	sM+4($pop80), $pop10
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push11=, $0, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop11, $pop72
-	tee_local	$push70=, $0=, $pop71
-	i32.const	$push69=, 16
-	i32.shr_u	$push12=, $pop70, $pop69
-	i32.store8	sM+5($pop74), $pop12
-	i32.const	$push68=, 0
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push13=, $0, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop13, $pop66
-	tee_local	$push64=, $0=, $pop65
-	i32.const	$push63=, 16
-	i32.shr_u	$push14=, $pop64, $pop63
-	i32.store8	sM+6($pop68), $pop14
-	i32.const	$push62=, 0
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push15=, $0, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop15, $pop60
-	tee_local	$push58=, $0=, $pop59
-	i32.const	$push57=, 16
-	i32.shr_u	$push16=, $pop58, $pop57
-	i32.store8	sM+7($pop62), $pop16
-	i32.const	$push56=, 0
-	i32.load	$3=, sM+4($pop56)
-	i32.const	$push55=, 0
-	i32.const	$push54=, 1103515245
-	i32.mul 	$push17=, $0, $pop54
-	i32.const	$push53=, 12345
-	i32.add 	$push52=, $pop17, $pop53
-	tee_local	$push51=, $2=, $pop52
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push18=, $pop51, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop18, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.store	myrnd.s($pop55), $pop47
-	i32.const	$push46=, 0
-	i32.const	$push45=, 16
-	i32.shr_u	$push44=, $2, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.const	$push42=, 63
-	i32.and 	$push20=, $pop43, $pop42
-	i32.const	$push19=, -64
-	i32.and 	$push41=, $3, $pop19
-	tee_local	$push40=, $1=, $pop41
-	i32.or  	$push39=, $pop20, $pop40
-	tee_local	$push38=, $3=, $pop39
-	i32.store	sM+4($pop46), $pop38
+	i32.load	$push0=, myrnd.s($pop105)
+	i32.const	$push104=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop104
+	i32.const	$push103=, 12345
+	i32.add 	$push102=, $pop1, $pop103
+	tee_local	$push101=, $0=, $pop102
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push2=, $pop101, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$push98=, $pop2, $pop99
+	tee_local	$push97=, $1=, $pop98
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push3=, $pop97, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop3, $pop95
+	tee_local	$push93=, $2=, $pop94
+	i32.const	$push92=, 1103515245
+	i32.mul 	$push4=, $pop93, $pop92
+	i32.const	$push91=, 12345
+	i32.add 	$push90=, $pop4, $pop91
+	tee_local	$push89=, $3=, $pop90
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push5=, $pop89, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$push86=, $pop5, $pop87
+	tee_local	$push85=, $4=, $pop86
+	i32.const	$push84=, 16
+	i32.shr_u	$push6=, $pop85, $pop84
+	i32.store8	sM+4($pop106), $pop6
+	i32.const	$push83=, 0
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push7=, $4, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop7, $pop81
+	tee_local	$push79=, $4=, $pop80
+	i32.const	$push78=, 16
+	i32.shr_u	$push8=, $pop79, $pop78
+	i32.store8	sM+5($pop83), $pop8
+	i32.const	$push77=, 0
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push9=, $4, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$push74=, $pop9, $pop75
+	tee_local	$push73=, $4=, $pop74
+	i32.const	$push72=, 16
+	i32.shr_u	$push10=, $pop73, $pop72
+	i32.store8	sM+6($pop77), $pop10
+	i32.const	$push71=, 0
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push11=, $4, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop11, $pop69
+	tee_local	$push67=, $4=, $pop68
+	i32.const	$push66=, 16
+	i32.shr_u	$push12=, $pop67, $pop66
+	i32.store8	sM+7($pop71), $pop12
+	i32.const	$push65=, 0
+	i32.const	$push64=, 16
+	i32.shr_u	$push13=, $0, $pop64
+	i32.store8	sM($pop65), $pop13
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push14=, $1, $pop62
+	i32.store8	sM+1($pop63), $pop14
+	i32.const	$push61=, 0
+	i32.const	$push60=, 16
+	i32.shr_u	$push15=, $2, $pop60
+	i32.store8	sM+2($pop61), $pop15
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push16=, $3, $pop58
+	i32.store8	sM+3($pop59), $pop16
+	i32.const	$push57=, 0
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $4, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$push54=, $pop17, $pop55
+	tee_local	$push53=, $1=, $pop54
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push18=, $pop53, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$push50=, $pop18, $pop51
+	tee_local	$push49=, $0=, $pop50
+	i32.store	myrnd.s($pop57), $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push46=, $1, $pop47
+	tee_local	$push45=, $1=, $pop46
+	i32.const	$push44=, 63
+	i32.and 	$push21=, $pop45, $pop44
+	i32.const	$push43=, 0
+	i32.load	$push19=, sM+4($pop43)
+	i32.const	$push20=, -64
+	i32.and 	$push42=, $pop19, $pop20
+	tee_local	$push41=, $2=, $pop42
+	i32.or  	$push40=, $pop21, $pop41
+	tee_local	$push39=, $3=, $pop40
+	i32.store	sM+4($pop48), $pop39
 	block   	
-	i32.const	$push37=, 16
-	i32.shr_u	$push36=, $0, $pop37
-	tee_local	$push35=, $4=, $pop36
-	i32.add 	$push22=, $3, $pop35
-	i32.add 	$push21=, $4, $2
-	i32.xor 	$push23=, $pop22, $pop21
-	i32.const	$push34=, 63
-	i32.and 	$push24=, $pop23, $pop34
-	br_if   	0, $pop24       # 0: down to label2
-# BB#1:                                 # %if.end107
-	i32.const	$push116=, 0
-	i32.const	$push25=, -2139243339
-	i32.mul 	$push26=, $0, $pop25
-	i32.const	$push27=, -1492899873
-	i32.add 	$push115=, $pop26, $pop27
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, 1103515245
-	i32.mul 	$push28=, $pop114, $pop113
-	i32.const	$push112=, 12345
-	i32.add 	$push111=, $pop28, $pop112
-	tee_local	$push110=, $3=, $pop111
-	i32.store	myrnd.s($pop116), $pop110
-	i32.const	$push109=, 0
+	i32.const	$push38=, 16
+	i32.shr_u	$push37=, $0, $pop38
+	tee_local	$push36=, $4=, $pop37
+	i32.add 	$push23=, $pop36, $1
+	i32.add 	$push22=, $4, $3
+	i32.xor 	$push24=, $pop23, $pop22
+	i32.const	$push35=, 63
+	i32.and 	$push25=, $pop24, $pop35
+	br_if   	0, $pop25       # 0: down to label8
+# BB#1:                                 # %if.end159
+	i32.const	$push117=, 0
+	i32.const	$push26=, -2139243339
+	i32.mul 	$push27=, $0, $pop26
+	i32.const	$push28=, -1492899873
+	i32.add 	$push116=, $pop27, $pop28
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push29=, $pop115, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop29, $pop113
+	tee_local	$push111=, $1=, $pop112
+	i32.store	myrnd.s($pop117), $pop111
+	i32.const	$push110=, 0
+	i32.const	$push109=, 16
+	i32.shr_u	$push31=, $1, $pop109
 	i32.const	$push108=, 16
-	i32.shr_u	$push30=, $3, $pop108
-	i32.const	$push107=, 16
-	i32.shr_u	$push29=, $0, $pop107
-	i32.add 	$push31=, $pop30, $pop29
-	i32.const	$push106=, 63
-	i32.and 	$push32=, $pop31, $pop106
-	i32.or  	$push33=, $pop32, $1
-	i32.store	sM+4($pop109), $pop33
+	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$push32=, $pop31, $pop30
+	i32.const	$push107=, 63
+	i32.and 	$push33=, $pop32, $pop107
+	i32.or  	$push34=, $pop33, $2
+	i32.store	sM+4($pop110), $pop34
 	return
 .LBB78_2:                               # %if.then
-	end_block                       # label2:
+	end_block                       # label8:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end78:
 	.size	testM, .Lfunc_end78-testM
-
+                                        # -- End function
 	.section	.text.retmeN,"ax",@progbits
-	.hidden	retmeN
+	.hidden	retmeN                  # -- Begin function retmeN
 	.globl	retmeN
 	.type	retmeN,@function
 retmeN:                                 # @retmeN
@@ -2977,9 +3084,9 @@ retmeN:                                 # @retmeN
 	.endfunc
 .Lfunc_end79:
 	.size	retmeN, .Lfunc_end79-retmeN
-
+                                        # -- End function
 	.section	.text.fn1N,"ax",@progbits
-	.hidden	fn1N
+	.hidden	fn1N                    # -- Begin function fn1N
 	.globl	fn1N
 	.type	fn1N,@function
 fn1N:                                   # @fn1N
@@ -2997,9 +3104,9 @@ fn1N:                                   # @fn1N
 	.endfunc
 .Lfunc_end80:
 	.size	fn1N, .Lfunc_end80-fn1N
-
+                                        # -- End function
 	.section	.text.fn2N,"ax",@progbits
-	.hidden	fn2N
+	.hidden	fn2N                    # -- Begin function fn2N
 	.globl	fn2N
 	.type	fn2N,@function
 fn2N:                                   # @fn2N
@@ -3019,9 +3126,9 @@ fn2N:                                   # @fn2N
 	.endfunc
 .Lfunc_end81:
 	.size	fn2N, .Lfunc_end81-fn2N
-
+                                        # -- End function
 	.section	.text.retitN,"ax",@progbits
-	.hidden	retitN
+	.hidden	retitN                  # -- Begin function retitN
 	.globl	retitN
 	.type	retitN,@function
 retitN:                                 # @retitN
@@ -3037,9 +3144,9 @@ retitN:                                 # @retitN
 	.endfunc
 .Lfunc_end82:
 	.size	retitN, .Lfunc_end82-retitN
-
+                                        # -- End function
 	.section	.text.fn3N,"ax",@progbits
-	.hidden	fn3N
+	.hidden	fn3N                    # -- Begin function fn3N
 	.globl	fn3N
 	.type	fn3N,@function
 fn3N:                                   # @fn3N
@@ -3048,249 +3155,301 @@ fn3N:                                   # @fn3N
 	.local  	i64
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sN($pop16)
-	tee_local	$push14=, $1=, $pop15
-	i32.wrap/i64	$push3=, $pop14
-	i32.const	$push4=, 6
-	i32.shr_u	$push5=, $pop3, $pop4
-	i32.add 	$push6=, $pop5, $0
-	i32.const	$push7=, 63
-	i32.and 	$push13=, $pop6, $pop7
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push8=, $pop12
-	i64.const	$push9=, 6
-	i64.shl 	$push10=, $pop8, $pop9
+	i32.const	$push18=, 0
+	i64.load	$push17=, sN($pop18)
+	tee_local	$push16=, $1=, $pop17
 	i64.const	$push1=, -4033
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push11=, $pop10, $pop2
+	i64.and 	$push2=, $pop16, $pop1
+	i64.const	$push3=, 6
+	i64.shr_u	$push4=, $1, $pop3
+	i32.wrap/i64	$push5=, $pop4
+	i32.add 	$push15=, $pop5, $0
+	tee_local	$push14=, $0=, $pop15
+	i32.const	$push6=, 6
+	i32.shl 	$push7=, $pop14, $pop6
+	i32.const	$push8=, 4032
+	i32.and 	$push9=, $pop7, $pop8
+	i64.extend_u/i32	$push10=, $pop9
+	i64.or  	$push11=, $pop2, $pop10
 	i64.store	sN($pop0), $pop11
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	i32.const	$push12=, 63
+	i32.and 	$push13=, $0, $pop12
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end83:
 	.size	fn3N, .Lfunc_end83-fn3N
-
+                                        # -- End function
 	.section	.text.testN,"ax",@progbits
-	.hidden	testN
+	.hidden	testN                   # -- Begin function testN
 	.globl	testN
 	.type	testN,@function
 testN:                                  # @testN
-	.local  	i64, i32, i32, i32, i32, i64
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push140=, 0
-	i32.load	$push1=, myrnd.s($pop140)
-	i32.const	$push2=, 1103515245
-	i32.mul 	$push3=, $pop1, $pop2
-	i32.const	$push4=, 12345
-	i32.add 	$push139=, $pop3, $pop4
-	tee_local	$push138=, $2=, $pop139
-	i32.const	$push137=, 16
-	i32.shr_u	$push5=, $pop138, $pop137
-	i32.store8	sN($pop0), $pop5
-	i32.const	$push136=, 0
-	i32.const	$push135=, 1103515245
-	i32.mul 	$push6=, $2, $pop135
-	i32.const	$push134=, 12345
-	i32.add 	$push133=, $pop6, $pop134
-	tee_local	$push132=, $2=, $pop133
-	i32.const	$push131=, 16
-	i32.shr_u	$push7=, $pop132, $pop131
-	i32.store8	sN+1($pop136), $pop7
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push8=, $2, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop8, $pop128
-	tee_local	$push126=, $2=, $pop127
-	i32.const	$push125=, 16
-	i32.shr_u	$push9=, $pop126, $pop125
-	i32.store8	sN+2($pop130), $pop9
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push10=, $2, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop10, $pop122
-	tee_local	$push120=, $2=, $pop121
-	i32.const	$push119=, 16
-	i32.shr_u	$push11=, $pop120, $pop119
-	i32.store8	sN+3($pop124), $pop11
+	.local  	i64, i32, i32, i32, i64, i64, i32, i32, i32, i64
+# BB#0:                                 # %lor.lhs.false
+	i32.const	$push3=, 0
+	i32.const	$push173=, 0
+	i32.load	$push4=, myrnd.s($pop173)
+	i32.const	$push5=, 1103515245
+	i32.mul 	$push6=, $pop4, $pop5
+	i32.const	$push7=, 12345
+	i32.add 	$push172=, $pop6, $pop7
+	tee_local	$push171=, $8=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push8=, $pop171, $pop170
+	i32.store8	sN($pop3), $pop8
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push9=, $8, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop9, $pop167
+	tee_local	$push165=, $8=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push10=, $pop165, $pop164
+	i32.store8	sN+1($pop169), $pop10
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push11=, $8, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop11, $pop161
+	tee_local	$push159=, $8=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push12=, $pop159, $pop158
+	i32.store8	sN+2($pop163), $pop12
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push13=, $8, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop13, $pop155
+	tee_local	$push153=, $8=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push14=, $pop153, $pop152
+	i32.store8	sN+3($pop157), $pop14
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push15=, $8, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop15, $pop149
+	tee_local	$push147=, $8=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push16=, $pop147, $pop146
+	i32.store8	sN+4($pop151), $pop16
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push17=, $8, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop17, $pop143
+	tee_local	$push141=, $8=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push18=, $pop141, $pop140
+	i32.store8	sN+5($pop145), $pop18
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push19=, $8, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop19, $pop137
+	tee_local	$push135=, $8=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push20=, $pop135, $pop134
+	i32.store8	sN+6($pop139), $pop20
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push21=, $8, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop21, $pop131
+	tee_local	$push129=, $8=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push22=, $pop129, $pop128
+	i32.store8	sN+7($pop133), $pop22
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push23=, $8, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop23, $pop125
+	tee_local	$push123=, $8=, $pop124
+	i32.const	$push122=, 1103515245
+	i32.mul 	$push24=, $pop123, $pop122
+	i32.const	$push121=, 12345
+	i32.add 	$push120=, $pop24, $pop121
+	tee_local	$push119=, $1=, $pop120
+	i32.store	myrnd.s($pop127), $pop119
 	i32.const	$push118=, 0
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push12=, $2, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop12, $pop116
-	tee_local	$push114=, $2=, $pop115
-	i32.const	$push113=, 16
-	i32.shr_u	$push13=, $pop114, $pop113
-	i32.store8	sN+4($pop118), $pop13
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1103515245
-	i32.mul 	$push14=, $2, $pop111
-	i32.const	$push110=, 12345
-	i32.add 	$push109=, $pop14, $pop110
-	tee_local	$push108=, $2=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_u	$push15=, $pop108, $pop107
-	i32.store8	sN+5($pop112), $pop15
-	i32.const	$push106=, 0
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push16=, $2, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop16, $pop104
-	tee_local	$push102=, $2=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push17=, $pop102, $pop101
-	i32.store8	sN+6($pop106), $pop17
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push18=, $2, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop18, $pop98
-	tee_local	$push96=, $2=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push19=, $pop96, $pop95
-	i32.store8	sN+7($pop100), $pop19
-	i32.const	$push94=, 0
-	i64.load	$0=, sN($pop94)
-	i32.const	$push93=, 0
-	i32.const	$push92=, 1103515245
-	i32.mul 	$push20=, $2, $pop92
-	i32.const	$push91=, 12345
-	i32.add 	$push90=, $pop20, $pop91
-	tee_local	$push89=, $4=, $pop90
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push21=, $pop89, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop21, $pop87
-	tee_local	$push85=, $2=, $pop86
-	i32.store	myrnd.s($pop93), $pop85
-	i32.const	$push84=, 0
-	i32.const	$push83=, 16
-	i32.shr_u	$push82=, $4, $pop83
-	tee_local	$push81=, $1=, $pop82
-	i32.const	$push80=, 63
-	i32.and 	$push79=, $pop81, $pop80
-	tee_local	$push78=, $4=, $pop79
-	i64.extend_u/i32	$push24=, $pop78
-	i64.const	$push25=, 6
-	i64.shl 	$push26=, $pop24, $pop25
-	i64.const	$push22=, -4033
-	i64.and 	$push23=, $0, $pop22
-	i64.or  	$push77=, $pop26, $pop23
-	tee_local	$push76=, $5=, $pop77
-	i64.store	sN($pop84), $pop76
+	i32.const	$push117=, 0
+	i64.load	$push116=, sN($pop117)
+	tee_local	$push115=, $0=, $pop116
+	i64.const	$push25=, -4033
+	i64.and 	$push114=, $pop115, $pop25
+	tee_local	$push113=, $4=, $pop114
+	i32.const	$push26=, 10
+	i32.shr_u	$push27=, $8, $pop26
+	i32.const	$push28=, 4032
+	i32.and 	$push112=, $pop27, $pop28
+	tee_local	$push111=, $3=, $pop112
+	i64.extend_u/i32	$push29=, $pop111
+	i64.or  	$push110=, $pop113, $pop29
+	tee_local	$push109=, $5=, $pop110
+	i64.store	sN($pop118), $pop109
 	block   	
-	i64.const	$push75=, 6
-	i64.shr_u	$push27=, $5, $pop75
-	i32.wrap/i64	$push74=, $pop27
-	tee_local	$push73=, $3=, $pop74
-	i32.const	$push72=, 63
-	i32.and 	$push28=, $pop73, $pop72
-	i32.ne  	$push29=, $4, $pop28
-	br_if   	0, $pop29       # 0: down to label3
-# BB#1:                                 # %lor.lhs.false49
-	i32.const	$push144=, 16
-	i32.shr_u	$push143=, $2, $pop144
-	tee_local	$push142=, $4=, $pop143
-	i32.add 	$push31=, $3, $pop142
-	i32.add 	$push30=, $4, $1
-	i32.xor 	$push32=, $pop31, $pop30
-	i32.const	$push141=, 63
-	i32.and 	$push33=, $pop32, $pop141
-	br_if   	0, $pop33       # 0: down to label3
-# BB#2:                                 # %if.end
-	i32.const	$push38=, 0
-	i32.const	$push34=, 1103515245
-	i32.mul 	$push35=, $2, $pop34
-	i32.const	$push36=, 12345
-	i32.add 	$push163=, $pop35, $pop36
-	tee_local	$push162=, $4=, $pop163
-	i32.const	$push161=, 1103515245
-	i32.mul 	$push37=, $pop162, $pop161
-	i32.const	$push160=, 12345
-	i32.add 	$push159=, $pop37, $pop160
-	tee_local	$push158=, $2=, $pop159
-	i32.store	myrnd.s($pop38), $pop158
-	i32.const	$push157=, 0
-	i32.const	$push156=, 16
-	i32.shr_u	$push155=, $4, $pop156
-	tee_local	$push154=, $1=, $pop155
-	i32.const	$push153=, 63
-	i32.and 	$push152=, $pop154, $pop153
-	tee_local	$push151=, $4=, $pop152
-	i64.extend_u/i32	$push41=, $pop151
-	i64.const	$push42=, 6
-	i64.shl 	$push43=, $pop41, $pop42
-	i64.const	$push39=, -4033
-	i64.and 	$push40=, $0, $pop39
-	i64.or  	$push150=, $pop43, $pop40
-	tee_local	$push149=, $5=, $pop150
-	i64.store	sN($pop157), $pop149
-	i64.const	$push148=, 6
-	i64.shr_u	$push44=, $5, $pop148
-	i32.wrap/i64	$push147=, $pop44
-	tee_local	$push146=, $3=, $pop147
-	i32.const	$push145=, 63
-	i32.and 	$push45=, $pop146, $pop145
-	i32.ne  	$push46=, $4, $pop45
-	br_if   	0, $pop46       # 0: down to label3
-# BB#3:                                 # %lor.lhs.false100
-	i32.const	$push169=, 16
-	i32.shr_u	$push168=, $2, $pop169
-	tee_local	$push167=, $4=, $pop168
-	i32.add 	$push51=, $pop167, $1
-	i32.const	$push166=, 63
-	i32.and 	$push52=, $pop51, $pop166
-	i32.const	$push49=, 15
-	i32.rem_u	$push53=, $pop52, $pop49
-	i32.add 	$push47=, $3, $4
-	i32.const	$push165=, 63
-	i32.and 	$push48=, $pop47, $pop165
-	i32.const	$push164=, 15
-	i32.rem_u	$push50=, $pop48, $pop164
-	i32.ne  	$push54=, $pop53, $pop50
-	br_if   	0, $pop54       # 0: down to label3
-# BB#4:                                 # %if.end158
-	i32.const	$push59=, 0
-	i32.const	$push55=, 1103515245
-	i32.mul 	$push56=, $2, $pop55
-	i32.const	$push57=, 12345
-	i32.add 	$push177=, $pop56, $pop57
-	tee_local	$push176=, $2=, $pop177
-	i32.const	$push175=, 1103515245
-	i32.mul 	$push58=, $pop176, $pop175
-	i32.const	$push174=, 12345
-	i32.add 	$push173=, $pop58, $pop174
-	tee_local	$push172=, $4=, $pop173
-	i32.store	myrnd.s($pop59), $pop172
-	i32.const	$push171=, 0
-	i32.const	$push60=, 16
-	i32.shr_u	$push62=, $4, $pop60
-	i32.const	$push170=, 16
-	i32.shr_u	$push61=, $2, $pop170
-	i32.add 	$push63=, $pop62, $pop61
-	i32.const	$push64=, 63
-	i32.and 	$push65=, $pop63, $pop64
-	i64.extend_u/i32	$push66=, $pop65
-	i64.const	$push67=, 6
-	i64.shl 	$push68=, $pop66, $pop67
-	i64.const	$push69=, -4033
-	i64.and 	$push70=, $0, $pop69
-	i64.or  	$push71=, $pop68, $pop70
-	i64.store	sN($pop171), $pop71
+	i64.const	$push32=, 4032
+	i64.or  	$push33=, $0, $pop32
+	i64.xor 	$push108=, $5, $pop33
+	tee_local	$push107=, $9=, $pop108
+	i64.const	$push34=, 34359734272
+	i64.and 	$push35=, $pop107, $pop34
+	i64.const	$push106=, 0
+	i64.ne  	$push36=, $pop35, $pop106
+	br_if   	0, $pop36       # 0: down to label9
+# BB#1:                                 # %lor.lhs.false29
+	i64.const	$push41=, 63
+	i64.and 	$push42=, $9, $pop41
+	i64.const	$push174=, 0
+	i64.ne  	$push43=, $pop42, $pop174
+	br_if   	0, $pop43       # 0: down to label9
+# BB#2:                                 # %lor.lhs.false29
+	i32.const	$push40=, 6
+	i32.shr_u	$push37=, $3, $pop40
+	i64.const	$push30=, 6
+	i64.shr_u	$push31=, $5, $pop30
+	i32.wrap/i64	$push176=, $pop31
+	tee_local	$push175=, $3=, $pop176
+	i32.const	$push39=, 63
+	i32.and 	$push38=, $pop175, $pop39
+	i32.ne  	$push44=, $pop37, $pop38
+	br_if   	0, $pop44       # 0: down to label9
+# BB#3:                                 # %lor.lhs.false49
+	i32.const	$push181=, 16
+	i32.shr_u	$push180=, $1, $pop181
+	tee_local	$push179=, $2=, $pop180
+	i32.add 	$push1=, $pop179, $3
+	i32.const	$push178=, 16
+	i32.shr_u	$push0=, $8, $pop178
+	i32.add 	$push45=, $2, $pop0
+	i32.xor 	$push46=, $pop1, $pop45
+	i32.const	$push177=, 63
+	i32.and 	$push47=, $pop46, $pop177
+	br_if   	0, $pop47       # 0: down to label9
+# BB#4:                                 # %lor.lhs.false69
+	i32.const	$push52=, 0
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push49=, $1, $pop48
+	i32.const	$push50=, 12345
+	i32.add 	$push201=, $pop49, $pop50
+	tee_local	$push200=, $8=, $pop201
+	i32.const	$push199=, 1103515245
+	i32.mul 	$push51=, $pop200, $pop199
+	i32.const	$push198=, 12345
+	i32.add 	$push197=, $pop51, $pop198
+	tee_local	$push196=, $1=, $pop197
+	i32.store	myrnd.s($pop52), $pop196
+	i32.const	$push195=, 0
+	i32.const	$push53=, 10
+	i32.shr_u	$push54=, $8, $pop53
+	i32.const	$push55=, 4032
+	i32.and 	$push194=, $pop54, $pop55
+	tee_local	$push193=, $3=, $pop194
+	i64.extend_u/i32	$push56=, $pop193
+	i64.or  	$push192=, $4, $pop56
+	tee_local	$push191=, $9=, $pop192
+	i64.store	sN($pop195), $pop191
+	i32.const	$push190=, 16
+	i32.shr_u	$push189=, $1, $pop190
+	tee_local	$push188=, $2=, $pop189
+	i64.const	$push57=, 6
+	i64.shr_u	$push58=, $9, $pop57
+	i32.wrap/i64	$push187=, $pop58
+	tee_local	$push186=, $6=, $pop187
+	i32.add 	$push59=, $pop188, $pop186
+	i32.const	$push185=, 63
+	i32.and 	$push60=, $pop59, $pop185
+	i32.const	$push61=, 15
+	i32.rem_u	$7=, $pop60, $pop61
+	i64.xor 	$push184=, $9, $5
+	tee_local	$push183=, $5=, $pop184
+	i64.const	$push62=, 34359734272
+	i64.and 	$push63=, $pop183, $pop62
+	i64.const	$push182=, 0
+	i64.ne  	$push64=, $pop63, $pop182
+	br_if   	0, $pop64       # 0: down to label9
+# BB#5:                                 # %lor.lhs.false80
+	i64.const	$push69=, 63
+	i64.and 	$push70=, $5, $pop69
+	i64.const	$push202=, 0
+	i64.ne  	$push71=, $pop70, $pop202
+	br_if   	0, $pop71       # 0: down to label9
+# BB#6:                                 # %lor.lhs.false80
+	i32.const	$push68=, 6
+	i32.shr_u	$push65=, $3, $pop68
+	i32.const	$push67=, 63
+	i32.and 	$push66=, $6, $pop67
+	i32.ne  	$push72=, $pop65, $pop66
+	br_if   	0, $pop72       # 0: down to label9
+# BB#7:                                 # %lor.lhs.false100
+	i32.const	$push204=, 16
+	i32.shr_u	$push2=, $8, $pop204
+	i32.add 	$push73=, $2, $pop2
+	i32.const	$push203=, 63
+	i32.and 	$push74=, $pop73, $pop203
+	i32.const	$push75=, 15
+	i32.rem_u	$push76=, $pop74, $pop75
+	i32.ne  	$push77=, $pop76, $7
+	br_if   	0, $pop77       # 0: down to label9
+# BB#8:                                 # %lor.lhs.false125
+	i32.const	$push82=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push79=, $1, $pop78
+	i32.const	$push80=, 12345
+	i32.add 	$push218=, $pop79, $pop80
+	tee_local	$push217=, $8=, $pop218
+	i32.const	$push216=, 1103515245
+	i32.mul 	$push81=, $pop217, $pop216
+	i32.const	$push215=, 12345
+	i32.add 	$push214=, $pop81, $pop215
+	tee_local	$push213=, $1=, $pop214
+	i32.store	myrnd.s($pop82), $pop213
+	i32.const	$push212=, 0
+	i32.const	$push94=, 16
+	i32.shr_u	$push211=, $1, $pop94
+	tee_local	$push210=, $1=, $pop211
+	i32.const	$push95=, 2047
+	i32.and 	$push96=, $pop210, $pop95
+	i64.const	$push83=, 274877902848
+	i64.and 	$push84=, $0, $pop83
+	i32.const	$push85=, 10
+	i32.shr_u	$push86=, $8, $pop85
+	i32.const	$push87=, 4032
+	i32.and 	$push88=, $pop86, $pop87
+	i64.extend_u/i32	$push89=, $pop88
+	i64.or  	$push90=, $pop84, $pop89
+	i64.const	$push91=, 6
+	i64.shr_u	$push92=, $pop90, $pop91
+	i32.wrap/i64	$push93=, $pop92
+	i32.add 	$push209=, $pop96, $pop93
+	tee_local	$push208=, $3=, $pop209
+	i32.const	$push97=, 6
+	i32.shl 	$push98=, $pop208, $pop97
+	i32.const	$push207=, 4032
+	i32.and 	$push99=, $pop98, $pop207
+	i64.extend_u/i32	$push100=, $pop99
+	i64.or  	$push101=, $4, $pop100
+	i64.store	sN($pop212), $pop101
+	i32.const	$push206=, 16
+	i32.shr_u	$push102=, $8, $pop206
+	i32.add 	$push103=, $1, $pop102
+	i32.xor 	$push104=, $pop103, $3
+	i32.const	$push205=, 63
+	i32.and 	$push105=, $pop104, $pop205
+	br_if   	0, $pop105      # 0: down to label9
+# BB#9:                                 # %if.end158
 	return
-.LBB84_5:                               # %if.then106
-	end_block                       # label3:
+.LBB84_10:                              # %if.then
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end84:
 	.size	testN, .Lfunc_end84-testN
-
+                                        # -- End function
 	.section	.text.retmeO,"ax",@progbits
-	.hidden	retmeO
+	.hidden	retmeO                  # -- Begin function retmeO
 	.globl	retmeO
 	.type	retmeO,@function
 retmeO:                                 # @retmeO
@@ -3308,9 +3467,9 @@ retmeO:                                 # @retmeO
 	.endfunc
 .Lfunc_end85:
 	.size	retmeO, .Lfunc_end85-retmeO
-
+                                        # -- End function
 	.section	.text.fn1O,"ax",@progbits
-	.hidden	fn1O
+	.hidden	fn1O                    # -- Begin function fn1O
 	.globl	fn1O
 	.type	fn1O,@function
 fn1O:                                   # @fn1O
@@ -3326,9 +3485,9 @@ fn1O:                                   # @fn1O
 	.endfunc
 .Lfunc_end86:
 	.size	fn1O, .Lfunc_end86-fn1O
-
+                                        # -- End function
 	.section	.text.fn2O,"ax",@progbits
-	.hidden	fn2O
+	.hidden	fn2O                    # -- Begin function fn2O
 	.globl	fn2O
 	.type	fn2O,@function
 fn2O:                                   # @fn2O
@@ -3346,9 +3505,9 @@ fn2O:                                   # @fn2O
 	.endfunc
 .Lfunc_end87:
 	.size	fn2O, .Lfunc_end87-fn2O
-
+                                        # -- End function
 	.section	.text.retitO,"ax",@progbits
-	.hidden	retitO
+	.hidden	retitO                  # -- Begin function retitO
 	.globl	retitO
 	.type	retitO,@function
 retitO:                                 # @retitO
@@ -3362,9 +3521,9 @@ retitO:                                 # @retitO
 	.endfunc
 .Lfunc_end88:
 	.size	retitO, .Lfunc_end88-retitO
-
+                                        # -- End function
 	.section	.text.fn3O,"ax",@progbits
-	.hidden	fn3O
+	.hidden	fn3O                    # -- Begin function fn3O
 	.globl	fn3O
 	.type	fn3O,@function
 fn3O:                                   # @fn3O
@@ -3376,306 +3535,303 @@ fn3O:                                   # @fn3O
 	i32.const	$push12=, 0
 	i64.load	$push11=, sO+8($pop12)
 	tee_local	$push10=, $1=, $pop11
-	i32.wrap/i64	$push3=, $pop10
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $pop10, $pop1
+	i32.wrap/i64	$push3=, $1
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 4095
 	i32.and 	$push9=, $pop4, $pop5
 	tee_local	$push8=, $0=, $pop9
 	i64.extend_u/i32	$push6=, $pop8
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push7=, $pop6, $pop2
+	i64.or  	$push7=, $pop2, $pop6
 	i64.store	sO+8($pop0), $pop7
 	copy_local	$push13=, $0
                                         # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end89:
 	.size	fn3O, .Lfunc_end89-fn3O
-
+                                        # -- End function
 	.section	.text.testO,"ax",@progbits
-	.hidden	testO
+	.hidden	testO                   # -- Begin function testO
 	.globl	testO
 	.type	testO,@function
 testO:                                  # @testO
-	.local  	i64, i32, i32, i64, i32, i32
+	.local  	i32, i64, i32, i64, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push2=, 0
-	i32.const	$push199=, 0
-	i32.load	$push3=, myrnd.s($pop199)
+	i32.const	$push197=, 0
+	i32.load	$push3=, myrnd.s($pop197)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	i32.add 	$push198=, $pop5, $pop6
-	tee_local	$push197=, $2=, $pop198
-	i32.const	$push196=, 16
-	i32.shr_u	$push7=, $pop197, $pop196
+	i32.add 	$push196=, $pop5, $pop6
+	tee_local	$push195=, $0=, $pop196
+	i32.const	$push194=, 16
+	i32.shr_u	$push7=, $pop195, $pop194
 	i32.store8	sO($pop2), $pop7
-	i32.const	$push195=, 0
-	i32.const	$push194=, 1103515245
-	i32.mul 	$push8=, $2, $pop194
-	i32.const	$push193=, 12345
-	i32.add 	$push192=, $pop8, $pop193
-	tee_local	$push191=, $2=, $pop192
-	i32.const	$push190=, 16
-	i32.shr_u	$push9=, $pop191, $pop190
-	i32.store8	sO+1($pop195), $pop9
-	i32.const	$push189=, 0
-	i32.const	$push188=, 1103515245
-	i32.mul 	$push10=, $2, $pop188
-	i32.const	$push187=, 12345
-	i32.add 	$push186=, $pop10, $pop187
-	tee_local	$push185=, $2=, $pop186
-	i32.const	$push184=, 16
-	i32.shr_u	$push11=, $pop185, $pop184
-	i32.store8	sO+2($pop189), $pop11
-	i32.const	$push183=, 0
-	i32.const	$push182=, 1103515245
-	i32.mul 	$push12=, $2, $pop182
-	i32.const	$push181=, 12345
-	i32.add 	$push180=, $pop12, $pop181
-	tee_local	$push179=, $2=, $pop180
-	i32.const	$push178=, 16
-	i32.shr_u	$push13=, $pop179, $pop178
-	i32.store8	sO+3($pop183), $pop13
-	i32.const	$push177=, 0
-	i32.const	$push176=, 1103515245
-	i32.mul 	$push14=, $2, $pop176
-	i32.const	$push175=, 12345
-	i32.add 	$push174=, $pop14, $pop175
-	tee_local	$push173=, $2=, $pop174
-	i32.const	$push172=, 16
-	i32.shr_u	$push15=, $pop173, $pop172
-	i32.store8	sO+4($pop177), $pop15
-	i32.const	$push171=, 0
-	i32.const	$push170=, 1103515245
-	i32.mul 	$push16=, $2, $pop170
-	i32.const	$push169=, 12345
-	i32.add 	$push168=, $pop16, $pop169
-	tee_local	$push167=, $2=, $pop168
-	i32.const	$push166=, 16
-	i32.shr_u	$push17=, $pop167, $pop166
-	i32.store8	sO+5($pop171), $pop17
-	i32.const	$push165=, 0
-	i32.const	$push164=, 1103515245
-	i32.mul 	$push18=, $2, $pop164
-	i32.const	$push163=, 12345
-	i32.add 	$push162=, $pop18, $pop163
-	tee_local	$push161=, $2=, $pop162
-	i32.const	$push160=, 16
-	i32.shr_u	$push19=, $pop161, $pop160
-	i32.store8	sO+6($pop165), $pop19
-	i32.const	$push159=, 0
-	i32.const	$push158=, 1103515245
-	i32.mul 	$push20=, $2, $pop158
-	i32.const	$push157=, 12345
-	i32.add 	$push156=, $pop20, $pop157
-	tee_local	$push155=, $2=, $pop156
-	i32.const	$push154=, 16
-	i32.shr_u	$push21=, $pop155, $pop154
-	i32.store8	sO+7($pop159), $pop21
-	i32.const	$push153=, 0
-	i32.const	$push152=, 1103515245
-	i32.mul 	$push22=, $2, $pop152
-	i32.const	$push151=, 12345
-	i32.add 	$push150=, $pop22, $pop151
-	tee_local	$push149=, $2=, $pop150
-	i32.const	$push148=, 16
-	i32.shr_u	$push23=, $pop149, $pop148
-	i32.store8	sO+8($pop153), $pop23
-	i32.const	$push147=, 0
-	i32.const	$push146=, 1103515245
-	i32.mul 	$push24=, $2, $pop146
-	i32.const	$push145=, 12345
-	i32.add 	$push144=, $pop24, $pop145
-	tee_local	$push143=, $2=, $pop144
-	i32.const	$push142=, 16
-	i32.shr_u	$push25=, $pop143, $pop142
-	i32.store8	sO+9($pop147), $pop25
-	i32.const	$push141=, 0
-	i32.const	$push140=, 1103515245
-	i32.mul 	$push26=, $2, $pop140
-	i32.const	$push139=, 12345
-	i32.add 	$push138=, $pop26, $pop139
-	tee_local	$push137=, $2=, $pop138
-	i32.const	$push136=, 16
-	i32.shr_u	$push27=, $pop137, $pop136
-	i32.store8	sO+10($pop141), $pop27
-	i32.const	$push135=, 0
-	i32.const	$push134=, 1103515245
-	i32.mul 	$push28=, $2, $pop134
-	i32.const	$push133=, 12345
-	i32.add 	$push132=, $pop28, $pop133
-	tee_local	$push131=, $2=, $pop132
-	i32.const	$push130=, 16
-	i32.shr_u	$push29=, $pop131, $pop130
-	i32.store8	sO+11($pop135), $pop29
-	i32.const	$push129=, 0
-	i32.const	$push128=, 1103515245
-	i32.mul 	$push30=, $2, $pop128
-	i32.const	$push127=, 12345
-	i32.add 	$push126=, $pop30, $pop127
-	tee_local	$push125=, $2=, $pop126
-	i32.const	$push124=, 16
-	i32.shr_u	$push31=, $pop125, $pop124
-	i32.store8	sO+12($pop129), $pop31
-	i32.const	$push123=, 0
-	i32.const	$push122=, 1103515245
-	i32.mul 	$push32=, $2, $pop122
-	i32.const	$push121=, 12345
-	i32.add 	$push120=, $pop32, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.const	$push118=, 16
-	i32.shr_u	$push33=, $pop119, $pop118
-	i32.store8	sO+13($pop123), $pop33
-	i32.const	$push117=, 0
-	i32.const	$push116=, 1103515245
-	i32.mul 	$push34=, $2, $pop116
-	i32.const	$push115=, 12345
-	i32.add 	$push114=, $pop34, $pop115
-	tee_local	$push113=, $2=, $pop114
-	i32.const	$push112=, 16
-	i32.shr_u	$push35=, $pop113, $pop112
-	i32.store8	sO+14($pop117), $pop35
-	i32.const	$push111=, 0
-	i32.const	$push110=, 1103515245
-	i32.mul 	$push36=, $2, $pop110
-	i32.const	$push109=, 12345
-	i32.add 	$push108=, $pop36, $pop109
-	tee_local	$push107=, $2=, $pop108
-	i32.const	$push106=, 16
-	i32.shr_u	$push37=, $pop107, $pop106
-	i32.store8	sO+15($pop111), $pop37
-	i32.const	$push105=, 0
-	i64.load	$0=, sO+8($pop105)
-	i32.const	$push104=, 0
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push38=, $2, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop38, $pop102
-	tee_local	$push100=, $2=, $pop101
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push39=, $pop100, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop39, $pop98
-	tee_local	$push96=, $1=, $pop97
-	i32.store	myrnd.s($pop104), $pop96
-	i32.const	$push95=, 0
-	i32.const	$push94=, 16
-	i32.shr_u	$push42=, $2, $pop94
-	i32.const	$push93=, 2047
-	i32.and 	$push92=, $pop42, $pop93
-	tee_local	$push91=, $2=, $pop92
-	i64.extend_u/i32	$push43=, $pop91
-	i64.const	$push40=, -4096
-	i64.and 	$push41=, $0, $pop40
-	i64.or  	$push90=, $pop43, $pop41
-	tee_local	$push89=, $3=, $pop90
-	i64.store	sO+8($pop95), $pop89
+	i32.const	$push193=, 0
+	i32.const	$push192=, 1103515245
+	i32.mul 	$push8=, $0, $pop192
+	i32.const	$push191=, 12345
+	i32.add 	$push190=, $pop8, $pop191
+	tee_local	$push189=, $0=, $pop190
+	i32.const	$push188=, 16
+	i32.shr_u	$push9=, $pop189, $pop188
+	i32.store8	sO+1($pop193), $pop9
+	i32.const	$push187=, 0
+	i32.const	$push186=, 1103515245
+	i32.mul 	$push10=, $0, $pop186
+	i32.const	$push185=, 12345
+	i32.add 	$push184=, $pop10, $pop185
+	tee_local	$push183=, $0=, $pop184
+	i32.const	$push182=, 16
+	i32.shr_u	$push11=, $pop183, $pop182
+	i32.store8	sO+2($pop187), $pop11
+	i32.const	$push181=, 0
+	i32.const	$push180=, 1103515245
+	i32.mul 	$push12=, $0, $pop180
+	i32.const	$push179=, 12345
+	i32.add 	$push178=, $pop12, $pop179
+	tee_local	$push177=, $0=, $pop178
+	i32.const	$push176=, 16
+	i32.shr_u	$push13=, $pop177, $pop176
+	i32.store8	sO+3($pop181), $pop13
+	i32.const	$push175=, 0
+	i32.const	$push174=, 1103515245
+	i32.mul 	$push14=, $0, $pop174
+	i32.const	$push173=, 12345
+	i32.add 	$push172=, $pop14, $pop173
+	tee_local	$push171=, $0=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push15=, $pop171, $pop170
+	i32.store8	sO+4($pop175), $pop15
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push16=, $0, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop16, $pop167
+	tee_local	$push165=, $0=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push17=, $pop165, $pop164
+	i32.store8	sO+5($pop169), $pop17
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push18=, $0, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop18, $pop161
+	tee_local	$push159=, $0=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push19=, $pop159, $pop158
+	i32.store8	sO+6($pop163), $pop19
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push20=, $0, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop20, $pop155
+	tee_local	$push153=, $0=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push21=, $pop153, $pop152
+	i32.store8	sO+7($pop157), $pop21
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push22=, $0, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop22, $pop149
+	tee_local	$push147=, $0=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push23=, $pop147, $pop146
+	i32.store8	sO+8($pop151), $pop23
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push24=, $0, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop24, $pop143
+	tee_local	$push141=, $0=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push25=, $pop141, $pop140
+	i32.store8	sO+9($pop145), $pop25
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push26=, $0, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop26, $pop137
+	tee_local	$push135=, $0=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push27=, $pop135, $pop134
+	i32.store8	sO+10($pop139), $pop27
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push28=, $0, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop28, $pop131
+	tee_local	$push129=, $0=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push29=, $pop129, $pop128
+	i32.store8	sO+11($pop133), $pop29
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push30=, $0, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop30, $pop125
+	tee_local	$push123=, $0=, $pop124
+	i32.const	$push122=, 16
+	i32.shr_u	$push31=, $pop123, $pop122
+	i32.store8	sO+12($pop127), $pop31
+	i32.const	$push121=, 0
+	i32.const	$push120=, 1103515245
+	i32.mul 	$push32=, $0, $pop120
+	i32.const	$push119=, 12345
+	i32.add 	$push118=, $pop32, $pop119
+	tee_local	$push117=, $0=, $pop118
+	i32.const	$push116=, 16
+	i32.shr_u	$push33=, $pop117, $pop116
+	i32.store8	sO+13($pop121), $pop33
+	i32.const	$push115=, 0
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push34=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop34, $pop113
+	tee_local	$push111=, $0=, $pop112
+	i32.const	$push110=, 16
+	i32.shr_u	$push35=, $pop111, $pop110
+	i32.store8	sO+14($pop115), $pop35
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push36=, $0, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop36, $pop107
+	tee_local	$push105=, $0=, $pop106
+	i32.const	$push104=, 16
+	i32.shr_u	$push37=, $pop105, $pop104
+	i32.store8	sO+15($pop109), $pop37
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push38=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop38, $pop101
+	tee_local	$push99=, $2=, $pop100
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push39=, $pop99, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop39, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.store	myrnd.s($pop103), $pop95
+	i32.const	$push94=, 0
+	i32.const	$push93=, 0
+	i64.load	$push40=, sO+8($pop93)
+	i64.const	$push41=, -4096
+	i64.and 	$push92=, $pop40, $pop41
+	tee_local	$push91=, $1=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push42=, $2, $pop90
+	i32.const	$push89=, 2047
+	i32.and 	$push88=, $pop42, $pop89
+	tee_local	$push87=, $2=, $pop88
+	i64.extend_u/i32	$push43=, $pop87
+	i64.or  	$push86=, $pop91, $pop43
+	tee_local	$push85=, $3=, $pop86
+	i64.store	sO+8($pop94), $pop85
 	block   	
-	i32.wrap/i64	$push88=, $3
-	tee_local	$push87=, $5=, $pop88
-	i32.const	$push86=, 2047
-	i32.and 	$push47=, $pop87, $pop86
+	i32.wrap/i64	$push84=, $3
+	tee_local	$push83=, $5=, $pop84
+	i32.const	$push82=, 2047
+	i32.and 	$push47=, $pop83, $pop82
 	i32.ne  	$push48=, $2, $pop47
-	br_if   	0, $pop48       # 0: down to label4
+	br_if   	0, $pop48       # 0: down to label10
 # BB#1:                                 # %entry
-	i32.const	$push203=, 16
-	i32.shr_u	$push44=, $1, $pop203
-	i32.const	$push202=, 2047
-	i32.and 	$push201=, $pop44, $pop202
-	tee_local	$push200=, $4=, $pop201
-	i32.add 	$push0=, $pop200, $2
-	i32.add 	$push45=, $5, $4
+	i32.const	$push201=, 16
+	i32.shr_u	$push44=, $0, $pop201
+	i32.const	$push200=, 2047
+	i32.and 	$push199=, $pop44, $pop200
+	tee_local	$push198=, $4=, $pop199
+	i32.add 	$push0=, $pop198, $2
+	i32.add 	$push45=, $4, $5
 	i32.const	$push46=, 4095
 	i32.and 	$push1=, $pop45, $pop46
 	i32.ne  	$push49=, $pop0, $pop1
-	br_if   	0, $pop49       # 0: down to label4
+	br_if   	0, $pop49       # 0: down to label10
 # BB#2:                                 # %if.end
 	i32.const	$push54=, 0
 	i32.const	$push50=, 1103515245
-	i32.mul 	$push51=, $1, $pop50
+	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	i32.add 	$push219=, $pop51, $pop52
-	tee_local	$push218=, $2=, $pop219
-	i32.const	$push217=, 1103515245
-	i32.mul 	$push53=, $pop218, $pop217
-	i32.const	$push216=, 12345
-	i32.add 	$push215=, $pop53, $pop216
-	tee_local	$push214=, $1=, $pop215
-	i32.store	myrnd.s($pop54), $pop214
-	i32.const	$push213=, 0
-	i32.const	$push212=, 16
-	i32.shr_u	$push57=, $2, $pop212
-	i32.const	$push211=, 2047
-	i32.and 	$push210=, $pop57, $pop211
-	tee_local	$push209=, $2=, $pop210
-	i64.extend_u/i32	$push58=, $pop209
-	i64.const	$push55=, -4096
-	i64.and 	$push56=, $0, $pop55
-	i64.or  	$push208=, $pop58, $pop56
-	tee_local	$push207=, $3=, $pop208
-	i64.store	sO+8($pop213), $pop207
-	i32.wrap/i64	$push206=, $3
-	tee_local	$push205=, $5=, $pop206
-	i32.const	$push204=, 2047
-	i32.and 	$push59=, $pop205, $pop204
-	i32.ne  	$push60=, $2, $pop59
-	br_if   	0, $pop60       # 0: down to label4
+	i32.add 	$push217=, $pop51, $pop52
+	tee_local	$push216=, $2=, $pop217
+	i32.const	$push215=, 1103515245
+	i32.mul 	$push53=, $pop216, $pop215
+	i32.const	$push214=, 12345
+	i32.add 	$push213=, $pop53, $pop214
+	tee_local	$push212=, $0=, $pop213
+	i32.store	myrnd.s($pop54), $pop212
+	i32.const	$push211=, 0
+	i32.const	$push210=, 16
+	i32.shr_u	$push55=, $2, $pop210
+	i32.const	$push209=, 2047
+	i32.and 	$push208=, $pop55, $pop209
+	tee_local	$push207=, $2=, $pop208
+	i64.extend_u/i32	$push56=, $pop207
+	i64.or  	$push206=, $1, $pop56
+	tee_local	$push205=, $3=, $pop206
+	i64.store	sO+8($pop211), $pop205
+	i32.wrap/i64	$push204=, $3
+	tee_local	$push203=, $5=, $pop204
+	i32.const	$push202=, 2047
+	i32.and 	$push57=, $pop203, $pop202
+	i32.ne  	$push58=, $2, $pop57
+	br_if   	0, $pop58       # 0: down to label10
 # BB#3:                                 # %lor.lhs.false87
+	i32.const	$push222=, 16
+	i32.shr_u	$push59=, $0, $pop222
+	i32.const	$push221=, 2047
+	i32.and 	$push220=, $pop59, $pop221
+	tee_local	$push219=, $4=, $pop220
+	i32.add 	$push60=, $pop219, $2
+	i32.const	$push61=, 15
+	i32.rem_u	$push62=, $pop60, $pop61
+	i32.add 	$push63=, $4, $5
+	i32.const	$push64=, 4095
+	i32.and 	$push65=, $pop63, $pop64
+	i32.const	$push218=, 15
+	i32.rem_u	$push66=, $pop65, $pop218
+	i32.ne  	$push67=, $pop62, $pop66
+	br_if   	0, $pop67       # 0: down to label10
+# BB#4:                                 # %if.end140
+	i32.const	$push72=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push69=, $0, $pop68
+	i32.const	$push70=, 12345
+	i32.add 	$push231=, $pop69, $pop70
+	tee_local	$push230=, $0=, $pop231
+	i32.const	$push229=, 1103515245
+	i32.mul 	$push71=, $pop230, $pop229
+	i32.const	$push228=, 12345
+	i32.add 	$push227=, $pop71, $pop228
+	tee_local	$push226=, $2=, $pop227
+	i32.store	myrnd.s($pop72), $pop226
+	i32.const	$push225=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push77=, $2, $pop73
+	i32.const	$push75=, 2047
+	i32.and 	$push78=, $pop77, $pop75
 	i32.const	$push224=, 16
-	i32.shr_u	$push61=, $1, $pop224
+	i32.shr_u	$push74=, $0, $pop224
 	i32.const	$push223=, 2047
-	i32.and 	$push222=, $pop61, $pop223
-	tee_local	$push221=, $4=, $pop222
-	i32.add 	$push62=, $pop221, $2
-	i32.const	$push63=, 15
-	i32.rem_u	$push64=, $pop62, $pop63
-	i32.add 	$push65=, $5, $4
-	i32.const	$push66=, 4095
-	i32.and 	$push67=, $pop65, $pop66
-	i32.const	$push220=, 15
-	i32.rem_u	$push68=, $pop67, $pop220
-	i32.ne  	$push69=, $pop64, $pop68
-	br_if   	0, $pop69       # 0: down to label4
-# BB#4:                                 # %if.end140
-	i32.const	$push74=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push71=, $1, $pop70
-	i32.const	$push72=, 12345
-	i32.add 	$push233=, $pop71, $pop72
-	tee_local	$push232=, $2=, $pop233
-	i32.const	$push231=, 1103515245
-	i32.mul 	$push73=, $pop232, $pop231
-	i32.const	$push230=, 12345
-	i32.add 	$push229=, $pop73, $pop230
-	tee_local	$push228=, $1=, $pop229
-	i32.store	myrnd.s($pop74), $pop228
-	i32.const	$push227=, 0
-	i32.const	$push75=, 16
-	i32.shr_u	$push79=, $1, $pop75
-	i32.const	$push77=, 2047
-	i32.and 	$push80=, $pop79, $pop77
-	i32.const	$push226=, 16
-	i32.shr_u	$push76=, $2, $pop226
-	i32.const	$push225=, 2047
-	i32.and 	$push78=, $pop76, $pop225
-	i32.add 	$push81=, $pop80, $pop78
-	i64.extend_u/i32	$push82=, $pop81
-	i64.const	$push83=, -4096
-	i64.and 	$push84=, $0, $pop83
-	i64.or  	$push85=, $pop82, $pop84
-	i64.store	sO+8($pop227), $pop85
+	i32.and 	$push76=, $pop74, $pop223
+	i32.add 	$push79=, $pop78, $pop76
+	i64.extend_u/i32	$push80=, $pop79
+	i64.or  	$push81=, $1, $pop80
+	i64.store	sO+8($pop225), $pop81
 	return
-.LBB90_5:                               # %if.then93
-	end_block                       # label4:
+.LBB90_5:                               # %if.then
+	end_block                       # label10:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end90:
 	.size	testO, .Lfunc_end90-testO
-
+                                        # -- End function
 	.section	.text.retmeP,"ax",@progbits
-	.hidden	retmeP
+	.hidden	retmeP                  # -- Begin function retmeP
 	.globl	retmeP
 	.type	retmeP,@function
 retmeP:                                 # @retmeP
@@ -3693,9 +3849,9 @@ retmeP:                                 # @retmeP
 	.endfunc
 .Lfunc_end91:
 	.size	retmeP, .Lfunc_end91-retmeP
-
+                                        # -- End function
 	.section	.text.fn1P,"ax",@progbits
-	.hidden	fn1P
+	.hidden	fn1P                    # -- Begin function fn1P
 	.globl	fn1P
 	.type	fn1P,@function
 fn1P:                                   # @fn1P
@@ -3711,9 +3867,9 @@ fn1P:                                   # @fn1P
 	.endfunc
 .Lfunc_end92:
 	.size	fn1P, .Lfunc_end92-fn1P
-
+                                        # -- End function
 	.section	.text.fn2P,"ax",@progbits
-	.hidden	fn2P
+	.hidden	fn2P                    # -- Begin function fn2P
 	.globl	fn2P
 	.type	fn2P,@function
 fn2P:                                   # @fn2P
@@ -3731,9 +3887,9 @@ fn2P:                                   # @fn2P
 	.endfunc
 .Lfunc_end93:
 	.size	fn2P, .Lfunc_end93-fn2P
-
+                                        # -- End function
 	.section	.text.retitP,"ax",@progbits
-	.hidden	retitP
+	.hidden	retitP                  # -- Begin function retitP
 	.globl	retitP
 	.type	retitP,@function
 retitP:                                 # @retitP
@@ -3747,9 +3903,9 @@ retitP:                                 # @retitP
 	.endfunc
 .Lfunc_end94:
 	.size	retitP, .Lfunc_end94-retitP
-
+                                        # -- End function
 	.section	.text.fn3P,"ax",@progbits
-	.hidden	fn3P
+	.hidden	fn3P                    # -- Begin function fn3P
 	.globl	fn3P
 	.type	fn3P,@function
 fn3P:                                   # @fn3P
@@ -3761,306 +3917,303 @@ fn3P:                                   # @fn3P
 	i32.const	$push12=, 0
 	i64.load	$push11=, sP($pop12)
 	tee_local	$push10=, $1=, $pop11
-	i32.wrap/i64	$push3=, $pop10
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $pop10, $pop1
+	i32.wrap/i64	$push3=, $1
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 4095
 	i32.and 	$push9=, $pop4, $pop5
 	tee_local	$push8=, $0=, $pop9
 	i64.extend_u/i32	$push6=, $pop8
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $1, $pop1
-	i64.or  	$push7=, $pop6, $pop2
+	i64.or  	$push7=, $pop2, $pop6
 	i64.store	sP($pop0), $pop7
 	copy_local	$push13=, $0
                                         # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end95:
 	.size	fn3P, .Lfunc_end95-fn3P
-
+                                        # -- End function
 	.section	.text.testP,"ax",@progbits
-	.hidden	testP
+	.hidden	testP                   # -- Begin function testP
 	.globl	testP
 	.type	testP,@function
 testP:                                  # @testP
-	.local  	i64, i32, i32, i64, i32, i32
+	.local  	i32, i64, i32, i64, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push2=, 0
-	i32.const	$push199=, 0
-	i32.load	$push3=, myrnd.s($pop199)
+	i32.const	$push197=, 0
+	i32.load	$push3=, myrnd.s($pop197)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	i32.add 	$push198=, $pop5, $pop6
-	tee_local	$push197=, $2=, $pop198
-	i32.const	$push196=, 16
-	i32.shr_u	$push7=, $pop197, $pop196
+	i32.add 	$push196=, $pop5, $pop6
+	tee_local	$push195=, $0=, $pop196
+	i32.const	$push194=, 16
+	i32.shr_u	$push7=, $pop195, $pop194
 	i32.store8	sP($pop2), $pop7
-	i32.const	$push195=, 0
-	i32.const	$push194=, 1103515245
-	i32.mul 	$push8=, $2, $pop194
-	i32.const	$push193=, 12345
-	i32.add 	$push192=, $pop8, $pop193
-	tee_local	$push191=, $2=, $pop192
-	i32.const	$push190=, 16
-	i32.shr_u	$push9=, $pop191, $pop190
-	i32.store8	sP+1($pop195), $pop9
-	i32.const	$push189=, 0
-	i32.const	$push188=, 1103515245
-	i32.mul 	$push10=, $2, $pop188
-	i32.const	$push187=, 12345
-	i32.add 	$push186=, $pop10, $pop187
-	tee_local	$push185=, $2=, $pop186
-	i32.const	$push184=, 16
-	i32.shr_u	$push11=, $pop185, $pop184
-	i32.store8	sP+2($pop189), $pop11
-	i32.const	$push183=, 0
-	i32.const	$push182=, 1103515245
-	i32.mul 	$push12=, $2, $pop182
-	i32.const	$push181=, 12345
-	i32.add 	$push180=, $pop12, $pop181
-	tee_local	$push179=, $2=, $pop180
-	i32.const	$push178=, 16
-	i32.shr_u	$push13=, $pop179, $pop178
-	i32.store8	sP+3($pop183), $pop13
-	i32.const	$push177=, 0
-	i32.const	$push176=, 1103515245
-	i32.mul 	$push14=, $2, $pop176
-	i32.const	$push175=, 12345
-	i32.add 	$push174=, $pop14, $pop175
-	tee_local	$push173=, $2=, $pop174
-	i32.const	$push172=, 16
-	i32.shr_u	$push15=, $pop173, $pop172
-	i32.store8	sP+4($pop177), $pop15
-	i32.const	$push171=, 0
-	i32.const	$push170=, 1103515245
-	i32.mul 	$push16=, $2, $pop170
-	i32.const	$push169=, 12345
-	i32.add 	$push168=, $pop16, $pop169
-	tee_local	$push167=, $2=, $pop168
-	i32.const	$push166=, 16
-	i32.shr_u	$push17=, $pop167, $pop166
-	i32.store8	sP+5($pop171), $pop17
-	i32.const	$push165=, 0
-	i32.const	$push164=, 1103515245
-	i32.mul 	$push18=, $2, $pop164
-	i32.const	$push163=, 12345
-	i32.add 	$push162=, $pop18, $pop163
-	tee_local	$push161=, $2=, $pop162
-	i32.const	$push160=, 16
-	i32.shr_u	$push19=, $pop161, $pop160
-	i32.store8	sP+6($pop165), $pop19
-	i32.const	$push159=, 0
-	i32.const	$push158=, 1103515245
-	i32.mul 	$push20=, $2, $pop158
-	i32.const	$push157=, 12345
-	i32.add 	$push156=, $pop20, $pop157
-	tee_local	$push155=, $2=, $pop156
-	i32.const	$push154=, 16
-	i32.shr_u	$push21=, $pop155, $pop154
-	i32.store8	sP+7($pop159), $pop21
-	i32.const	$push153=, 0
-	i32.const	$push152=, 1103515245
-	i32.mul 	$push22=, $2, $pop152
-	i32.const	$push151=, 12345
-	i32.add 	$push150=, $pop22, $pop151
-	tee_local	$push149=, $2=, $pop150
-	i32.const	$push148=, 16
-	i32.shr_u	$push23=, $pop149, $pop148
-	i32.store8	sP+8($pop153), $pop23
-	i32.const	$push147=, 0
-	i32.const	$push146=, 1103515245
-	i32.mul 	$push24=, $2, $pop146
-	i32.const	$push145=, 12345
-	i32.add 	$push144=, $pop24, $pop145
-	tee_local	$push143=, $2=, $pop144
-	i32.const	$push142=, 16
-	i32.shr_u	$push25=, $pop143, $pop142
-	i32.store8	sP+9($pop147), $pop25
-	i32.const	$push141=, 0
-	i32.const	$push140=, 1103515245
-	i32.mul 	$push26=, $2, $pop140
-	i32.const	$push139=, 12345
-	i32.add 	$push138=, $pop26, $pop139
-	tee_local	$push137=, $2=, $pop138
-	i32.const	$push136=, 16
-	i32.shr_u	$push27=, $pop137, $pop136
-	i32.store8	sP+10($pop141), $pop27
-	i32.const	$push135=, 0
-	i32.const	$push134=, 1103515245
-	i32.mul 	$push28=, $2, $pop134
-	i32.const	$push133=, 12345
-	i32.add 	$push132=, $pop28, $pop133
-	tee_local	$push131=, $2=, $pop132
-	i32.const	$push130=, 16
-	i32.shr_u	$push29=, $pop131, $pop130
-	i32.store8	sP+11($pop135), $pop29
-	i32.const	$push129=, 0
-	i32.const	$push128=, 1103515245
-	i32.mul 	$push30=, $2, $pop128
-	i32.const	$push127=, 12345
-	i32.add 	$push126=, $pop30, $pop127
-	tee_local	$push125=, $2=, $pop126
-	i32.const	$push124=, 16
-	i32.shr_u	$push31=, $pop125, $pop124
-	i32.store8	sP+12($pop129), $pop31
-	i32.const	$push123=, 0
-	i32.const	$push122=, 1103515245
-	i32.mul 	$push32=, $2, $pop122
-	i32.const	$push121=, 12345
-	i32.add 	$push120=, $pop32, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.const	$push118=, 16
-	i32.shr_u	$push33=, $pop119, $pop118
-	i32.store8	sP+13($pop123), $pop33
-	i32.const	$push117=, 0
-	i32.const	$push116=, 1103515245
-	i32.mul 	$push34=, $2, $pop116
-	i32.const	$push115=, 12345
-	i32.add 	$push114=, $pop34, $pop115
-	tee_local	$push113=, $2=, $pop114
-	i32.const	$push112=, 16
-	i32.shr_u	$push35=, $pop113, $pop112
-	i32.store8	sP+14($pop117), $pop35
-	i32.const	$push111=, 0
-	i32.const	$push110=, 1103515245
-	i32.mul 	$push36=, $2, $pop110
-	i32.const	$push109=, 12345
-	i32.add 	$push108=, $pop36, $pop109
-	tee_local	$push107=, $2=, $pop108
-	i32.const	$push106=, 16
-	i32.shr_u	$push37=, $pop107, $pop106
-	i32.store8	sP+15($pop111), $pop37
-	i32.const	$push105=, 0
-	i64.load	$0=, sP($pop105)
-	i32.const	$push104=, 0
-	i32.const	$push103=, 1103515245
-	i32.mul 	$push38=, $2, $pop103
-	i32.const	$push102=, 12345
-	i32.add 	$push101=, $pop38, $pop102
-	tee_local	$push100=, $2=, $pop101
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push39=, $pop100, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop39, $pop98
-	tee_local	$push96=, $1=, $pop97
-	i32.store	myrnd.s($pop104), $pop96
-	i32.const	$push95=, 0
-	i32.const	$push94=, 16
-	i32.shr_u	$push42=, $2, $pop94
-	i32.const	$push93=, 2047
-	i32.and 	$push92=, $pop42, $pop93
-	tee_local	$push91=, $2=, $pop92
-	i64.extend_u/i32	$push43=, $pop91
-	i64.const	$push40=, -4096
-	i64.and 	$push41=, $0, $pop40
-	i64.or  	$push90=, $pop43, $pop41
-	tee_local	$push89=, $3=, $pop90
-	i64.store	sP($pop95), $pop89
+	i32.const	$push193=, 0
+	i32.const	$push192=, 1103515245
+	i32.mul 	$push8=, $0, $pop192
+	i32.const	$push191=, 12345
+	i32.add 	$push190=, $pop8, $pop191
+	tee_local	$push189=, $0=, $pop190
+	i32.const	$push188=, 16
+	i32.shr_u	$push9=, $pop189, $pop188
+	i32.store8	sP+1($pop193), $pop9
+	i32.const	$push187=, 0
+	i32.const	$push186=, 1103515245
+	i32.mul 	$push10=, $0, $pop186
+	i32.const	$push185=, 12345
+	i32.add 	$push184=, $pop10, $pop185
+	tee_local	$push183=, $0=, $pop184
+	i32.const	$push182=, 16
+	i32.shr_u	$push11=, $pop183, $pop182
+	i32.store8	sP+2($pop187), $pop11
+	i32.const	$push181=, 0
+	i32.const	$push180=, 1103515245
+	i32.mul 	$push12=, $0, $pop180
+	i32.const	$push179=, 12345
+	i32.add 	$push178=, $pop12, $pop179
+	tee_local	$push177=, $0=, $pop178
+	i32.const	$push176=, 16
+	i32.shr_u	$push13=, $pop177, $pop176
+	i32.store8	sP+3($pop181), $pop13
+	i32.const	$push175=, 0
+	i32.const	$push174=, 1103515245
+	i32.mul 	$push14=, $0, $pop174
+	i32.const	$push173=, 12345
+	i32.add 	$push172=, $pop14, $pop173
+	tee_local	$push171=, $0=, $pop172
+	i32.const	$push170=, 16
+	i32.shr_u	$push15=, $pop171, $pop170
+	i32.store8	sP+4($pop175), $pop15
+	i32.const	$push169=, 0
+	i32.const	$push168=, 1103515245
+	i32.mul 	$push16=, $0, $pop168
+	i32.const	$push167=, 12345
+	i32.add 	$push166=, $pop16, $pop167
+	tee_local	$push165=, $0=, $pop166
+	i32.const	$push164=, 16
+	i32.shr_u	$push17=, $pop165, $pop164
+	i32.store8	sP+5($pop169), $pop17
+	i32.const	$push163=, 0
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push18=, $0, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$push160=, $pop18, $pop161
+	tee_local	$push159=, $0=, $pop160
+	i32.const	$push158=, 16
+	i32.shr_u	$push19=, $pop159, $pop158
+	i32.store8	sP+6($pop163), $pop19
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1103515245
+	i32.mul 	$push20=, $0, $pop156
+	i32.const	$push155=, 12345
+	i32.add 	$push154=, $pop20, $pop155
+	tee_local	$push153=, $0=, $pop154
+	i32.const	$push152=, 16
+	i32.shr_u	$push21=, $pop153, $pop152
+	i32.store8	sP+7($pop157), $pop21
+	i32.const	$push151=, 0
+	i32.const	$push150=, 1103515245
+	i32.mul 	$push22=, $0, $pop150
+	i32.const	$push149=, 12345
+	i32.add 	$push148=, $pop22, $pop149
+	tee_local	$push147=, $0=, $pop148
+	i32.const	$push146=, 16
+	i32.shr_u	$push23=, $pop147, $pop146
+	i32.store8	sP+8($pop151), $pop23
+	i32.const	$push145=, 0
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push24=, $0, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$push142=, $pop24, $pop143
+	tee_local	$push141=, $0=, $pop142
+	i32.const	$push140=, 16
+	i32.shr_u	$push25=, $pop141, $pop140
+	i32.store8	sP+9($pop145), $pop25
+	i32.const	$push139=, 0
+	i32.const	$push138=, 1103515245
+	i32.mul 	$push26=, $0, $pop138
+	i32.const	$push137=, 12345
+	i32.add 	$push136=, $pop26, $pop137
+	tee_local	$push135=, $0=, $pop136
+	i32.const	$push134=, 16
+	i32.shr_u	$push27=, $pop135, $pop134
+	i32.store8	sP+10($pop139), $pop27
+	i32.const	$push133=, 0
+	i32.const	$push132=, 1103515245
+	i32.mul 	$push28=, $0, $pop132
+	i32.const	$push131=, 12345
+	i32.add 	$push130=, $pop28, $pop131
+	tee_local	$push129=, $0=, $pop130
+	i32.const	$push128=, 16
+	i32.shr_u	$push29=, $pop129, $pop128
+	i32.store8	sP+11($pop133), $pop29
+	i32.const	$push127=, 0
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push30=, $0, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$push124=, $pop30, $pop125
+	tee_local	$push123=, $0=, $pop124
+	i32.const	$push122=, 16
+	i32.shr_u	$push31=, $pop123, $pop122
+	i32.store8	sP+12($pop127), $pop31
+	i32.const	$push121=, 0
+	i32.const	$push120=, 1103515245
+	i32.mul 	$push32=, $0, $pop120
+	i32.const	$push119=, 12345
+	i32.add 	$push118=, $pop32, $pop119
+	tee_local	$push117=, $0=, $pop118
+	i32.const	$push116=, 16
+	i32.shr_u	$push33=, $pop117, $pop116
+	i32.store8	sP+13($pop121), $pop33
+	i32.const	$push115=, 0
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push34=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop34, $pop113
+	tee_local	$push111=, $0=, $pop112
+	i32.const	$push110=, 16
+	i32.shr_u	$push35=, $pop111, $pop110
+	i32.store8	sP+14($pop115), $pop35
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push36=, $0, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop36, $pop107
+	tee_local	$push105=, $0=, $pop106
+	i32.const	$push104=, 16
+	i32.shr_u	$push37=, $pop105, $pop104
+	i32.store8	sP+15($pop109), $pop37
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push38=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop38, $pop101
+	tee_local	$push99=, $2=, $pop100
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push39=, $pop99, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$push96=, $pop39, $pop97
+	tee_local	$push95=, $0=, $pop96
+	i32.store	myrnd.s($pop103), $pop95
+	i32.const	$push94=, 0
+	i32.const	$push93=, 0
+	i64.load	$push40=, sP($pop93)
+	i64.const	$push41=, -4096
+	i64.and 	$push92=, $pop40, $pop41
+	tee_local	$push91=, $1=, $pop92
+	i32.const	$push90=, 16
+	i32.shr_u	$push42=, $2, $pop90
+	i32.const	$push89=, 2047
+	i32.and 	$push88=, $pop42, $pop89
+	tee_local	$push87=, $2=, $pop88
+	i64.extend_u/i32	$push43=, $pop87
+	i64.or  	$push86=, $pop91, $pop43
+	tee_local	$push85=, $3=, $pop86
+	i64.store	sP($pop94), $pop85
 	block   	
-	i32.wrap/i64	$push88=, $3
-	tee_local	$push87=, $5=, $pop88
-	i32.const	$push86=, 2047
-	i32.and 	$push47=, $pop87, $pop86
+	i32.wrap/i64	$push84=, $3
+	tee_local	$push83=, $5=, $pop84
+	i32.const	$push82=, 2047
+	i32.and 	$push47=, $pop83, $pop82
 	i32.ne  	$push48=, $2, $pop47
-	br_if   	0, $pop48       # 0: down to label5
+	br_if   	0, $pop48       # 0: down to label11
 # BB#1:                                 # %entry
-	i32.const	$push203=, 16
-	i32.shr_u	$push44=, $1, $pop203
-	i32.const	$push202=, 2047
-	i32.and 	$push201=, $pop44, $pop202
-	tee_local	$push200=, $4=, $pop201
-	i32.add 	$push0=, $pop200, $2
-	i32.add 	$push45=, $5, $4
+	i32.const	$push201=, 16
+	i32.shr_u	$push44=, $0, $pop201
+	i32.const	$push200=, 2047
+	i32.and 	$push199=, $pop44, $pop200
+	tee_local	$push198=, $4=, $pop199
+	i32.add 	$push0=, $pop198, $2
+	i32.add 	$push45=, $4, $5
 	i32.const	$push46=, 4095
 	i32.and 	$push1=, $pop45, $pop46
 	i32.ne  	$push49=, $pop0, $pop1
-	br_if   	0, $pop49       # 0: down to label5
+	br_if   	0, $pop49       # 0: down to label11
 # BB#2:                                 # %if.end
 	i32.const	$push54=, 0
 	i32.const	$push50=, 1103515245
-	i32.mul 	$push51=, $1, $pop50
+	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	i32.add 	$push219=, $pop51, $pop52
-	tee_local	$push218=, $2=, $pop219
-	i32.const	$push217=, 1103515245
-	i32.mul 	$push53=, $pop218, $pop217
-	i32.const	$push216=, 12345
-	i32.add 	$push215=, $pop53, $pop216
-	tee_local	$push214=, $1=, $pop215
-	i32.store	myrnd.s($pop54), $pop214
-	i32.const	$push213=, 0
-	i32.const	$push212=, 16
-	i32.shr_u	$push57=, $2, $pop212
-	i32.const	$push211=, 2047
-	i32.and 	$push210=, $pop57, $pop211
-	tee_local	$push209=, $2=, $pop210
-	i64.extend_u/i32	$push58=, $pop209
-	i64.const	$push55=, -4096
-	i64.and 	$push56=, $0, $pop55
-	i64.or  	$push208=, $pop58, $pop56
-	tee_local	$push207=, $3=, $pop208
-	i64.store	sP($pop213), $pop207
-	i32.wrap/i64	$push206=, $3
-	tee_local	$push205=, $5=, $pop206
-	i32.const	$push204=, 2047
-	i32.and 	$push59=, $pop205, $pop204
-	i32.ne  	$push60=, $2, $pop59
-	br_if   	0, $pop60       # 0: down to label5
+	i32.add 	$push217=, $pop51, $pop52
+	tee_local	$push216=, $2=, $pop217
+	i32.const	$push215=, 1103515245
+	i32.mul 	$push53=, $pop216, $pop215
+	i32.const	$push214=, 12345
+	i32.add 	$push213=, $pop53, $pop214
+	tee_local	$push212=, $0=, $pop213
+	i32.store	myrnd.s($pop54), $pop212
+	i32.const	$push211=, 0
+	i32.const	$push210=, 16
+	i32.shr_u	$push55=, $2, $pop210
+	i32.const	$push209=, 2047
+	i32.and 	$push208=, $pop55, $pop209
+	tee_local	$push207=, $2=, $pop208
+	i64.extend_u/i32	$push56=, $pop207
+	i64.or  	$push206=, $1, $pop56
+	tee_local	$push205=, $3=, $pop206
+	i64.store	sP($pop211), $pop205
+	i32.wrap/i64	$push204=, $3
+	tee_local	$push203=, $5=, $pop204
+	i32.const	$push202=, 2047
+	i32.and 	$push57=, $pop203, $pop202
+	i32.ne  	$push58=, $2, $pop57
+	br_if   	0, $pop58       # 0: down to label11
 # BB#3:                                 # %lor.lhs.false83
+	i32.const	$push222=, 16
+	i32.shr_u	$push59=, $0, $pop222
+	i32.const	$push221=, 2047
+	i32.and 	$push220=, $pop59, $pop221
+	tee_local	$push219=, $4=, $pop220
+	i32.add 	$push60=, $pop219, $2
+	i32.const	$push61=, 15
+	i32.rem_u	$push62=, $pop60, $pop61
+	i32.add 	$push63=, $4, $5
+	i32.const	$push64=, 4095
+	i32.and 	$push65=, $pop63, $pop64
+	i32.const	$push218=, 15
+	i32.rem_u	$push66=, $pop65, $pop218
+	i32.ne  	$push67=, $pop62, $pop66
+	br_if   	0, $pop67       # 0: down to label11
+# BB#4:                                 # %if.end134
+	i32.const	$push72=, 0
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push69=, $0, $pop68
+	i32.const	$push70=, 12345
+	i32.add 	$push231=, $pop69, $pop70
+	tee_local	$push230=, $0=, $pop231
+	i32.const	$push229=, 1103515245
+	i32.mul 	$push71=, $pop230, $pop229
+	i32.const	$push228=, 12345
+	i32.add 	$push227=, $pop71, $pop228
+	tee_local	$push226=, $2=, $pop227
+	i32.store	myrnd.s($pop72), $pop226
+	i32.const	$push225=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push77=, $2, $pop73
+	i32.const	$push75=, 2047
+	i32.and 	$push78=, $pop77, $pop75
 	i32.const	$push224=, 16
-	i32.shr_u	$push61=, $1, $pop224
+	i32.shr_u	$push74=, $0, $pop224
 	i32.const	$push223=, 2047
-	i32.and 	$push222=, $pop61, $pop223
-	tee_local	$push221=, $4=, $pop222
-	i32.add 	$push62=, $pop221, $2
-	i32.const	$push63=, 15
-	i32.rem_u	$push64=, $pop62, $pop63
-	i32.add 	$push65=, $5, $4
-	i32.const	$push66=, 4095
-	i32.and 	$push67=, $pop65, $pop66
-	i32.const	$push220=, 15
-	i32.rem_u	$push68=, $pop67, $pop220
-	i32.ne  	$push69=, $pop64, $pop68
-	br_if   	0, $pop69       # 0: down to label5
-# BB#4:                                 # %if.end134
-	i32.const	$push74=, 0
-	i32.const	$push70=, 1103515245
-	i32.mul 	$push71=, $1, $pop70
-	i32.const	$push72=, 12345
-	i32.add 	$push233=, $pop71, $pop72
-	tee_local	$push232=, $2=, $pop233
-	i32.const	$push231=, 1103515245
-	i32.mul 	$push73=, $pop232, $pop231
-	i32.const	$push230=, 12345
-	i32.add 	$push229=, $pop73, $pop230
-	tee_local	$push228=, $1=, $pop229
-	i32.store	myrnd.s($pop74), $pop228
-	i32.const	$push227=, 0
-	i32.const	$push75=, 16
-	i32.shr_u	$push79=, $1, $pop75
-	i32.const	$push77=, 2047
-	i32.and 	$push80=, $pop79, $pop77
-	i32.const	$push226=, 16
-	i32.shr_u	$push76=, $2, $pop226
-	i32.const	$push225=, 2047
-	i32.and 	$push78=, $pop76, $pop225
-	i32.add 	$push81=, $pop80, $pop78
-	i64.extend_u/i32	$push82=, $pop81
-	i64.const	$push83=, -4096
-	i64.and 	$push84=, $0, $pop83
-	i64.or  	$push85=, $pop82, $pop84
-	i64.store	sP($pop227), $pop85
+	i32.and 	$push76=, $pop74, $pop223
+	i32.add 	$push79=, $pop78, $pop76
+	i64.extend_u/i32	$push80=, $pop79
+	i64.or  	$push81=, $1, $pop80
+	i64.store	sP($pop225), $pop81
 	return
-.LBB96_5:                               # %if.then89
-	end_block                       # label5:
+.LBB96_5:                               # %if.then
+	end_block                       # label11:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end96:
 	.size	testP, .Lfunc_end96-testP
-
+                                        # -- End function
 	.section	.text.retmeQ,"ax",@progbits
-	.hidden	retmeQ
+	.hidden	retmeQ                  # -- Begin function retmeQ
 	.globl	retmeQ
 	.type	retmeQ,@function
 retmeQ:                                 # @retmeQ
@@ -4078,9 +4231,9 @@ retmeQ:                                 # @retmeQ
 	.endfunc
 .Lfunc_end97:
 	.size	retmeQ, .Lfunc_end97-retmeQ
-
+                                        # -- End function
 	.section	.text.fn1Q,"ax",@progbits
-	.hidden	fn1Q
+	.hidden	fn1Q                    # -- Begin function fn1Q
 	.globl	fn1Q
 	.type	fn1Q,@function
 fn1Q:                                   # @fn1Q
@@ -4096,9 +4249,9 @@ fn1Q:                                   # @fn1Q
 	.endfunc
 .Lfunc_end98:
 	.size	fn1Q, .Lfunc_end98-fn1Q
-
+                                        # -- End function
 	.section	.text.fn2Q,"ax",@progbits
-	.hidden	fn2Q
+	.hidden	fn2Q                    # -- Begin function fn2Q
 	.globl	fn2Q
 	.type	fn2Q,@function
 fn2Q:                                   # @fn2Q
@@ -4116,9 +4269,9 @@ fn2Q:                                   # @fn2Q
 	.endfunc
 .Lfunc_end99:
 	.size	fn2Q, .Lfunc_end99-fn2Q
-
+                                        # -- End function
 	.section	.text.retitQ,"ax",@progbits
-	.hidden	retitQ
+	.hidden	retitQ                  # -- Begin function retitQ
 	.globl	retitQ
 	.type	retitQ,@function
 retitQ:                                 # @retitQ
@@ -4132,9 +4285,9 @@ retitQ:                                 # @retitQ
 	.endfunc
 .Lfunc_end100:
 	.size	retitQ, .Lfunc_end100-retitQ
-
+                                        # -- End function
 	.section	.text.fn3Q,"ax",@progbits
-	.hidden	fn3Q
+	.hidden	fn3Q                    # -- Begin function fn3Q
 	.globl	fn3Q
 	.type	fn3Q,@function
 fn3Q:                                   # @fn3Q
@@ -4159,141 +4312,193 @@ fn3Q:                                   # @fn3Q
 	.endfunc
 .Lfunc_end101:
 	.size	fn3Q, .Lfunc_end101-fn3Q
-
+                                        # -- End function
 	.section	.text.testQ,"ax",@progbits
-	.hidden	testQ
+	.hidden	testQ                   # -- Begin function testQ
 	.globl	testQ
 	.type	testQ,@function
 testQ:                                  # @testQ
 	.local  	i32, i32, i32
-# BB#0:                                 # %if.end90
-	i32.const	$push0=, 0
-	i32.const	$push106=, 0
-	i32.load	$push1=, myrnd.s($pop106)
-	i32.const	$push2=, 1103515245
-	i32.mul 	$push3=, $pop1, $pop2
-	i32.const	$push4=, 12345
-	i32.add 	$push105=, $pop3, $pop4
-	tee_local	$push104=, $0=, $pop105
-	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop104, $pop5
-	i32.store8	sQ($pop0), $pop6
+# BB#0:                                 # %entry
+	i32.const	$push122=, 0
+	i32.const	$push121=, 0
+	i32.load	$push0=, myrnd.s($pop121)
+	i32.const	$push120=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop120
+	i32.const	$push119=, 12345
+	i32.add 	$push118=, $pop1, $pop119
+	tee_local	$push117=, $1=, $pop118
+	i32.const	$push116=, 16
+	i32.shr_u	$push2=, $pop117, $pop116
+	i32.store8	sQ($pop122), $pop2
+	i32.const	$push115=, 0
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push3=, $1, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$push112=, $pop3, $pop113
+	tee_local	$push111=, $1=, $pop112
+	i32.const	$push110=, 16
+	i32.shr_u	$push4=, $pop111, $pop110
+	i32.store8	sQ+1($pop115), $pop4
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push5=, $1, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop5, $pop107
+	tee_local	$push105=, $1=, $pop106
+	i32.const	$push104=, 16
+	i32.shr_u	$push6=, $pop105, $pop104
+	i32.store8	sQ+2($pop109), $pop6
 	i32.const	$push103=, 0
 	i32.const	$push102=, 1103515245
-	i32.mul 	$push7=, $0, $pop102
+	i32.mul 	$push7=, $1, $pop102
 	i32.const	$push101=, 12345
 	i32.add 	$push100=, $pop7, $pop101
-	tee_local	$push99=, $0=, $pop100
+	tee_local	$push99=, $1=, $pop100
 	i32.const	$push98=, 16
 	i32.shr_u	$push8=, $pop99, $pop98
-	i32.store8	sQ+1($pop103), $pop8
+	i32.store8	sQ+3($pop103), $pop8
 	i32.const	$push97=, 0
 	i32.const	$push96=, 1103515245
-	i32.mul 	$push9=, $0, $pop96
+	i32.mul 	$push9=, $1, $pop96
 	i32.const	$push95=, 12345
 	i32.add 	$push94=, $pop9, $pop95
-	tee_local	$push93=, $0=, $pop94
+	tee_local	$push93=, $1=, $pop94
 	i32.const	$push92=, 16
 	i32.shr_u	$push10=, $pop93, $pop92
-	i32.store8	sQ+2($pop97), $pop10
+	i32.store8	sQ+4($pop97), $pop10
 	i32.const	$push91=, 0
 	i32.const	$push90=, 1103515245
-	i32.mul 	$push11=, $0, $pop90
+	i32.mul 	$push11=, $1, $pop90
 	i32.const	$push89=, 12345
 	i32.add 	$push88=, $pop11, $pop89
-	tee_local	$push87=, $0=, $pop88
+	tee_local	$push87=, $1=, $pop88
 	i32.const	$push86=, 16
 	i32.shr_u	$push12=, $pop87, $pop86
-	i32.store8	sQ+3($pop91), $pop12
+	i32.store8	sQ+5($pop91), $pop12
 	i32.const	$push85=, 0
 	i32.const	$push84=, 1103515245
-	i32.mul 	$push13=, $0, $pop84
+	i32.mul 	$push13=, $1, $pop84
 	i32.const	$push83=, 12345
 	i32.add 	$push82=, $pop13, $pop83
-	tee_local	$push81=, $0=, $pop82
+	tee_local	$push81=, $1=, $pop82
 	i32.const	$push80=, 16
 	i32.shr_u	$push14=, $pop81, $pop80
-	i32.store8	sQ+4($pop85), $pop14
+	i32.store8	sQ+6($pop85), $pop14
 	i32.const	$push79=, 0
 	i32.const	$push78=, 1103515245
-	i32.mul 	$push15=, $0, $pop78
+	i32.mul 	$push15=, $1, $pop78
 	i32.const	$push77=, 12345
 	i32.add 	$push76=, $pop15, $pop77
-	tee_local	$push75=, $0=, $pop76
+	tee_local	$push75=, $1=, $pop76
 	i32.const	$push74=, 16
 	i32.shr_u	$push16=, $pop75, $pop74
-	i32.store8	sQ+5($pop79), $pop16
+	i32.store8	sQ+7($pop79), $pop16
 	i32.const	$push73=, 0
 	i32.const	$push72=, 1103515245
-	i32.mul 	$push17=, $0, $pop72
+	i32.mul 	$push17=, $1, $pop72
 	i32.const	$push71=, 12345
 	i32.add 	$push70=, $pop17, $pop71
-	tee_local	$push69=, $0=, $pop70
+	tee_local	$push69=, $1=, $pop70
 	i32.const	$push68=, 16
 	i32.shr_u	$push18=, $pop69, $pop68
-	i32.store8	sQ+6($pop73), $pop18
+	i32.store8	sQ+8($pop73), $pop18
 	i32.const	$push67=, 0
 	i32.const	$push66=, 1103515245
-	i32.mul 	$push19=, $0, $pop66
+	i32.mul 	$push19=, $1, $pop66
 	i32.const	$push65=, 12345
 	i32.add 	$push64=, $pop19, $pop65
-	tee_local	$push63=, $0=, $pop64
+	tee_local	$push63=, $1=, $pop64
 	i32.const	$push62=, 16
 	i32.shr_u	$push20=, $pop63, $pop62
-	i32.store8	sQ+7($pop67), $pop20
+	i32.store8	sQ+9($pop67), $pop20
 	i32.const	$push61=, 0
 	i32.const	$push60=, 1103515245
-	i32.mul 	$push21=, $0, $pop60
+	i32.mul 	$push21=, $1, $pop60
 	i32.const	$push59=, 12345
 	i32.add 	$push58=, $pop21, $pop59
-	tee_local	$push57=, $0=, $pop58
-	i32.const	$push56=, 16
-	i32.shr_u	$push22=, $pop57, $pop56
-	i32.store8	sQ+8($pop61), $pop22
-	i32.const	$push55=, 0
-	i32.const	$push54=, 1103515245
-	i32.mul 	$push23=, $0, $pop54
-	i32.const	$push53=, 12345
-	i32.add 	$push52=, $pop23, $pop53
-	tee_local	$push51=, $0=, $pop52
-	i32.const	$push50=, 16
-	i32.shr_u	$push24=, $pop51, $pop50
-	i32.store8	sQ+9($pop55), $pop24
+	tee_local	$push57=, $1=, $pop58
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push22=, $pop57, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$push54=, $pop22, $pop55
+	tee_local	$push53=, $0=, $pop54
+	i32.store	myrnd.s($pop61), $pop53
+	i32.const	$push52=, 0
+	i32.const	$push51=, 16
+	i32.shr_u	$push25=, $1, $pop51
+	i32.const	$push50=, 2047
+	i32.and 	$push26=, $pop25, $pop50
 	i32.const	$push49=, 0
-	i32.load16_u	$2=, sQ($pop49)
-	i32.const	$push48=, 0
-	i32.const	$push25=, -341751747
-	i32.mul 	$push26=, $0, $pop25
-	i32.const	$push27=, 229283573
-	i32.add 	$push47=, $pop26, $pop27
-	tee_local	$push46=, $0=, $pop47
-	i32.const	$push45=, 1103515245
-	i32.mul 	$push28=, $pop46, $pop45
-	i32.const	$push44=, 12345
-	i32.add 	$push43=, $pop28, $pop44
-	tee_local	$push42=, $1=, $pop43
-	i32.store	myrnd.s($pop48), $pop42
-	i32.const	$push41=, 0
-	i32.const	$push40=, 16
-	i32.shr_u	$push32=, $1, $pop40
-	i32.const	$push30=, 2047
-	i32.and 	$push33=, $pop32, $pop30
-	i32.const	$push39=, 16
-	i32.shr_u	$push29=, $0, $pop39
-	i32.const	$push38=, 2047
-	i32.and 	$push31=, $pop29, $pop38
-	i32.add 	$push34=, $pop33, $pop31
-	i32.const	$push35=, 61440
-	i32.and 	$push36=, $2, $pop35
-	i32.or  	$push37=, $pop34, $pop36
-	i32.store16	sQ($pop41), $pop37
-                                        # fallthrough-return
+	i32.load16_u	$push23=, sQ($pop49)
+	i32.const	$push24=, -4096
+	i32.and 	$push48=, $pop23, $pop24
+	tee_local	$push47=, $1=, $pop48
+	i32.or  	$push27=, $pop26, $pop47
+	i32.store16	sQ($pop52), $pop27
+	block   	
+	i32.const	$push46=, 1
+	i32.eqz 	$push145=, $pop46
+	br_if   	0, $pop145      # 0: down to label12
+# BB#1:                                 # %if.end
+	i32.const	$push135=, 0
+	i32.const	$push134=, 1103515245
+	i32.mul 	$push28=, $0, $pop134
+	i32.const	$push133=, 12345
+	i32.add 	$push132=, $pop28, $pop133
+	tee_local	$push131=, $0=, $pop132
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push29=, $pop131, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop29, $pop129
+	tee_local	$push127=, $2=, $pop128
+	i32.store	myrnd.s($pop135), $pop127
+	i32.const	$push126=, 0
+	i32.const	$push125=, 16
+	i32.shr_u	$push30=, $0, $pop125
+	i32.const	$push124=, 2047
+	i32.and 	$push31=, $pop30, $pop124
+	i32.or  	$push32=, $pop31, $1
+	i32.store16	sQ($pop126), $pop32
+	i32.const	$push123=, 1
+	i32.eqz 	$push146=, $pop123
+	br_if   	0, $pop146      # 0: down to label12
+# BB#2:                                 # %if.end134
+	i32.const	$push37=, 0
+	i32.const	$push33=, 1103515245
+	i32.mul 	$push34=, $2, $pop33
+	i32.const	$push35=, 12345
+	i32.add 	$push144=, $pop34, $pop35
+	tee_local	$push143=, $0=, $pop144
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push36=, $pop143, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop36, $pop141
+	tee_local	$push139=, $2=, $pop140
+	i32.store	myrnd.s($pop37), $pop139
+	i32.const	$push138=, 0
+	i32.const	$push38=, 16
+	i32.shr_u	$push42=, $2, $pop38
+	i32.const	$push40=, 2047
+	i32.and 	$push43=, $pop42, $pop40
+	i32.const	$push137=, 16
+	i32.shr_u	$push39=, $0, $pop137
+	i32.const	$push136=, 2047
+	i32.and 	$push41=, $pop39, $pop136
+	i32.add 	$push44=, $pop43, $pop41
+	i32.or  	$push45=, $1, $pop44
+	i32.store16	sQ($pop138), $pop45
+	return
+.LBB102_3:                              # %if.then
+	end_block                       # label12:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end102:
 	.size	testQ, .Lfunc_end102-testQ
-
+                                        # -- End function
 	.section	.text.retmeR,"ax",@progbits
-	.hidden	retmeR
+	.hidden	retmeR                  # -- Begin function retmeR
 	.globl	retmeR
 	.type	retmeR,@function
 retmeR:                                 # @retmeR
@@ -4311,9 +4516,9 @@ retmeR:                                 # @retmeR
 	.endfunc
 .Lfunc_end103:
 	.size	retmeR, .Lfunc_end103-retmeR
-
+                                        # -- End function
 	.section	.text.fn1R,"ax",@progbits
-	.hidden	fn1R
+	.hidden	fn1R                    # -- Begin function fn1R
 	.globl	fn1R
 	.type	fn1R,@function
 fn1R:                                   # @fn1R
@@ -4329,9 +4534,9 @@ fn1R:                                   # @fn1R
 	.endfunc
 .Lfunc_end104:
 	.size	fn1R, .Lfunc_end104-fn1R
-
+                                        # -- End function
 	.section	.text.fn2R,"ax",@progbits
-	.hidden	fn2R
+	.hidden	fn2R                    # -- Begin function fn2R
 	.globl	fn2R
 	.type	fn2R,@function
 fn2R:                                   # @fn2R
@@ -4343,15 +4548,13 @@ fn2R:                                   # @fn2R
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 3
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end105:
 	.size	fn2R, .Lfunc_end105-fn2R
-
+                                        # -- End function
 	.section	.text.retitR,"ax",@progbits
-	.hidden	retitR
+	.hidden	retitR                  # -- Begin function retitR
 	.globl	retitR
 	.type	retitR,@function
 retitR:                                 # @retitR
@@ -4365,9 +4568,9 @@ retitR:                                 # @retitR
 	.endfunc
 .Lfunc_end106:
 	.size	retitR, .Lfunc_end106-retitR
-
+                                        # -- End function
 	.section	.text.fn3R,"ax",@progbits
-	.hidden	fn3R
+	.hidden	fn3R                    # -- Begin function fn3R
 	.globl	fn3R
 	.type	fn3R,@function
 fn3R:                                   # @fn3R
@@ -4392,148 +4595,148 @@ fn3R:                                   # @fn3R
 	.endfunc
 .Lfunc_end107:
 	.size	fn3R, .Lfunc_end107-fn3R
-
+                                        # -- End function
 	.section	.text.testR,"ax",@progbits
-	.hidden	testR
+	.hidden	testR                   # -- Begin function testR
 	.globl	testR
 	.type	testR,@function
 testR:                                  # @testR
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %if.end90
 	i32.const	$push0=, 0
-	i32.const	$push105=, 0
-	i32.load	$push1=, myrnd.s($pop105)
+	i32.const	$push106=, 0
+	i32.load	$push1=, myrnd.s($pop106)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push104=, $pop3, $pop4
-	tee_local	$push103=, $0=, $pop104
+	i32.add 	$push105=, $pop3, $pop4
+	tee_local	$push104=, $0=, $pop105
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop103, $pop5
+	i32.shr_u	$push6=, $pop104, $pop5
 	i32.store8	sR($pop0), $pop6
-	i32.const	$push102=, 0
-	i32.const	$push101=, 1103515245
-	i32.mul 	$push7=, $0, $pop101
-	i32.const	$push100=, 12345
-	i32.add 	$push99=, $pop7, $pop100
-	tee_local	$push98=, $0=, $pop99
-	i32.const	$push97=, 16
-	i32.shr_u	$push8=, $pop98, $pop97
-	i32.store8	sR+1($pop102), $pop8
-	i32.const	$push96=, 0
-	i32.const	$push95=, 1103515245
-	i32.mul 	$push9=, $0, $pop95
-	i32.const	$push94=, 12345
-	i32.add 	$push93=, $pop9, $pop94
-	tee_local	$push92=, $0=, $pop93
-	i32.const	$push91=, 16
-	i32.shr_u	$push10=, $pop92, $pop91
-	i32.store8	sR+2($pop96), $pop10
-	i32.const	$push90=, 0
-	i32.const	$push89=, 1103515245
-	i32.mul 	$push11=, $0, $pop89
-	i32.const	$push88=, 12345
-	i32.add 	$push87=, $pop11, $pop88
-	tee_local	$push86=, $0=, $pop87
-	i32.const	$push85=, 16
-	i32.shr_u	$push12=, $pop86, $pop85
-	i32.store8	sR+3($pop90), $pop12
-	i32.const	$push84=, 0
-	i32.const	$push83=, 1103515245
-	i32.mul 	$push13=, $0, $pop83
-	i32.const	$push82=, 12345
-	i32.add 	$push81=, $pop13, $pop82
-	tee_local	$push80=, $0=, $pop81
-	i32.const	$push79=, 16
-	i32.shr_u	$push14=, $pop80, $pop79
-	i32.store8	sR+4($pop84), $pop14
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push15=, $0, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop15, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 16
-	i32.shr_u	$push16=, $pop74, $pop73
-	i32.store8	sR+5($pop78), $pop16
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push17=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop17, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 16
-	i32.shr_u	$push18=, $pop68, $pop67
-	i32.store8	sR+6($pop72), $pop18
-	i32.const	$push66=, 0
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push19=, $0, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop19, $pop64
-	tee_local	$push62=, $0=, $pop63
-	i32.const	$push61=, 16
-	i32.shr_u	$push20=, $pop62, $pop61
-	i32.store8	sR+7($pop66), $pop20
-	i32.const	$push60=, 0
-	i32.const	$push59=, 1103515245
-	i32.mul 	$push21=, $0, $pop59
-	i32.const	$push58=, 12345
-	i32.add 	$push57=, $pop21, $pop58
-	tee_local	$push56=, $0=, $pop57
-	i32.const	$push55=, 16
-	i32.shr_u	$push22=, $pop56, $pop55
-	i32.store8	sR+8($pop60), $pop22
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push23=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop23, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push24=, $pop50, $pop49
-	i32.store8	sR+9($pop54), $pop24
-	i32.const	$push48=, 0
-	i32.load16_u	$2=, sR($pop48)
-	i32.const	$push47=, 0
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push7=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop7, $pop101
+	tee_local	$push99=, $0=, $pop100
+	i32.const	$push98=, 16
+	i32.shr_u	$push8=, $pop99, $pop98
+	i32.store8	sR+1($pop103), $pop8
+	i32.const	$push97=, 0
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push9=, $0, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop9, $pop95
+	tee_local	$push93=, $0=, $pop94
+	i32.const	$push92=, 16
+	i32.shr_u	$push10=, $pop93, $pop92
+	i32.store8	sR+2($pop97), $pop10
+	i32.const	$push91=, 0
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push11=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$push88=, $pop11, $pop89
+	tee_local	$push87=, $0=, $pop88
+	i32.const	$push86=, 16
+	i32.shr_u	$push12=, $pop87, $pop86
+	i32.store8	sR+3($pop91), $pop12
+	i32.const	$push85=, 0
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push13=, $0, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop13, $pop83
+	tee_local	$push81=, $0=, $pop82
+	i32.const	$push80=, 16
+	i32.shr_u	$push14=, $pop81, $pop80
+	i32.store8	sR+4($pop85), $pop14
+	i32.const	$push79=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push15=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop15, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push16=, $pop75, $pop74
+	i32.store8	sR+5($pop79), $pop16
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push17=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop17, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push18=, $pop69, $pop68
+	i32.store8	sR+6($pop73), $pop18
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push19=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop19, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push20=, $pop63, $pop62
+	i32.store8	sR+7($pop67), $pop20
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push21=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop21, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push22=, $pop57, $pop56
+	i32.store8	sR+8($pop61), $pop22
+	i32.const	$push55=, 0
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push23=, $0, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$push52=, $pop23, $pop53
+	tee_local	$push51=, $0=, $pop52
+	i32.const	$push50=, 16
+	i32.shr_u	$push24=, $pop51, $pop50
+	i32.store8	sR+9($pop55), $pop24
+	i32.const	$push49=, 0
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	i32.add 	$push46=, $pop26, $pop27
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, 1103515245
-	i32.mul 	$push28=, $pop45, $pop44
-	i32.const	$push43=, 12345
-	i32.add 	$push42=, $pop28, $pop43
-	tee_local	$push41=, $1=, $pop42
-	i32.store	myrnd.s($pop47), $pop41
-	i32.const	$push40=, 0
-	i32.const	$push39=, 16
-	i32.shr_u	$push30=, $1, $pop39
-	i32.const	$push38=, 16
-	i32.shr_u	$push29=, $0, $pop38
+	i32.add 	$push48=, $pop26, $pop27
+	tee_local	$push47=, $0=, $pop48
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push28=, $pop47, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$push44=, $pop28, $pop45
+	tee_local	$push43=, $1=, $pop44
+	i32.store	myrnd.s($pop49), $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push30=, $1, $pop41
+	i32.const	$push40=, 16
+	i32.shr_u	$push29=, $0, $pop40
 	i32.add 	$push31=, $pop30, $pop29
 	i32.const	$push32=, 3
 	i32.and 	$push33=, $pop31, $pop32
-	i32.const	$push34=, 65532
-	i32.and 	$push35=, $2, $pop34
-	i32.or  	$push36=, $pop33, $pop35
-	i32.store16	sR($pop40), $pop36
+	i32.const	$push39=, 0
+	i32.load16_u	$push34=, sR($pop39)
+	i32.const	$push35=, 65532
+	i32.and 	$push36=, $pop34, $pop35
+	i32.or  	$push37=, $pop33, $pop36
+	i32.store16	sR($pop42), $pop37
 	block   	
-	i32.const	$push37=, 1
-	i32.eqz 	$push106=, $pop37
-	br_if   	0, $pop106      # 0: down to label6
+	i32.const	$push38=, 1
+	i32.eqz 	$push107=, $pop38
+	br_if   	0, $pop107      # 0: down to label13
 # BB#1:                                 # %if.end134
 	return
 .LBB108_2:                              # %if.then133
-	end_block                       # label6:
+	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end108:
 	.size	testR, .Lfunc_end108-testR
-
+                                        # -- End function
 	.section	.text.retmeS,"ax",@progbits
-	.hidden	retmeS
+	.hidden	retmeS                  # -- Begin function retmeS
 	.globl	retmeS
 	.type	retmeS,@function
 retmeS:                                 # @retmeS
@@ -4551,9 +4754,9 @@ retmeS:                                 # @retmeS
 	.endfunc
 .Lfunc_end109:
 	.size	retmeS, .Lfunc_end109-retmeS
-
+                                        # -- End function
 	.section	.text.fn1S,"ax",@progbits
-	.hidden	fn1S
+	.hidden	fn1S                    # -- Begin function fn1S
 	.globl	fn1S
 	.type	fn1S,@function
 fn1S:                                   # @fn1S
@@ -4569,9 +4772,9 @@ fn1S:                                   # @fn1S
 	.endfunc
 .Lfunc_end110:
 	.size	fn1S, .Lfunc_end110-fn1S
-
+                                        # -- End function
 	.section	.text.fn2S,"ax",@progbits
-	.hidden	fn2S
+	.hidden	fn2S                    # -- Begin function fn2S
 	.globl	fn2S
 	.type	fn2S,@function
 fn2S:                                   # @fn2S
@@ -4583,15 +4786,13 @@ fn2S:                                   # @fn2S
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 1
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end111:
 	.size	fn2S, .Lfunc_end111-fn2S
-
+                                        # -- End function
 	.section	.text.retitS,"ax",@progbits
-	.hidden	retitS
+	.hidden	retitS                  # -- Begin function retitS
 	.globl	retitS
 	.type	retitS,@function
 retitS:                                 # @retitS
@@ -4605,9 +4806,9 @@ retitS:                                 # @retitS
 	.endfunc
 .Lfunc_end112:
 	.size	retitS, .Lfunc_end112-retitS
-
+                                        # -- End function
 	.section	.text.fn3S,"ax",@progbits
-	.hidden	fn3S
+	.hidden	fn3S                    # -- Begin function fn3S
 	.globl	fn3S
 	.type	fn3S,@function
 fn3S:                                   # @fn3S
@@ -4632,148 +4833,148 @@ fn3S:                                   # @fn3S
 	.endfunc
 .Lfunc_end113:
 	.size	fn3S, .Lfunc_end113-fn3S
-
+                                        # -- End function
 	.section	.text.testS,"ax",@progbits
-	.hidden	testS
+	.hidden	testS                   # -- Begin function testS
 	.globl	testS
 	.type	testS,@function
 testS:                                  # @testS
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %if.end90
 	i32.const	$push0=, 0
-	i32.const	$push105=, 0
-	i32.load	$push1=, myrnd.s($pop105)
+	i32.const	$push106=, 0
+	i32.load	$push1=, myrnd.s($pop106)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push104=, $pop3, $pop4
-	tee_local	$push103=, $0=, $pop104
+	i32.add 	$push105=, $pop3, $pop4
+	tee_local	$push104=, $0=, $pop105
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop103, $pop5
+	i32.shr_u	$push6=, $pop104, $pop5
 	i32.store8	sS($pop0), $pop6
-	i32.const	$push102=, 0
-	i32.const	$push101=, 1103515245
-	i32.mul 	$push7=, $0, $pop101
-	i32.const	$push100=, 12345
-	i32.add 	$push99=, $pop7, $pop100
-	tee_local	$push98=, $0=, $pop99
-	i32.const	$push97=, 16
-	i32.shr_u	$push8=, $pop98, $pop97
-	i32.store8	sS+1($pop102), $pop8
-	i32.const	$push96=, 0
-	i32.const	$push95=, 1103515245
-	i32.mul 	$push9=, $0, $pop95
-	i32.const	$push94=, 12345
-	i32.add 	$push93=, $pop9, $pop94
-	tee_local	$push92=, $0=, $pop93
-	i32.const	$push91=, 16
-	i32.shr_u	$push10=, $pop92, $pop91
-	i32.store8	sS+2($pop96), $pop10
-	i32.const	$push90=, 0
-	i32.const	$push89=, 1103515245
-	i32.mul 	$push11=, $0, $pop89
-	i32.const	$push88=, 12345
-	i32.add 	$push87=, $pop11, $pop88
-	tee_local	$push86=, $0=, $pop87
-	i32.const	$push85=, 16
-	i32.shr_u	$push12=, $pop86, $pop85
-	i32.store8	sS+3($pop90), $pop12
-	i32.const	$push84=, 0
-	i32.const	$push83=, 1103515245
-	i32.mul 	$push13=, $0, $pop83
-	i32.const	$push82=, 12345
-	i32.add 	$push81=, $pop13, $pop82
-	tee_local	$push80=, $0=, $pop81
-	i32.const	$push79=, 16
-	i32.shr_u	$push14=, $pop80, $pop79
-	i32.store8	sS+4($pop84), $pop14
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1103515245
-	i32.mul 	$push15=, $0, $pop77
-	i32.const	$push76=, 12345
-	i32.add 	$push75=, $pop15, $pop76
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 16
-	i32.shr_u	$push16=, $pop74, $pop73
-	i32.store8	sS+5($pop78), $pop16
-	i32.const	$push72=, 0
-	i32.const	$push71=, 1103515245
-	i32.mul 	$push17=, $0, $pop71
-	i32.const	$push70=, 12345
-	i32.add 	$push69=, $pop17, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 16
-	i32.shr_u	$push18=, $pop68, $pop67
-	i32.store8	sS+6($pop72), $pop18
-	i32.const	$push66=, 0
-	i32.const	$push65=, 1103515245
-	i32.mul 	$push19=, $0, $pop65
-	i32.const	$push64=, 12345
-	i32.add 	$push63=, $pop19, $pop64
-	tee_local	$push62=, $0=, $pop63
-	i32.const	$push61=, 16
-	i32.shr_u	$push20=, $pop62, $pop61
-	i32.store8	sS+7($pop66), $pop20
-	i32.const	$push60=, 0
-	i32.const	$push59=, 1103515245
-	i32.mul 	$push21=, $0, $pop59
-	i32.const	$push58=, 12345
-	i32.add 	$push57=, $pop21, $pop58
-	tee_local	$push56=, $0=, $pop57
-	i32.const	$push55=, 16
-	i32.shr_u	$push22=, $pop56, $pop55
-	i32.store8	sS+8($pop60), $pop22
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push23=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop23, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push24=, $pop50, $pop49
-	i32.store8	sS+9($pop54), $pop24
-	i32.const	$push48=, 0
-	i32.load16_u	$2=, sS($pop48)
-	i32.const	$push47=, 0
+	i32.const	$push103=, 0
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push7=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop7, $pop101
+	tee_local	$push99=, $0=, $pop100
+	i32.const	$push98=, 16
+	i32.shr_u	$push8=, $pop99, $pop98
+	i32.store8	sS+1($pop103), $pop8
+	i32.const	$push97=, 0
+	i32.const	$push96=, 1103515245
+	i32.mul 	$push9=, $0, $pop96
+	i32.const	$push95=, 12345
+	i32.add 	$push94=, $pop9, $pop95
+	tee_local	$push93=, $0=, $pop94
+	i32.const	$push92=, 16
+	i32.shr_u	$push10=, $pop93, $pop92
+	i32.store8	sS+2($pop97), $pop10
+	i32.const	$push91=, 0
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push11=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$push88=, $pop11, $pop89
+	tee_local	$push87=, $0=, $pop88
+	i32.const	$push86=, 16
+	i32.shr_u	$push12=, $pop87, $pop86
+	i32.store8	sS+3($pop91), $pop12
+	i32.const	$push85=, 0
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push13=, $0, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop13, $pop83
+	tee_local	$push81=, $0=, $pop82
+	i32.const	$push80=, 16
+	i32.shr_u	$push14=, $pop81, $pop80
+	i32.store8	sS+4($pop85), $pop14
+	i32.const	$push79=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push15=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop15, $pop77
+	tee_local	$push75=, $0=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push16=, $pop75, $pop74
+	i32.store8	sS+5($pop79), $pop16
+	i32.const	$push73=, 0
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push17=, $0, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$push70=, $pop17, $pop71
+	tee_local	$push69=, $0=, $pop70
+	i32.const	$push68=, 16
+	i32.shr_u	$push18=, $pop69, $pop68
+	i32.store8	sS+6($pop73), $pop18
+	i32.const	$push67=, 0
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push19=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$push64=, $pop19, $pop65
+	tee_local	$push63=, $0=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push20=, $pop63, $pop62
+	i32.store8	sS+7($pop67), $pop20
+	i32.const	$push61=, 0
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push21=, $0, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop21, $pop59
+	tee_local	$push57=, $0=, $pop58
+	i32.const	$push56=, 16
+	i32.shr_u	$push22=, $pop57, $pop56
+	i32.store8	sS+8($pop61), $pop22
+	i32.const	$push55=, 0
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push23=, $0, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$push52=, $pop23, $pop53
+	tee_local	$push51=, $0=, $pop52
+	i32.const	$push50=, 16
+	i32.shr_u	$push24=, $pop51, $pop50
+	i32.store8	sS+9($pop55), $pop24
+	i32.const	$push49=, 0
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	i32.add 	$push46=, $pop26, $pop27
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, 1103515245
-	i32.mul 	$push28=, $pop45, $pop44
-	i32.const	$push43=, 12345
-	i32.add 	$push42=, $pop28, $pop43
-	tee_local	$push41=, $1=, $pop42
-	i32.store	myrnd.s($pop47), $pop41
-	i32.const	$push40=, 0
-	i32.const	$push39=, 16
-	i32.shr_u	$push30=, $1, $pop39
-	i32.const	$push38=, 16
-	i32.shr_u	$push29=, $0, $pop38
+	i32.add 	$push48=, $pop26, $pop27
+	tee_local	$push47=, $0=, $pop48
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push28=, $pop47, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$push44=, $pop28, $pop45
+	tee_local	$push43=, $1=, $pop44
+	i32.store	myrnd.s($pop49), $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push30=, $1, $pop41
+	i32.const	$push40=, 16
+	i32.shr_u	$push29=, $0, $pop40
 	i32.add 	$push31=, $pop30, $pop29
 	i32.const	$push32=, 1
 	i32.and 	$push33=, $pop31, $pop32
-	i32.const	$push34=, 65534
-	i32.and 	$push35=, $2, $pop34
-	i32.or  	$push36=, $pop33, $pop35
-	i32.store16	sS($pop40), $pop36
+	i32.const	$push39=, 0
+	i32.load16_u	$push34=, sS($pop39)
+	i32.const	$push35=, 65534
+	i32.and 	$push36=, $pop34, $pop35
+	i32.or  	$push37=, $pop33, $pop36
+	i32.store16	sS($pop42), $pop37
 	block   	
-	i32.const	$push37=, 1
-	i32.eqz 	$push106=, $pop37
-	br_if   	0, $pop106      # 0: down to label7
+	i32.const	$push38=, 1
+	i32.eqz 	$push107=, $pop38
+	br_if   	0, $pop107      # 0: down to label14
 # BB#1:                                 # %if.end134
 	return
 .LBB114_2:                              # %if.then133
-	end_block                       # label7:
+	end_block                       # label14:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end114:
 	.size	testS, .Lfunc_end114-testS
-
+                                        # -- End function
 	.section	.text.retmeT,"ax",@progbits
-	.hidden	retmeT
+	.hidden	retmeT                  # -- Begin function retmeT
 	.globl	retmeT
 	.type	retmeT,@function
 retmeT:                                 # @retmeT
@@ -4785,9 +4986,9 @@ retmeT:                                 # @retmeT
 	.endfunc
 .Lfunc_end115:
 	.size	retmeT, .Lfunc_end115-retmeT
-
+                                        # -- End function
 	.section	.text.fn1T,"ax",@progbits
-	.hidden	fn1T
+	.hidden	fn1T                    # -- Begin function fn1T
 	.globl	fn1T
 	.type	fn1T,@function
 fn1T:                                   # @fn1T
@@ -4803,9 +5004,9 @@ fn1T:                                   # @fn1T
 	.endfunc
 .Lfunc_end116:
 	.size	fn1T, .Lfunc_end116-fn1T
-
+                                        # -- End function
 	.section	.text.fn2T,"ax",@progbits
-	.hidden	fn2T
+	.hidden	fn2T                    # -- Begin function fn2T
 	.globl	fn2T
 	.type	fn2T,@function
 fn2T:                                   # @fn2T
@@ -4817,15 +5018,13 @@ fn2T:                                   # @fn2T
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 1
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end117:
 	.size	fn2T, .Lfunc_end117-fn2T
-
+                                        # -- End function
 	.section	.text.retitT,"ax",@progbits
-	.hidden	retitT
+	.hidden	retitT                  # -- Begin function retitT
 	.globl	retitT
 	.type	retitT,@function
 retitT:                                 # @retitT
@@ -4839,9 +5038,9 @@ retitT:                                 # @retitT
 	.endfunc
 .Lfunc_end118:
 	.size	retitT, .Lfunc_end118-retitT
-
+                                        # -- End function
 	.section	.text.fn3T,"ax",@progbits
-	.hidden	fn3T
+	.hidden	fn3T                    # -- Begin function fn3T
 	.globl	fn3T
 	.type	fn3T,@function
 fn3T:                                   # @fn3T
@@ -4866,129 +5065,127 @@ fn3T:                                   # @fn3T
 	.endfunc
 .Lfunc_end119:
 	.size	fn3T, .Lfunc_end119-fn3T
-
+                                        # -- End function
 	.section	.text.testT,"ax",@progbits
-	.hidden	testT
+	.hidden	testT                   # -- Begin function testT
 	.globl	testT
 	.type	testT,@function
 testT:                                  # @testT
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push76=, 0
 	i32.const	$push75=, 0
-	i32.load	$push0=, myrnd.s($pop75)
-	i32.const	$push74=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop74
-	i32.const	$push73=, 12345
-	i32.add 	$push72=, $pop1, $pop73
-	tee_local	$push71=, $0=, $pop72
-	i32.const	$push70=, 16
-	i32.shr_u	$push2=, $pop71, $pop70
-	i32.store8	sT($pop76), $pop2
-	i32.const	$push69=, 0
-	i32.const	$push68=, 1103515245
-	i32.mul 	$push3=, $0, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop3, $pop67
-	tee_local	$push65=, $0=, $pop66
-	i32.const	$push64=, 16
-	i32.shr_u	$push4=, $pop65, $pop64
-	i32.store8	sT+1($pop69), $pop4
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push5=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop5, $pop61
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push58=, 16
-	i32.shr_u	$push6=, $pop59, $pop58
-	i32.store8	sT+2($pop63), $pop6
-	i32.const	$push57=, 0
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push7=, $0, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop7, $pop55
-	tee_local	$push53=, $0=, $pop54
-	i32.const	$push52=, 16
-	i32.shr_u	$push8=, $pop53, $pop52
-	i32.store8	sT+3($pop57), $pop8
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push11=, $0, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop11, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 16
-	i32.shr_u	$push45=, $pop47, $pop46
-	tee_local	$push44=, $1=, $pop45
-	i32.const	$push43=, 1
-	i32.and 	$push12=, $pop44, $pop43
-	i32.const	$push42=, 0
-	i32.load16_u	$push9=, sT($pop42)
-	i32.const	$push41=, 65534
-	i32.and 	$push10=, $pop9, $pop41
-	i32.or  	$push13=, $pop12, $pop10
-	i32.store16	sT($pop51), $pop13
-	i32.const	$push40=, 0
-	i32.const	$push39=, 1103515245
-	i32.mul 	$push14=, $0, $pop39
-	i32.const	$push38=, 12345
-	i32.add 	$push37=, $pop14, $pop38
-	tee_local	$push36=, $0=, $pop37
-	i32.store	myrnd.s($pop40), $pop36
+	i32.const	$push74=, 0
+	i32.load	$push0=, myrnd.s($pop74)
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$push71=, $pop1, $pop72
+	tee_local	$push70=, $0=, $pop71
+	i32.const	$push69=, 16
+	i32.shr_u	$push2=, $pop70, $pop69
+	i32.store8	sT($pop75), $pop2
+	i32.const	$push68=, 0
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push3=, $0, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$push65=, $pop3, $pop66
+	tee_local	$push64=, $0=, $pop65
+	i32.const	$push63=, 16
+	i32.shr_u	$push4=, $pop64, $pop63
+	i32.store8	sT+1($pop68), $pop4
+	i32.const	$push62=, 0
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push5=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$push59=, $pop5, $pop60
+	tee_local	$push58=, $0=, $pop59
+	i32.const	$push57=, 16
+	i32.shr_u	$push6=, $pop58, $pop57
+	i32.store8	sT+2($pop62), $pop6
+	i32.const	$push56=, 0
+	i32.const	$push55=, 1103515245
+	i32.mul 	$push7=, $0, $pop55
+	i32.const	$push54=, 12345
+	i32.add 	$push53=, $pop7, $pop54
+	tee_local	$push52=, $0=, $pop53
+	i32.const	$push51=, 16
+	i32.shr_u	$push8=, $pop52, $pop51
+	i32.store8	sT+3($pop56), $pop8
+	i32.const	$push50=, 0
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push11=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$push47=, $pop11, $pop48
+	tee_local	$push46=, $0=, $pop47
+	i32.const	$push45=, 16
+	i32.shr_u	$push44=, $pop46, $pop45
+	tee_local	$push43=, $2=, $pop44
+	i32.const	$push42=, 1
+	i32.and 	$push12=, $pop43, $pop42
+	i32.const	$push41=, 0
+	i32.load16_u	$push9=, sT($pop41)
+	i32.const	$push10=, -2
+	i32.and 	$push40=, $pop9, $pop10
+	tee_local	$push39=, $1=, $pop40
+	i32.or  	$push13=, $pop12, $pop39
+	i32.store16	sT($pop50), $pop13
+	i32.const	$push38=, 0
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push14=, $0, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$push35=, $pop14, $pop36
+	tee_local	$push34=, $0=, $pop35
+	i32.store	myrnd.s($pop38), $pop34
 	block   	
-	i32.const	$push35=, 16
-	i32.shr_u	$push34=, $0, $pop35
-	tee_local	$push33=, $2=, $pop34
-	i32.add 	$push15=, $pop33, $1
-	i32.const	$push32=, 0
-	i32.load	$push31=, sT($pop32)
-	tee_local	$push30=, $1=, $pop31
-	i32.add 	$push16=, $2, $pop30
-	i32.xor 	$push17=, $pop15, $pop16
+	i32.const	$push33=, 16
+	i32.shr_u	$push32=, $0, $pop33
+	tee_local	$push31=, $3=, $pop32
+	i32.add 	$push15=, $pop31, $2
+	i32.const	$push30=, 0
+	i32.load	$push16=, sT($pop30)
+	i32.add 	$push17=, $3, $pop16
+	i32.xor 	$push18=, $pop15, $pop17
 	i32.const	$push29=, 1
-	i32.and 	$push18=, $pop17, $pop29
-	br_if   	0, $pop18       # 0: down to label8
+	i32.and 	$push19=, $pop18, $pop29
+	br_if   	0, $pop19       # 0: down to label15
 # BB#1:                                 # %if.end94
-	i32.const	$push89=, 0
-	i32.const	$push19=, -2139243339
-	i32.mul 	$push20=, $0, $pop19
-	i32.const	$push21=, -1492899873
-	i32.add 	$push88=, $pop20, $pop21
-	tee_local	$push87=, $0=, $pop88
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push22=, $pop87, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop22, $pop85
-	tee_local	$push83=, $2=, $pop84
-	i32.store	myrnd.s($pop89), $pop83
-	i32.const	$push82=, 0
-	i32.const	$push81=, 16
-	i32.shr_u	$push24=, $2, $pop81
-	i32.const	$push80=, 16
-	i32.shr_u	$push23=, $0, $pop80
-	i32.add 	$push25=, $pop24, $pop23
-	i32.const	$push79=, 1
-	i32.and 	$push26=, $pop25, $pop79
-	i32.const	$push78=, 65534
-	i32.and 	$push27=, $1, $pop78
-	i32.or  	$push28=, $pop26, $pop27
-	i32.store16	sT($pop82), $pop28
+	i32.const	$push87=, 0
+	i32.const	$push20=, -2139243339
+	i32.mul 	$push21=, $0, $pop20
+	i32.const	$push22=, -1492899873
+	i32.add 	$push86=, $pop21, $pop22
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push23=, $pop85, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop23, $pop83
+	tee_local	$push81=, $2=, $pop82
+	i32.store	myrnd.s($pop87), $pop81
+	i32.const	$push80=, 0
+	i32.const	$push79=, 16
+	i32.shr_u	$push25=, $2, $pop79
+	i32.const	$push78=, 16
+	i32.shr_u	$push24=, $0, $pop78
+	i32.add 	$push26=, $pop25, $pop24
 	i32.const	$push77=, 1
-	i32.eqz 	$push90=, $pop77
-	br_if   	0, $pop90       # 0: down to label8
+	i32.and 	$push27=, $pop26, $pop77
+	i32.or  	$push28=, $pop27, $1
+	i32.store16	sT($pop80), $pop28
+	i32.const	$push76=, 1
+	i32.eqz 	$push88=, $pop76
+	br_if   	0, $pop88       # 0: down to label15
 # BB#2:                                 # %if.end140
 	return
-.LBB120_3:                              # %if.then139
-	end_block                       # label8:
+.LBB120_3:                              # %if.then
+	end_block                       # label15:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end120:
 	.size	testT, .Lfunc_end120-testT
-
+                                        # -- End function
 	.section	.text.retmeU,"ax",@progbits
-	.hidden	retmeU
+	.hidden	retmeU                  # -- Begin function retmeU
 	.globl	retmeU
 	.type	retmeU,@function
 retmeU:                                 # @retmeU
@@ -5006,9 +5203,9 @@ retmeU:                                 # @retmeU
 	.endfunc
 .Lfunc_end121:
 	.size	retmeU, .Lfunc_end121-retmeU
-
+                                        # -- End function
 	.section	.text.fn1U,"ax",@progbits
-	.hidden	fn1U
+	.hidden	fn1U                    # -- Begin function fn1U
 	.globl	fn1U
 	.type	fn1U,@function
 fn1U:                                   # @fn1U
@@ -5026,9 +5223,9 @@ fn1U:                                   # @fn1U
 	.endfunc
 .Lfunc_end122:
 	.size	fn1U, .Lfunc_end122-fn1U
-
+                                        # -- End function
 	.section	.text.fn2U,"ax",@progbits
-	.hidden	fn2U
+	.hidden	fn2U                    # -- Begin function fn2U
 	.globl	fn2U
 	.type	fn2U,@function
 fn2U:                                   # @fn2U
@@ -5042,15 +5239,13 @@ fn2U:                                   # @fn2U
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 15
-	i32.rem_u	$push8=, $pop6, $pop7
-                                        # fallthrough-return: $pop8
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end123:
 	.size	fn2U, .Lfunc_end123-fn2U
-
+                                        # -- End function
 	.section	.text.retitU,"ax",@progbits
-	.hidden	retitU
+	.hidden	retitU                  # -- Begin function retitU
 	.globl	retitU
 	.type	retitU,@function
 retitU:                                 # @retitU
@@ -5066,9 +5261,9 @@ retitU:                                 # @retitU
 	.endfunc
 .Lfunc_end124:
 	.size	retitU, .Lfunc_end124-retitU
-
+                                        # -- End function
 	.section	.text.fn3U,"ax",@progbits
-	.hidden	fn3U
+	.hidden	fn3U                    # -- Begin function fn3U
 	.globl	fn3U
 	.type	fn3U,@function
 fn3U:                                   # @fn3U
@@ -5098,108 +5293,106 @@ fn3U:                                   # @fn3U
 	.endfunc
 .Lfunc_end125:
 	.size	fn3U, .Lfunc_end125-fn3U
-
+                                        # -- End function
 	.section	.text.testU,"ax",@progbits
-	.hidden	testU
+	.hidden	testU                   # -- Begin function testU
 	.globl	testU
 	.type	testU,@function
 testU:                                  # @testU
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push166=, 0
-	i32.load	$push1=, myrnd.s($pop166)
+	i32.const	$push165=, 0
+	i32.load	$push1=, myrnd.s($pop165)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push165=, $pop3, $pop4
-	tee_local	$push164=, $2=, $pop165
-	i32.const	$push163=, 16
-	i32.shr_u	$push5=, $pop164, $pop163
+	i32.add 	$push164=, $pop3, $pop4
+	tee_local	$push163=, $2=, $pop164
+	i32.const	$push162=, 16
+	i32.shr_u	$push5=, $pop163, $pop162
 	i32.store8	sU($pop0), $pop5
-	i32.const	$push162=, 0
-	i32.const	$push161=, 1103515245
-	i32.mul 	$push6=, $2, $pop161
-	i32.const	$push160=, 12345
-	i32.add 	$push159=, $pop6, $pop160
-	tee_local	$push158=, $2=, $pop159
-	i32.const	$push157=, 16
-	i32.shr_u	$push7=, $pop158, $pop157
-	i32.store8	sU+1($pop162), $pop7
-	i32.const	$push156=, 0
-	i32.const	$push155=, 1103515245
-	i32.mul 	$push8=, $2, $pop155
-	i32.const	$push154=, 12345
-	i32.add 	$push153=, $pop8, $pop154
-	tee_local	$push152=, $2=, $pop153
-	i32.const	$push151=, 16
-	i32.shr_u	$push9=, $pop152, $pop151
-	i32.store8	sU+2($pop156), $pop9
-	i32.const	$push150=, 0
-	i32.const	$push149=, 1103515245
-	i32.mul 	$push10=, $2, $pop149
-	i32.const	$push148=, 12345
-	i32.add 	$push147=, $pop10, $pop148
-	tee_local	$push146=, $2=, $pop147
-	i32.const	$push145=, 16
-	i32.shr_u	$push11=, $pop146, $pop145
-	i32.store8	sU+3($pop150), $pop11
-	i32.const	$push144=, 0
-	i32.const	$push143=, 1103515245
-	i32.mul 	$push12=, $2, $pop143
-	i32.const	$push142=, 12345
-	i32.add 	$push141=, $pop12, $pop142
-	tee_local	$push140=, $2=, $pop141
-	i32.const	$push139=, 16
-	i32.shr_u	$push13=, $pop140, $pop139
-	i32.store8	sU+4($pop144), $pop13
-	i32.const	$push138=, 0
-	i32.const	$push137=, 1103515245
-	i32.mul 	$push14=, $2, $pop137
-	i32.const	$push136=, 12345
-	i32.add 	$push135=, $pop14, $pop136
-	tee_local	$push134=, $2=, $pop135
-	i32.const	$push133=, 16
-	i32.shr_u	$push15=, $pop134, $pop133
-	i32.store8	sU+5($pop138), $pop15
-	i32.const	$push132=, 0
-	i32.const	$push131=, 1103515245
-	i32.mul 	$push16=, $2, $pop131
-	i32.const	$push130=, 12345
-	i32.add 	$push129=, $pop16, $pop130
-	tee_local	$push128=, $2=, $pop129
-	i32.const	$push127=, 16
-	i32.shr_u	$push17=, $pop128, $pop127
-	i32.store8	sU+6($pop132), $pop17
-	i32.const	$push126=, 0
-	i32.const	$push125=, 1103515245
-	i32.mul 	$push18=, $2, $pop125
-	i32.const	$push124=, 12345
-	i32.add 	$push123=, $pop18, $pop124
-	tee_local	$push122=, $2=, $pop123
-	i32.const	$push121=, 16
-	i32.shr_u	$push19=, $pop122, $pop121
-	i32.store8	sU+7($pop126), $pop19
-	i32.const	$push120=, 0
-	i32.const	$push119=, 1103515245
-	i32.mul 	$push20=, $2, $pop119
-	i32.const	$push118=, 12345
-	i32.add 	$push117=, $pop20, $pop118
-	tee_local	$push116=, $2=, $pop117
-	i32.const	$push115=, 16
-	i32.shr_u	$push21=, $pop116, $pop115
-	i32.store8	sU+8($pop120), $pop21
-	i32.const	$push114=, 0
-	i32.const	$push113=, 1103515245
-	i32.mul 	$push22=, $2, $pop113
-	i32.const	$push112=, 12345
-	i32.add 	$push111=, $pop22, $pop112
-	tee_local	$push110=, $2=, $pop111
-	i32.const	$push109=, 16
-	i32.shr_u	$push23=, $pop110, $pop109
-	i32.store8	sU+9($pop114), $pop23
-	i32.const	$push108=, 0
-	i32.load16_u	$3=, sU($pop108)
+	i32.const	$push161=, 0
+	i32.const	$push160=, 1103515245
+	i32.mul 	$push6=, $2, $pop160
+	i32.const	$push159=, 12345
+	i32.add 	$push158=, $pop6, $pop159
+	tee_local	$push157=, $2=, $pop158
+	i32.const	$push156=, 16
+	i32.shr_u	$push7=, $pop157, $pop156
+	i32.store8	sU+1($pop161), $pop7
+	i32.const	$push155=, 0
+	i32.const	$push154=, 1103515245
+	i32.mul 	$push8=, $2, $pop154
+	i32.const	$push153=, 12345
+	i32.add 	$push152=, $pop8, $pop153
+	tee_local	$push151=, $2=, $pop152
+	i32.const	$push150=, 16
+	i32.shr_u	$push9=, $pop151, $pop150
+	i32.store8	sU+2($pop155), $pop9
+	i32.const	$push149=, 0
+	i32.const	$push148=, 1103515245
+	i32.mul 	$push10=, $2, $pop148
+	i32.const	$push147=, 12345
+	i32.add 	$push146=, $pop10, $pop147
+	tee_local	$push145=, $2=, $pop146
+	i32.const	$push144=, 16
+	i32.shr_u	$push11=, $pop145, $pop144
+	i32.store8	sU+3($pop149), $pop11
+	i32.const	$push143=, 0
+	i32.const	$push142=, 1103515245
+	i32.mul 	$push12=, $2, $pop142
+	i32.const	$push141=, 12345
+	i32.add 	$push140=, $pop12, $pop141
+	tee_local	$push139=, $2=, $pop140
+	i32.const	$push138=, 16
+	i32.shr_u	$push13=, $pop139, $pop138
+	i32.store8	sU+4($pop143), $pop13
+	i32.const	$push137=, 0
+	i32.const	$push136=, 1103515245
+	i32.mul 	$push14=, $2, $pop136
+	i32.const	$push135=, 12345
+	i32.add 	$push134=, $pop14, $pop135
+	tee_local	$push133=, $2=, $pop134
+	i32.const	$push132=, 16
+	i32.shr_u	$push15=, $pop133, $pop132
+	i32.store8	sU+5($pop137), $pop15
+	i32.const	$push131=, 0
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push16=, $2, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$push128=, $pop16, $pop129
+	tee_local	$push127=, $2=, $pop128
+	i32.const	$push126=, 16
+	i32.shr_u	$push17=, $pop127, $pop126
+	i32.store8	sU+6($pop131), $pop17
+	i32.const	$push125=, 0
+	i32.const	$push124=, 1103515245
+	i32.mul 	$push18=, $2, $pop124
+	i32.const	$push123=, 12345
+	i32.add 	$push122=, $pop18, $pop123
+	tee_local	$push121=, $2=, $pop122
+	i32.const	$push120=, 16
+	i32.shr_u	$push19=, $pop121, $pop120
+	i32.store8	sU+7($pop125), $pop19
+	i32.const	$push119=, 0
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push20=, $2, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$push116=, $pop20, $pop117
+	tee_local	$push115=, $2=, $pop116
+	i32.const	$push114=, 16
+	i32.shr_u	$push21=, $pop115, $pop114
+	i32.store8	sU+8($pop119), $pop21
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1103515245
+	i32.mul 	$push22=, $2, $pop112
+	i32.const	$push111=, 12345
+	i32.add 	$push110=, $pop22, $pop111
+	tee_local	$push109=, $2=, $pop110
+	i32.const	$push108=, 16
+	i32.shr_u	$push23=, $pop109, $pop108
+	i32.store8	sU+9($pop113), $pop23
 	i32.const	$push107=, 0
 	i32.const	$push106=, 1103515245
 	i32.mul 	$push24=, $2, $pop106
@@ -5216,144 +5409,142 @@ testU:                                  # @testU
 	i32.const	$push97=, 16
 	i32.shr_u	$push96=, $2, $pop97
 	tee_local	$push95=, $0=, $pop96
-	i32.const	$push27=, 2047
-	i32.and 	$push94=, $pop95, $pop27
-	tee_local	$push93=, $4=, $pop94
-	i32.const	$push28=, 6
-	i32.shl 	$push29=, $pop93, $pop28
-	i32.const	$push30=, 64
-	i32.and 	$push31=, $pop29, $pop30
-	i32.const	$push26=, -65
-	i32.and 	$push92=, $3, $pop26
-	tee_local	$push91=, $2=, $pop92
-	i32.or  	$push90=, $pop31, $pop91
-	tee_local	$push89=, $3=, $pop90
-	i32.store16	sU($pop98), $pop89
+	i32.const	$push28=, 2047
+	i32.and 	$push94=, $pop95, $pop28
+	tee_local	$push93=, $3=, $pop94
+	i32.const	$push29=, 6
+	i32.shl 	$push30=, $pop93, $pop29
+	i32.const	$push31=, 64
+	i32.and 	$push32=, $pop30, $pop31
+	i32.const	$push92=, 0
+	i32.load16_u	$push26=, sU($pop92)
+	i32.const	$push27=, -65
+	i32.and 	$push91=, $pop26, $pop27
+	tee_local	$push90=, $2=, $pop91
+	i32.or  	$push89=, $pop32, $pop90
+	tee_local	$push88=, $4=, $pop89
+	i32.store16	sU($pop98), $pop88
 	block   	
-	i32.const	$push32=, 65472
-	i32.and 	$push33=, $3, $pop32
-	i32.const	$push88=, 6
-	i32.shr_u	$push87=, $pop33, $pop88
-	tee_local	$push86=, $3=, $pop87
-	i32.xor 	$push34=, $pop86, $4
-	i32.const	$push85=, 1
-	i32.and 	$push35=, $pop34, $pop85
-	br_if   	0, $pop35       # 0: down to label9
+	i32.const	$push33=, 65472
+	i32.and 	$push34=, $4, $pop33
+	i32.const	$push87=, 6
+	i32.shr_u	$push86=, $pop34, $pop87
+	tee_local	$push85=, $4=, $pop86
+	i32.xor 	$push35=, $pop85, $3
+	i32.const	$push84=, 1
+	i32.and 	$push36=, $pop35, $pop84
+	br_if   	0, $pop36       # 0: down to label16
 # BB#1:                                 # %lor.lhs.false41
-	i32.const	$push170=, 16
-	i32.shr_u	$push169=, $1, $pop170
-	tee_local	$push168=, $4=, $pop169
-	i32.add 	$push37=, $3, $pop168
-	i32.add 	$push36=, $4, $0
-	i32.xor 	$push38=, $pop37, $pop36
-	i32.const	$push167=, 1
-	i32.and 	$push39=, $pop38, $pop167
-	br_if   	0, $pop39       # 0: down to label9
+	i32.const	$push169=, 16
+	i32.shr_u	$push168=, $1, $pop169
+	tee_local	$push167=, $3=, $pop168
+	i32.add 	$push38=, $pop167, $4
+	i32.add 	$push37=, $3, $0
+	i32.xor 	$push39=, $pop38, $pop37
+	i32.const	$push166=, 1
+	i32.and 	$push40=, $pop39, $pop166
+	br_if   	0, $pop40       # 0: down to label16
 # BB#2:                                 # %if.end
-	i32.const	$push44=, 0
-	i32.const	$push40=, 1103515245
-	i32.mul 	$push41=, $1, $pop40
-	i32.const	$push42=, 12345
-	i32.add 	$push188=, $pop41, $pop42
-	tee_local	$push187=, $3=, $pop188
-	i32.const	$push186=, 1103515245
-	i32.mul 	$push43=, $pop187, $pop186
-	i32.const	$push185=, 12345
-	i32.add 	$push184=, $pop43, $pop185
-	tee_local	$push183=, $1=, $pop184
-	i32.store	myrnd.s($pop44), $pop183
-	i32.const	$push182=, 0
-	i32.const	$push181=, 16
-	i32.shr_u	$push180=, $3, $pop181
-	tee_local	$push179=, $0=, $pop180
-	i32.const	$push45=, 2047
-	i32.and 	$push178=, $pop179, $pop45
-	tee_local	$push177=, $3=, $pop178
-	i32.const	$push46=, 6
-	i32.shl 	$push47=, $pop177, $pop46
-	i32.const	$push48=, 64
-	i32.and 	$push49=, $pop47, $pop48
-	i32.or  	$push176=, $pop49, $2
-	tee_local	$push175=, $4=, $pop176
-	i32.store16	sU($pop182), $pop175
-	i32.const	$push50=, 65472
-	i32.and 	$push51=, $4, $pop50
-	i32.const	$push174=, 6
-	i32.shr_u	$push173=, $pop51, $pop174
-	tee_local	$push172=, $4=, $pop173
-	i32.xor 	$push52=, $pop172, $3
-	i32.const	$push171=, 1
-	i32.and 	$push53=, $pop52, $pop171
-	br_if   	0, $pop53       # 0: down to label9
+	i32.const	$push45=, 0
+	i32.const	$push41=, 1103515245
+	i32.mul 	$push42=, $1, $pop41
+	i32.const	$push43=, 12345
+	i32.add 	$push187=, $pop42, $pop43
+	tee_local	$push186=, $0=, $pop187
+	i32.const	$push185=, 1103515245
+	i32.mul 	$push44=, $pop186, $pop185
+	i32.const	$push184=, 12345
+	i32.add 	$push183=, $pop44, $pop184
+	tee_local	$push182=, $1=, $pop183
+	i32.store	myrnd.s($pop45), $pop182
+	i32.const	$push181=, 0
+	i32.const	$push180=, 16
+	i32.shr_u	$push179=, $0, $pop180
+	tee_local	$push178=, $0=, $pop179
+	i32.const	$push46=, 2047
+	i32.and 	$push177=, $pop178, $pop46
+	tee_local	$push176=, $3=, $pop177
+	i32.const	$push47=, 6
+	i32.shl 	$push48=, $pop176, $pop47
+	i32.const	$push49=, 64
+	i32.and 	$push50=, $pop48, $pop49
+	i32.or  	$push175=, $pop50, $2
+	tee_local	$push174=, $4=, $pop175
+	i32.store16	sU($pop181), $pop174
+	i32.const	$push51=, 65472
+	i32.and 	$push52=, $4, $pop51
+	i32.const	$push173=, 6
+	i32.shr_u	$push172=, $pop52, $pop173
+	tee_local	$push171=, $4=, $pop172
+	i32.xor 	$push53=, $pop171, $3
+	i32.const	$push170=, 1
+	i32.and 	$push54=, $pop53, $pop170
+	br_if   	0, $pop54       # 0: down to label16
 # BB#3:                                 # %lor.lhs.false85
-	i32.const	$push194=, 16
-	i32.shr_u	$push193=, $1, $pop194
-	tee_local	$push192=, $3=, $pop193
-	i32.add 	$push58=, $pop192, $0
-	i32.const	$push191=, 1
-	i32.and 	$push59=, $pop58, $pop191
-	i32.const	$push56=, 15
-	i32.rem_u	$push60=, $pop59, $pop56
-	i32.add 	$push54=, $4, $3
-	i32.const	$push190=, 1
-	i32.and 	$push55=, $pop54, $pop190
-	i32.const	$push189=, 15
-	i32.rem_u	$push57=, $pop55, $pop189
-	i32.ne  	$push61=, $pop60, $pop57
-	br_if   	0, $pop61       # 0: down to label9
+	i32.const	$push191=, 16
+	i32.shr_u	$push190=, $1, $pop191
+	tee_local	$push189=, $3=, $pop190
+	i32.add 	$push56=, $pop189, $4
+	i32.add 	$push55=, $3, $0
+	i32.xor 	$push57=, $pop56, $pop55
+	i32.const	$push188=, 1
+	i32.and 	$push58=, $pop57, $pop188
+	br_if   	0, $pop58       # 0: down to label16
 # BB#4:                                 # %lor.lhs.false130
-	i32.const	$push66=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push63=, $1, $pop62
-	i32.const	$push64=, 12345
-	i32.add 	$push208=, $pop63, $pop64
-	tee_local	$push207=, $1=, $pop208
-	i32.const	$push206=, 1103515245
-	i32.mul 	$push65=, $pop207, $pop206
-	i32.const	$push205=, 12345
-	i32.add 	$push204=, $pop65, $pop205
-	tee_local	$push203=, $3=, $pop204
-	i32.store	myrnd.s($pop66), $pop203
-	i32.const	$push202=, 0
-	i32.const	$push68=, 10
-	i32.shr_u	$push69=, $1, $pop68
-	i32.const	$push70=, 64
-	i32.and 	$push71=, $pop69, $pop70
-	i32.or  	$push72=, $pop71, $2
-	i32.const	$push73=, 65472
-	i32.and 	$push74=, $pop72, $pop73
-	i32.const	$push75=, 6
-	i32.shr_u	$push76=, $pop74, $pop75
-	i32.const	$push67=, 16
-	i32.shr_u	$push201=, $3, $pop67
-	tee_local	$push200=, $3=, $pop201
-	i32.add 	$push199=, $pop76, $pop200
-	tee_local	$push198=, $4=, $pop199
-	i32.const	$push197=, 6
-	i32.shl 	$push77=, $pop198, $pop197
-	i32.const	$push196=, 64
-	i32.and 	$push78=, $pop77, $pop196
-	i32.or  	$push79=, $pop78, $2
-	i32.store16	sU($pop202), $pop79
-	i32.const	$push195=, 16
-	i32.shr_u	$push80=, $1, $pop195
-	i32.add 	$push81=, $3, $pop80
-	i32.xor 	$push82=, $pop81, $4
-	i32.const	$push83=, 1
-	i32.and 	$push84=, $pop82, $pop83
-	br_if   	0, $pop84       # 0: down to label9
+	i32.const	$push63=, 0
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push60=, $1, $pop59
+	i32.const	$push61=, 12345
+	i32.add 	$push205=, $pop60, $pop61
+	tee_local	$push204=, $1=, $pop205
+	i32.const	$push203=, 1103515245
+	i32.mul 	$push62=, $pop204, $pop203
+	i32.const	$push202=, 12345
+	i32.add 	$push201=, $pop62, $pop202
+	tee_local	$push200=, $0=, $pop201
+	i32.store	myrnd.s($pop63), $pop200
+	i32.const	$push199=, 0
+	i32.const	$push64=, 16
+	i32.shr_u	$push198=, $0, $pop64
+	tee_local	$push197=, $0=, $pop198
+	i32.const	$push65=, 2047
+	i32.and 	$push66=, $pop197, $pop65
+	i32.const	$push67=, 10
+	i32.shr_u	$push68=, $1, $pop67
+	i32.const	$push69=, 64
+	i32.and 	$push70=, $pop68, $pop69
+	i32.or  	$push71=, $pop70, $2
+	i32.const	$push72=, 65472
+	i32.and 	$push73=, $pop71, $pop72
+	i32.const	$push74=, 6
+	i32.shr_u	$push75=, $pop73, $pop74
+	i32.add 	$push196=, $pop66, $pop75
+	tee_local	$push195=, $3=, $pop196
+	i32.const	$push194=, 6
+	i32.shl 	$push76=, $pop195, $pop194
+	i32.const	$push193=, 64
+	i32.and 	$push77=, $pop76, $pop193
+	i32.or  	$push78=, $pop77, $2
+	i32.store16	sU($pop199), $pop78
+	i32.const	$push192=, 16
+	i32.shr_u	$push79=, $1, $pop192
+	i32.add 	$push80=, $0, $pop79
+	i32.xor 	$push81=, $pop80, $3
+	i32.const	$push82=, 1
+	i32.and 	$push83=, $pop81, $pop82
+	br_if   	0, $pop83       # 0: down to label16
 # BB#5:                                 # %if.end136
 	return
-.LBB126_6:                              # %if.then135
-	end_block                       # label9:
+.LBB126_6:                              # %if.then
+	end_block                       # label16:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end126:
 	.size	testU, .Lfunc_end126-testU
-
+                                        # -- End function
 	.section	.text.retmeV,"ax",@progbits
-	.hidden	retmeV
+	.hidden	retmeV                  # -- Begin function retmeV
 	.globl	retmeV
 	.type	retmeV,@function
 retmeV:                                 # @retmeV
@@ -5365,9 +5556,9 @@ retmeV:                                 # @retmeV
 	.endfunc
 .Lfunc_end127:
 	.size	retmeV, .Lfunc_end127-retmeV
-
+                                        # -- End function
 	.section	.text.fn1V,"ax",@progbits
-	.hidden	fn1V
+	.hidden	fn1V                    # -- Begin function fn1V
 	.globl	fn1V
 	.type	fn1V,@function
 fn1V:                                   # @fn1V
@@ -5385,9 +5576,9 @@ fn1V:                                   # @fn1V
 	.endfunc
 .Lfunc_end128:
 	.size	fn1V, .Lfunc_end128-fn1V
-
+                                        # -- End function
 	.section	.text.fn2V,"ax",@progbits
-	.hidden	fn2V
+	.hidden	fn2V                    # -- Begin function fn2V
 	.globl	fn2V
 	.type	fn2V,@function
 fn2V:                                   # @fn2V
@@ -5399,15 +5590,13 @@ fn2V:                                   # @fn2V
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 1
 	i32.and 	$push4=, $pop2, $pop3
-	i32.const	$push5=, 15
-	i32.rem_u	$push6=, $pop4, $pop5
-                                        # fallthrough-return: $pop6
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end129:
 	.size	fn2V, .Lfunc_end129-fn2V
-
+                                        # -- End function
 	.section	.text.retitV,"ax",@progbits
-	.hidden	retitV
+	.hidden	retitV                  # -- Begin function retitV
 	.globl	retitV
 	.type	retitV,@function
 retitV:                                 # @retitV
@@ -5421,9 +5610,9 @@ retitV:                                 # @retitV
 	.endfunc
 .Lfunc_end130:
 	.size	retitV, .Lfunc_end130-retitV
-
+                                        # -- End function
 	.section	.text.fn3V,"ax",@progbits
-	.hidden	fn3V
+	.hidden	fn3V                    # -- Begin function fn3V
 	.globl	fn3V
 	.type	fn3V,@function
 fn3V:                                   # @fn3V
@@ -5453,200 +5642,193 @@ fn3V:                                   # @fn3V
 	.endfunc
 .Lfunc_end131:
 	.size	fn3V, .Lfunc_end131-fn3V
-
+                                        # -- End function
 	.section	.text.testV,"ax",@progbits
-	.hidden	testV
+	.hidden	testV                   # -- Begin function testV
 	.globl	testV
 	.type	testV,@function
 testV:                                  # @testV
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push107=, 0
-	i32.const	$push106=, 0
-	i32.load	$push0=, myrnd.s($pop106)
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop1, $pop104
-	tee_local	$push102=, $2=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_u	$push2=, $pop102, $pop101
-	i32.store8	sV($pop107), $pop2
-	i32.const	$push100=, 0
-	i32.const	$push99=, 1103515245
-	i32.mul 	$push3=, $2, $pop99
-	i32.const	$push98=, 12345
-	i32.add 	$push97=, $pop3, $pop98
-	tee_local	$push96=, $2=, $pop97
-	i32.const	$push95=, 16
-	i32.shr_u	$push4=, $pop96, $pop95
-	i32.store8	sV+1($pop100), $pop4
-	i32.const	$push94=, 0
-	i32.const	$push93=, 1103515245
-	i32.mul 	$push5=, $2, $pop93
-	i32.const	$push92=, 12345
-	i32.add 	$push91=, $pop5, $pop92
-	tee_local	$push90=, $2=, $pop91
-	i32.const	$push89=, 16
-	i32.shr_u	$push6=, $pop90, $pop89
-	i32.store8	sV+2($pop94), $pop6
-	i32.const	$push88=, 0
-	i32.const	$push87=, 1103515245
-	i32.mul 	$push7=, $2, $pop87
-	i32.const	$push86=, 12345
-	i32.add 	$push85=, $pop7, $pop86
-	tee_local	$push84=, $2=, $pop85
-	i32.const	$push83=, 16
-	i32.shr_u	$push8=, $pop84, $pop83
-	i32.store8	sV+3($pop88), $pop8
-	i32.const	$push82=, 0
-	i32.const	$push81=, 1103515245
-	i32.mul 	$push11=, $2, $pop81
-	i32.const	$push80=, 12345
-	i32.add 	$push79=, $pop11, $pop80
-	tee_local	$push78=, $2=, $pop79
-	i32.const	$push77=, 8
-	i32.shr_u	$push12=, $pop78, $pop77
-	i32.const	$push76=, 256
-	i32.and 	$push13=, $pop12, $pop76
-	i32.const	$push75=, 0
-	i32.load16_u	$push9=, sV($pop75)
-	i32.const	$push74=, 65279
-	i32.and 	$push10=, $pop9, $pop74
-	i32.or  	$push14=, $pop13, $pop10
-	i32.store16	sV($pop82), $pop14
+	i32.const	$push105=, 0
+	i32.const	$push104=, 0
+	i32.load	$push0=, myrnd.s($pop104)
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$push101=, $pop1, $pop102
+	tee_local	$push100=, $1=, $pop101
+	i32.const	$push99=, 16
+	i32.shr_u	$push2=, $pop100, $pop99
+	i32.store8	sV($pop105), $pop2
+	i32.const	$push98=, 0
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push3=, $1, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$push95=, $pop3, $pop96
+	tee_local	$push94=, $1=, $pop95
+	i32.const	$push93=, 16
+	i32.shr_u	$push4=, $pop94, $pop93
+	i32.store8	sV+1($pop98), $pop4
+	i32.const	$push92=, 0
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push5=, $1, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$push89=, $pop5, $pop90
+	tee_local	$push88=, $1=, $pop89
+	i32.const	$push87=, 16
+	i32.shr_u	$push6=, $pop88, $pop87
+	i32.store8	sV+2($pop92), $pop6
+	i32.const	$push86=, 0
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push7=, $1, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$push83=, $pop7, $pop84
+	tee_local	$push82=, $1=, $pop83
+	i32.const	$push81=, 16
+	i32.shr_u	$push8=, $pop82, $pop81
+	i32.store8	sV+3($pop86), $pop8
+	i32.const	$push80=, 0
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push11=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$push77=, $pop11, $pop78
+	tee_local	$push76=, $2=, $pop77
+	i32.const	$push75=, 8
+	i32.shr_u	$push12=, $pop76, $pop75
+	i32.const	$push74=, 256
+	i32.and 	$push13=, $pop12, $pop74
 	i32.const	$push73=, 0
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push15=, $2, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop15, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.store	myrnd.s($pop73), $pop69
+	i32.load16_u	$push9=, sV($pop73)
+	i32.const	$push10=, -257
+	i32.and 	$push72=, $pop9, $pop10
+	tee_local	$push71=, $1=, $pop72
+	i32.or  	$push14=, $pop13, $pop71
+	i32.store16	sV($pop80), $pop14
+	i32.const	$push70=, 0
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push15=, $2, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$push67=, $pop15, $pop68
+	tee_local	$push66=, $0=, $pop67
+	i32.store	myrnd.s($pop70), $pop66
 	block   	
-	i32.const	$push68=, 16
-	i32.shr_u	$push67=, $0, $pop68
-	tee_local	$push66=, $3=, $pop67
 	i32.const	$push65=, 16
-	i32.shr_u	$push16=, $2, $pop65
-	i32.add 	$push17=, $pop66, $pop16
-	i32.const	$push64=, 0
-	i32.load	$push63=, sV($pop64)
-	tee_local	$push62=, $2=, $pop63
-	i32.const	$push61=, 8
-	i32.shr_u	$push18=, $pop62, $pop61
-	i32.add 	$push19=, $pop18, $3
-	i32.xor 	$push20=, $pop17, $pop19
-	i32.const	$push60=, 1
-	i32.and 	$push21=, $pop20, $pop60
-	br_if   	0, $pop21       # 0: down to label10
+	i32.shr_u	$push64=, $0, $pop65
+	tee_local	$push63=, $3=, $pop64
+	i32.const	$push62=, 16
+	i32.shr_u	$push16=, $2, $pop62
+	i32.add 	$push17=, $pop63, $pop16
+	i32.const	$push61=, 0
+	i32.load	$push18=, sV($pop61)
+	i32.const	$push60=, 8
+	i32.shr_u	$push19=, $pop18, $pop60
+	i32.add 	$push20=, $3, $pop19
+	i32.xor 	$push21=, $pop17, $pop20
+	i32.const	$push59=, 1
+	i32.and 	$push22=, $pop21, $pop59
+	br_if   	0, $pop22       # 0: down to label17
 # BB#1:                                 # %if.end
-	i32.const	$push130=, 0
-	i32.const	$push129=, 1103515245
-	i32.mul 	$push22=, $0, $pop129
-	i32.const	$push128=, 12345
-	i32.add 	$push127=, $pop22, $pop128
-	tee_local	$push126=, $3=, $pop127
-	i32.const	$push125=, 1103515245
-	i32.mul 	$push23=, $pop126, $pop125
-	i32.const	$push124=, 12345
-	i32.add 	$push123=, $pop23, $pop124
-	tee_local	$push122=, $0=, $pop123
-	i32.store	myrnd.s($pop130), $pop122
-	i32.const	$push121=, 0
-	i32.const	$push120=, 16
-	i32.shr_u	$push119=, $3, $pop120
-	tee_local	$push118=, $1=, $pop119
-	i32.const	$push26=, 2047
-	i32.and 	$push117=, $pop118, $pop26
-	tee_local	$push116=, $3=, $pop117
-	i32.const	$push115=, 8
-	i32.shl 	$push27=, $pop116, $pop115
-	i32.const	$push114=, 256
-	i32.and 	$push28=, $pop27, $pop114
-	i32.const	$push24=, -257
-	i32.and 	$push25=, $2, $pop24
-	i32.or  	$push113=, $pop28, $pop25
-	tee_local	$push112=, $4=, $pop113
-	i32.store16	sV($pop121), $pop112
-	i32.const	$push29=, 65280
-	i32.and 	$push30=, $4, $pop29
-	i32.const	$push111=, 8
-	i32.shr_u	$push110=, $pop30, $pop111
-	tee_local	$push109=, $4=, $pop110
-	i32.xor 	$push31=, $pop109, $3
-	i32.const	$push108=, 1
-	i32.and 	$push32=, $pop31, $pop108
-	br_if   	0, $pop32       # 0: down to label10
+	i32.const	$push128=, 0
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push23=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$push125=, $pop23, $pop126
+	tee_local	$push124=, $0=, $pop125
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push24=, $pop124, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$push121=, $pop24, $pop122
+	tee_local	$push120=, $2=, $pop121
+	i32.store	myrnd.s($pop128), $pop120
+	i32.const	$push119=, 0
+	i32.const	$push118=, 16
+	i32.shr_u	$push117=, $0, $pop118
+	tee_local	$push116=, $0=, $pop117
+	i32.const	$push25=, 2047
+	i32.and 	$push115=, $pop116, $pop25
+	tee_local	$push114=, $3=, $pop115
+	i32.const	$push113=, 8
+	i32.shl 	$push26=, $pop114, $pop113
+	i32.const	$push112=, 256
+	i32.and 	$push27=, $pop26, $pop112
+	i32.or  	$push111=, $pop27, $1
+	tee_local	$push110=, $4=, $pop111
+	i32.store16	sV($pop119), $pop110
+	i32.const	$push28=, 65280
+	i32.and 	$push29=, $4, $pop28
+	i32.const	$push109=, 8
+	i32.shr_u	$push108=, $pop29, $pop109
+	tee_local	$push107=, $4=, $pop108
+	i32.xor 	$push30=, $pop107, $3
+	i32.const	$push106=, 1
+	i32.and 	$push31=, $pop30, $pop106
+	br_if   	0, $pop31       # 0: down to label17
 # BB#2:                                 # %lor.lhs.false89
-	i32.const	$push136=, 16
-	i32.shr_u	$push135=, $0, $pop136
-	tee_local	$push134=, $3=, $pop135
-	i32.add 	$push37=, $pop134, $1
-	i32.const	$push133=, 1
-	i32.and 	$push38=, $pop37, $pop133
-	i32.const	$push35=, 15
-	i32.rem_u	$push39=, $pop38, $pop35
-	i32.add 	$push33=, $4, $3
-	i32.const	$push132=, 1
-	i32.and 	$push34=, $pop33, $pop132
-	i32.const	$push131=, 15
-	i32.rem_u	$push36=, $pop34, $pop131
-	i32.ne  	$push40=, $pop39, $pop36
-	br_if   	0, $pop40       # 0: down to label10
+	i32.const	$push132=, 16
+	i32.shr_u	$push131=, $2, $pop132
+	tee_local	$push130=, $3=, $pop131
+	i32.add 	$push33=, $pop130, $4
+	i32.add 	$push32=, $3, $0
+	i32.xor 	$push34=, $pop33, $pop32
+	i32.const	$push129=, 1
+	i32.and 	$push35=, $pop34, $pop129
+	br_if   	0, $pop35       # 0: down to label17
 # BB#3:                                 # %lor.lhs.false136
-	i32.const	$push45=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push42=, $0, $pop41
-	i32.const	$push43=, 12345
-	i32.add 	$push155=, $pop42, $pop43
-	tee_local	$push154=, $0=, $pop155
-	i32.const	$push153=, 1103515245
-	i32.mul 	$push44=, $pop154, $pop153
-	i32.const	$push152=, 12345
-	i32.add 	$push151=, $pop44, $pop152
-	tee_local	$push150=, $3=, $pop151
-	i32.store	myrnd.s($pop45), $pop150
-	i32.const	$push149=, 0
-	i32.const	$push47=, 8
-	i32.shr_u	$push48=, $0, $pop47
-	i32.const	$push49=, 256
+	i32.const	$push40=, 0
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push37=, $2, $pop36
+	i32.const	$push38=, 12345
+	i32.add 	$push148=, $pop37, $pop38
+	tee_local	$push147=, $2=, $pop148
+	i32.const	$push146=, 1103515245
+	i32.mul 	$push39=, $pop147, $pop146
+	i32.const	$push145=, 12345
+	i32.add 	$push144=, $pop39, $pop145
+	tee_local	$push143=, $0=, $pop144
+	i32.store	myrnd.s($pop40), $pop143
+	i32.const	$push142=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push141=, $0, $pop41
+	tee_local	$push140=, $0=, $pop141
+	i32.const	$push42=, 2047
+	i32.and 	$push43=, $pop140, $pop42
+	i32.const	$push44=, 8
+	i32.shr_u	$push45=, $2, $pop44
+	i32.const	$push46=, 256
+	i32.and 	$push47=, $pop45, $pop46
+	i32.or  	$push48=, $pop47, $1
+	i32.const	$push49=, 65280
 	i32.and 	$push50=, $pop48, $pop49
-	i32.const	$push148=, 65279
-	i32.and 	$push147=, $2, $pop148
-	tee_local	$push146=, $2=, $pop147
-	i32.or  	$push51=, $pop50, $pop146
-	i32.const	$push145=, 8
-	i32.shr_u	$push52=, $pop51, $pop145
-	i32.const	$push46=, 16
-	i32.shr_u	$push144=, $3, $pop46
-	tee_local	$push143=, $3=, $pop144
-	i32.add 	$push142=, $pop52, $pop143
-	tee_local	$push141=, $4=, $pop142
-	i32.const	$push140=, 8
-	i32.shl 	$push53=, $pop141, $pop140
-	i32.const	$push139=, 256
-	i32.and 	$push54=, $pop53, $pop139
-	i32.or  	$push55=, $pop54, $2
-	i32.store16	sV($pop149), $pop55
-	i32.const	$push138=, 16
-	i32.shr_u	$push56=, $0, $pop138
-	i32.add 	$push57=, $3, $pop56
-	i32.xor 	$push58=, $pop57, $4
-	i32.const	$push137=, 1
-	i32.and 	$push59=, $pop58, $pop137
-	br_if   	0, $pop59       # 0: down to label10
+	i32.const	$push139=, 8
+	i32.shr_u	$push51=, $pop50, $pop139
+	i32.add 	$push138=, $pop43, $pop51
+	tee_local	$push137=, $3=, $pop138
+	i32.const	$push136=, 8
+	i32.shl 	$push52=, $pop137, $pop136
+	i32.const	$push135=, 256
+	i32.and 	$push53=, $pop52, $pop135
+	i32.or  	$push54=, $pop53, $1
+	i32.store16	sV($pop142), $pop54
+	i32.const	$push134=, 16
+	i32.shr_u	$push55=, $2, $pop134
+	i32.add 	$push56=, $0, $pop55
+	i32.xor 	$push57=, $pop56, $3
+	i32.const	$push133=, 1
+	i32.and 	$push58=, $pop57, $pop133
+	br_if   	0, $pop58       # 0: down to label17
 # BB#4:                                 # %if.end142
 	return
-.LBB132_5:                              # %if.then141
-	end_block                       # label10:
+.LBB132_5:                              # %if.then
+	end_block                       # label17:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end132:
 	.size	testV, .Lfunc_end132-testV
-
+                                        # -- End function
 	.section	.text.retmeW,"ax",@progbits
-	.hidden	retmeW
+	.hidden	retmeW                  # -- Begin function retmeW
 	.globl	retmeW
 	.type	retmeW,@function
 retmeW:                                 # @retmeW
@@ -5670,9 +5852,9 @@ retmeW:                                 # @retmeW
 	.endfunc
 .Lfunc_end133:
 	.size	retmeW, .Lfunc_end133-retmeW
-
+                                        # -- End function
 	.section	.text.fn1W,"ax",@progbits
-	.hidden	fn1W
+	.hidden	fn1W                    # -- Begin function fn1W
 	.globl	fn1W
 	.type	fn1W,@function
 fn1W:                                   # @fn1W
@@ -5688,9 +5870,9 @@ fn1W:                                   # @fn1W
 	.endfunc
 .Lfunc_end134:
 	.size	fn1W, .Lfunc_end134-fn1W
-
+                                        # -- End function
 	.section	.text.fn2W,"ax",@progbits
-	.hidden	fn2W
+	.hidden	fn2W                    # -- Begin function fn2W
 	.globl	fn2W
 	.type	fn2W,@function
 fn2W:                                   # @fn2W
@@ -5708,9 +5890,9 @@ fn2W:                                   # @fn2W
 	.endfunc
 .Lfunc_end135:
 	.size	fn2W, .Lfunc_end135-fn2W
-
+                                        # -- End function
 	.section	.text.retitW,"ax",@progbits
-	.hidden	retitW
+	.hidden	retitW                  # -- Begin function retitW
 	.globl	retitW
 	.type	retitW,@function
 retitW:                                 # @retitW
@@ -5724,9 +5906,9 @@ retitW:                                 # @retitW
 	.endfunc
 .Lfunc_end136:
 	.size	retitW, .Lfunc_end136-retitW
-
+                                        # -- End function
 	.section	.text.fn3W,"ax",@progbits
-	.hidden	fn3W
+	.hidden	fn3W                    # -- Begin function fn3W
 	.globl	fn3W
 	.type	fn3W,@function
 fn3W:                                   # @fn3W
@@ -5751,132 +5933,93 @@ fn3W:                                   # @fn3W
 	.endfunc
 .Lfunc_end137:
 	.size	fn3W, .Lfunc_end137-fn3W
-
+                                        # -- End function
 	.section	.text.testW,"ax",@progbits
-	.hidden	testW
+	.hidden	testW                   # -- Begin function testW
 	.globl	testW
 	.type	testW,@function
 testW:                                  # @testW
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# BB#0:                                 # %if.end119
 	i32.const	$push0=, 0
-	i32.const	$push98=, 0
-	i32.load	$push1=, myrnd.s($pop98)
+	i32.const	$push63=, 0
+	i32.load	$push1=, myrnd.s($pop63)
 	i32.const	$push2=, 1670464429
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 2121308585
-	i32.add 	$push97=, $pop3, $pop4
-	tee_local	$push96=, $1=, $pop97
+	i32.add 	$push62=, $pop3, $pop4
+	tee_local	$push61=, $0=, $pop62
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop96, $pop5
+	i32.shr_u	$push6=, $pop61, $pop5
 	i32.store8	sW+16($pop0), $pop6
-	i32.const	$push95=, 0
+	i32.const	$push60=, 0
 	i32.const	$push7=, 1103515245
-	i32.mul 	$push8=, $1, $pop7
+	i32.mul 	$push8=, $0, $pop7
 	i32.const	$push9=, 12345
-	i32.add 	$push94=, $pop8, $pop9
-	tee_local	$push93=, $1=, $pop94
-	i32.const	$push92=, 16
-	i32.shr_u	$push10=, $pop93, $pop92
-	i32.store8	sW+17($pop95), $pop10
-	i32.const	$push91=, 0
-	i32.const	$push90=, 1103515245
-	i32.mul 	$push11=, $1, $pop90
-	i32.const	$push89=, 12345
-	i32.add 	$push88=, $pop11, $pop89
-	tee_local	$push87=, $1=, $pop88
-	i32.const	$push86=, 16
-	i32.shr_u	$push12=, $pop87, $pop86
-	i32.store8	sW+18($pop91), $pop12
-	i32.const	$push85=, 0
-	i32.const	$push84=, 1103515245
-	i32.mul 	$push13=, $1, $pop84
-	i32.const	$push83=, 12345
-	i32.add 	$push82=, $pop13, $pop83
-	tee_local	$push81=, $1=, $pop82
-	i32.const	$push80=, 16
-	i32.shr_u	$push14=, $pop81, $pop80
-	i32.store8	sW+19($pop85), $pop14
-	i32.const	$push79=, 0
+	i32.add 	$push59=, $pop8, $pop9
+	tee_local	$push58=, $0=, $pop59
+	i32.const	$push57=, 16
+	i32.shr_u	$push10=, $pop58, $pop57
+	i32.store8	sW+17($pop60), $pop10
+	i32.const	$push56=, 0
+	i32.const	$push55=, 1103515245
+	i32.mul 	$push11=, $0, $pop55
+	i32.const	$push54=, 12345
+	i32.add 	$push53=, $pop11, $pop54
+	tee_local	$push52=, $0=, $pop53
+	i32.const	$push51=, 16
+	i32.shr_u	$push12=, $pop52, $pop51
+	i32.store8	sW+18($pop56), $pop12
+	i32.const	$push50=, 0
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push13=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$push47=, $pop13, $pop48
+	tee_local	$push46=, $0=, $pop47
+	i32.const	$push45=, 16
+	i32.shr_u	$push14=, $pop46, $pop45
+	i32.store8	sW+19($pop50), $pop14
+	i32.const	$push44=, 0
 	i64.const	$push15=, 4612055454334320640
-	i64.store	sW+8($pop79), $pop15
-	i32.const	$push78=, 0
+	i64.store	sW+8($pop44), $pop15
+	i32.const	$push43=, 0
 	i64.const	$push16=, 0
-	i64.store	sW($pop78), $pop16
-	i32.const	$push77=, 0
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push17=, $1, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop17, $pop75
-	tee_local	$push73=, $1=, $pop74
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push18=, $pop73, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop18, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.store	myrnd.s($pop77), $pop69
-	i32.const	$push68=, 0
-	i32.const	$push67=, 16
-	i32.shr_u	$push21=, $1, $pop67
-	i32.const	$push22=, 2047
-	i32.and 	$push23=, $pop21, $pop22
-	i32.const	$push66=, 0
-	i32.load	$push19=, sW+16($pop66)
-	i32.const	$push20=, -4096
-	i32.and 	$push65=, $pop19, $pop20
-	tee_local	$push64=, $1=, $pop65
-	i32.or  	$push24=, $pop23, $pop64
-	i32.store	sW+16($pop68), $pop24
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push25=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop25, $pop61
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push26=, $pop59, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop26, $pop57
-	tee_local	$push55=, $2=, $pop56
-	i32.store	myrnd.s($pop63), $pop55
-	i32.const	$push54=, 0
-	i32.const	$push53=, 16
-	i32.shr_u	$push27=, $0, $pop53
-	i32.const	$push52=, 2047
-	i32.and 	$push28=, $pop27, $pop52
-	i32.or  	$push29=, $pop28, $1
-	i32.store	sW+16($pop54), $pop29
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push30=, $2, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop30, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 1103515245
-	i32.mul 	$push31=, $pop47, $pop46
-	i32.const	$push45=, 12345
-	i32.add 	$push44=, $pop31, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.store	myrnd.s($pop51), $pop43
+	i64.store	sW($pop43), $pop16
 	i32.const	$push42=, 0
-	i32.const	$push41=, 16
-	i32.shr_u	$push34=, $2, $pop41
-	i32.const	$push40=, 2047
-	i32.and 	$push35=, $pop34, $pop40
-	i32.const	$push39=, 16
-	i32.shr_u	$push32=, $0, $pop39
-	i32.const	$push38=, 2047
-	i32.and 	$push33=, $pop32, $pop38
-	i32.add 	$push36=, $pop35, $pop33
-	i32.or  	$push37=, $pop36, $1
-	i32.store	sW+16($pop42), $pop37
+	i32.const	$push17=, -341751747
+	i32.mul 	$push18=, $0, $pop17
+	i32.const	$push19=, 229283573
+	i32.add 	$push41=, $pop18, $pop19
+	tee_local	$push40=, $0=, $pop41
+	i32.const	$push39=, 1103515245
+	i32.mul 	$push20=, $pop40, $pop39
+	i32.const	$push38=, 12345
+	i32.add 	$push37=, $pop20, $pop38
+	tee_local	$push36=, $1=, $pop37
+	i32.store	myrnd.s($pop42), $pop36
+	i32.const	$push35=, 0
+	i32.const	$push34=, 16
+	i32.shr_u	$push24=, $1, $pop34
+	i32.const	$push22=, 2047
+	i32.and 	$push25=, $pop24, $pop22
+	i32.const	$push33=, 16
+	i32.shr_u	$push21=, $0, $pop33
+	i32.const	$push32=, 2047
+	i32.and 	$push23=, $pop21, $pop32
+	i32.add 	$push26=, $pop25, $pop23
+	i32.const	$push31=, 0
+	i32.load	$push27=, sW+16($pop31)
+	i32.const	$push28=, -4096
+	i32.and 	$push29=, $pop27, $pop28
+	i32.or  	$push30=, $pop26, $pop29
+	i32.store	sW+16($pop35), $pop30
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end138:
 	.size	testW, .Lfunc_end138-testW
-
+                                        # -- End function
 	.section	.text.retmeX,"ax",@progbits
-	.hidden	retmeX
+	.hidden	retmeX                  # -- Begin function retmeX
 	.globl	retmeX
 	.type	retmeX,@function
 retmeX:                                 # @retmeX
@@ -5900,9 +6043,9 @@ retmeX:                                 # @retmeX
 	.endfunc
 .Lfunc_end139:
 	.size	retmeX, .Lfunc_end139-retmeX
-
+                                        # -- End function
 	.section	.text.fn1X,"ax",@progbits
-	.hidden	fn1X
+	.hidden	fn1X                    # -- Begin function fn1X
 	.globl	fn1X
 	.type	fn1X,@function
 fn1X:                                   # @fn1X
@@ -5918,9 +6061,9 @@ fn1X:                                   # @fn1X
 	.endfunc
 .Lfunc_end140:
 	.size	fn1X, .Lfunc_end140-fn1X
-
+                                        # -- End function
 	.section	.text.fn2X,"ax",@progbits
-	.hidden	fn2X
+	.hidden	fn2X                    # -- Begin function fn2X
 	.globl	fn2X
 	.type	fn2X,@function
 fn2X:                                   # @fn2X
@@ -5938,9 +6081,9 @@ fn2X:                                   # @fn2X
 	.endfunc
 .Lfunc_end141:
 	.size	fn2X, .Lfunc_end141-fn2X
-
+                                        # -- End function
 	.section	.text.retitX,"ax",@progbits
-	.hidden	retitX
+	.hidden	retitX                  # -- Begin function retitX
 	.globl	retitX
 	.type	retitX,@function
 retitX:                                 # @retitX
@@ -5954,9 +6097,9 @@ retitX:                                 # @retitX
 	.endfunc
 .Lfunc_end142:
 	.size	retitX, .Lfunc_end142-retitX
-
+                                        # -- End function
 	.section	.text.fn3X,"ax",@progbits
-	.hidden	fn3X
+	.hidden	fn3X                    # -- Begin function fn3X
 	.globl	fn3X
 	.type	fn3X,@function
 fn3X:                                   # @fn3X
@@ -5981,132 +6124,93 @@ fn3X:                                   # @fn3X
 	.endfunc
 .Lfunc_end143:
 	.size	fn3X, .Lfunc_end143-fn3X
-
+                                        # -- End function
 	.section	.text.testX,"ax",@progbits
-	.hidden	testX
+	.hidden	testX                   # -- Begin function testX
 	.globl	testX
 	.type	testX,@function
 testX:                                  # @testX
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# BB#0:                                 # %if.end113
 	i32.const	$push0=, 0
-	i32.const	$push98=, 0
-	i32.load	$push1=, myrnd.s($pop98)
+	i32.const	$push63=, 0
+	i32.load	$push1=, myrnd.s($pop63)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push97=, $pop3, $pop4
-	tee_local	$push96=, $1=, $pop97
+	i32.add 	$push62=, $pop3, $pop4
+	tee_local	$push61=, $0=, $pop62
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop96, $pop5
+	i32.shr_u	$push6=, $pop61, $pop5
 	i32.store8	sX($pop0), $pop6
-	i32.const	$push95=, 0
-	i32.const	$push94=, 1103515245
-	i32.mul 	$push7=, $1, $pop94
-	i32.const	$push93=, 12345
-	i32.add 	$push92=, $pop7, $pop93
-	tee_local	$push91=, $1=, $pop92
-	i32.const	$push90=, 16
-	i32.shr_u	$push8=, $pop91, $pop90
-	i32.store8	sX+1($pop95), $pop8
-	i32.const	$push89=, 0
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push9=, $1, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop9, $pop87
-	tee_local	$push85=, $1=, $pop86
-	i32.const	$push84=, 16
-	i32.shr_u	$push10=, $pop85, $pop84
-	i32.store8	sX+2($pop89), $pop10
-	i32.const	$push83=, 0
-	i32.const	$push82=, 1103515245
-	i32.mul 	$push11=, $1, $pop82
-	i32.const	$push81=, 12345
-	i32.add 	$push80=, $pop11, $pop81
-	tee_local	$push79=, $1=, $pop80
-	i32.const	$push78=, 16
-	i32.shr_u	$push12=, $pop79, $pop78
-	i32.store8	sX+3($pop83), $pop12
-	i32.const	$push77=, 0
-	i64.const	$push13=, 4612055454334320640
-	i64.store	sX+12($pop77):p2align=2, $pop13
-	i32.const	$push76=, 0
-	i64.const	$push14=, 0
-	i64.store	sX+4($pop76):p2align=2, $pop14
-	i32.const	$push75=, 0
-	i32.const	$push15=, 1670464429
-	i32.mul 	$push16=, $1, $pop15
-	i32.const	$push17=, 2121308585
-	i32.add 	$push74=, $pop16, $pop17
-	tee_local	$push73=, $1=, $pop74
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push18=, $pop73, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop18, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.store	myrnd.s($pop75), $pop69
-	i32.const	$push68=, 0
-	i32.const	$push67=, 16
-	i32.shr_u	$push21=, $1, $pop67
-	i32.const	$push22=, 2047
-	i32.and 	$push23=, $pop21, $pop22
-	i32.const	$push66=, 0
-	i32.load	$push19=, sX($pop66)
-	i32.const	$push20=, -4096
-	i32.and 	$push65=, $pop19, $pop20
-	tee_local	$push64=, $1=, $pop65
-	i32.or  	$push24=, $pop23, $pop64
-	i32.store	sX($pop68), $pop24
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push25=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop25, $pop61
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push26=, $pop59, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop26, $pop57
-	tee_local	$push55=, $2=, $pop56
-	i32.store	myrnd.s($pop63), $pop55
+	i32.const	$push60=, 0
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push7=, $0, $pop59
+	i32.const	$push58=, 12345
+	i32.add 	$push57=, $pop7, $pop58
+	tee_local	$push56=, $0=, $pop57
+	i32.const	$push55=, 16
+	i32.shr_u	$push8=, $pop56, $pop55
+	i32.store8	sX+1($pop60), $pop8
 	i32.const	$push54=, 0
-	i32.const	$push53=, 16
-	i32.shr_u	$push27=, $0, $pop53
-	i32.const	$push52=, 2047
-	i32.and 	$push28=, $pop27, $pop52
-	i32.or  	$push29=, $pop28, $1
-	i32.store	sX($pop54), $pop29
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push30=, $2, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop30, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 1103515245
-	i32.mul 	$push31=, $pop47, $pop46
-	i32.const	$push45=, 12345
-	i32.add 	$push44=, $pop31, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.store	myrnd.s($pop51), $pop43
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push9=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$push51=, $pop9, $pop52
+	tee_local	$push50=, $0=, $pop51
+	i32.const	$push49=, 16
+	i32.shr_u	$push10=, $pop50, $pop49
+	i32.store8	sX+2($pop54), $pop10
+	i32.const	$push48=, 0
+	i32.const	$push47=, 1103515245
+	i32.mul 	$push11=, $0, $pop47
+	i32.const	$push46=, 12345
+	i32.add 	$push45=, $pop11, $pop46
+	tee_local	$push44=, $0=, $pop45
+	i32.const	$push43=, 16
+	i32.shr_u	$push12=, $pop44, $pop43
+	i32.store8	sX+3($pop48), $pop12
 	i32.const	$push42=, 0
-	i32.const	$push41=, 16
-	i32.shr_u	$push34=, $2, $pop41
-	i32.const	$push40=, 2047
-	i32.and 	$push35=, $pop34, $pop40
-	i32.const	$push39=, 16
-	i32.shr_u	$push32=, $0, $pop39
-	i32.const	$push38=, 2047
-	i32.and 	$push33=, $pop32, $pop38
-	i32.add 	$push36=, $pop35, $pop33
-	i32.or  	$push37=, $pop36, $1
-	i32.store	sX($pop42), $pop37
+	i64.const	$push13=, 4612055454334320640
+	i64.store	sX+12($pop42):p2align=2, $pop13
+	i32.const	$push41=, 0
+	i64.const	$push14=, 0
+	i64.store	sX+4($pop41):p2align=2, $pop14
+	i32.const	$push40=, 0
+	i32.const	$push15=, 424038781
+	i32.mul 	$push16=, $0, $pop15
+	i32.const	$push17=, -804247707
+	i32.add 	$push39=, $pop16, $pop17
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push18=, $pop38, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$push35=, $pop18, $pop36
+	tee_local	$push34=, $1=, $pop35
+	i32.store	myrnd.s($pop40), $pop34
+	i32.const	$push33=, 0
+	i32.const	$push32=, 16
+	i32.shr_u	$push22=, $1, $pop32
+	i32.const	$push20=, 2047
+	i32.and 	$push23=, $pop22, $pop20
+	i32.const	$push31=, 16
+	i32.shr_u	$push19=, $0, $pop31
+	i32.const	$push30=, 2047
+	i32.and 	$push21=, $pop19, $pop30
+	i32.add 	$push24=, $pop23, $pop21
+	i32.const	$push29=, 0
+	i32.load	$push25=, sX($pop29)
+	i32.const	$push26=, -4096
+	i32.and 	$push27=, $pop25, $pop26
+	i32.or  	$push28=, $pop24, $pop27
+	i32.store	sX($pop33), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end144:
 	.size	testX, .Lfunc_end144-testX
-
+                                        # -- End function
 	.section	.text.retmeY,"ax",@progbits
-	.hidden	retmeY
+	.hidden	retmeY                  # -- Begin function retmeY
 	.globl	retmeY
 	.type	retmeY,@function
 retmeY:                                 # @retmeY
@@ -6130,9 +6234,9 @@ retmeY:                                 # @retmeY
 	.endfunc
 .Lfunc_end145:
 	.size	retmeY, .Lfunc_end145-retmeY
-
+                                        # -- End function
 	.section	.text.fn1Y,"ax",@progbits
-	.hidden	fn1Y
+	.hidden	fn1Y                    # -- Begin function fn1Y
 	.globl	fn1Y
 	.type	fn1Y,@function
 fn1Y:                                   # @fn1Y
@@ -6148,9 +6252,9 @@ fn1Y:                                   # @fn1Y
 	.endfunc
 .Lfunc_end146:
 	.size	fn1Y, .Lfunc_end146-fn1Y
-
+                                        # -- End function
 	.section	.text.fn2Y,"ax",@progbits
-	.hidden	fn2Y
+	.hidden	fn2Y                    # -- Begin function fn2Y
 	.globl	fn2Y
 	.type	fn2Y,@function
 fn2Y:                                   # @fn2Y
@@ -6168,9 +6272,9 @@ fn2Y:                                   # @fn2Y
 	.endfunc
 .Lfunc_end147:
 	.size	fn2Y, .Lfunc_end147-fn2Y
-
+                                        # -- End function
 	.section	.text.retitY,"ax",@progbits
-	.hidden	retitY
+	.hidden	retitY                  # -- Begin function retitY
 	.globl	retitY
 	.type	retitY,@function
 retitY:                                 # @retitY
@@ -6184,9 +6288,9 @@ retitY:                                 # @retitY
 	.endfunc
 .Lfunc_end148:
 	.size	retitY, .Lfunc_end148-retitY
-
+                                        # -- End function
 	.section	.text.fn3Y,"ax",@progbits
-	.hidden	fn3Y
+	.hidden	fn3Y                    # -- Begin function fn3Y
 	.globl	fn3Y
 	.type	fn3Y,@function
 fn3Y:                                   # @fn3Y
@@ -6211,132 +6315,93 @@ fn3Y:                                   # @fn3Y
 	.endfunc
 .Lfunc_end149:
 	.size	fn3Y, .Lfunc_end149-fn3Y
-
+                                        # -- End function
 	.section	.text.testY,"ax",@progbits
-	.hidden	testY
+	.hidden	testY                   # -- Begin function testY
 	.globl	testY
 	.type	testY,@function
 testY:                                  # @testY
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# BB#0:                                 # %if.end113
 	i32.const	$push0=, 0
-	i32.const	$push98=, 0
-	i32.load	$push1=, myrnd.s($pop98)
+	i32.const	$push63=, 0
+	i32.load	$push1=, myrnd.s($pop63)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push97=, $pop3, $pop4
-	tee_local	$push96=, $1=, $pop97
+	i32.add 	$push62=, $pop3, $pop4
+	tee_local	$push61=, $0=, $pop62
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop96, $pop5
+	i32.shr_u	$push6=, $pop61, $pop5
 	i32.store8	sY($pop0), $pop6
-	i32.const	$push95=, 0
-	i32.const	$push94=, 1103515245
-	i32.mul 	$push7=, $1, $pop94
-	i32.const	$push93=, 12345
-	i32.add 	$push92=, $pop7, $pop93
-	tee_local	$push91=, $1=, $pop92
-	i32.const	$push90=, 16
-	i32.shr_u	$push8=, $pop91, $pop90
-	i32.store8	sY+1($pop95), $pop8
-	i32.const	$push89=, 0
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push9=, $1, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop9, $pop87
-	tee_local	$push85=, $1=, $pop86
-	i32.const	$push84=, 16
-	i32.shr_u	$push10=, $pop85, $pop84
-	i32.store8	sY+2($pop89), $pop10
-	i32.const	$push83=, 0
-	i32.const	$push82=, 1103515245
-	i32.mul 	$push11=, $1, $pop82
-	i32.const	$push81=, 12345
-	i32.add 	$push80=, $pop11, $pop81
-	tee_local	$push79=, $1=, $pop80
-	i32.const	$push78=, 16
-	i32.shr_u	$push12=, $pop79, $pop78
-	i32.store8	sY+3($pop83), $pop12
-	i32.const	$push77=, 0
-	i64.const	$push13=, 4612055454334320640
-	i64.store	sY+12($pop77):p2align=2, $pop13
-	i32.const	$push76=, 0
-	i64.const	$push14=, 0
-	i64.store	sY+4($pop76):p2align=2, $pop14
-	i32.const	$push75=, 0
-	i32.const	$push15=, 1670464429
-	i32.mul 	$push16=, $1, $pop15
-	i32.const	$push17=, 2121308585
-	i32.add 	$push74=, $pop16, $pop17
-	tee_local	$push73=, $1=, $pop74
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push18=, $pop73, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop18, $pop71
-	tee_local	$push69=, $0=, $pop70
-	i32.store	myrnd.s($pop75), $pop69
-	i32.const	$push68=, 0
-	i32.const	$push67=, 16
-	i32.shr_u	$push21=, $1, $pop67
-	i32.const	$push22=, 2047
-	i32.and 	$push23=, $pop21, $pop22
-	i32.const	$push66=, 0
-	i32.load	$push19=, sY($pop66)
-	i32.const	$push20=, -4096
-	i32.and 	$push65=, $pop19, $pop20
-	tee_local	$push64=, $1=, $pop65
-	i32.or  	$push24=, $pop23, $pop64
-	i32.store	sY($pop68), $pop24
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push25=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop25, $pop61
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push58=, 1103515245
-	i32.mul 	$push26=, $pop59, $pop58
-	i32.const	$push57=, 12345
-	i32.add 	$push56=, $pop26, $pop57
-	tee_local	$push55=, $2=, $pop56
-	i32.store	myrnd.s($pop63), $pop55
+	i32.const	$push60=, 0
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push7=, $0, $pop59
+	i32.const	$push58=, 12345
+	i32.add 	$push57=, $pop7, $pop58
+	tee_local	$push56=, $0=, $pop57
+	i32.const	$push55=, 16
+	i32.shr_u	$push8=, $pop56, $pop55
+	i32.store8	sY+1($pop60), $pop8
 	i32.const	$push54=, 0
-	i32.const	$push53=, 16
-	i32.shr_u	$push27=, $0, $pop53
-	i32.const	$push52=, 2047
-	i32.and 	$push28=, $pop27, $pop52
-	i32.or  	$push29=, $pop28, $1
-	i32.store	sY($pop54), $pop29
-	i32.const	$push51=, 0
-	i32.const	$push50=, 1103515245
-	i32.mul 	$push30=, $2, $pop50
-	i32.const	$push49=, 12345
-	i32.add 	$push48=, $pop30, $pop49
-	tee_local	$push47=, $0=, $pop48
-	i32.const	$push46=, 1103515245
-	i32.mul 	$push31=, $pop47, $pop46
-	i32.const	$push45=, 12345
-	i32.add 	$push44=, $pop31, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.store	myrnd.s($pop51), $pop43
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push9=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$push51=, $pop9, $pop52
+	tee_local	$push50=, $0=, $pop51
+	i32.const	$push49=, 16
+	i32.shr_u	$push10=, $pop50, $pop49
+	i32.store8	sY+2($pop54), $pop10
+	i32.const	$push48=, 0
+	i32.const	$push47=, 1103515245
+	i32.mul 	$push11=, $0, $pop47
+	i32.const	$push46=, 12345
+	i32.add 	$push45=, $pop11, $pop46
+	tee_local	$push44=, $0=, $pop45
+	i32.const	$push43=, 16
+	i32.shr_u	$push12=, $pop44, $pop43
+	i32.store8	sY+3($pop48), $pop12
 	i32.const	$push42=, 0
-	i32.const	$push41=, 16
-	i32.shr_u	$push34=, $2, $pop41
-	i32.const	$push40=, 2047
-	i32.and 	$push35=, $pop34, $pop40
-	i32.const	$push39=, 16
-	i32.shr_u	$push32=, $0, $pop39
-	i32.const	$push38=, 2047
-	i32.and 	$push33=, $pop32, $pop38
-	i32.add 	$push36=, $pop35, $pop33
-	i32.or  	$push37=, $pop36, $1
-	i32.store	sY($pop42), $pop37
+	i64.const	$push13=, 4612055454334320640
+	i64.store	sY+12($pop42):p2align=2, $pop13
+	i32.const	$push41=, 0
+	i64.const	$push14=, 0
+	i64.store	sY+4($pop41):p2align=2, $pop14
+	i32.const	$push40=, 0
+	i32.const	$push15=, 424038781
+	i32.mul 	$push16=, $0, $pop15
+	i32.const	$push17=, -804247707
+	i32.add 	$push39=, $pop16, $pop17
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push18=, $pop38, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$push35=, $pop18, $pop36
+	tee_local	$push34=, $1=, $pop35
+	i32.store	myrnd.s($pop40), $pop34
+	i32.const	$push33=, 0
+	i32.const	$push32=, 16
+	i32.shr_u	$push22=, $1, $pop32
+	i32.const	$push20=, 2047
+	i32.and 	$push23=, $pop22, $pop20
+	i32.const	$push31=, 16
+	i32.shr_u	$push19=, $0, $pop31
+	i32.const	$push30=, 2047
+	i32.and 	$push21=, $pop19, $pop30
+	i32.add 	$push24=, $pop23, $pop21
+	i32.const	$push29=, 0
+	i32.load	$push25=, sY($pop29)
+	i32.const	$push26=, -4096
+	i32.and 	$push27=, $pop25, $pop26
+	i32.or  	$push28=, $pop24, $pop27
+	i32.store	sY($pop33), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end150:
 	.size	testY, .Lfunc_end150-testY
-
+                                        # -- End function
 	.section	.text.retmeZ,"ax",@progbits
-	.hidden	retmeZ
+	.hidden	retmeZ                  # -- Begin function retmeZ
 	.globl	retmeZ
 	.type	retmeZ,@function
 retmeZ:                                 # @retmeZ
@@ -6360,9 +6425,9 @@ retmeZ:                                 # @retmeZ
 	.endfunc
 .Lfunc_end151:
 	.size	retmeZ, .Lfunc_end151-retmeZ
-
+                                        # -- End function
 	.section	.text.fn1Z,"ax",@progbits
-	.hidden	fn1Z
+	.hidden	fn1Z                    # -- Begin function fn1Z
 	.globl	fn1Z
 	.type	fn1Z,@function
 fn1Z:                                   # @fn1Z
@@ -6380,9 +6445,9 @@ fn1Z:                                   # @fn1Z
 	.endfunc
 .Lfunc_end152:
 	.size	fn1Z, .Lfunc_end152-fn1Z
-
+                                        # -- End function
 	.section	.text.fn2Z,"ax",@progbits
-	.hidden	fn2Z
+	.hidden	fn2Z                    # -- Begin function fn2Z
 	.globl	fn2Z
 	.type	fn2Z,@function
 fn2Z:                                   # @fn2Z
@@ -6402,9 +6467,9 @@ fn2Z:                                   # @fn2Z
 	.endfunc
 .Lfunc_end153:
 	.size	fn2Z, .Lfunc_end153-fn2Z
-
+                                        # -- End function
 	.section	.text.retitZ,"ax",@progbits
-	.hidden	retitZ
+	.hidden	retitZ                  # -- Begin function retitZ
 	.globl	retitZ
 	.type	retitZ,@function
 retitZ:                                 # @retitZ
@@ -6418,9 +6483,9 @@ retitZ:                                 # @retitZ
 	.endfunc
 .Lfunc_end154:
 	.size	retitZ, .Lfunc_end154-retitZ
-
+                                        # -- End function
 	.section	.text.fn3Z,"ax",@progbits
-	.hidden	fn3Z
+	.hidden	fn3Z                    # -- Begin function fn3Z
 	.globl	fn3Z
 	.type	fn3Z,@function
 fn3Z:                                   # @fn3Z
@@ -6441,169 +6506,155 @@ fn3Z:                                   # @fn3Z
 	.endfunc
 .Lfunc_end155:
 	.size	fn3Z, .Lfunc_end155-fn3Z
-
+                                        # -- End function
 	.section	.text.testZ,"ax",@progbits
-	.hidden	testZ
+	.hidden	testZ                   # -- Begin function testZ
 	.globl	testZ
 	.type	testZ,@function
 testZ:                                  # @testZ
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push98=, 0
-	i32.const	$push97=, 0
-	i32.load	$push1=, myrnd.s($pop97)
-	i32.const	$push2=, 1670464429
-	i32.mul 	$push3=, $pop1, $pop2
-	i32.const	$push4=, 2121308585
-	i32.add 	$push96=, $pop3, $pop4
-	tee_local	$push95=, $0=, $pop96
-	i32.const	$push94=, 16
-	i32.shr_u	$push5=, $pop95, $pop94
-	i32.store8	sZ+16($pop98), $pop5
-	i32.const	$push93=, 0
-	i32.const	$push92=, 1103515245
-	i32.mul 	$push6=, $0, $pop92
-	i32.const	$push91=, 12345
-	i32.add 	$push90=, $pop6, $pop91
-	tee_local	$push89=, $0=, $pop90
-	i32.const	$push88=, 16
-	i32.shr_u	$push7=, $pop89, $pop88
-	i32.store8	sZ+17($pop93), $pop7
-	i32.const	$push87=, 0
-	i32.const	$push86=, 1103515245
-	i32.mul 	$push8=, $0, $pop86
-	i32.const	$push85=, 12345
-	i32.add 	$push84=, $pop8, $pop85
-	tee_local	$push83=, $0=, $pop84
-	i32.const	$push82=, 16
-	i32.shr_u	$push9=, $pop83, $pop82
-	i32.store8	sZ+18($pop87), $pop9
-	i32.const	$push81=, 0
-	i32.const	$push80=, 1103515245
-	i32.mul 	$push10=, $0, $pop80
-	i32.const	$push79=, 12345
-	i32.add 	$push78=, $pop10, $pop79
-	tee_local	$push77=, $0=, $pop78
-	i32.const	$push76=, 16
-	i32.shr_u	$push11=, $pop77, $pop76
-	i32.store8	sZ+19($pop81), $pop11
-	i32.const	$push75=, 0
-	i64.const	$push12=, 4612055454334320640
-	i64.store	sZ+8($pop75), $pop12
-	i32.const	$push74=, 0
-	i64.const	$push13=, 0
-	i64.store	sZ($pop74), $pop13
+	i32.const	$push90=, 0
+	i32.const	$push89=, 0
+	i32.load	$push0=, myrnd.s($pop89)
+	i32.const	$push1=, 1670464429
+	i32.mul 	$push2=, $pop0, $pop1
+	i32.const	$push3=, 2121308585
+	i32.add 	$push88=, $pop2, $pop3
+	tee_local	$push87=, $1=, $pop88
+	i32.const	$push86=, 16
+	i32.shr_u	$push4=, $pop87, $pop86
+	i32.store8	sZ+16($pop90), $pop4
+	i32.const	$push85=, 0
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push5=, $1, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$push82=, $pop5, $pop83
+	tee_local	$push81=, $1=, $pop82
+	i32.const	$push80=, 16
+	i32.shr_u	$push6=, $pop81, $pop80
+	i32.store8	sZ+17($pop85), $pop6
+	i32.const	$push79=, 0
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push7=, $1, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$push76=, $pop7, $pop77
+	tee_local	$push75=, $1=, $pop76
+	i32.const	$push74=, 16
+	i32.shr_u	$push8=, $pop75, $pop74
+	i32.store8	sZ+18($pop79), $pop8
 	i32.const	$push73=, 0
 	i32.const	$push72=, 1103515245
-	i32.mul 	$push14=, $0, $pop72
+	i32.mul 	$push9=, $1, $pop72
 	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop14, $pop71
+	i32.add 	$push70=, $pop9, $pop71
 	tee_local	$push69=, $1=, $pop70
-	i32.const	$push68=, 1103515245
-	i32.mul 	$push15=, $pop69, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop15, $pop67
-	tee_local	$push65=, $0=, $pop66
-	i32.store	myrnd.s($pop73), $pop65
-	i32.const	$push64=, 0
-	i32.const	$push63=, 16
-	i32.shr_u	$push17=, $1, $pop63
-	i32.const	$push62=, 2047
-	i32.and 	$push61=, $pop17, $pop62
-	tee_local	$push60=, $2=, $pop61
-	i32.const	$push59=, 20
-	i32.shl 	$push18=, $pop60, $pop59
-	i32.const	$push58=, 0
-	i32.load	$push0=, sZ+16($pop58)
-	i32.const	$push16=, 1048575
-	i32.and 	$push57=, $pop0, $pop16
-	tee_local	$push56=, $1=, $pop57
-	i32.or  	$push55=, $pop18, $pop56
-	tee_local	$push54=, $3=, $pop55
-	i32.store	sZ+16($pop64), $pop54
+	i32.const	$push68=, 16
+	i32.shr_u	$push10=, $pop69, $pop68
+	i32.store8	sZ+19($pop73), $pop10
+	i32.const	$push67=, 0
+	i64.const	$push11=, 4612055454334320640
+	i64.store	sZ+8($pop67), $pop11
+	i32.const	$push66=, 0
+	i64.const	$push12=, 0
+	i64.store	sZ($pop66), $pop12
+	i32.const	$push65=, 0
+	i32.const	$push64=, 1103515245
+	i32.mul 	$push13=, $1, $pop64
+	i32.const	$push63=, 12345
+	i32.add 	$push62=, $pop13, $pop63
+	tee_local	$push61=, $3=, $pop62
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push14=, $pop61, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$push58=, $pop14, $pop59
+	tee_local	$push57=, $1=, $pop58
+	i32.store	myrnd.s($pop65), $pop57
+	i32.const	$push56=, 0
+	i32.const	$push55=, 16
+	i32.shr_u	$push15=, $3, $pop55
+	i32.const	$push54=, 2047
+	i32.and 	$push53=, $pop15, $pop54
+	tee_local	$push52=, $3=, $pop53
+	i32.const	$push51=, 20
+	i32.shl 	$push16=, $pop52, $pop51
+	i32.const	$push50=, 0
+	i32.load	$push49=, sZ+16($pop50)
+	tee_local	$push48=, $0=, $pop49
+	i32.const	$push47=, 1048575
+	i32.and 	$push46=, $pop48, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.or  	$push44=, $pop16, $pop45
+	tee_local	$push43=, $4=, $pop44
+	i32.store	sZ+16($pop56), $pop43
 	block   	
-	i32.const	$push53=, 16
-	i32.shr_u	$push19=, $0, $pop53
-	i32.const	$push52=, 2047
-	i32.and 	$push51=, $pop19, $pop52
-	tee_local	$push50=, $4=, $pop51
-	i32.add 	$push20=, $pop50, $2
-	i32.const	$push49=, 20
-	i32.shl 	$push21=, $4, $pop49
-	i32.add 	$push22=, $pop21, $3
-	i32.const	$push48=, 20
-	i32.shr_u	$push23=, $pop22, $pop48
-	i32.ne  	$push24=, $pop20, $pop23
-	br_if   	0, $pop24       # 0: down to label11
+	i32.const	$push42=, 16
+	i32.shr_u	$push17=, $1, $pop42
+	i32.const	$push41=, 2047
+	i32.and 	$push40=, $pop17, $pop41
+	tee_local	$push39=, $5=, $pop40
+	i32.add 	$push18=, $pop39, $3
+	i32.const	$push38=, 20
+	i32.shl 	$push19=, $5, $pop38
+	i32.add 	$push20=, $pop19, $4
+	i32.const	$push37=, 20
+	i32.shr_u	$push21=, $pop20, $pop37
+	i32.ne  	$push22=, $pop18, $pop21
+	br_if   	0, $pop22       # 0: down to label18
 # BB#1:                                 # %if.end80
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1103515245
-	i32.mul 	$push25=, $0, $pop123
-	i32.const	$push122=, 12345
-	i32.add 	$push121=, $pop25, $pop122
-	tee_local	$push120=, $2=, $pop121
-	i32.const	$push26=, -1029531031
-	i32.mul 	$push27=, $pop120, $pop26
-	i32.const	$push28=, -740551042
-	i32.add 	$push119=, $pop27, $pop28
-	tee_local	$push118=, $0=, $pop119
-	i32.const	$push117=, 1103515245
-	i32.mul 	$push29=, $pop118, $pop117
-	i32.const	$push116=, 12345
-	i32.add 	$push115=, $pop29, $pop116
-	tee_local	$push114=, $3=, $pop115
-	i32.store	myrnd.s($pop124), $pop114
-	i32.const	$push113=, 0
-	i32.const	$push112=, 16
-	i32.shr_u	$push33=, $3, $pop112
-	i32.const	$push111=, 2047
-	i32.and 	$push110=, $pop33, $pop111
-	tee_local	$push109=, $3=, $pop110
-	i32.const	$push108=, 20
-	i32.shl 	$push34=, $pop109, $pop108
-	i32.const	$push107=, 16
-	i32.shr_u	$push30=, $0, $pop107
-	i32.const	$push106=, 2047
-	i32.and 	$push105=, $pop30, $pop106
-	tee_local	$push104=, $4=, $pop105
-	i32.const	$push103=, 20
-	i32.shl 	$push31=, $pop104, $pop103
-	i32.or  	$push32=, $pop31, $1
-	i32.add 	$push102=, $pop34, $pop32
-	tee_local	$push101=, $0=, $pop102
-	i32.store	sZ+16($pop113), $pop101
-	i32.const	$push35=, 4
-	i32.shl 	$push36=, $2, $pop35
-	i32.const	$push37=, 2146435072
-	i32.and 	$push38=, $pop36, $pop37
-	i32.or  	$push39=, $pop38, $1
-	i32.xor 	$push100=, $0, $pop39
-	tee_local	$push99=, $1=, $pop100
-	i32.const	$push40=, 1040384
-	i32.and 	$push41=, $pop99, $pop40
-	br_if   	0, $pop41       # 0: down to label11
-# BB#2:                                 # %lor.lhs.false98
-	i32.add 	$push45=, $3, $4
-	i32.const	$push43=, 20
-	i32.shr_u	$push44=, $0, $pop43
-	i32.ne  	$push46=, $pop45, $pop44
-	br_if   	0, $pop46       # 0: down to label11
-# BB#3:                                 # %lor.lhs.false98
-	i32.const	$push47=, 8191
-	i32.and 	$push42=, $1, $pop47
-	br_if   	0, $pop42       # 0: down to label11
-# BB#4:                                 # %if.end121
+	i32.const	$push111=, 0
+	i32.const	$push24=, -2139243339
+	i32.mul 	$push25=, $1, $pop24
+	i32.const	$push26=, -1492899873
+	i32.add 	$push110=, $pop25, $pop26
+	tee_local	$push109=, $1=, $pop110
+	i32.const	$push108=, 1103515245
+	i32.mul 	$push27=, $pop109, $pop108
+	i32.const	$push107=, 12345
+	i32.add 	$push106=, $pop27, $pop107
+	tee_local	$push105=, $3=, $pop106
+	i32.store	myrnd.s($pop111), $pop105
+	i32.const	$push104=, 0
+	i32.const	$push103=, 16
+	i32.shr_u	$push31=, $3, $pop103
+	i32.const	$push102=, 2047
+	i32.and 	$push101=, $pop31, $pop102
+	tee_local	$push100=, $3=, $pop101
+	i32.const	$push99=, 20
+	i32.shl 	$push32=, $pop100, $pop99
+	i32.const	$push98=, 16
+	i32.shr_u	$push28=, $1, $pop98
+	i32.const	$push97=, 2047
+	i32.and 	$push96=, $pop28, $pop97
+	tee_local	$push95=, $4=, $pop96
+	i32.const	$push94=, 20
+	i32.shl 	$push29=, $pop95, $pop94
+	i32.or  	$push30=, $pop29, $2
+	i32.add 	$push93=, $pop32, $pop30
+	tee_local	$push92=, $1=, $pop93
+	i32.store	sZ+16($pop104), $pop92
+	i32.add 	$push33=, $3, $4
+	i32.const	$push91=, 20
+	i32.shr_u	$push34=, $1, $pop91
+	i32.ne  	$push35=, $pop33, $pop34
+	br_if   	0, $pop35       # 0: down to label18
+# BB#2:                                 # %if.end80
+	i32.xor 	$push36=, $1, $0
+	i32.const	$push112=, 1048575
+	i32.and 	$push23=, $pop36, $pop112
+	br_if   	0, $pop23       # 0: down to label18
+# BB#3:                                 # %if.end121
 	return
-.LBB156_5:                              # %if.then120
-	end_block                       # label11:
+.LBB156_4:                              # %if.then
+	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end156:
 	.size	testZ, .Lfunc_end156-testZ
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -6641,7 +6692,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end157:
 	.size	main, .Lfunc_end157-main
-
+                                        # -- End function
 	.type	myrnd.s,@object         # @myrnd.s
 	.section	.data.myrnd.s,"aw",@progbits
 	.p2align	2
@@ -6882,6 +6933,6 @@ sZ:
 	.size	sZ, 20
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040805-1.c.s b/test/torture-s/20040805-1.c.s
index 0049c0ca4..35ccc3a35 100644
--- a/test/torture-s/20040805-1.c.s
+++ b/test/torture-s/20040805-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040805-1.c"
+	.file	"20040805-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,9 +23,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
@@ -44,9 +44,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.type	bar,@function
+	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
@@ -62,7 +62,7 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -74,6 +74,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040811-1.c.s b/test/torture-s/20040811-1.c.s
index baf7f36d3..7b2b881f7 100644
--- a/test/torture-s/20040811-1.c.s
+++ b/test/torture-s/20040811-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040811-1.c"
+	.file	"20040811-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -61,4 +61,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20040820-1.c.s b/test/torture-s/20040820-1.c.s
index dec5e00fb..be364d163 100644
--- a/test/torture-s/20040820-1.c.s
+++ b/test/torture-s/20040820-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040820-1.c"
+	.file	"20040820-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -20,24 +20,23 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
 # BB#0:                                 # %entry
 	block   	
+	i32.const	$push1=, 2
 	i32.const	$push0=, 0
-	i32.ne  	$push2=, $1, $pop0
-	i32.const	$push3=, 1
-	i32.shl 	$push4=, $pop2, $pop3
-	i32.const	$push8=, 0
-	i32.ne  	$push1=, $0, $pop8
-	i32.or  	$push5=, $pop4, $pop1
-	i32.const	$push7=, 1
-	i32.ne  	$push6=, $pop5, $pop7
+	i32.select	$push2=, $pop1, $pop0, $1
+	i32.const	$push7=, 0
+	i32.ne  	$push3=, $0, $pop7
+	i32.or  	$push4=, $pop2, $pop3
+	i32.const	$push5=, 1
+	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
 # BB#1:                                 # %check.exit
 	return
@@ -48,9 +47,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end1:
 	.size	test, .Lfunc_end1-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,8 +64,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040823-1.c.s b/test/torture-s/20040823-1.c.s
index 4697edbe3..3c6b31b43 100644
--- a/test/torture-s/20040823-1.c.s
+++ b/test/torture-s/20040823-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040823-1.c"
+	.file	"20040823-1.c"
 	.section	.text.bla,"ax",@progbits
-	.hidden	bla
+	.hidden	bla                     # -- Begin function bla
 	.globl	bla
 	.type	bla,@function
 bla:                                    # @bla
@@ -22,9 +22,9 @@ bla:                                    # @bla
 	.endfunc
 .Lfunc_end0:
 	.size	bla, .Lfunc_end0-bla
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,10 +32,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push9=, $pop3, $pop4
+	i32.sub 	$push9=, $pop2, $pop4
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop5), $pop8
 	i32.const	$push0=, 1
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	pwarn                   # @pwarn
 	.type	pwarn,@object
 	.section	.bss.pwarn,"aw",@nobits
@@ -60,6 +60,6 @@ pwarn:
 	.size	pwarn, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040831-1.c.s b/test/torture-s/20040831-1.c.s
index 0e485eee5..15e48615d 100644
--- a/test/torture-s/20040831-1.c.s
+++ b/test/torture-s/20040831-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040831-1.c"
+	.file	"20040831-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040917-1.c.s b/test/torture-s/20040917-1.c.s
index b0e5e0750..68a8bdaea 100644
--- a/test/torture-s/20040917-1.c.s
+++ b/test/torture-s/20040917-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20040917-1.c"
+	.file	"20040917-1.c"
 	.section	.text.not_inlinable,"ax",@progbits
-	.hidden	not_inlinable
+	.hidden	not_inlinable           # -- Begin function not_inlinable
 	.globl	not_inlinable
 	.type	not_inlinable,@function
 not_inlinable:                          # @not_inlinable
@@ -13,9 +13,9 @@ not_inlinable:                          # @not_inlinable
 	.endfunc
 .Lfunc_end0:
 	.size	not_inlinable, .Lfunc_end0-not_inlinable
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	test_var,@object        # @test_var
 	.section	.bss.test_var,"aw",@nobits
 	.p2align	2
@@ -50,5 +50,5 @@ test_var:
 	.size	test_var, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20041011-1.c.s b/test/torture-s/20041011-1.c.s
index 3b43be343..94fc8b599 100644
--- a/test/torture-s/20041011-1.c.s
+++ b/test/torture-s/20041011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041011-1.c"
+	.file	"20041011-1.c"
 	.section	.text.t1,"ax",@progbits
-	.hidden	t1
+	.hidden	t1                      # -- Begin function t1
 	.globl	t1
 	.type	t1,@function
 t1:                                     # @t1
@@ -12,7 +12,7 @@ t1:                                     # @t1
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -157,9 +157,9 @@ t1:                                     # @t1
 	.endfunc
 .Lfunc_end0:
 	.size	t1, .Lfunc_end0-t1
-
+                                        # -- End function
 	.section	.text.t2,"ax",@progbits
-	.hidden	t2
+	.hidden	t2                      # -- Begin function t2
 	.globl	t2
 	.type	t2,@function
 t2:                                     # @t2
@@ -170,7 +170,7 @@ t2:                                     # @t2
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label2
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push4=, -1
 	i32.add 	$push0=, $0, $pop4
 	i64.extend_u/i32	$2=, $pop0
@@ -315,9 +315,9 @@ t2:                                     # @t2
 	.endfunc
 .Lfunc_end1:
 	.size	t2, .Lfunc_end1-t2
-
+                                        # -- End function
 	.section	.text.t3,"ax",@progbits
-	.hidden	t3
+	.hidden	t3                      # -- Begin function t3
 	.globl	t3
 	.type	t3,@function
 t3:                                     # @t3
@@ -328,7 +328,7 @@ t3:                                     # @t3
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label4
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -473,9 +473,9 @@ t3:                                     # @t3
 	.endfunc
 .Lfunc_end2:
 	.size	t3, .Lfunc_end2-t3
-
+                                        # -- End function
 	.section	.text.t4,"ax",@progbits
-	.hidden	t4
+	.hidden	t4                      # -- Begin function t4
 	.globl	t4
 	.type	t4,@function
 t4:                                     # @t4
@@ -486,7 +486,7 @@ t4:                                     # @t4
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label6
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push4=, -1
 	i32.add 	$push0=, $0, $pop4
 	i64.extend_u/i32	$2=, $pop0
@@ -631,9 +631,9 @@ t4:                                     # @t4
 	.endfunc
 .Lfunc_end3:
 	.size	t4, .Lfunc_end3-t4
-
+                                        # -- End function
 	.section	.text.t5,"ax",@progbits
-	.hidden	t5
+	.hidden	t5                      # -- Begin function t5
 	.globl	t5
 	.type	t5,@function
 t5:                                     # @t5
@@ -644,7 +644,7 @@ t5:                                     # @t5
 	block   	
 	i32.eqz 	$push67=, $0
 	br_if   	0, $pop67       # 0: down to label8
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push3=, -1
 	i32.add 	$push0=, $0, $pop3
 	i64.extend_u/i32	$2=, $pop0
@@ -787,9 +787,9 @@ t5:                                     # @t5
 	.endfunc
 .Lfunc_end4:
 	.size	t5, .Lfunc_end4-t5
-
+                                        # -- End function
 	.section	.text.t6,"ax",@progbits
-	.hidden	t6
+	.hidden	t6                      # -- Begin function t6
 	.globl	t6
 	.type	t6,@function
 t6:                                     # @t6
@@ -800,7 +800,7 @@ t6:                                     # @t6
 	block   	
 	i32.eqz 	$push67=, $0
 	br_if   	0, $pop67       # 0: down to label10
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push3=, -1
 	i32.add 	$push0=, $0, $pop3
 	i64.extend_u/i32	$push1=, $pop0
@@ -943,9 +943,9 @@ t6:                                     # @t6
 	.endfunc
 .Lfunc_end5:
 	.size	t6, .Lfunc_end5-t6
-
+                                        # -- End function
 	.section	.text.t7,"ax",@progbits
-	.hidden	t7
+	.hidden	t7                      # -- Begin function t7
 	.globl	t7
 	.type	t7,@function
 t7:                                     # @t7
@@ -956,7 +956,7 @@ t7:                                     # @t7
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label12
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -1101,9 +1101,9 @@ t7:                                     # @t7
 	.endfunc
 .Lfunc_end6:
 	.size	t7, .Lfunc_end6-t7
-
+                                        # -- End function
 	.section	.text.t8,"ax",@progbits
-	.hidden	t8
+	.hidden	t8                      # -- Begin function t8
 	.globl	t8
 	.type	t8,@function
 t8:                                     # @t8
@@ -1114,7 +1114,7 @@ t8:                                     # @t8
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label14
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -1259,9 +1259,9 @@ t8:                                     # @t8
 	.endfunc
 .Lfunc_end7:
 	.size	t8, .Lfunc_end7-t8
-
+                                        # -- End function
 	.section	.text.t9,"ax",@progbits
-	.hidden	t9
+	.hidden	t9                      # -- Begin function t9
 	.globl	t9
 	.type	t9,@function
 t9:                                     # @t9
@@ -1272,7 +1272,7 @@ t9:                                     # @t9
 	block   	
 	i32.eqz 	$push69=, $0
 	br_if   	0, $pop69       # 0: down to label16
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -1417,9 +1417,9 @@ t9:                                     # @t9
 	.endfunc
 .Lfunc_end8:
 	.size	t9, .Lfunc_end8-t9
-
+                                        # -- End function
 	.section	.text.t10,"ax",@progbits
-	.hidden	t10
+	.hidden	t10                     # -- Begin function t10
 	.globl	t10
 	.type	t10,@function
 t10:                                    # @t10
@@ -1576,9 +1576,9 @@ t10:                                    # @t10
 	.endfunc
 .Lfunc_end9:
 	.size	t10, .Lfunc_end9-t10
-
+                                        # -- End function
 	.section	.text.t11,"ax",@progbits
-	.hidden	t11
+	.hidden	t11                     # -- Begin function t11
 	.globl	t11
 	.type	t11,@function
 t11:                                    # @t11
@@ -1735,9 +1735,9 @@ t11:                                    # @t11
 	.endfunc
 .Lfunc_end10:
 	.size	t11, .Lfunc_end10-t11
-
+                                        # -- End function
 	.section	.text.neg,"ax",@progbits
-	.hidden	neg
+	.hidden	neg                     # -- Begin function neg
 	.globl	neg
 	.type	neg,@function
 neg:                                    # @neg
@@ -1750,9 +1750,9 @@ neg:                                    # @neg
 	.endfunc
 .Lfunc_end11:
 	.size	neg, .Lfunc_end11-neg
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1945,14 +1945,14 @@ main:                                   # @main
 	i32.const	$push99=, 0
 	call    	exit@FUNCTION, $pop99
 	unreachable
-.LBB12_24:                              # %if.then94
+.LBB12_24:                              # %if.then
 	end_block                       # label22:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
-
+                                        # -- End function
 	.hidden	gvol                    # @gvol
 	.type	gvol,@object
 	.section	.bss.gvol,"aw",@nobits
@@ -1972,6 +1972,6 @@ gull:
 	.size	gull, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041019-1.c.s b/test/torture-s/20041019-1.c.s
index a2ca455b9..d1a8edc5e 100644
--- a/test/torture-s/20041019-1.c.s
+++ b/test/torture-s/20041019-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041019-1.c"
+	.file	"20041019-1.c"
 	.section	.text.test_store_ccp,"ax",@progbits
-	.hidden	test_store_ccp
+	.hidden	test_store_ccp          # -- Begin function test_store_ccp
 	.globl	test_store_ccp
 	.type	test_store_ccp,@function
 test_store_ccp:                         # @test_store_ccp
@@ -9,10 +9,10 @@ test_store_ccp:                         # @test_store_ccp
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push22=, $pop11, $pop12
+	i32.sub 	$push22=, $pop10, $pop12
 	tee_local	$push21=, $1=, $pop22
 	i32.const	$push17=, 12
 	i32.add 	$push18=, $pop21, $pop17
@@ -38,9 +38,9 @@ test_store_ccp:                         # @test_store_ccp
 	.endfunc
 .Lfunc_end0:
 	.size	test_store_ccp, .Lfunc_end0-test_store_ccp
-
+                                        # -- End function
 	.section	.text.test_store_copy_prop,"ax",@progbits
-	.hidden	test_store_copy_prop
+	.hidden	test_store_copy_prop    # -- Begin function test_store_copy_prop
 	.globl	test_store_copy_prop
 	.type	test_store_copy_prop,@function
 test_store_copy_prop:                   # @test_store_copy_prop
@@ -48,10 +48,10 @@ test_store_copy_prop:                   # @test_store_copy_prop
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push20=, $pop9, $pop10
+	i32.sub 	$push20=, $pop8, $pop10
 	tee_local	$push19=, $2=, $pop20
 	i32.const	$push15=, 12
 	i32.add 	$push16=, $pop19, $pop15
@@ -75,9 +75,9 @@ test_store_copy_prop:                   # @test_store_copy_prop
 	.endfunc
 .Lfunc_end1:
 	.size	test_store_copy_prop, .Lfunc_end1-test_store_copy_prop
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -88,6 +88,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20041112-1.c.s b/test/torture-s/20041112-1.c.s
index ada0b93a1..8177d70f2 100644
--- a/test/torture-s/20041112-1.c.s
+++ b/test/torture-s/20041112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041112-1.c"
+	.file	"20041112-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -33,9 +33,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	global                  # @global
 	.type	global,@object
 	.section	.bss.global,"aw",@nobits
@@ -60,4 +60,4 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20041113-1.c.s b/test/torture-s/20041113-1.c.s
index cbde9c7fc..a84909e47 100644
--- a/test/torture-s/20041113-1.c.s
+++ b/test/torture-s/20041113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041113-1.c"
+	.file	"20041113-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -9,13 +9,12 @@ test:                                   # @test
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push27=, $pop18, $pop19
+	i32.sub 	$push27=, $pop17, $pop19
 	tee_local	$push26=, $4=, $pop27
 	i32.store	__stack_pointer($pop20), $pop26
-	i32.store	12($4), $1
 	i32.const	$push0=, 4
 	i32.add 	$push25=, $1, $pop0
 	tee_local	$push24=, $2=, $pop25
@@ -57,16 +56,16 @@ test:                                   # @test
 	i32.add 	$push22=, $4, $pop21
 	i32.store	__stack_pointer($pop23), $pop22
 	return
-.LBB0_5:                                # %if.then15
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,33 +73,31 @@ main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
+	i32.const	$push10=, 0
 	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push14=, $pop9, $pop10
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop11), $pop13
-	i32.const	$push0=, 3
-	i32.store	8($2), $pop0
-	i32.const	$push1=, 2
-	i32.store	4($2), $pop1
-	i32.const	$push2=, 1
-	i32.store	0($2), $pop2
-	i32.const	$push3=, 0
-	f64.load	$push4=, a($pop3)
-	f64.const	$push5=, 0x1.4p3
-	f64.div 	$push6=, $pop4, $pop5
-	i32.trunc_s/f64	$push7=, $pop6
-	i32.store	12($2), $pop7
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 16
+	i32.sub 	$push13=, $pop7, $pop9
+	tee_local	$push12=, $2=, $pop13
+	i32.store	__stack_pointer($pop10), $pop12
+	i64.const	$push0=, 12884901890
+	i64.store	4($2):p2align=2, $pop0
+	i32.const	$push1=, 1
+	i32.store	0($2), $pop1
+	i32.const	$push2=, 0
+	f64.load	$push3=, a($pop2)
+	f64.const	$push4=, 0x1.4p3
+	f64.div 	$push5=, $pop3, $pop4
+	i32.trunc_s/f64	$push6=, $pop5
+	i32.store	12($2), $pop6
 	call    	test@FUNCTION, $2, $2
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+	i32.const	$push11=, 0
+	call    	exit@FUNCTION, $pop11
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -111,6 +108,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041114-1.c.s b/test/torture-s/20041114-1.c.s
index 9fcd53810..b8300cca3 100644
--- a/test/torture-s/20041114-1.c.s
+++ b/test/torture-s/20041114-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041114-1.c"
+	.file	"20041114-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -38,4 +38,4 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20041124-1.c.s b/test/torture-s/20041124-1.c.s
index 3a6096c76..ca807d733 100644
--- a/test/torture-s/20041124-1.c.s
+++ b/test/torture-s/20041124-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041124-1.c"
+	.file	"20041124-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,10 +24,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push18=, $pop11, $pop12
+	i32.sub 	$push18=, $pop10, $pop12
 	tee_local	$push17=, $0=, $pop18
 	i32.store	__stack_pointer($pop13), $pop17
 	i32.const	$push14=, 8
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	gs                      # @gs
 	.type	gs,@object
 	.section	.data.gs,"aw",@progbits
@@ -72,6 +72,6 @@ gs:
 	.size	gs, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041126-1.c.s b/test/torture-s/20041126-1.c.s
index 56941d396..1fe0ed4b2 100644
--- a/test/torture-s/20041126-1.c.s
+++ b/test/torture-s/20041126-1.c.s
@@ -1,12 +1,12 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041126-1.c"
+	.file	"20041126-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
-	.local  	i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	block   	
 	i32.load	$push0=, 0($0)
@@ -23,103 +23,112 @@ check:                                  # @check
 # BB#4:                                 # %for.inc.3
 	i32.load	$push4=, 16($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#5:                                 # %for.cond1.preheader
-	i32.const	$1=, 5
-.LBB0_6:                                # %for.cond1
+# BB#5:                                 # %for.body3.preheader
+	i32.const	$3=, 5
+.LBB0_6:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label2:
-	i32.const	$push10=, 9
-	i32.gt_s	$push5=, $1, $pop10
-	br_if   	1, $pop5        # 1: down to label1
-# BB#7:                                 # %for.body3
+	loop    	                # label1:
+	i32.const	$push12=, 2
+	i32.shl 	$push6=, $3, $pop12
+	i32.add 	$push7=, $0, $pop6
+	i32.load	$push11=, 0($pop7)
+	tee_local	$push10=, $1=, $pop11
+	i32.const	$push9=, 1
+	i32.add 	$push5=, $3, $pop9
+	i32.ne  	$push8=, $pop10, $pop5
+	br_if   	1, $pop8        # 1: down to label0
+# BB#7:                                 # %for.cond1
                                         #   in Loop: Header=BB0_6 Depth=1
-	i32.const	$push14=, 1
-	i32.add 	$push6=, $1, $pop14
-	i32.const	$push13=, 2
-	i32.shl 	$push7=, $1, $pop13
-	i32.add 	$push8=, $0, $pop7
-	i32.load	$push12=, 0($pop8)
-	tee_local	$push11=, $1=, $pop12
-	i32.eq  	$push9=, $pop6, $pop11
-	br_if   	0, $pop9        # 0: up to label2
-# BB#8:                                 # %if.then6
+	i32.const	$push13=, 8
+	i32.gt_s	$2=, $3, $pop13
+	copy_local	$3=, $1
+	i32.eqz 	$push14=, $2
+	br_if   	0, $pop14       # 0: up to label1
+# BB#8:                                 # %for.end10
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_9:                                # %for.end10
-	end_block                       # label1:
 	return
-.LBB0_10:                               # %if.then
+.LBB0_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %for.cond1.i.preheader
-	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
-	i32.const	$push14=, 48
-	i32.sub 	$push23=, $pop13, $pop14
-	tee_local	$push22=, $1=, $pop23
-	i32.store	__stack_pointer($pop15), $pop22
-	i32.const	$push1=, .Lmain.a
-	i32.const	$push0=, 40
-	i32.call	$push21=, memcpy@FUNCTION, $1, $pop1, $pop0
-	tee_local	$push20=, $0=, $pop21
+	.local  	i32, i32, i32, i32
+# BB#0:                                 # %for.body3.lr.ph.i
+	i32.const	$push18=, 0
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 48
+	i32.sub 	$push29=, $pop15, $pop17
+	tee_local	$push28=, $3=, $pop29
+	i32.store	__stack_pointer($pop18), $pop28
 	i32.const	$push2=, 16
-	i32.add 	$push3=, $pop20, $pop2
-	i32.const	$push4=, 0
-	i32.store	0($pop3), $pop4
-	i64.const	$push5=, 0
-	i64.store	8($0), $pop5
-	i64.const	$push19=, 0
-	i64.store	0($0), $pop19
-	i32.const	$1=, 5
-.LBB1_1:                                # %for.cond1.i
+	i32.add 	$push27=, $3, $pop2
+	tee_local	$push26=, $2=, $pop27
+	i32.const	$push0=, 0
+	i64.load	$push1=, .Lmain.a+16($pop0)
+	i64.store	0($pop26), $pop1
+	i32.const	$push4=, 32
+	i32.add 	$push5=, $3, $pop4
+	i32.const	$push25=, 0
+	i64.load	$push3=, .Lmain.a+32($pop25)
+	i64.store	0($pop5), $pop3
+	i32.const	$push7=, 24
+	i32.add 	$push8=, $3, $pop7
+	i32.const	$push24=, 0
+	i64.load	$push6=, .Lmain.a+24($pop24)
+	i64.store	0($pop8), $pop6
+	i32.const	$push23=, 0
+	i32.store	0($2), $pop23
+	i64.const	$push9=, 0
+	i64.store	8($3), $pop9
+	i64.const	$push22=, 0
+	i64.store	0($3), $pop22
+	i32.const	$2=, 5
+.LBB1_1:                                # %for.body3.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label4:
-	i32.const	$push24=, 9
-	i32.gt_s	$push6=, $1, $pop24
-	br_if   	1, $pop6        # 1: down to label3
-# BB#2:                                 # %for.body3.i
+	loop    	                # label3:
+	i32.const	$push33=, 2
+	i32.shl 	$push11=, $2, $pop33
+	i32.add 	$push12=, $3, $pop11
+	i32.load	$push32=, 0($pop12)
+	tee_local	$push31=, $0=, $pop32
+	i32.const	$push30=, 1
+	i32.add 	$push10=, $2, $pop30
+	i32.ne  	$push13=, $pop31, $pop10
+	br_if   	1, $pop13       # 1: down to label2
+# BB#2:                                 # %for.cond1.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push28=, 1
-	i32.add 	$push8=, $1, $pop28
-	i32.const	$push27=, 2
-	i32.shl 	$push9=, $1, $pop27
-	i32.add 	$push10=, $0, $pop9
-	i32.load	$push26=, 0($pop10)
-	tee_local	$push25=, $1=, $pop26
-	i32.eq  	$push11=, $pop8, $pop25
-	br_if   	0, $pop11       # 0: up to label4
-# BB#3:                                 # %if.then6.i
+	i32.const	$push34=, 8
+	i32.gt_s	$1=, $2, $pop34
+	copy_local	$2=, $0
+	i32.eqz 	$push35=, $1
+	br_if   	0, $pop35       # 0: up to label3
+# BB#3:                                 # %check.exit
 	end_loop
+	i32.const	$push21=, 0
+	i32.const	$push19=, 48
+	i32.add 	$push20=, $3, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
+	i32.const	$push14=, 0
+	return  	$pop14
+.LBB1_4:                                # %if.then6.i
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_4:                                # %check.exit
-	end_block                       # label3:
-	i32.const	$push18=, 0
-	i32.const	$push16=, 48
-	i32.add 	$push17=, $0, $pop16
-	i32.store	__stack_pointer($pop18), $pop17
-	i32.const	$push7=, 0
-                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.a,@object        # @main.a
 	.section	.rodata..Lmain.a,"a",@progbits
 	.p2align	4
@@ -137,5 +146,5 @@ main:                                   # @main
 	.size	.Lmain.a, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20041201-1.c.s b/test/torture-s/20041201-1.c.s
index 41ca781d9..c2b793747 100644
--- a/test/torture-s/20041201-1.c.s
+++ b/test/torture-s/20041201-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041201-1.c"
+	.file	"20041201-1.c"
 	.section	.text.checkScc2,"ax",@progbits
-	.hidden	checkScc2
+	.hidden	checkScc2               # -- Begin function checkScc2
 	.globl	checkScc2
 	.type	checkScc2,@function
 checkScc2:                              # @checkScc2
@@ -39,9 +39,9 @@ checkScc2:                              # @checkScc2
 	.endfunc
 .Lfunc_end0:
 	.size	checkScc2, .Lfunc_end0-checkScc2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -80,7 +80,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -93,4 +93,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20041210-1.c.s b/test/torture-s/20041210-1.c.s
index a18a84ebd..55bd20b21 100644
--- a/test/torture-s/20041210-1.c.s
+++ b/test/torture-s/20041210-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041210-1.c"
+	.file	"20041210-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -48,6 +48,6 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041212-1.c.s b/test/torture-s/20041212-1.c.s
index d9f1e59b7..b64ee7d4b 100644
--- a/test/torture-s/20041212-1.c.s
+++ b/test/torture-s/20041212-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041212-1.c"
+	.file	"20041212-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041213-2.c.s b/test/torture-s/20041213-2.c.s
index 657854684..dafd96d5e 100644
--- a/test/torture-s/20041213-2.c.s
+++ b/test/torture-s/20041213-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041213-2.c"
+	.file	"20041213-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,10 +12,10 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push9=, $0
 	br_if   	0, $pop9        # 0: down to label1
-# BB#1:                                 # %for.cond1.preheader.preheader
+# BB#1:                                 # %for.body.preheader
 	i32.const	$2=, 0
 	i32.const	$3=, 1
-.LBB0_2:                                # %for.cond1.preheader
+.LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	block   	
@@ -55,9 +55,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -71,8 +71,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041214-1.c.s b/test/torture-s/20041214-1.c.s
index cace42335..cec0adc08 100644
--- a/test/torture-s/20041214-1.c.s
+++ b/test/torture-s/20041214-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041214-1.c"
+	.file	"20041214-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -13,10 +13,10 @@ g:                                      # @g
 	i32.load8_u	$push1=, 0($1)
 	i32.eqz 	$push7=, $pop1
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %do_form_string.preheader
+# BB#1:                                 # %do.body.preheader
 	i32.const	$push4=, 2
 	i32.add 	$1=, $1, $pop4
-.LBB0_2:                                # %do_form_string
+.LBB0_2:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.load	$push2=, 0($2)
@@ -36,9 +36,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -46,10 +46,10 @@ f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop4, $pop5
+	i32.sub 	$push11=, $pop3, $pop5
 	tee_local	$push10=, $4=, $pop11
 	i32.store	__stack_pointer($pop6), $pop10
 	i32.store	12($4), $2
@@ -57,11 +57,11 @@ f:                                      # @f
 	i32.load8_u	$push1=, 0($1)
 	i32.eqz 	$push15=, $pop1
 	br_if   	0, $pop15       # 0: down to label2
-# BB#1:                                 # %do_form_string.i.preheader
+# BB#1:                                 # %if.end.i
 	i32.const	$push12=, 2
 	i32.add 	$1=, $1, $pop12
 	i32.load	$2=, 12($4)
-.LBB1_2:                                # %do_form_string.i
+.LBB1_2:                                # %do.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	i32.load	$push2=, 0($2)
@@ -84,9 +84,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -94,10 +94,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push17=, $pop4, $pop5
+	i32.sub 	$push17=, $pop3, $pop5
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop6), $pop16
 	i32.const	$push15=, 0
@@ -128,7 +128,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -141,7 +141,7 @@ main:                                   # @main
 	.size	.L.str.1, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcpy, i32, i32, i32
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20041218-1.c.s b/test/torture-s/20041218-1.c.s
index 11557fefa..5df6eef95 100644
--- a/test/torture-s/20041218-1.c.s
+++ b/test/torture-s/20041218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20041218-1.c"
+	.file	"20041218-1.c"
 	.section	.text.dummy1,"ax",@progbits
-	.hidden	dummy1
+	.hidden	dummy1                  # -- Begin function dummy1
 	.globl	dummy1
 	.type	dummy1,@function
 dummy1:                                 # @dummy1
@@ -13,9 +13,9 @@ dummy1:                                 # @dummy1
 	.endfunc
 .Lfunc_end0:
 	.size	dummy1, .Lfunc_end0-dummy1
-
+                                        # -- End function
 	.section	.text.dummy2,"ax",@progbits
-	.hidden	dummy2
+	.hidden	dummy2                  # -- Begin function dummy2
 	.globl	dummy2
 	.type	dummy2,@function
 dummy2:                                 # @dummy2
@@ -28,26 +28,41 @@ dummy2:                                 # @dummy2
 	.endfunc
 .Lfunc_end1:
 	.size	dummy2, .Lfunc_end1-dummy2
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
+	i32.const	$push1=, 0
+	i32.const	$push0=, 1431655765
+	i32.store	baz.v+40($pop1), $pop0
+	i32.const	$push12=, 0
+	i64.const	$push2=, 6148914691236517205
+	i64.store	baz.v+32($pop12):p2align=2, $pop2
+	i32.const	$push11=, 0
+	i64.const	$push10=, 6148914691236517205
+	i64.store	baz.v+24($pop11):p2align=2, $pop10
+	i32.const	$push9=, 0
+	i64.const	$push8=, 6148914691236517205
+	i64.store	baz.v+16($pop9):p2align=2, $pop8
+	i32.const	$push7=, 0
+	i64.const	$push6=, 6148914691236517205
+	i64.store	baz.v+8($pop7):p2align=2, $pop6
+	i32.const	$push5=, 0
+	i64.const	$push4=, 6148914691236517205
+	i64.store	baz.v($pop5):p2align=2, $pop4
 	i32.const	$push3=, baz.v
-	i32.const	$push2=, 85
-	i32.const	$push1=, 44
-	i32.call	$push0=, memset@FUNCTION, $pop3, $pop2, $pop1
-                                        # fallthrough-return: $pop0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -85,53 +100,64 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end3:
 	.size	check, .Lfunc_end3-check
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %for.cond
-	i32.const	$3=, 0
-	i32.const	$push6=, 0
-	i32.store	0($2), $pop6
+	i32.const	$push5=, 0
+	i32.store	0($2), $pop5
 	block   	
 	block   	
-	i32.eqz 	$push10=, $1
-	br_if   	0, $pop10       # 0: down to label2
+	i32.eqz 	$push20=, $1
+	br_if   	0, $pop20       # 0: down to label2
 # BB#1:                                 # %for.body
-	i32.const	$3=, 1
 	i32.load	$push0=, 0($0)
-	i32.const	$push7=, 1
-	i32.ne  	$push1=, $pop0, $pop7
+	i32.const	$push6=, 1
+	i32.eq  	$push1=, $pop0, $pop6
 	br_if   	1, $pop1        # 1: down to label1
-# BB#2:                                 # %sw.bb
-	i32.const	$push3=, 0
-	i32.const	$push2=, 1
-	i32.store	baz.v($pop3), $pop2
-	i32.const	$push5=, baz.v+4
-	i32.const	$push8=, 0
-	i32.const	$push4=, 40
-	i32.call	$drop=, memset@FUNCTION, $pop5, $pop8, $pop4
-	i32.call	$drop=, dummy2@FUNCTION, $3, $3
-	unreachable
+# BB#2:                                 # %cleanup2
+	i32.const	$push7=, 1
+	return  	$pop7
 .LBB4_3:                                # %for.end
 	end_block                       # label2:
 	i32.const	$push9=, 0
 	i32.store	0($2), $pop9
-.LBB4_4:                                # %cleanup2
+	i32.const	$push8=, 0
+	return  	$pop8
+.LBB4_4:                                # %sw.bb
 	end_block                       # label1:
-	copy_local	$push11=, $3
-                                        # fallthrough-return: $pop11
+	i32.const	$push3=, 0
+	i64.const	$push2=, 0
+	i64.store	baz.v+36($pop3):p2align=2, $pop2
+	i32.const	$push19=, 0
+	i64.const	$push18=, 0
+	i64.store	baz.v+28($pop19):p2align=2, $pop18
+	i32.const	$push17=, 0
+	i64.const	$push16=, 0
+	i64.store	baz.v+20($pop17):p2align=2, $pop16
+	i32.const	$push15=, 0
+	i64.const	$push14=, 0
+	i64.store	baz.v+12($pop15):p2align=2, $pop14
+	i32.const	$push13=, 0
+	i64.const	$push12=, 0
+	i64.store	baz.v+4($pop13):p2align=2, $pop12
+	i32.const	$push11=, 0
+	i32.const	$push4=, 1
+	i32.store	baz.v($pop11), $pop4
+	i32.const	$push10=, 0
+	call    	exit@FUNCTION, $pop10
+	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	foo, .Lfunc_end4-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -139,10 +165,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push11=, $pop2, $pop3
+	i32.sub 	$push11=, $pop1, $pop3
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop4), $pop10
 	i32.const	$push0=, 1
@@ -158,7 +184,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -173,6 +199,6 @@ baz.v:
 	.size	baz.v, 44
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050104-1.c.s b/test/torture-s/20050104-1.c.s
index 5da4ac395..9b48b5341 100644
--- a/test/torture-s/20050104-1.c.s
+++ b/test/torture-s/20050104-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050104-1.c"
+	.file	"20050104-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050106-1.c.s b/test/torture-s/20050106-1.c.s
index f755aa99e..7a7795bd3 100644
--- a/test/torture-s/20050106-1.c.s
+++ b/test/torture-s/20050106-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050106-1.c"
+	.file	"20050106-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.bss.u,"aw",@nobits
@@ -34,5 +34,5 @@ u:
 	.size	u, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050107-1.c.s b/test/torture-s/20050107-1.c.s
index b129db6ee..a718c46e0 100644
--- a/test/torture-s/20050107-1.c.s
+++ b/test/torture-s/20050107-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050107-1.c"
+	.file	"20050107-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050111-1.c.s b/test/torture-s/20050111-1.c.s
index 507ff1a86..384bcca9c 100644
--- a/test/torture-s/20050111-1.c.s
+++ b/test/torture-s/20050111-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050111-1.c"
+	.file	"20050111-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -34,9 +34,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,6 +47,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050119-1.c.s b/test/torture-s/20050119-1.c.s
index df3ec5547..a2f6d1e34 100644
--- a/test/torture-s/20050119-1.c.s
+++ b/test/torture-s/20050119-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050119-1.c"
+	.file	"20050119-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,48 +19,42 @@ foo:                                    # @foo
 	br_if   	0, $pop5        # 0: down to label0
 # BB#2:                                 # %if.end7
 	return
-.LBB0_3:                                # %if.then6
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
-	i32.const	$push6=, 16
-	i32.sub 	$push12=, $pop5, $pop6
-	tee_local	$push11=, $0=, $pop12
-	i32.store	__stack_pointer($pop7), $pop11
-	i32.const	$push0=, 50462977
-	i32.store	8($0), $pop0
-	i32.const	$push1=, 3
-	i32.store8	12($0), $pop1
-	i32.const	$push2=, 258
-	i32.store16	13($0):p2align=0, $pop2
+	i32.const	$push5=, 0
 	i32.const	$push3=, 0
-	i32.store8	15($0), $pop3
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	call    	foo@FUNCTION, $pop9
-	i32.const	$push10=, 0
-	call    	exit@FUNCTION, $pop10
+	i32.load	$push2=, __stack_pointer($pop3)
+	i32.const	$push4=, 16
+	i32.sub 	$push9=, $pop2, $pop4
+	tee_local	$push8=, $0=, $pop9
+	i32.store	__stack_pointer($pop5), $pop8
+	i64.const	$push0=, 283686935331073
+	i64.store	8($0), $pop0
+	i32.const	$push6=, 8
+	i32.add 	$push7=, $0, $pop6
+	call    	foo@FUNCTION, $pop7
+	i32.const	$push1=, 0
+	call    	exit@FUNCTION, $pop1
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20050119-2.c.s b/test/torture-s/20050119-2.c.s
index 4a8df70ca..a1cf75931 100644
--- a/test/torture-s/20050119-2.c.s
+++ b/test/torture-s/20050119-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050119-2.c"
+	.file	"20050119-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,16 +21,16 @@ foo:                                    # @foo
 # BB#2:                                 # %if.end7
 	i32.load8_u	$push6=, 3($0)
 	return  	$pop6
-.LBB0_3:                                # %if.then6
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,8 +42,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20050121-1.c.s b/test/torture-s/20050121-1.c.s
index f5b0c5015..3e12f4970 100644
--- a/test/torture-s/20050121-1.c.s
+++ b/test/torture-s/20050121-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050121-1.c"
+	.file	"20050121-1.c"
 	.section	.text.foo_float,"ax",@progbits
-	.hidden	foo_float
+	.hidden	foo_float               # -- Begin function foo_float
 	.globl	foo_float
 	.type	foo_float,@function
 foo_float:                              # @foo_float
@@ -19,9 +19,9 @@ foo_float:                              # @foo_float
 	.endfunc
 .Lfunc_end0:
 	.size	foo_float, .Lfunc_end0-foo_float
-
+                                        # -- End function
 	.section	.text.bar_float,"ax",@progbits
-	.hidden	bar_float
+	.hidden	bar_float               # -- Begin function bar_float
 	.globl	bar_float
 	.type	bar_float,@function
 bar_float:                              # @bar_float
@@ -33,9 +33,9 @@ bar_float:                              # @bar_float
 	.endfunc
 .Lfunc_end1:
 	.size	bar_float, .Lfunc_end1-bar_float
-
+                                        # -- End function
 	.section	.text.baz_float,"ax",@progbits
-	.hidden	baz_float
+	.hidden	baz_float               # -- Begin function baz_float
 	.globl	baz_float
 	.type	baz_float,@function
 baz_float:                              # @baz_float
@@ -47,9 +47,9 @@ baz_float:                              # @baz_float
 	.endfunc
 .Lfunc_end2:
 	.size	baz_float, .Lfunc_end2-baz_float
-
+                                        # -- End function
 	.section	.text.foo_double,"ax",@progbits
-	.hidden	foo_double
+	.hidden	foo_double              # -- Begin function foo_double
 	.globl	foo_double
 	.type	foo_double,@function
 foo_double:                             # @foo_double
@@ -67,9 +67,9 @@ foo_double:                             # @foo_double
 	.endfunc
 .Lfunc_end3:
 	.size	foo_double, .Lfunc_end3-foo_double
-
+                                        # -- End function
 	.section	.text.bar_double,"ax",@progbits
-	.hidden	bar_double
+	.hidden	bar_double              # -- Begin function bar_double
 	.globl	bar_double
 	.type	bar_double,@function
 bar_double:                             # @bar_double
@@ -81,9 +81,9 @@ bar_double:                             # @bar_double
 	.endfunc
 .Lfunc_end4:
 	.size	bar_double, .Lfunc_end4-bar_double
-
+                                        # -- End function
 	.section	.text.baz_double,"ax",@progbits
-	.hidden	baz_double
+	.hidden	baz_double              # -- Begin function baz_double
 	.globl	baz_double
 	.type	baz_double,@function
 baz_double:                             # @baz_double
@@ -95,9 +95,9 @@ baz_double:                             # @baz_double
 	.endfunc
 .Lfunc_end5:
 	.size	baz_double, .Lfunc_end5-baz_double
-
+                                        # -- End function
 	.section	.text.foo_ldouble_t,"ax",@progbits
-	.hidden	foo_ldouble_t
+	.hidden	foo_ldouble_t           # -- Begin function foo_ldouble_t
 	.globl	foo_ldouble_t
 	.type	foo_ldouble_t,@function
 foo_ldouble_t:                          # @foo_ldouble_t
@@ -105,10 +105,10 @@ foo_ldouble_t:                          # @foo_ldouble_t
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 32
-	i32.sub 	$push28=, $pop15, $pop16
+	i32.sub 	$push28=, $pop14, $pop16
 	tee_local	$push27=, $2=, $pop28
 	i32.store	__stack_pointer($pop17), $pop27
 	i32.const	$push0=, -1
@@ -145,9 +145,9 @@ foo_ldouble_t:                          # @foo_ldouble_t
 	.endfunc
 .Lfunc_end6:
 	.size	foo_ldouble_t, .Lfunc_end6-foo_ldouble_t
-
+                                        # -- End function
 	.section	.text.bar_ldouble_t,"ax",@progbits
-	.hidden	bar_ldouble_t
+	.hidden	bar_ldouble_t           # -- Begin function bar_ldouble_t
 	.globl	bar_ldouble_t
 	.type	bar_ldouble_t,@function
 bar_ldouble_t:                          # @bar_ldouble_t
@@ -163,9 +163,9 @@ bar_ldouble_t:                          # @bar_ldouble_t
 	.endfunc
 .Lfunc_end7:
 	.size	bar_ldouble_t, .Lfunc_end7-bar_ldouble_t
-
+                                        # -- End function
 	.section	.text.baz_ldouble_t,"ax",@progbits
-	.hidden	baz_ldouble_t
+	.hidden	baz_ldouble_t           # -- Begin function baz_ldouble_t
 	.globl	baz_ldouble_t
 	.type	baz_ldouble_t,@function
 baz_ldouble_t:                          # @baz_ldouble_t
@@ -181,9 +181,9 @@ baz_ldouble_t:                          # @baz_ldouble_t
 	.endfunc
 .Lfunc_end8:
 	.size	baz_ldouble_t, .Lfunc_end8-baz_ldouble_t
-
+                                        # -- End function
 	.section	.text.foo_char,"ax",@progbits
-	.hidden	foo_char
+	.hidden	foo_char                # -- Begin function foo_char
 	.globl	foo_char
 	.type	foo_char,@function
 foo_char:                               # @foo_char
@@ -199,9 +199,9 @@ foo_char:                               # @foo_char
 	.endfunc
 .Lfunc_end9:
 	.size	foo_char, .Lfunc_end9-foo_char
-
+                                        # -- End function
 	.section	.text.bar_char,"ax",@progbits
-	.hidden	bar_char
+	.hidden	bar_char                # -- Begin function bar_char
 	.globl	bar_char
 	.type	bar_char,@function
 bar_char:                               # @bar_char
@@ -213,9 +213,9 @@ bar_char:                               # @bar_char
 	.endfunc
 .Lfunc_end10:
 	.size	bar_char, .Lfunc_end10-bar_char
-
+                                        # -- End function
 	.section	.text.baz_char,"ax",@progbits
-	.hidden	baz_char
+	.hidden	baz_char                # -- Begin function baz_char
 	.globl	baz_char
 	.type	baz_char,@function
 baz_char:                               # @baz_char
@@ -227,9 +227,9 @@ baz_char:                               # @baz_char
 	.endfunc
 .Lfunc_end11:
 	.size	baz_char, .Lfunc_end11-baz_char
-
+                                        # -- End function
 	.section	.text.foo_short,"ax",@progbits
-	.hidden	foo_short
+	.hidden	foo_short               # -- Begin function foo_short
 	.globl	foo_short
 	.type	foo_short,@function
 foo_short:                              # @foo_short
@@ -245,9 +245,9 @@ foo_short:                              # @foo_short
 	.endfunc
 .Lfunc_end12:
 	.size	foo_short, .Lfunc_end12-foo_short
-
+                                        # -- End function
 	.section	.text.bar_short,"ax",@progbits
-	.hidden	bar_short
+	.hidden	bar_short               # -- Begin function bar_short
 	.globl	bar_short
 	.type	bar_short,@function
 bar_short:                              # @bar_short
@@ -259,9 +259,9 @@ bar_short:                              # @bar_short
 	.endfunc
 .Lfunc_end13:
 	.size	bar_short, .Lfunc_end13-bar_short
-
+                                        # -- End function
 	.section	.text.baz_short,"ax",@progbits
-	.hidden	baz_short
+	.hidden	baz_short               # -- Begin function baz_short
 	.globl	baz_short
 	.type	baz_short,@function
 baz_short:                              # @baz_short
@@ -273,9 +273,9 @@ baz_short:                              # @baz_short
 	.endfunc
 .Lfunc_end14:
 	.size	baz_short, .Lfunc_end14-baz_short
-
+                                        # -- End function
 	.section	.text.foo_int,"ax",@progbits
-	.hidden	foo_int
+	.hidden	foo_int                 # -- Begin function foo_int
 	.globl	foo_int
 	.type	foo_int,@function
 foo_int:                                # @foo_int
@@ -291,9 +291,9 @@ foo_int:                                # @foo_int
 	.endfunc
 .Lfunc_end15:
 	.size	foo_int, .Lfunc_end15-foo_int
-
+                                        # -- End function
 	.section	.text.bar_int,"ax",@progbits
-	.hidden	bar_int
+	.hidden	bar_int                 # -- Begin function bar_int
 	.globl	bar_int
 	.type	bar_int,@function
 bar_int:                                # @bar_int
@@ -305,9 +305,9 @@ bar_int:                                # @bar_int
 	.endfunc
 .Lfunc_end16:
 	.size	bar_int, .Lfunc_end16-bar_int
-
+                                        # -- End function
 	.section	.text.baz_int,"ax",@progbits
-	.hidden	baz_int
+	.hidden	baz_int                 # -- Begin function baz_int
 	.globl	baz_int
 	.type	baz_int,@function
 baz_int:                                # @baz_int
@@ -319,9 +319,9 @@ baz_int:                                # @baz_int
 	.endfunc
 .Lfunc_end17:
 	.size	baz_int, .Lfunc_end17-baz_int
-
+                                        # -- End function
 	.section	.text.foo_long,"ax",@progbits
-	.hidden	foo_long
+	.hidden	foo_long                # -- Begin function foo_long
 	.globl	foo_long
 	.type	foo_long,@function
 foo_long:                               # @foo_long
@@ -337,9 +337,9 @@ foo_long:                               # @foo_long
 	.endfunc
 .Lfunc_end18:
 	.size	foo_long, .Lfunc_end18-foo_long
-
+                                        # -- End function
 	.section	.text.bar_long,"ax",@progbits
-	.hidden	bar_long
+	.hidden	bar_long                # -- Begin function bar_long
 	.globl	bar_long
 	.type	bar_long,@function
 bar_long:                               # @bar_long
@@ -351,9 +351,9 @@ bar_long:                               # @bar_long
 	.endfunc
 .Lfunc_end19:
 	.size	bar_long, .Lfunc_end19-bar_long
-
+                                        # -- End function
 	.section	.text.baz_long,"ax",@progbits
-	.hidden	baz_long
+	.hidden	baz_long                # -- Begin function baz_long
 	.globl	baz_long
 	.type	baz_long,@function
 baz_long:                               # @baz_long
@@ -365,9 +365,9 @@ baz_long:                               # @baz_long
 	.endfunc
 .Lfunc_end20:
 	.size	baz_long, .Lfunc_end20-baz_long
-
+                                        # -- End function
 	.section	.text.foo_llong,"ax",@progbits
-	.hidden	foo_llong
+	.hidden	foo_llong               # -- Begin function foo_llong
 	.globl	foo_llong
 	.type	foo_llong,@function
 foo_llong:                              # @foo_llong
@@ -385,9 +385,9 @@ foo_llong:                              # @foo_llong
 	.endfunc
 .Lfunc_end21:
 	.size	foo_llong, .Lfunc_end21-foo_llong
-
+                                        # -- End function
 	.section	.text.bar_llong,"ax",@progbits
-	.hidden	bar_llong
+	.hidden	bar_llong               # -- Begin function bar_llong
 	.globl	bar_llong
 	.type	bar_llong,@function
 bar_llong:                              # @bar_llong
@@ -399,9 +399,9 @@ bar_llong:                              # @bar_llong
 	.endfunc
 .Lfunc_end22:
 	.size	bar_llong, .Lfunc_end22-bar_llong
-
+                                        # -- End function
 	.section	.text.baz_llong,"ax",@progbits
-	.hidden	baz_llong
+	.hidden	baz_llong               # -- Begin function baz_llong
 	.globl	baz_llong
 	.type	baz_llong,@function
 baz_llong:                              # @baz_llong
@@ -413,9 +413,9 @@ baz_llong:                              # @baz_llong
 	.endfunc
 .Lfunc_end23:
 	.size	baz_llong, .Lfunc_end23-baz_llong
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -426,6 +426,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end24:
 	.size	main, .Lfunc_end24-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050124-1.c.s b/test/torture-s/20050124-1.c.s
index 26183b292..9142a27ea 100644
--- a/test/torture-s/20050124-1.c.s
+++ b/test/torture-s/20050124-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050124-1.c"
+	.file	"20050124-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -34,9 +34,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,6 +47,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050125-1.c.s b/test/torture-s/20050125-1.c.s
index 918f117d6..a116e417f 100644
--- a/test/torture-s/20050125-1.c.s
+++ b/test/torture-s/20050125-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050125-1.c"
+	.file	"20050125-1.c"
 	.section	.text.seterr,"ax",@progbits
-	.hidden	seterr
+	.hidden	seterr                  # -- Begin function seterr
 	.globl	seterr
 	.type	seterr,@function
 seterr:                                 # @seterr
@@ -14,9 +14,9 @@ seterr:                                 # @seterr
 	.endfunc
 .Lfunc_end0:
 	.size	seterr, .Lfunc_end0-seterr
-
+                                        # -- End function
 	.section	.text.bracket_empty,"ax",@progbits
-	.hidden	bracket_empty
+	.hidden	bracket_empty           # -- Begin function bracket_empty
 	.globl	bracket_empty
 	.type	bracket_empty,@function
 bracket_empty:                          # @bracket_empty
@@ -48,9 +48,9 @@ bracket_empty:                          # @bracket_empty
 	.endfunc
 .Lfunc_end1:
 	.size	bracket_empty, .Lfunc_end1-bracket_empty
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,6 +62,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050131-1.c.s b/test/torture-s/20050131-1.c.s
index 814e1a2c8..effe27a1c 100644
--- a/test/torture-s/20050131-1.c.s
+++ b/test/torture-s/20050131-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050131-1.c"
+	.file	"20050131-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20050203-1.c.s b/test/torture-s/20050203-1.c.s
index c932f0417..a027df480 100644
--- a/test/torture-s/20050203-1.c.s
+++ b/test/torture-s/20050203-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050203-1.c"
+	.file	"20050203-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push10=, $pop4, $pop5
+	i32.sub 	$push10=, $pop3, $pop5
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop6), $pop9
 	i32.const	$push7=, 15
@@ -35,9 +35,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
 # BB#0:                                 # %entry
@@ -47,9 +47,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.type	bar,@function
+	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 # BB#0:                                 # %entry
 	#APP
@@ -58,8 +58,8 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050215-1.c.s b/test/torture-s/20050215-1.c.s
index 5c0c5f6ed..939ddad3c 100644
--- a/test/torture-s/20050215-1.c.s
+++ b/test/torture-s/20050215-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050215-1.c"
+	.file	"20050215-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -19,7 +19,8 @@ main:                                   # @main
 	i32.const	$push14=, v
 	i32.const	$push10=, 7
 	i32.and 	$push11=, $pop14, $pop10
-	br_if   	1, $pop11       # 1: down to label1
+	i32.eqz 	$push18=, $pop11
+	br_if   	1, $pop18       # 1: down to label1
 	br      	2               # 2: down to label0
 .LBB0_2:                                # %lor.lhs.false
 	end_block                       # label2:
@@ -33,20 +34,19 @@ main:                                   # @main
 	i32.const	$push4=, 0
 	i32.ne  	$push5=, $pop3, $pop4
 	i32.or  	$push9=, $pop8, $pop5
-	i32.eqz 	$push18=, $pop9
-	br_if   	1, $pop18       # 1: down to label0
-.LBB0_3:                                # %if.end3
+	br_if   	1, $pop9        # 1: down to label0
+.LBB0_3:                                # %if.then2
 	end_block                       # label1:
-	i32.const	$push12=, 0
-	return  	$pop12
-.LBB0_4:                                # %if.then2
-	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
+.LBB0_4:                                # %if.end3
+	end_block                       # label0:
+	i32.const	$push12=, 0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -56,5 +56,5 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050218-1.c.s b/test/torture-s/20050218-1.c.s
index 52355b201..88e221871 100644
--- a/test/torture-s/20050218-1.c.s
+++ b/test/torture-s/20050218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050218-1.c"
+	.file	"20050218-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -59,9 +59,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -107,7 +107,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -160,7 +160,7 @@ a:
 	.size	.L.str.4, 6
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strncmp, i32, i32, i32, i32
 	.functype	strlen, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050224-1.c.s b/test/torture-s/20050224-1.c.s
index 71d45f6e8..8e6791858 100644
--- a/test/torture-s/20050224-1.c.s
+++ b/test/torture-s/20050224-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050224-1.c"
+	.file	"20050224-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -28,9 +28,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -89,7 +89,7 @@ main:                                   # @main
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label5:
 	i32.lt_u	$push4=, $5, $4
-	i32.add 	$7=, $pop4, $7
+	i32.add 	$7=, $7, $pop4
 .LBB1_8:                                # %for.inc
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label3:
@@ -121,7 +121,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -177,5 +177,5 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050316-1.c.s b/test/torture-s/20050316-1.c.s
index ac4ff8a78..c900f563c 100644
--- a/test/torture-s/20050316-1.c.s
+++ b/test/torture-s/20050316-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050316-1.c"
+	.file	"20050316-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -12,9 +12,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -26,9 +26,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -44,9 +44,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -63,9 +63,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -79,9 +79,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -92,6 +92,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050316-2.c.s b/test/torture-s/20050316-2.c.s
index 10ae80000..614abc3f6 100644
--- a/test/torture-s/20050316-2.c.s
+++ b/test/torture-s/20050316-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050316-2.c"
+	.file	"20050316-2.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -19,9 +19,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -39,9 +39,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -57,9 +57,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,6 +70,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050316-3.c.s b/test/torture-s/20050316-3.c.s
index e4b5369a3..dea6387ed 100644
--- a/test/torture-s/20050316-3.c.s
+++ b/test/torture-s/20050316-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050316-3.c"
+	.file	"20050316-3.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -15,9 +15,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -33,9 +33,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,6 +46,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050410-1.c.s b/test/torture-s/20050410-1.c.s
index 07174f999..c1e6327f3 100644
--- a/test/torture-s/20050410-1.c.s
+++ b/test/torture-s/20050410-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050410-1.c"
+	.file	"20050410-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,9 +21,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -56,6 +56,6 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20050502-1.c.s b/test/torture-s/20050502-1.c.s
index d163a88cf..11d1c0b49 100644
--- a/test/torture-s/20050502-1.c.s
+++ b/test/torture-s/20050502-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050502-1.c"
+	.file	"20050502-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -19,9 +19,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -34,9 +34,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -78,7 +78,7 @@ foo:                                    # @foo
 	i32.call	$push10=, baz@FUNCTION, $pop9
 	i32.eqz 	$push32=, $pop10
 	br_if   	2, $pop32       # 2: down to label0
-.LBB2_5:                                # %while.cond.backedge
+.LBB2_5:                                # %if.end23
                                         #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label2:
 	i32.add 	$push12=, $1, $7
@@ -94,7 +94,7 @@ foo:                                    # @foo
 	i32.eq  	$push14=, $pop25, $pop24
 	i32.and 	$push15=, $pop14, $2
 	br_if   	1, $pop15       # 1: down to label0
-# BB#6:                                 # %while.cond.backedge
+# BB#6:                                 # %if.end23
                                         #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$push31=, 34
 	i32.eq  	$push13=, $5, $pop31
@@ -111,9 +111,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -121,10 +121,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push41=, 0
-	i32.const	$push38=, 0
-	i32.load	$push39=, __stack_pointer($pop38)
+	i32.const	$push39=, 0
+	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 80
-	i32.sub 	$push76=, $pop39, $pop40
+	i32.sub 	$push76=, $pop38, $pop40
 	tee_local	$push75=, $0=, $pop76
 	i32.store	__stack_pointer($pop41), $pop75
 	i32.const	$push0=, .L.str
@@ -234,14 +234,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop44), $pop43
 	i32.const	$push37=, 0
 	return  	$pop37
-.LBB3_11:                               # %if.then38
+.LBB3_11:                               # %if.then
 	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -319,6 +319,6 @@ main:                                   # @main
 	.size	.L.str.14, 7
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050502-2.c.s b/test/torture-s/20050502-2.c.s
index fc5fa897e..9e726d5c2 100644
--- a/test/torture-s/20050502-2.c.s
+++ b/test/torture-s/20050502-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050502-2.c"
+	.file	"20050502-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -27,73 +27,66 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
+	i32.const	$push16=, 0
 	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$push33=, $pop15, $pop16
-	tee_local	$push32=, $1=, $pop33
-	i32.store	__stack_pointer($pop17), $pop32
-	i32.const	$push1=, 14
-	i32.add 	$push2=, $1, $pop1
-	i32.const	$push31=, 0
-	i32.load8_u	$push0=, .Lmain.x+10($pop31)
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 16
+	i32.sub 	$push26=, $pop13, $pop15
+	tee_local	$push25=, $0=, $pop26
+	i32.store	__stack_pointer($pop16), $pop25
+	i32.const	$push1=, 10
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push24=, 0
+	i32.load8_u	$push0=, .Lmain.x+10($pop24)
 	i32.store8	0($pop2), $pop0
-	i32.const	$push4=, 12
-	i32.add 	$push5=, $1, $pop4
-	i32.const	$push30=, 0
-	i32.load16_u	$push3=, .Lmain.x+8($pop30):p2align=0
+	i32.const	$push4=, 8
+	i32.add 	$push5=, $0, $pop4
+	i32.const	$push23=, 0
+	i32.load16_u	$push3=, .Lmain.x+8($pop23):p2align=0
 	i32.store16	0($pop5), $pop3
-	i32.const	$push29=, 0
-	i64.load	$push6=, .Lmain.x($pop29):p2align=0
-	i64.store	4($1):p2align=2, $pop6
-	i32.const	$push7=, 8
-	i32.add 	$push28=, $1, $pop7
-	tee_local	$push27=, $0=, $pop28
-	i32.const	$push26=, 0
-	i32.store8	0($pop27), $pop26
+	i32.const	$push22=, 0
+	i64.load	$push6=, .Lmain.x($pop22):p2align=0
+	i64.store	0($0), $pop6
+	i32.const	$push21=, 0
+	i32.store8	4($0), $pop21
 	block   	
-	i32.const	$push21=, 4
-	i32.add 	$push22=, $1, $pop21
-	i32.const	$push8=, .L.str
-	i32.const	$push25=, 11
-	i32.call	$push9=, memcmp@FUNCTION, $pop22, $pop8, $pop25
-	br_if   	0, $pop9        # 0: down to label0
+	i32.const	$push7=, .L.str
+	i32.const	$push20=, 11
+	i32.call	$push8=, memcmp@FUNCTION, $0, $pop7, $pop20
+	br_if   	0, $pop8        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push10=, 77
-	i32.store8	0($0), $pop10
-	i32.const	$push35=, 0
-	i32.store8	12($1), $pop35
-	i32.const	$push23=, 4
-	i32.add 	$push24=, $1, $pop23
-	i32.const	$push11=, .L.str.1
-	i32.const	$push34=, 11
-	i32.call	$push12=, memcmp@FUNCTION, $pop24, $pop11, $pop34
-	br_if   	0, $pop12       # 0: down to label0
+	i32.const	$push28=, 0
+	i32.store8	8($0), $pop28
+	i32.const	$push9=, 77
+	i32.store8	4($0), $pop9
+	i32.const	$push10=, .L.str.1
+	i32.const	$push27=, 11
+	i32.call	$push11=, memcmp@FUNCTION, $0, $pop10, $pop27
+	br_if   	0, $pop11       # 0: down to label0
 # BB#2:                                 # %if.end7
-	i32.const	$push20=, 0
-	i32.const	$push18=, 16
-	i32.add 	$push19=, $1, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
-	i32.const	$push13=, 0
-	return  	$pop13
-.LBB2_3:                                # %if.then6
+	i32.const	$push19=, 0
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $0, $pop17
+	i32.store	__stack_pointer($pop19), $pop18
+	i32.const	$push12=, 0
+	return  	$pop12
+.LBB2_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lmain.x,@object        # @main.x
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .Lmain.x:
@@ -113,6 +106,6 @@ main:                                   # @main
 	.size	.L.str.1, 11
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050604-1.c.s b/test/torture-s/20050604-1.c.s
index 503f9b4fa..42a6da133 100644
--- a/test/torture-s/20050604-1.c.s
+++ b/test/torture-s/20050604-1.c.s
@@ -1,167 +1,166 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050604-1.c"
+	.file	"20050604-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-	.local  	f32, f32, f32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push34=, 0
-	i32.load16_u	$push1=, u+2($pop34)
+	i32.const	$push37=, 0
+	i32.load16_u	$push1=, u+2($pop37)
 	i32.const	$push2=, 28
 	i32.add 	$push3=, $pop1, $pop2
 	i32.store16	u+2($pop0), $pop3
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load16_u	$push4=, u($pop32)
+	i32.const	$push36=, 0
+	i32.const	$push35=, 0
+	i32.load16_u	$push4=, u($pop35)
 	i32.const	$push5=, 24
 	i32.add 	$push6=, $pop4, $pop5
-	i32.store16	u($pop33), $pop6
+	i32.store16	u($pop36), $pop6
+	i32.const	$push34=, 0
+	i32.const	$push33=, 0
+	f32.load	$push7=, v+12($pop33)
+	f32.const	$push8=, 0x0p0
+	f32.add 	$push9=, $pop7, $pop8
+	f32.const	$push32=, 0x0p0
+	f32.add 	$push10=, $pop9, $pop32
+	f32.store	v+12($pop34), $pop10
 	i32.const	$push31=, 0
-	f32.load	$0=, v($pop31)
 	i32.const	$push30=, 0
-	f32.load	$1=, v+4($pop30)
-	i32.const	$push29=, 0
-	f32.load	$2=, v+8($pop29)
+	f32.load	$push11=, v+8($pop30)
+	f32.const	$push12=, 0x1.6p4
+	f32.add 	$push13=, $pop11, $pop12
+	f32.const	$push29=, 0x1.6p4
+	f32.add 	$push14=, $pop13, $pop29
+	f32.store	v+8($pop31), $pop14
 	i32.const	$push28=, 0
 	i32.const	$push27=, 0
-	f32.load	$push7=, v+12($pop27)
-	f32.const	$push8=, 0x0p0
-	f32.add 	$push9=, $pop7, $pop8
-	f32.const	$push26=, 0x0p0
-	f32.add 	$push10=, $pop9, $pop26
-	f32.store	v+12($pop28), $pop10
+	f32.load	$push15=, v+4($pop27)
+	f32.const	$push16=, 0x1.4p4
+	f32.add 	$push17=, $pop15, $pop16
+	f32.const	$push26=, 0x1.4p4
+	f32.add 	$push18=, $pop17, $pop26
+	f32.store	v+4($pop28), $pop18
 	i32.const	$push25=, 0
-	f32.const	$push11=, 0x1.6p4
-	f32.add 	$push12=, $2, $pop11
-	f32.const	$push24=, 0x1.6p4
-	f32.add 	$push13=, $pop12, $pop24
-	f32.store	v+8($pop25), $pop13
-	i32.const	$push23=, 0
-	f32.const	$push14=, 0x1.4p4
-	f32.add 	$push15=, $1, $pop14
-	f32.const	$push22=, 0x1.4p4
-	f32.add 	$push16=, $pop15, $pop22
-	f32.store	v+4($pop23), $pop16
-	i32.const	$push21=, 0
-	f32.const	$push17=, 0x1.2p4
-	f32.add 	$push18=, $0, $pop17
+	i32.const	$push24=, 0
+	f32.load	$push19=, v($pop24)
 	f32.const	$push20=, 0x1.2p4
-	f32.add 	$push19=, $pop18, $pop20
-	f32.store	v($pop21), $pop19
+	f32.add 	$push21=, $pop19, $pop20
+	f32.const	$push23=, 0x1.2p4
+	f32.add 	$push22=, $pop21, $pop23
+	f32.store	v($pop25), $pop22
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f32, i32, i32, i32, i32, f32, f32, f32
+	.local  	f32, f32, f32, f32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push60=, 0
-	i32.load16_u	$push2=, u+2($pop60)
-	i32.const	$push59=, 28
-	i32.add 	$push58=, $pop2, $pop59
-	tee_local	$push57=, $1=, $pop58
-	i32.store16	u+2($pop1), $pop57
-	i32.const	$push56=, 0
-	i32.const	$push55=, 0
-	i32.load16_u	$push3=, u($pop55)
-	i32.const	$push4=, 24
-	i32.add 	$push54=, $pop3, $pop4
-	tee_local	$push53=, $2=, $pop54
-	i32.store16	u($pop56), $pop53
-	i32.const	$push52=, 0
-	i32.load16_u	$3=, u+6($pop52)
-	i32.const	$push51=, 0
-	i32.load16_u	$4=, u+4($pop51)
-	i32.const	$push50=, 0
-	f32.load	$5=, v($pop50)
+	i32.const	$push63=, 0
+	i32.const	$push62=, 0
+	i32.load16_u	$push1=, u+2($pop62)
+	i32.const	$push61=, 28
+	i32.add 	$push60=, $pop1, $pop61
+	tee_local	$push59=, $4=, $pop60
+	i32.store16	u+2($pop63), $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 0
+	i32.load16_u	$push2=, u($pop57)
+	i32.const	$push3=, 24
+	i32.add 	$push56=, $pop2, $pop3
+	tee_local	$push55=, $5=, $pop56
+	i32.store16	u($pop58), $pop55
+	i32.const	$push54=, 0
+	i32.const	$push53=, 0
+	f32.load	$push4=, v+12($pop53)
+	f32.const	$push5=, 0x0p0
+	f32.add 	$push6=, $pop4, $pop5
+	f32.const	$push52=, 0x0p0
+	f32.add 	$push51=, $pop6, $pop52
+	tee_local	$push50=, $3=, $pop51
+	f32.store	v+12($pop54), $pop50
 	i32.const	$push49=, 0
-	f32.load	$6=, v+4($pop49)
 	i32.const	$push48=, 0
-	f32.load	$7=, v+8($pop48)
-	i32.const	$push47=, 0
-	i32.const	$push46=, 0
-	f32.load	$push5=, v+12($pop46)
-	f32.const	$push6=, 0x0p0
-	f32.add 	$push7=, $pop5, $pop6
-	f32.const	$push45=, 0x0p0
-	f32.add 	$push44=, $pop7, $pop45
-	tee_local	$push43=, $0=, $pop44
-	f32.store	v+12($pop47), $pop43
-	i32.const	$push42=, 0
+	f32.load	$push7=, v+8($pop48)
 	f32.const	$push8=, 0x1.6p4
-	f32.add 	$push9=, $7, $pop8
-	f32.const	$push41=, 0x1.6p4
-	f32.add 	$push40=, $pop9, $pop41
-	tee_local	$push39=, $7=, $pop40
-	f32.store	v+8($pop42), $pop39
+	f32.add 	$push9=, $pop7, $pop8
+	f32.const	$push47=, 0x1.6p4
+	f32.add 	$push46=, $pop9, $pop47
+	tee_local	$push45=, $2=, $pop46
+	f32.store	v+8($pop49), $pop45
+	i32.const	$push44=, 0
+	i32.const	$push43=, 0
+	f32.load	$push10=, v+4($pop43)
+	f32.const	$push11=, 0x1.4p4
+	f32.add 	$push12=, $pop10, $pop11
+	f32.const	$push42=, 0x1.4p4
+	f32.add 	$push41=, $pop12, $pop42
+	tee_local	$push40=, $1=, $pop41
+	f32.store	v+4($pop44), $pop40
+	i32.const	$push39=, 0
 	i32.const	$push38=, 0
-	f32.const	$push10=, 0x1.4p4
-	f32.add 	$push11=, $6, $pop10
-	f32.const	$push37=, 0x1.4p4
-	f32.add 	$push36=, $pop11, $pop37
-	tee_local	$push35=, $6=, $pop36
-	f32.store	v+4($pop38), $pop35
-	i32.const	$push34=, 0
-	f32.const	$push12=, 0x1.2p4
-	f32.add 	$push13=, $5, $pop12
-	f32.const	$push33=, 0x1.2p4
-	f32.add 	$push32=, $pop13, $pop33
-	tee_local	$push31=, $5=, $pop32
-	f32.store	v($pop34), $pop31
+	f32.load	$push13=, v($pop38)
+	f32.const	$push14=, 0x1.2p4
+	f32.add 	$push15=, $pop13, $pop14
+	f32.const	$push37=, 0x1.2p4
+	f32.add 	$push36=, $pop15, $pop37
+	tee_local	$push35=, $0=, $pop36
+	f32.store	v($pop39), $pop35
 	block   	
-	i32.const	$push30=, 65535
-	i32.and 	$push14=, $2, $pop30
-	i32.const	$push29=, 24
-	i32.ne  	$push15=, $pop14, $pop29
-	br_if   	0, $pop15       # 0: down to label0
+	i32.const	$push34=, 65535
+	i32.and 	$push18=, $5, $pop34
+	i32.const	$push33=, 24
+	i32.ne  	$push19=, $pop18, $pop33
+	br_if   	0, $pop19       # 0: down to label0
 # BB#1:                                 # %entry
-	i32.const	$push62=, 65535
-	i32.and 	$push16=, $1, $pop62
-	i32.const	$push61=, 28
-	i32.ne  	$push17=, $pop16, $pop61
-	br_if   	0, $pop17       # 0: down to label0
+	i32.const	$push65=, 65535
+	i32.and 	$push20=, $4, $pop65
+	i32.const	$push64=, 28
+	i32.ne  	$push21=, $pop20, $pop64
+	br_if   	0, $pop21       # 0: down to label0
 # BB#2:                                 # %entry
-	i32.or  	$push0=, $3, $4
-	i32.const	$push18=, 65535
-	i32.and 	$push19=, $pop0, $pop18
-	br_if   	0, $pop19       # 0: down to label0
+	i32.const	$push67=, 0
+	i32.load16_u	$push17=, u+6($pop67)
+	i32.const	$push66=, 0
+	i32.load16_u	$push16=, u+4($pop66)
+	i32.or  	$push0=, $pop17, $pop16
+	i32.const	$push22=, 65535
+	i32.and 	$push23=, $pop0, $pop22
+	br_if   	0, $pop23       # 0: down to label0
 # BB#3:                                 # %if.end
-	f32.const	$push20=, 0x1.2p5
-	f32.ne  	$push21=, $5, $pop20
-	br_if   	0, $pop21       # 0: down to label0
+	f32.const	$push24=, 0x1.2p5
+	f32.ne  	$push25=, $0, $pop24
+	br_if   	0, $pop25       # 0: down to label0
 # BB#4:                                 # %if.end
-	f32.const	$push22=, 0x1.4p5
-	f32.ne  	$push23=, $6, $pop22
-	br_if   	0, $pop23       # 0: down to label0
+	f32.const	$push26=, 0x1.4p5
+	f32.ne  	$push27=, $1, $pop26
+	br_if   	0, $pop27       # 0: down to label0
 # BB#5:                                 # %if.end
-	f32.const	$push24=, 0x1.6p5
-	f32.ne  	$push25=, $7, $pop24
-	br_if   	0, $pop25       # 0: down to label0
+	f32.const	$push28=, 0x1.6p5
+	f32.ne  	$push29=, $2, $pop28
+	br_if   	0, $pop29       # 0: down to label0
 # BB#6:                                 # %if.end
-	f32.const	$push26=, 0x0p0
-	f32.ne  	$push27=, $0, $pop26
-	br_if   	0, $pop27       # 0: down to label0
+	f32.const	$push30=, 0x0p0
+	f32.ne  	$push31=, $3, $pop30
+	br_if   	0, $pop31       # 0: down to label0
 # BB#7:                                 # %if.end26
-	i32.const	$push28=, 0
-	return  	$pop28
-.LBB1_8:                                # %if.then25
+	i32.const	$push32=, 0
+	return  	$pop32
+.LBB1_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.bss.u,"aw",@nobits
@@ -181,5 +180,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050607-1.c.s b/test/torture-s/20050607-1.c.s
index 1a58b9c75..494930d2d 100644
--- a/test/torture-s/20050607-1.c.s
+++ b/test/torture-s/20050607-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050607-1.c"
+	.file	"20050607-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20050613-1.c.s b/test/torture-s/20050613-1.c.s
index 37966ebe8..e4607a488 100644
--- a/test/torture-s/20050613-1.c.s
+++ b/test/torture-s/20050613-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050613-1.c"
+	.file	"20050613-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -30,9 +30,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050713-1.c.s b/test/torture-s/20050713-1.c.s
index 1907efea2..15f9b6f9e 100644
--- a/test/torture-s/20050713-1.c.s
+++ b/test/torture-s/20050713-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050713-1.c"
+	.file	"20050713-1.c"
 	.section	.text.foo2,"ax",@progbits
-	.hidden	foo2
+	.hidden	foo2                    # -- Begin function foo2
 	.globl	foo2
 	.type	foo2,@function
 foo2:                                   # @foo2
@@ -41,16 +41,16 @@ foo2:                                   # @foo2
 # BB#6:                                 # %if.end13
 	i32.const	$push18=, 0
 	return  	$pop18
-.LBB0_7:                                # %if.then12
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo2, .Lfunc_end0-foo2
-
+                                        # -- End function
 	.section	.text.foo3,"ax",@progbits
-	.hidden	foo3
+	.hidden	foo3                    # -- Begin function foo3
 	.globl	foo3
 	.type	foo3,@function
 foo3:                                   # @foo3
@@ -105,16 +105,16 @@ foo3:                                   # @foo3
 # BB#9:                                 # %if.end
 	i32.const	$push27=, 0
 	return  	$pop27
-.LBB1_10:                               # %if.then
+.LBB1_10:                               # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	foo3, .Lfunc_end1-foo3
-
+                                        # -- End function
 	.section	.text.bar2,"ax",@progbits
-	.hidden	bar2
+	.hidden	bar2                    # -- Begin function bar2
 	.globl	bar2
 	.type	bar2,@function
 bar2:                                   # @bar2
@@ -154,16 +154,16 @@ bar2:                                   # @bar2
 # BB#6:                                 # %foo2.exit
 	i32.const	$push18=, 0
 	return  	$pop18
-.LBB2_7:                                # %if.then12.i
+.LBB2_7:                                # %if.then.i
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	bar2, .Lfunc_end2-bar2
-
+                                        # -- End function
 	.section	.text.bar3,"ax",@progbits
-	.hidden	bar3
+	.hidden	bar3                    # -- Begin function bar3
 	.globl	bar3
 	.type	bar3,@function
 bar3:                                   # @bar3
@@ -218,16 +218,16 @@ bar3:                                   # @bar3
 # BB#9:                                 # %foo3.exit
 	i32.const	$push27=, 0
 	return  	$pop27
-.LBB3_10:                               # %if.then.i
+.LBB3_10:                               # %if.then.i.i
 	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	bar3, .Lfunc_end3-bar3
-
+                                        # -- End function
 	.section	.text.baz3,"ax",@progbits
-	.hidden	baz3
+	.hidden	baz3                    # -- Begin function baz3
 	.globl	baz3
 	.type	baz3,@function
 baz3:                                   # @baz3
@@ -282,16 +282,16 @@ baz3:                                   # @baz3
 # BB#9:                                 # %foo3.exit
 	i32.const	$push27=, 0
 	return  	$pop27
-.LBB4_10:                               # %if.then.i
+.LBB4_10:                               # %if.then.i.i
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	baz3, .Lfunc_end4-baz3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -302,7 +302,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050826-1.c.s b/test/torture-s/20050826-1.c.s
index 75ccfb11c..74df6f0d6 100644
--- a/test/torture-s/20050826-1.c.s
+++ b/test/torture-s/20050826-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050826-1.c"
+	.file	"20050826-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -19,11 +19,10 @@ bar:                                    # @bar
 	i32.const	$0=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label2:
+	loop    	                # label1:
 	i32.add 	$push4=, $1, $0
 	i32.load8_u	$push5=, 0($pop4)
-	br_if   	1, $pop5        # 1: down to label1
+	br_if   	1, $pop5        # 1: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push10=, 1
@@ -31,24 +30,20 @@ bar:                                    # @bar
 	tee_local	$push8=, $0=, $pop9
 	i32.const	$push7=, 2040
 	i32.le_u	$push6=, $pop8, $pop7
-	br_if   	0, $pop6        # 0: up to label2
+	br_if   	0, $pop6        # 0: up to label1
 # BB#4:                                 # %for.end
 	end_loop
 	return
-.LBB0_5:                                # %if.then2
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_6:                                # %if.then
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -74,6 +69,7 @@ foo:                                    # @foo
 	i32.load	$push5=, .L.str.1($pop14):p2align=0
 	i32.store	a+1($pop15):p2align=0, $pop5
 	block   	
+	block   	
 	i32.const	$push13=, 0
 	i64.load	$push6=, a($pop13):p2align=0
 	i64.const	$push7=, 368664092428289
@@ -83,13 +79,12 @@ foo:                                    # @foo
 	i32.const	$1=, 8
 .LBB1_2:                                # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label5:
+	loop    	                # label4:
 	i32.const	$push23=, -7
 	i32.add 	$push9=, $1, $pop23
 	i32.const	$push22=, 2040
 	i32.gt_u	$push10=, $pop9, $pop22
-	br_if   	1, $pop10       # 1: down to label4
+	br_if   	2, $pop10       # 2: down to label2
 # BB#3:                                 # %for.cond.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB1_2 Depth=1
 	i32.const	$push25=, a
@@ -99,25 +94,22 @@ foo:                                    # @foo
 	copy_local	$1=, $pop0
 	i32.load8_u	$push12=, 0($0)
 	i32.eqz 	$push26=, $pop12
-	br_if   	0, $pop26       # 0: up to label5
-# BB#4:                                 # %if.then2.i
+	br_if   	0, $pop26       # 0: up to label4
+.LBB1_4:                                # %if.then.i
 	end_loop
+	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 .LBB1_5:                                # %bar.exit
-	end_block                       # label4:
+	end_block                       # label2:
 	i32.const	$push11=, 0
-	return  	$pop11
-.LBB1_6:                                # %if.then.i
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -143,6 +135,7 @@ main:                                   # @main
 	i32.load	$push5=, .L.str.1($pop14):p2align=0
 	i32.store	a+1($pop15):p2align=0, $pop5
 	block   	
+	block   	
 	i32.const	$push13=, 0
 	i64.load	$push6=, a($pop13):p2align=0
 	i64.const	$push7=, 368664092428289
@@ -152,13 +145,12 @@ main:                                   # @main
 	i32.const	$1=, 8
 .LBB2_2:                                # %for.cond.i.i
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label8:
+	loop    	                # label7:
 	i32.const	$push23=, -7
 	i32.add 	$push9=, $1, $pop23
 	i32.const	$push22=, 2040
 	i32.gt_u	$push10=, $pop9, $pop22
-	br_if   	1, $pop10       # 1: down to label7
+	br_if   	2, $pop10       # 2: down to label5
 # BB#3:                                 # %for.cond.i.for.body.i_crit_edge.i
                                         #   in Loop: Header=BB2_2 Depth=1
 	i32.const	$push25=, a
@@ -168,23 +160,20 @@ main:                                   # @main
 	copy_local	$1=, $pop0
 	i32.load8_u	$push12=, 0($0)
 	i32.eqz 	$push26=, $pop12
-	br_if   	0, $pop26       # 0: up to label8
-# BB#4:                                 # %if.then2.i.i
+	br_if   	0, $pop26       # 0: up to label7
+.LBB2_4:                                # %if.then.i.i
 	end_loop
+	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_5:                                # %foo.exit
-	end_block                       # label7:
+	end_block                       # label5:
 	i32.const	$push11=, 0
-	return  	$pop11
-.LBB2_6:                                # %if.then.i.i
-	end_block                       # label6:
-	call    	abort@FUNCTION
-	unreachable
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -206,6 +195,6 @@ a:
 	.size	.L.str.1, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20050826-2.c.s b/test/torture-s/20050826-2.c.s
index 8f03c73a1..e208536a2 100644
--- a/test/torture-s/20050826-2.c.s
+++ b/test/torture-s/20050826-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050826-2.c"
+	.file	"20050826-2.c"
 	.section	.text.inet_check_attr,"ax",@progbits
-	.hidden	inet_check_attr
+	.hidden	inet_check_attr         # -- Begin function inet_check_attr
 	.globl	inet_check_attr
 	.type	inet_check_attr,@function
 inet_check_attr:                        # @inet_check_attr
@@ -9,46 +9,45 @@ inet_check_attr:                        # @inet_check_attr
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$3=, 1
+	i32.const	$3=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
+	i32.const	$push11=, 1
+	i32.add 	$3=, $3, $pop11
 	block   	
 	i32.load	$push10=, 0($1)
 	tee_local	$push9=, $2=, $pop10
-	i32.eqz 	$push21=, $pop9
-	br_if   	0, $pop21       # 0: down to label2
+	i32.eqz 	$push19=, $pop9
+	br_if   	0, $pop19       # 0: down to label2
 # BB#2:                                 # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.load16_u	$push0=, 0($2)
-	i32.const	$push12=, 65532
-	i32.and 	$push1=, $pop0, $pop12
-	i32.const	$push11=, 4
-	i32.eq  	$push2=, $pop1, $pop11
+	i32.const	$push13=, 65532
+	i32.and 	$push1=, $pop0, $pop13
+	i32.const	$push12=, 4
+	i32.eq  	$push2=, $pop1, $pop12
 	br_if   	2, $pop2        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push14=, -2
-	i32.and 	$push3=, $3, $pop14
-	i32.const	$push13=, 8
-	i32.eq  	$push4=, $pop3, $pop13
+	i32.const	$push15=, 1
+	i32.or  	$push3=, $3, $pop15
+	i32.const	$push14=, 9
+	i32.eq  	$push4=, $pop3, $pop14
 	br_if   	0, $pop4        # 0: down to label2
 # BB#4:                                 # %if.then9
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push15=, 4
-	i32.add 	$push5=, $2, $pop15
+	i32.const	$push16=, 4
+	i32.add 	$push5=, $2, $pop16
 	i32.store	0($1), $pop5
 .LBB0_5:                                # %for.inc
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push20=, 4
-	i32.add 	$1=, $1, $pop20
-	i32.const	$push19=, 1
-	i32.add 	$push18=, $3, $pop19
-	tee_local	$push17=, $3=, $pop18
-	i32.const	$push16=, 15
-	i32.lt_s	$push6=, $pop17, $pop16
+	i32.const	$push18=, 4
+	i32.add 	$1=, $1, $pop18
+	i32.const	$push17=, 14
+	i32.lt_u	$push6=, $3, $pop17
 	br_if   	0, $pop6        # 0: up to label1
 # BB#6:
 	end_loop
@@ -61,302 +60,449 @@ inet_check_attr:                        # @inet_check_attr
 	.endfunc
 .Lfunc_end0:
 	.size	inet_check_attr, .Lfunc_end0-inet_check_attr
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push88=, 0
+	i32.const	$push87=, 0
 	i32.const	$push85=, 0
-	i32.load	$push86=, __stack_pointer($pop85)
-	i32.const	$push87=, 64
-	i32.sub 	$push151=, $pop86, $pop87
-	tee_local	$push150=, $4=, $pop151
-	i32.store	__stack_pointer($pop88), $pop150
+	i32.load	$push84=, __stack_pointer($pop85)
+	i32.const	$push86=, 64
+	i32.sub 	$push150=, $pop84, $pop86
+	tee_local	$push149=, $5=, $pop150
+	i32.store	__stack_pointer($pop87), $pop149
 	i64.const	$push0=, 51539607564
-	i64.store	56($4), $pop0
-	i32.const	$push92=, 56
-	i32.add 	$push93=, $4, $pop92
-	i32.store	4($4), $pop93
-	i32.const	$push94=, 56
-	i32.add 	$push95=, $4, $pop94
-	i32.store	8($4), $pop95
-	i32.const	$push96=, 56
-	i32.add 	$push97=, $4, $pop96
-	i32.store	12($4), $pop97
-	i32.const	$push98=, 56
-	i32.add 	$push99=, $4, $pop98
-	i32.store	16($4), $pop99
-	i32.const	$push100=, 56
-	i32.add 	$push101=, $4, $pop100
-	i32.store	0($4), $pop101
-	i32.const	$push102=, 56
-	i32.add 	$push103=, $4, $pop102
-	i32.store	20($4), $pop103
-	i32.const	$push104=, 56
-	i32.add 	$push105=, $4, $pop104
-	i32.store	24($4), $pop105
-	i32.const	$push106=, 56
-	i32.add 	$push107=, $4, $pop106
-	i32.store	28($4), $pop107
-	i32.const	$push108=, 56
-	i32.add 	$push109=, $4, $pop108
-	i32.store	32($4), $pop109
-	i32.const	$push110=, 56
-	i32.add 	$push111=, $4, $pop110
-	i32.store	36($4), $pop111
-	i32.const	$push112=, 56
-	i32.add 	$push113=, $4, $pop112
-	i32.store	40($4), $pop113
-	i32.const	$push114=, 56
-	i32.add 	$push115=, $4, $pop114
-	i32.store	44($4), $pop115
-	i32.const	$push116=, 56
-	i32.add 	$push117=, $4, $pop116
-	i32.store	48($4), $pop117
-	i32.const	$push118=, 56
-	i32.add 	$push119=, $4, $pop118
-	i32.store	52($4), $pop119
-	block   	
-	block   	
-	block   	
-	i32.call	$push2=, inet_check_attr@FUNCTION, $1, $4
-	br_if   	0, $pop2        # 0: down to label5
-# BB#1:                                 # %for.body9.preheader
-	i32.load	$push16=, 0($4)
-	i32.const	$push120=, 56
-	i32.add 	$push121=, $4, $pop120
+	i64.store	56($5), $pop0
+	i32.const	$push91=, 56
+	i32.add 	$push92=, $5, $pop91
+	i32.store	0($5), $pop92
+	i32.const	$push93=, 56
+	i32.add 	$push94=, $5, $pop93
+	i32.store	4($5), $pop94
+	i32.const	$push95=, 56
+	i32.add 	$push96=, $5, $pop95
+	i32.store	8($5), $pop96
+	i32.const	$push97=, 56
+	i32.add 	$push98=, $5, $pop97
+	i32.store	12($5), $pop98
+	i32.const	$push99=, 56
+	i32.add 	$push100=, $5, $pop99
+	i32.store	16($5), $pop100
+	i32.const	$push101=, 56
+	i32.add 	$push102=, $5, $pop101
+	i32.store	20($5), $pop102
+	i32.const	$push103=, 56
+	i32.add 	$push104=, $5, $pop103
+	i32.store	24($5), $pop104
+	i32.const	$push105=, 56
+	i32.add 	$push106=, $5, $pop105
+	i32.store	28($5), $pop106
+	i32.const	$push107=, 56
+	i32.add 	$push108=, $5, $pop107
+	i32.store	32($5), $pop108
+	i32.const	$push109=, 56
+	i32.add 	$push110=, $5, $pop109
+	i32.store	36($5), $pop110
+	i32.const	$push111=, 56
+	i32.add 	$push112=, $5, $pop111
+	i32.store	40($5), $pop112
+	i32.const	$push113=, 56
+	i32.add 	$push114=, $5, $pop113
+	i32.store	44($5), $pop114
+	i32.const	$push115=, 56
+	i32.add 	$push116=, $5, $pop115
+	i32.store	48($5), $pop116
+	i32.const	$push117=, 56
+	i32.add 	$push118=, $5, $pop117
+	i32.store	52($5), $pop118
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	i32.call	$push2=, inet_check_attr@FUNCTION, $3, $5
+	br_if   	0, $pop2        # 0: down to label19
+# BB#1:                                 # %if.end
+	i32.load	$push16=, 0($5)
+	i32.const	$push119=, 56
+	i32.add 	$push120=, $5, $pop119
 	i32.const	$push1=, 4
-	i32.or  	$push153=, $pop121, $pop1
-	tee_local	$push152=, $0=, $pop153
-	i32.ne  	$push17=, $pop16, $pop152
-	br_if   	2, $pop17       # 2: down to label3
-# BB#2:                                 # %for.body9.preheader
-	i32.load	$push3=, 4($4)
+	i32.or  	$push152=, $pop120, $pop1
+	tee_local	$push151=, $0=, $pop152
+	i32.ne  	$push17=, $pop16, $pop151
+	br_if   	1, $pop17       # 1: down to label18
+# BB#2:                                 # %if.end
+	i32.load	$push3=, 4($5)
 	i32.ne  	$push38=, $pop3, $0
-	br_if   	2, $pop38       # 2: down to label3
-# BB#3:                                 # %for.body9.preheader
-	i32.load	$push4=, 8($4)
+	br_if   	2, $pop38       # 2: down to label17
+# BB#3:                                 # %if.end
+	i32.load	$push4=, 8($5)
 	i32.ne  	$push39=, $pop4, $0
-	br_if   	2, $pop39       # 2: down to label3
-# BB#4:                                 # %for.body9.preheader
-	i32.load	$push5=, 12($4)
+	br_if   	3, $pop39       # 3: down to label16
+# BB#4:                                 # %if.end
+	i32.load	$push5=, 12($5)
 	i32.ne  	$push40=, $pop5, $0
-	br_if   	2, $pop40       # 2: down to label3
-# BB#5:                                 # %for.body9.preheader
+	br_if   	4, $pop40       # 4: down to label15
+# BB#5:                                 # %if.end
 	i32.const	$push36=, 16
-	i32.add 	$push37=, $4, $pop36
+	i32.add 	$push37=, $5, $pop36
 	i32.load	$push6=, 0($pop37)
 	i32.ne  	$push41=, $pop6, $0
-	br_if   	2, $pop41       # 2: down to label3
-# BB#6:                                 # %for.body9.preheader
+	br_if   	5, $pop41       # 5: down to label14
+# BB#6:                                 # %if.end
 	i32.const	$push34=, 20
-	i32.add 	$push35=, $4, $pop34
+	i32.add 	$push35=, $5, $pop34
 	i32.load	$push7=, 0($pop35)
 	i32.ne  	$push42=, $pop7, $0
-	br_if   	2, $pop42       # 2: down to label3
-# BB#7:                                 # %for.body9.preheader
+	br_if   	6, $pop42       # 6: down to label13
+# BB#7:                                 # %if.end
 	i32.const	$push32=, 24
-	i32.add 	$push33=, $4, $pop32
+	i32.add 	$push33=, $5, $pop32
 	i32.load	$push8=, 0($pop33)
 	i32.ne  	$push43=, $pop8, $0
-	br_if   	2, $pop43       # 2: down to label3
-# BB#8:                                 # %for.body9.preheader
+	br_if   	7, $pop43       # 7: down to label12
+# BB#8:                                 # %if.end
 	i32.const	$push30=, 28
-	i32.add 	$push31=, $4, $pop30
+	i32.add 	$push31=, $5, $pop30
 	i32.load	$push9=, 0($pop31)
-	i32.const	$push122=, 56
-	i32.add 	$push123=, $4, $pop122
-	copy_local	$push155=, $pop123
-	tee_local	$push154=, $1=, $pop155
-	i32.ne  	$push44=, $pop9, $pop154
-	br_if   	2, $pop44       # 2: down to label3
-# BB#9:                                 # %for.body9.preheader
+	i32.const	$push121=, 56
+	i32.add 	$push122=, $5, $pop121
+	copy_local	$push154=, $pop122
+	tee_local	$push153=, $3=, $pop154
+	i32.ne  	$push44=, $pop9, $pop153
+	br_if   	8, $pop44       # 8: down to label11
+# BB#9:                                 # %if.end
 	i32.const	$push28=, 32
-	i32.add 	$push29=, $4, $pop28
+	i32.add 	$push29=, $5, $pop28
 	i32.load	$push10=, 0($pop29)
-	i32.ne  	$push45=, $pop10, $1
-	br_if   	2, $pop45       # 2: down to label3
-# BB#10:                                # %for.body9.preheader
+	i32.ne  	$push45=, $pop10, $3
+	br_if   	9, $pop45       # 9: down to label10
+# BB#10:                                # %if.end
 	i32.const	$push26=, 36
-	i32.add 	$push27=, $4, $pop26
+	i32.add 	$push27=, $5, $pop26
 	i32.load	$push11=, 0($pop27)
 	i32.ne  	$push46=, $pop11, $0
-	br_if   	2, $pop46       # 2: down to label3
-# BB#11:                                # %for.body9.preheader
+	br_if   	10, $pop46      # 10: down to label9
+# BB#11:                                # %if.end
 	i32.const	$push24=, 40
-	i32.add 	$push25=, $4, $pop24
+	i32.add 	$push25=, $5, $pop24
 	i32.load	$push12=, 0($pop25)
 	i32.ne  	$push47=, $pop12, $0
-	br_if   	2, $pop47       # 2: down to label3
-# BB#12:                                # %for.body9.preheader
+	br_if   	11, $pop47      # 11: down to label8
+# BB#12:                                # %if.end
 	i32.const	$push22=, 44
-	i32.add 	$push23=, $4, $pop22
+	i32.add 	$push23=, $5, $pop22
 	i32.load	$push13=, 0($pop23)
 	i32.ne  	$push48=, $pop13, $0
-	br_if   	2, $pop48       # 2: down to label3
-# BB#13:                                # %for.body9.preheader
+	br_if   	12, $pop48      # 12: down to label7
+# BB#13:                                # %if.end
 	i32.const	$push20=, 48
-	i32.add 	$push21=, $4, $pop20
+	i32.add 	$push21=, $5, $pop20
 	i32.load	$push14=, 0($pop21)
 	i32.ne  	$push49=, $pop14, $0
-	br_if   	2, $pop49       # 2: down to label3
-# BB#14:                                # %for.body9.preheader
+	br_if   	13, $pop49      # 13: down to label6
+# BB#14:                                # %if.end
 	i32.const	$push18=, 52
-	i32.add 	$push19=, $4, $pop18
+	i32.add 	$push19=, $5, $pop18
 	i32.load	$push15=, 0($pop19)
 	i32.ne  	$push50=, $pop15, $0
-	br_if   	2, $pop50       # 2: down to label3
+	br_if   	14, $pop50      # 14: down to label5
 # BB#15:                                # %for.cond7.13
-	i32.const	$push51=, 16
-	i32.add 	$push52=, $4, $pop51
-	i32.const	$push124=, 56
-	i32.add 	$push125=, $4, $pop124
-	i32.store	0($pop52), $pop125
-	i32.const	$push53=, 24
-	i32.add 	$push54=, $4, $pop53
-	i32.const	$push126=, 56
-	i32.add 	$push127=, $4, $pop126
-	i32.store	0($pop54), $pop127
-	i32.const	$push55=, 28
-	i32.add 	$push56=, $4, $pop55
-	i32.const	$push128=, 56
-	i32.add 	$push129=, $4, $pop128
-	i32.store	0($pop56), $pop129
-	i32.const	$push57=, 32
-	i32.add 	$push58=, $4, $pop57
-	i32.const	$push130=, 56
-	i32.add 	$push131=, $4, $pop130
-	i32.store	0($pop58), $pop131
-	i32.const	$push132=, 56
-	i32.add 	$push133=, $4, $pop132
-	i32.store	8($4), $pop133
-	i32.const	$push134=, 56
-	i32.add 	$push135=, $4, $pop134
-	i32.store	0($4), $pop135
-	i32.const	$push136=, 56
-	i32.add 	$push137=, $4, $pop136
-	i32.store	12($4), $pop137
-	i32.const	$push59=, 36
-	i32.add 	$push60=, $4, $pop59
-	i32.const	$push138=, 56
-	i32.add 	$push139=, $4, $pop138
-	i32.store	0($pop60), $pop139
-	i32.const	$push61=, 40
-	i32.add 	$push62=, $4, $pop61
-	i32.const	$push140=, 56
-	i32.add 	$push141=, $4, $pop140
-	i32.store	0($pop62), $pop141
-	i32.const	$push63=, 44
-	i32.add 	$push64=, $4, $pop63
-	i32.const	$push142=, 56
-	i32.add 	$push143=, $4, $pop142
-	i32.store	0($pop64), $pop143
-	i32.const	$push65=, 48
-	i32.add 	$push66=, $4, $pop65
-	i32.const	$push144=, 56
-	i32.add 	$push145=, $4, $pop144
-	i32.store	0($pop66), $pop145
-	i32.const	$push67=, 52
-	i32.add 	$push68=, $4, $pop67
-	i32.const	$push146=, 56
-	i32.add 	$push147=, $4, $pop146
-	i32.store	0($pop68), $pop147
-	i32.const	$1=, 0
-	i32.const	$push156=, 0
-	i32.store	4($4), $pop156
-	i32.load16_u	$push70=, 60($4)
-	i32.const	$push69=, 65528
-	i32.add 	$push71=, $pop70, $pop69
-	i32.store16	60($4), $pop71
-	i32.const	$push72=, 20
-	i32.add 	$push73=, $4, $pop72
-	i32.store	0($pop73), $0
-	i32.call	$push74=, inet_check_attr@FUNCTION, $1, $4
+	i32.const	$push51=, 20
+	i32.add 	$push52=, $5, $pop51
+	i32.store	0($pop52), $0
+	i32.const	$3=, 0
+	i32.const	$push155=, 0
+	i32.store	4($5), $pop155
+	i32.const	$push53=, 16
+	i32.add 	$push54=, $5, $pop53
+	i32.const	$push123=, 56
+	i32.add 	$push124=, $5, $pop123
+	i32.store	0($pop54), $pop124
+	i32.const	$push55=, 24
+	i32.add 	$push56=, $5, $pop55
+	i32.const	$push125=, 56
+	i32.add 	$push126=, $5, $pop125
+	i32.store	0($pop56), $pop126
+	i32.const	$push57=, 28
+	i32.add 	$push58=, $5, $pop57
+	i32.const	$push127=, 56
+	i32.add 	$push128=, $5, $pop127
+	i32.store	0($pop58), $pop128
+	i32.const	$push59=, 32
+	i32.add 	$push60=, $5, $pop59
+	i32.const	$push129=, 56
+	i32.add 	$push130=, $5, $pop129
+	i32.store	0($pop60), $pop130
+	i32.const	$push61=, 36
+	i32.add 	$push62=, $5, $pop61
+	i32.const	$push131=, 56
+	i32.add 	$push132=, $5, $pop131
+	i32.store	0($pop62), $pop132
+	i32.const	$push63=, 40
+	i32.add 	$push64=, $5, $pop63
+	i32.const	$push133=, 56
+	i32.add 	$push134=, $5, $pop133
+	i32.store	0($pop64), $pop134
+	i32.const	$push65=, 44
+	i32.add 	$push66=, $5, $pop65
+	i32.const	$push135=, 56
+	i32.add 	$push136=, $5, $pop135
+	i32.store	0($pop66), $pop136
+	i32.const	$push67=, 48
+	i32.add 	$push68=, $5, $pop67
+	i32.const	$push137=, 56
+	i32.add 	$push138=, $5, $pop137
+	i32.store	0($pop68), $pop138
+	i32.const	$push69=, 52
+	i32.add 	$push70=, $5, $pop69
+	i32.const	$push139=, 56
+	i32.add 	$push140=, $5, $pop139
+	i32.store	0($pop70), $pop140
+	i32.load16_u	$push72=, 60($5)
+	i32.const	$push71=, 65528
+	i32.add 	$push73=, $pop72, $pop71
+	i32.store16	60($5), $pop73
+	i32.const	$push141=, 56
+	i32.add 	$push142=, $5, $pop141
+	i32.store	8($5), $pop142
+	i32.const	$push143=, 56
+	i32.add 	$push144=, $5, $pop143
+	i32.store	0($5), $pop144
+	i32.const	$push145=, 56
+	i32.add 	$push146=, $5, $pop145
+	i32.store	12($5), $pop146
+	i32.call	$push74=, inet_check_attr@FUNCTION, $3, $5
 	i32.const	$push75=, -22
 	i32.ne  	$push76=, $pop74, $pop75
-	br_if   	2, $pop76       # 2: down to label3
-# BB#16:                                # %for.body43.preheader
-	i32.load	$3=, 4($4)
-.LBB1_17:                               # %for.body43
-                                        # =>This Inner Loop Header: Depth=1
+	br_if   	15, $pop76      # 15: down to label4
+# BB#16:                                # %if.end39
+	copy_local	$2=, $5
+	i32.load	$1=, 4($5)
 	block   	
-	loop    	                # label7:
-	block   	
-	i32.const	$push157=, 1
-	i32.ne  	$push77=, $1, $pop157
-	br_if   	0, $pop77       # 0: down to label8
-# BB#18:                                # %land.lhs.true
-                                        #   in Loop: Header=BB1_17 Depth=1
-	i32.const	$1=, 2
-	i32.eqz 	$push164=, $3
-	br_if   	1, $pop164      # 1: up to label7
-	br      	2               # 2: down to label6
-.LBB1_19:                               # %if.else
-                                        #   in Loop: Header=BB1_17 Depth=1
-	end_block                       # label8:
-	i32.const	$push159=, 2
-	i32.shl 	$push79=, $1, $pop159
-	i32.add 	$push80=, $4, $pop79
-	i32.load	$2=, 0($pop80)
-	block   	
-	block   	
-	i32.const	$push158=, 5
-	i32.gt_s	$push78=, $1, $pop158
-	br_if   	0, $pop78       # 0: down to label10
-# BB#20:                                # %land.lhs.true55
-                                        #   in Loop: Header=BB1_17 Depth=1
-	i32.eq  	$push82=, $2, $0
-	br_if   	1, $pop82       # 1: down to label9
-	br      	5               # 5: down to label4
-.LBB1_21:                               # %land.lhs.true64
-                                        #   in Loop: Header=BB1_17 Depth=1
+	i32.const	$push157=, 0
+	i32.const	$push156=, 1
+	i32.ne  	$push77=, $pop157, $pop156
+	br_if   	0, $pop77       # 0: down to label20
+# BB#17:
+	i32.const	$6=, 7
+	br      	17              # 17: down to label3
+.LBB1_18:
+	end_block                       # label20:
+	i32.const	$6=, 3
+	br      	16              # 16: down to label3
+.LBB1_19:
+	end_block                       # label19:
+	i32.const	$6=, 5
+	br      	15              # 15: down to label3
+.LBB1_20:
+	end_block                       # label18:
+	i32.const	$6=, 5
+	br      	14              # 14: down to label3
+.LBB1_21:
+	end_block                       # label17:
+	i32.const	$6=, 5
+	br      	13              # 13: down to label3
+.LBB1_22:
+	end_block                       # label16:
+	i32.const	$6=, 5
+	br      	12              # 12: down to label3
+.LBB1_23:
+	end_block                       # label15:
+	i32.const	$6=, 5
+	br      	11              # 11: down to label3
+.LBB1_24:
+	end_block                       # label14:
+	i32.const	$6=, 5
+	br      	10              # 10: down to label3
+.LBB1_25:
+	end_block                       # label13:
+	i32.const	$6=, 5
+	br      	9               # 9: down to label3
+.LBB1_26:
+	end_block                       # label12:
+	i32.const	$6=, 5
+	br      	8               # 8: down to label3
+.LBB1_27:
+	end_block                       # label11:
+	i32.const	$6=, 5
+	br      	7               # 7: down to label3
+.LBB1_28:
 	end_block                       # label10:
-	i32.const	$push148=, 56
-	i32.add 	$push149=, $4, $pop148
-	i32.ne  	$push81=, $2, $pop149
-	br_if   	3, $pop81       # 3: down to label5
-.LBB1_22:                               # %for.inc73
-                                        #   in Loop: Header=BB1_17 Depth=1
+	i32.const	$6=, 5
+	br      	6               # 6: down to label3
+.LBB1_29:
 	end_block                       # label9:
-	i32.const	$push163=, 1
-	i32.add 	$push162=, $1, $pop163
-	tee_local	$push161=, $1=, $pop162
-	i32.const	$push160=, 14
-	i32.lt_s	$push83=, $pop161, $pop160
-	br_if   	0, $pop83       # 0: up to label7
-# BB#23:                                # %for.end75
-	end_loop
-	i32.const	$push91=, 0
-	i32.const	$push89=, 64
-	i32.add 	$push90=, $4, $pop89
-	i32.store	__stack_pointer($pop91), $pop90
-	i32.const	$push84=, 0
-	return  	$pop84
-.LBB1_24:                               # %if.then49
+	i32.const	$6=, 5
+	br      	5               # 5: down to label3
+.LBB1_30:
+	end_block                       # label8:
+	i32.const	$6=, 5
+	br      	4               # 4: down to label3
+.LBB1_31:
+	end_block                       # label7:
+	i32.const	$6=, 5
+	br      	3               # 3: down to label3
+.LBB1_32:
 	end_block                       # label6:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_25:                               # %if.then69
+	i32.const	$6=, 5
+	br      	2               # 2: down to label3
+.LBB1_33:
 	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_26:                               # %if.then60
+	i32.const	$6=, 5
+	br      	1               # 1: down to label3
+.LBB1_34:
 	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_27:                               # %if.then38
+	i32.const	$6=, 5
+.LBB1_35:                               # =>This Inner Loop Header: Depth=1
 	end_block                       # label3:
+	loop    	i32             # label21:
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	br_table 	$6, 5, 6, 0, 2, 4, 7, 3, 1, 1 # 5: down to label32
+                                        # 6: down to label31
+                                        # 0: down to label37
+                                        # 2: down to label35
+                                        # 4: down to label33
+                                        # 7: down to label30
+                                        # 3: down to label34
+                                        # 1: down to label36
+.LBB1_36:                               # %for.body43.backedge
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label37:
+	i32.const	$push162=, 4
+	i32.add 	$2=, $2, $pop162
+	i32.const	$push161=, 1
+	i32.add 	$push160=, $3, $pop161
+	tee_local	$push159=, $3=, $pop160
+	i32.const	$push158=, 1
+	i32.ne  	$push78=, $pop159, $pop158
+	br_if   	7, $pop78       # 7: down to label29
+# BB#37:                                #   in Loop: Header=BB1_35 Depth=1
+	i32.const	$6=, 7
+	br      	15              # 15: up to label21
+.LBB1_38:                               # %land.lhs.true
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label36:
+	i32.eqz 	$push165=, $1
+	br_if   	11, $pop165     # 11: down to label24
+	br      	12              # 12: down to label23
+.LBB1_39:                               # %if.else
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label35:
+	i32.load	$4=, 0($2)
+	i32.const	$push163=, 5
+	i32.gt_u	$push79=, $3, $pop163
+	br_if   	12, $pop79      # 12: down to label22
+# BB#40:                                #   in Loop: Header=BB1_35 Depth=1
+	i32.const	$6=, 6
+	br      	13              # 13: up to label21
+.LBB1_41:                               # %land.lhs.true55
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label34:
+	i32.eq  	$push83=, $4, $0
+	br_if   	5, $pop83       # 5: down to label28
+	br      	6               # 6: down to label27
+.LBB1_42:                               # %land.lhs.true64
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label33:
+	i32.const	$push147=, 56
+	i32.add 	$push148=, $5, $pop147
+	i32.ne  	$push80=, $4, $pop148
+	br_if   	7, $pop80       # 7: down to label25
+# BB#43:                                #   in Loop: Header=BB1_35 Depth=1
+	i32.const	$6=, 0
+	br      	11              # 11: up to label21
+.LBB1_44:                               # %for.inc73
+                                        #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label32:
+	i32.const	$push164=, 12
+	i32.le_u	$push81=, $3, $pop164
+	br_if   	5, $pop81       # 5: down to label26
+# BB#45:                                #   in Loop: Header=BB1_35 Depth=1
+	i32.const	$6=, 1
+	br      	10              # 10: up to label21
+.LBB1_46:                               # %for.end75
+	end_block                       # label31:
+	i32.const	$push90=, 0
+	i32.const	$push88=, 64
+	i32.add 	$push89=, $5, $pop88
+	i32.store	__stack_pointer($pop90), $pop89
+	i32.const	$push82=, 0
+	return  	$pop82
+.LBB1_47:                               # %if.then
+	end_block                       # label30:
 	call    	abort@FUNCTION
 	unreachable
+.LBB1_48:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label29:
+	i32.const	$6=, 3
+	br      	7               # 7: up to label21
+.LBB1_49:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label28:
+	i32.const	$6=, 2
+	br      	6               # 6: up to label21
+.LBB1_50:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label27:
+	i32.const	$6=, 5
+	br      	5               # 5: up to label21
+.LBB1_51:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label26:
+	i32.const	$6=, 2
+	br      	4               # 4: up to label21
+.LBB1_52:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label25:
+	i32.const	$6=, 5
+	br      	3               # 3: up to label21
+.LBB1_53:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label24:
+	i32.const	$6=, 2
+	br      	2               # 2: up to label21
+.LBB1_54:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label23:
+	i32.const	$6=, 5
+	br      	1               # 1: up to label21
+.LBB1_55:                               #   in Loop: Header=BB1_35 Depth=1
+	end_block                       # label22:
+	i32.const	$6=, 4
+	br      	0               # 0: up to label21
+.LBB1_56:
+	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20050929-1.c.s b/test/torture-s/20050929-1.c.s
index 310a0d641..bfa5f377b 100644
--- a/test/torture-s/20050929-1.c.s
+++ b/test/torture-s/20050929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20050929-1.c"
+	.file	"20050929-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,40 +25,40 @@ main:                                   # @main
 	br_if   	0, $pop6        # 0: down to label0
 # BB#2:                                 # %if.end
 	i32.load	$push26=, 4($0)
-	tee_local	$push25=, $1=, $pop26
+	tee_local	$push25=, $0=, $pop26
 	i32.load	$push7=, 0($pop25)
 	i32.const	$push8=, 3
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
 # BB#3:                                 # %lor.lhs.false5
-	i32.load	$push10=, 4($1)
+	i32.load	$push10=, 4($0)
 	i32.const	$push11=, 4
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
 # BB#4:                                 # %if.end10
 	i32.const	$push13=, 0
 	i32.load	$push28=, e+4($pop13)
-	tee_local	$push27=, $1=, $pop28
+	tee_local	$push27=, $0=, $pop28
 	i32.load	$push14=, 0($pop27)
 	i32.const	$push15=, 5
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
 # BB#5:                                 # %lor.lhs.false13
-	i32.load	$push17=, 4($1)
+	i32.load	$push17=, 4($0)
 	i32.const	$push18=, 6
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
 # BB#6:                                 # %if.end17
 	i32.const	$push20=, 0
 	return  	$pop20
-.LBB0_7:                                # %if.then16
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.compoundliteral,@object # @.compoundliteral
 	.section	.data..compoundliteral,"aw",@progbits
 	.p2align	2
@@ -102,5 +102,5 @@ e:
 	.size	e, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20051012-1.c.s b/test/torture-s/20051012-1.c.s
index 44c9c9f24..4e941631c 100644
--- a/test/torture-s/20051012-1.c.s
+++ b/test/torture-s/20051012-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051012-1.c"
+	.file	"20051012-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -47,4 +47,4 @@ t:
 	.size	t, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20051021-1.c.s b/test/torture-s/20051021-1.c.s
index 61b8ed314..4c2279b8b 100644
--- a/test/torture-s/20051021-1.c.s
+++ b/test/torture-s/20051021-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051021-1.c"
+	.file	"20051021-1.c"
 	.section	.text.foo1,"ax",@progbits
-	.hidden	foo1
+	.hidden	foo1                    # -- Begin function foo1
 	.globl	foo1
 	.type	foo1,@function
 foo1:                                   # @foo1
@@ -18,9 +18,9 @@ foo1:                                   # @foo1
 	.endfunc
 .Lfunc_end0:
 	.size	foo1, .Lfunc_end0-foo1
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.hidden	foo2
+	.hidden	foo2                    # -- Begin function foo2
 	.globl	foo2
 	.type	foo2,@function
 foo2:                                   # @foo2
@@ -37,9 +37,9 @@ foo2:                                   # @foo2
 	.endfunc
 .Lfunc_end1:
 	.size	foo2, .Lfunc_end1-foo2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,7 +65,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -76,5 +76,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20051104-1.c.s b/test/torture-s/20051104-1.c.s
index a69ce7350..1897c5eda 100644
--- a/test/torture-s/20051104-1.c.s
+++ b/test/torture-s/20051104-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051104-1.c"
+	.file	"20051104-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -18,7 +18,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -35,4 +35,4 @@ s:
 	.size	.L.str, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20051110-1.c.s b/test/torture-s/20051110-1.c.s
index ef972ba28..2ba8ab085 100644
--- a/test/torture-s/20051110-1.c.s
+++ b/test/torture-s/20051110-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051110-1.c"
+	.file	"20051110-1.c"
 	.section	.text.add_unwind_adjustsp,"ax",@progbits
-	.hidden	add_unwind_adjustsp
+	.hidden	add_unwind_adjustsp     # -- Begin function add_unwind_adjustsp
 	.globl	add_unwind_adjustsp
 	.type	add_unwind_adjustsp,@function
 add_unwind_adjustsp:                    # @add_unwind_adjustsp
@@ -41,9 +41,9 @@ add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.endfunc
 .Lfunc_end0:
 	.size	add_unwind_adjustsp, .Lfunc_end0-add_unwind_adjustsp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,7 +57,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	bytes                   # @bytes
 	.type	bytes,@object
 	.section	.bss.bytes,"aw",@nobits
@@ -67,4 +67,4 @@ bytes:
 	.size	bytes, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20051110-2.c.s b/test/torture-s/20051110-2.c.s
index b663bc20f..9762ca4bd 100644
--- a/test/torture-s/20051110-2.c.s
+++ b/test/torture-s/20051110-2.c.s
@@ -1,126 +1,121 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051110-2.c"
+	.file	"20051110-2.c"
 	.section	.text.add_unwind_adjustsp,"ax",@progbits
-	.hidden	add_unwind_adjustsp
+	.hidden	add_unwind_adjustsp     # -- Begin function add_unwind_adjustsp
 	.globl	add_unwind_adjustsp
 	.type	add_unwind_adjustsp,@function
 add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.param  	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$6=, 0
+	i32.const	$push14=, 0
 	i32.const	$push0=, -516
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 2
-	i32.shr_s	$0=, $pop1, $pop2
-	i32.const	$3=, 0
-	i32.const	$push9=, 0
-	i32.load	$1=, flag($pop9)
-.LBB0_1:                                # %a
-                                        # =>This Inner Loop Header: Depth=1
+	i32.shr_s	$push13=, $pop1, $pop2
+	tee_local	$push12=, $5=, $pop13
+	i32.const	$push11=, 127
+	i32.and 	$push3=, $pop12, $pop11
+	i32.store8	bytes($pop14), $pop3
 	block   	
+	i32.const	$push10=, 7
+	i32.shr_u	$push9=, $5, $pop10
+	tee_local	$push8=, $0=, $pop9
+	i32.eqz 	$push30=, $pop8
+	br_if   	0, $pop30       # 0: down to label0
+# BB#1:                                 # %if.then.lr.ph.lr.ph
+	i32.const	$push15=, 0
+	i32.load	$1=, flag($pop15)
+	i32.const	$4=, bytes
+.LBB0_2:                                # %if.then.lr.ph
+                                        # =>This Loop Header: Depth=1
+                                        #     Child Loop BB0_3 Depth 2
 	loop    	                # label1:
 	copy_local	$push17=, $0
 	tee_local	$push16=, $2=, $pop17
-	i32.const	$push15=, 7
-	i32.shr_u	$push14=, $pop16, $pop15
-	tee_local	$push13=, $0=, $pop14
-	i32.eqz 	$push18=, $pop13
-	br_if   	1, $pop18       # 1: down to label0
-# BB#2:                                 # %if.then
-                                        #   in Loop: Header=BB0_1 Depth=1
-	br_if   	0, $1           # 0: up to label1
-# BB#3:                                 # %if.end7.thread
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push12=, bytes
-	i32.add 	$push4=, $3, $pop12
-	i32.const	$push11=, 128
-	i32.or  	$push3=, $2, $pop11
-	i32.store8	0($pop4), $pop3
-	i32.const	$push10=, 1
-	i32.add 	$3=, $3, $pop10
-	br      	0               # 0: up to label1
-.LBB0_4:                                # %do.end
+	copy_local	$0=, $pop16
+.LBB0_3:                                # %if.then
+                                        #   Parent Loop BB0_2 Depth=1
+                                        # =>  This Inner Loop Header: Depth=2
+	block   	
+	block   	
+	loop    	                # label4:
+	copy_local	$3=, $0
+	i32.eqz 	$push31=, $1
+	br_if   	1, $pop31       # 1: down to label3
+# BB#4:                                 # %a
+                                        #   in Loop: Header=BB0_3 Depth=2
+	i32.const	$push20=, 7
+	i32.shr_u	$push19=, $3, $pop20
+	tee_local	$push18=, $0=, $pop19
+	br_if   	0, $pop18       # 0: up to label4
+	br      	2               # 2: down to label2
+.LBB0_5:                                # %if.end7.thread
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_loop
+	end_block                       # label3:
+	i32.const	$push29=, 128
+	i32.or  	$push6=, $5, $pop29
+	i32.store8	0($4), $pop6
+	i32.const	$push28=, bytes+1
+	i32.add 	$push27=, $6, $pop28
+	tee_local	$push26=, $4=, $pop27
+	i32.const	$push25=, 127
+	i32.and 	$push7=, $2, $pop25
+	i32.store8	0($pop26), $pop7
+	i32.const	$push24=, 1
+	i32.add 	$6=, $6, $pop24
+	copy_local	$5=, $2
+	i32.const	$push23=, 7
+	i32.shr_u	$push22=, $2, $pop23
+	tee_local	$push21=, $0=, $pop22
+	br_if   	1, $pop21       # 1: up to label1
+	br      	2               # 2: down to label0
+.LBB0_6:                                # %a.do.end_crit_edge
+	end_block                       # label2:
+	end_loop
+	i32.const	$push4=, 127
+	i32.and 	$push5=, $3, $pop4
+	i32.store8	0($4), $pop5
+.LBB0_7:                                # %do.end
 	end_block                       # label0:
-	i32.const	$push7=, bytes
-	i32.add 	$push8=, $3, $pop7
-	i32.const	$push5=, 127
-	i32.and 	$push6=, $2, $pop5
-	i32.store8	0($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	add_unwind_adjustsp, .Lfunc_end0-add_unwind_adjustsp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 0
-	i32.const	$push15=, 0
-	i32.load	$0=, flag($pop15)
-	i32.const	$3=, 904
-.LBB1_1:                                # %a.i
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label3:
-	copy_local	$push23=, $3
-	tee_local	$push22=, $1=, $pop23
-	i32.const	$push21=, 7
-	i32.shr_u	$push20=, $pop22, $pop21
-	tee_local	$push19=, $3=, $pop20
-	i32.eqz 	$push26=, $pop19
-	br_if   	1, $pop26       # 1: down to label2
-# BB#2:                                 # %if.then.i
-                                        #   in Loop: Header=BB1_1 Depth=1
-	br_if   	0, $0           # 0: up to label3
-# BB#3:                                 # %if.end7.thread.i
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push18=, bytes
-	i32.add 	$push1=, $2, $pop18
-	i32.const	$push17=, 128
-	i32.or  	$push0=, $1, $pop17
-	i32.store8	0($pop1), $pop0
-	i32.const	$push16=, 1
-	i32.add 	$2=, $2, $pop16
-	br      	0               # 0: up to label3
-.LBB1_4:                                # %add_unwind_adjustsp.exit
-	end_loop
-	end_block                       # label2:
-	i32.const	$push5=, bytes
-	i32.add 	$push6=, $2, $pop5
-	i32.const	$push3=, 127
-	i32.and 	$push4=, $1, $pop3
-	i32.store8	0($pop6), $pop4
+	i32.const	$push5=, 0
+	i32.const	$push0=, 8
+	i32.store8	bytes($pop5), $pop0
 	block   	
-	i32.const	$push24=, 0
-	i32.load8_u	$push7=, bytes($pop24)
-	i32.const	$push8=, 136
-	i32.ne  	$push9=, $pop7, $pop8
-	br_if   	0, $pop9        # 0: down to label4
-# BB#5:                                 # %add_unwind_adjustsp.exit
-	i32.const	$push25=, 0
-	i32.load8_u	$push2=, bytes+1($pop25)
-	i32.const	$push10=, 255
-	i32.and 	$push11=, $pop2, $pop10
-	i32.const	$push12=, 7
-	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	0, $pop13       # 0: down to label4
-# BB#6:                                 # %if.end
-	i32.const	$push14=, 0
-	return  	$pop14
-.LBB1_7:                                # %if.then
-	end_block                       # label4:
+	i32.const	$push4=, 0
+	i32.load	$push1=, flag($pop4)
+	br_if   	0, $pop1        # 0: down to label5
+# BB#1:                                 # %if.end
+	i32.const	$push7=, 0
+	i32.const	$push3=, 1928
+	i32.store16	bytes($pop7):p2align=0, $pop3
+	i32.const	$push6=, 0
+	return  	$pop6
+.LBB1_2:                                # %if.then
+	end_block                       # label5:
+	i32.const	$push8=, 0
+	i32.const	$push2=, 7
+	i32.store8	bytes($pop8), $pop2
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	bytes                   # @bytes
 	.type	bytes,@object
 	.section	.bss.bytes,"aw",@nobits
@@ -139,5 +134,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20051113-1.c.s b/test/torture-s/20051113-1.c.s
index ddbf60070..7f3f1238c 100644
--- a/test/torture-s/20051113-1.c.s
+++ b/test/torture-s/20051113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051113-1.c"
+	.file	"20051113-1.c"
 	.section	.text.Sum,"ax",@progbits
-	.hidden	Sum
+	.hidden	Sum                     # -- Begin function Sum
 	.globl	Sum
 	.type	Sum,@function
 Sum:                                    # @Sum
@@ -43,9 +43,9 @@ Sum:                                    # @Sum
 	.endfunc
 .Lfunc_end0:
 	.size	Sum, .Lfunc_end0-Sum
-
+                                        # -- End function
 	.section	.text.Sum2,"ax",@progbits
-	.hidden	Sum2
+	.hidden	Sum2                    # -- Begin function Sum2
 	.globl	Sum2
 	.type	Sum2,@function
 Sum2:                                   # @Sum2
@@ -87,9 +87,9 @@ Sum2:                                   # @Sum2
 	.endfunc
 .Lfunc_end1:
 	.size	Sum2, .Lfunc_end1-Sum2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -131,15 +131,15 @@ main:                                   # @main
 # BB#2:                                 # %if.end25
 	i32.const	$push13=, 0
 	return  	$pop13
-.LBB2_3:                                # %if.then24
+.LBB2_3:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20051215-1.c.s b/test/torture-s/20051215-1.c.s
index b87cf5937..45e068a50 100644
--- a/test/torture-s/20051215-1.c.s
+++ b/test/torture-s/20051215-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20051215-1.c"
+	.file	"20051215-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -51,9 +51,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060102-1.c.s b/test/torture-s/20060102-1.c.s
index a77456b00..d46ddfdde 100644
--- a/test/torture-s/20060102-1.c.s
+++ b/test/torture-s/20060102-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060102-1.c"
+	.file	"20060102-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	one                     # @one
 	.type	one,@object
 	.section	.data.one,"aw",@progbits
@@ -62,5 +62,5 @@ one:
 	.size	one, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060110-1.c.s b/test/torture-s/20060110-1.c.s
index 44ce5642c..762cc3409 100644
--- a/test/torture-s/20060110-1.c.s
+++ b/test/torture-s/20060110-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060110-1.c"
+	.file	"20060110-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -61,5 +61,5 @@ b:
 	.size	b, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060110-2.c.s b/test/torture-s/20060110-2.c.s
index 7081d2167..eda056099 100644
--- a/test/torture-s/20060110-2.c.s
+++ b/test/torture-s/20060110-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060110-2.c"
+	.file	"20060110-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -78,5 +78,5 @@ c:
 	.size	c, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060127-1.c.s b/test/torture-s/20060127-1.c.s
index 5ce2f01de..7efd8f86f 100644
--- a/test/torture-s/20060127-1.c.s
+++ b/test/torture-s/20060127-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060127-1.c"
+	.file	"20060127-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -52,5 +52,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060412-1.c.s b/test/torture-s/20060412-1.c.s
index bf545c966..92a34e8a6 100644
--- a/test/torture-s/20060412-1.c.s
+++ b/test/torture-s/20060412-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060412-1.c"
+	.file	"20060412-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -19,7 +19,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -30,4 +30,4 @@ t:
 	.size	t, 332
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20060420-1.c.s b/test/torture-s/20060420-1.c.s
index 30414f1fe..024a1a83f 100644
--- a/test/torture-s/20060420-1.c.s
+++ b/test/torture-s/20060420-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060420-1.c"
+	.file	"20060420-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -75,7 +75,7 @@ foo:                                    # @foo
 	end_loop
 	end_block                       # label1:
 	i32.const	$10=, 0
-.LBB0_8:                                # %for.cond12.preheader
+.LBB0_8:                                # %for.end11
 	end_block                       # label0:
 	block   	
 	i32.const	$push14=, -15
@@ -273,11 +273,11 @@ foo:                                    # @foo
 	tee_local	$push141=, $10=, $pop142
 	i32.lt_s	$push75=, $pop141, $4
 	br_if   	0, $pop75       # 0: up to label6
-# BB#14:                                # %for.cond73.preheader.loopexit
+# BB#14:                                # %for.end72.loopexit
 	end_loop
 	i32.const	$push76=, 16
 	i32.add 	$10=, $5, $pop76
-.LBB0_15:                               # %for.cond73.preheader
+.LBB0_15:                               # %for.end72
 	end_block                       # label5:
 	block   	
 	i32.ge_s	$push77=, $10, $3
@@ -338,109 +338,109 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	f32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push30=, 0
-	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
-	i32.const	$push29=, 16
-	i32.sub 	$push42=, $pop28, $pop29
-	tee_local	$push41=, $3=, $pop42
-	i32.store	__stack_pointer($pop30), $pop41
+	i32.const	$push31=, 0
+	i32.const	$push29=, 0
+	i32.load	$push28=, __stack_pointer($pop29)
+	i32.const	$push30=, 16
+	i32.sub 	$push43=, $pop28, $pop30
+	tee_local	$push42=, $3=, $pop43
+	i32.store	__stack_pointer($pop31), $pop42
 	i32.const	$2=, 0
-	i32.const	$push40=, 0
+	i32.const	$push41=, 0
 	i32.const	$push0=, buffer
-	i32.sub 	$push1=, $pop40, $pop0
+	i32.sub 	$push1=, $pop41, $pop0
 	i32.const	$push2=, 63
-	i32.and 	$push39=, $pop1, $pop2
-	tee_local	$push38=, $1=, $pop39
+	i32.and 	$push40=, $pop1, $pop2
+	tee_local	$push39=, $1=, $pop40
 	i32.const	$push3=, buffer+128
-	i32.add 	$push4=, $pop38, $pop3
+	i32.add 	$push4=, $pop39, $pop3
 	i32.store	12($3), $pop4
 	i32.const	$push5=, buffer+64
-	i32.add 	$push37=, $1, $pop5
-	tee_local	$push36=, $1=, $pop37
-	i32.store	8($3), $pop36
+	i32.add 	$push38=, $1, $pop5
+	tee_local	$push37=, $1=, $pop38
+	i32.store	8($3), $pop37
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	i32.const	$push52=, 64
-	i32.add 	$push6=, $1, $pop52
-	f32.convert_s/i32	$push51=, $2
-	tee_local	$push50=, $0=, $pop51
-	f32.const	$push49=, 0x1.8p3
-	f32.mul 	$push7=, $0, $pop49
-	f32.add 	$push8=, $pop50, $pop7
+	i32.const	$push53=, 64
+	i32.add 	$push6=, $1, $pop53
+	f32.convert_s/i32	$push52=, $2
+	tee_local	$push51=, $0=, $pop52
+	f32.const	$push50=, 0x1.8p3
+	f32.mul 	$push7=, $pop51, $pop50
+	f32.add 	$push8=, $pop7, $0
 	f32.store	0($pop6), $pop8
-	f32.const	$push48=, 0x1.6p3
-	f32.mul 	$push9=, $0, $pop48
-	f32.add 	$push10=, $0, $pop9
+	f32.const	$push49=, 0x1.6p3
+	f32.mul 	$push9=, $0, $pop49
+	f32.add 	$push10=, $pop9, $0
 	f32.store	0($1), $pop10
-	i32.const	$push47=, 4
-	i32.add 	$1=, $1, $pop47
-	i32.const	$push46=, 1
-	i32.add 	$push45=, $2, $pop46
-	tee_local	$push44=, $2=, $pop45
-	i32.const	$push43=, 16
-	i32.ne  	$push11=, $pop44, $pop43
+	i32.const	$push48=, 4
+	i32.add 	$1=, $1, $pop48
+	i32.const	$push47=, 1
+	i32.add 	$push46=, $2, $pop47
+	tee_local	$push45=, $2=, $pop46
+	i32.const	$push44=, 16
+	i32.ne  	$push11=, $pop45, $pop44
 	br_if   	0, $pop11       # 0: up to label13
 # BB#2:                                 # %for.end
 	end_loop
-	i32.const	$1=, 0
-	i32.const	$push56=, 0
+	i32.const	$push13=, 0
 	i32.const	$push12=, buffer
-	i32.sub 	$push13=, $pop56, $pop12
-	i32.const	$push14=, 63
-	i32.and 	$push15=, $pop13, $pop14
-	i32.const	$push55=, buffer
-	i32.add 	$push54=, $pop15, $pop55
-	tee_local	$push53=, $2=, $pop54
-	i32.const	$push34=, 8
-	i32.add 	$push35=, $3, $pop34
-	i32.const	$push17=, 2
-	i32.const	$push16=, 16
-	call    	foo@FUNCTION, $pop53, $pop35, $pop17, $pop16
+	i32.sub 	$push14=, $pop13, $pop12
+	i32.const	$push15=, 63
+	i32.and 	$push16=, $pop14, $pop15
+	i32.const	$push56=, buffer
+	i32.add 	$push55=, $pop16, $pop56
+	tee_local	$push54=, $1=, $pop55
+	i32.const	$push35=, 8
+	i32.add 	$push36=, $3, $pop35
+	i32.const	$push18=, 2
+	i32.const	$push17=, 16
+	call    	foo@FUNCTION, $pop54, $pop36, $pop18, $pop17
+	i32.const	$2=, -1
 .LBB1_3:                                # %for.body16
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label15:
-	f32.load	$push23=, 0($2)
-	f32.convert_s/i32	$push60=, $1
+	f32.load	$push24=, 0($1)
+	i32.const	$push63=, 1
+	i32.add 	$push62=, $2, $pop63
+	tee_local	$push61=, $2=, $pop62
+	f32.convert_s/i32	$push60=, $pop61
 	tee_local	$push59=, $0=, $pop60
 	f32.const	$push58=, 0x1.8p3
-	f32.mul 	$push18=, $pop59, $pop58
+	f32.mul 	$push22=, $pop59, $pop58
 	f32.const	$push57=, 0x1.6p3
 	f32.mul 	$push19=, $0, $pop57
-	f32.add 	$push20=, $0, $pop19
-	f32.add 	$push21=, $0, $pop20
-	f32.add 	$push22=, $pop18, $pop21
-	f32.ne  	$push24=, $pop23, $pop22
-	br_if   	1, $pop24       # 1: down to label14
+	f32.add 	$push20=, $pop19, $0
+	f32.add 	$push21=, $pop20, $0
+	f32.add 	$push23=, $pop22, $pop21
+	f32.ne  	$push25=, $pop24, $pop23
+	br_if   	1, $pop25       # 1: down to label14
 # BB#4:                                 # %for.cond13
                                         #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$push65=, 4
-	i32.add 	$2=, $2, $pop65
-	i32.const	$push64=, 1
-	i32.add 	$push63=, $1, $pop64
-	tee_local	$push62=, $1=, $pop63
-	i32.const	$push61=, 15
-	i32.le_s	$push25=, $pop62, $pop61
-	br_if   	0, $pop25       # 0: up to label15
+	i32.add 	$1=, $1, $pop65
+	i32.const	$push64=, 14
+	i32.le_u	$push26=, $2, $pop64
+	br_if   	0, $pop26       # 0: up to label15
 # BB#5:                                 # %for.end31
 	end_loop
-	i32.const	$push33=, 0
-	i32.const	$push31=, 16
-	i32.add 	$push32=, $3, $pop31
-	i32.store	__stack_pointer($pop33), $pop32
-	i32.const	$push26=, 0
-	return  	$pop26
+	i32.const	$push34=, 0
+	i32.const	$push32=, 16
+	i32.add 	$push33=, $3, $pop32
+	i32.store	__stack_pointer($pop34), $pop33
+	i32.const	$push27=, 0
+	return  	$pop27
 .LBB1_6:                                # %if.then
 	end_block                       # label14:
 	call    	abort@FUNCTION
@@ -448,7 +448,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	buffer                  # @buffer
 	.type	buffer,@object
 	.section	.bss.buffer,"aw",@nobits
@@ -459,5 +459,5 @@ buffer:
 	.size	buffer, 256
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060905-1.c.s b/test/torture-s/20060905-1.c.s
index 0e7f9ad28..327a3a665 100644
--- a/test/torture-s/20060905-1.c.s
+++ b/test/torture-s/20060905-1.c.s
@@ -1,58 +1,53 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060905-1.c"
+	.file	"20060905-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$0=, s-384
+	i32.const	$0=, 128
 	i32.const	$1=, 0
-	i32.const	$2=, 0
-.LBB0_1:                                # %for.body.i
+.LBB0_1:                                # %for.body.outer.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	block   	
-	i32.const	$push6=, 128
-	i32.lt_s	$push0=, $2, $pop6
-	br_if   	0, $pop0        # 0: down to label1
-# BB#2:                                 # %if.then.i
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push8=, 0
-	i32.load8_u	$push1=, 0($0)
-	i32.store8	g($pop8), $pop1
-	i32.const	$push7=, 1
-	i32.add 	$1=, $1, $pop7
-.LBB0_3:                                # %for.inc.i
-                                        #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label1:
-	i32.const	$push13=, 3
-	i32.add 	$0=, $0, $pop13
-	i32.const	$push12=, 1
-	i32.add 	$push11=, $2, $pop12
-	tee_local	$push10=, $2=, $pop11
-	i32.const	$push9=, 256
-	i32.ne  	$push2=, $pop10, $pop9
-	br_if   	0, $pop2        # 0: up to label0
-# BB#4:                                 # %foo.exit
+	i32.const	$push17=, 0
+	i32.const	$push16=, 128
+	i32.const	$push15=, 128
+	i32.gt_u	$push0=, $1, $pop15
+	i32.select	$push14=, $1, $pop16, $pop0
+	tee_local	$push13=, $1=, $pop14
+	i32.const	$push12=, 3
+	i32.mul 	$push1=, $pop13, $pop12
+	i32.const	$push11=, s-384
+	i32.add 	$push2=, $pop1, $pop11
+	i32.load8_u	$push3=, 0($pop2)
+	i32.store8	g($pop17), $pop3
+	i32.const	$push10=, -1
+	i32.add 	$0=, $0, $pop10
+	i32.const	$push9=, 1
+	i32.add 	$push8=, $1, $pop9
+	tee_local	$push7=, $1=, $pop8
+	i32.const	$push6=, 256
+	i32.ne  	$push4=, $pop7, $pop6
+	br_if   	0, $pop4        # 0: up to label0
+# BB#2:                                 # %foo.exit
 	end_loop
 	block   	
-	i32.const	$push3=, 128
-	i32.ne  	$push4=, $1, $pop3
-	br_if   	0, $pop4        # 0: down to label2
-# BB#5:                                 # %if.end
+	br_if   	0, $0           # 0: down to label1
+# BB#3:                                 # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
-.LBB0_6:                                # %if.then
-	end_block                       # label2:
+.LBB0_4:                                # %if.then
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -71,5 +66,5 @@ g:
 	.size	g, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060910-1.c.s b/test/torture-s/20060910-1.c.s
index f5c740494..6a60d4352 100644
--- a/test/torture-s/20060910-1.c.s
+++ b/test/torture-s/20060910-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060910-1.c"
+	.file	"20060910-1.c"
 	.section	.text.input_getc_complicated,"ax",@progbits
-	.hidden	input_getc_complicated
+	.hidden	input_getc_complicated  # -- Begin function input_getc_complicated
 	.globl	input_getc_complicated
 	.type	input_getc_complicated,@function
 input_getc_complicated:                 # @input_getc_complicated
@@ -13,87 +13,80 @@ input_getc_complicated:                 # @input_getc_complicated
 	.endfunc
 .Lfunc_end0:
 	.size	input_getc_complicated, .Lfunc_end0-input_getc_complicated
-
+                                        # -- End function
 	.section	.text.check_header,"ax",@progbits
-	.hidden	check_header
+	.hidden	check_header            # -- Begin function check_header
 	.globl	check_header
 	.type	check_header,@function
 check_header:                           # @check_header
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	block   	
-	i32.load	$push17=, 0($0)
-	tee_local	$push16=, $2=, $pop17
-	i32.load	$push15=, 4($0)
-	tee_local	$push14=, $1=, $pop15
-	i32.ge_u	$push0=, $pop16, $pop14
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %cond.true
-	i32.const	$push1=, 1
-	i32.add 	$push19=, $2, $pop1
-	tee_local	$push18=, $2=, $pop19
-	i32.store	0($0), $pop18
-.LBB1_2:                                # %for.inc
-	end_block                       # label0:
-	block   	
-	i32.ge_u	$push2=, $2, $1
-	br_if   	0, $pop2        # 0: down to label1
-# BB#3:                                 # %cond.true.1
-	i32.const	$push3=, 1
-	i32.add 	$push21=, $2, $pop3
-	tee_local	$push20=, $2=, $pop21
-	i32.store	0($0), $pop20
-.LBB1_4:                                # %for.inc.1
-	end_block                       # label1:
-	block   	
-	i32.ge_u	$push4=, $2, $1
-	br_if   	0, $pop4        # 0: down to label2
-# BB#5:                                 # %cond.true.2
-	i32.const	$push5=, 1
-	i32.add 	$push23=, $2, $pop5
-	tee_local	$push22=, $2=, $pop23
-	i32.store	0($0), $pop22
-.LBB1_6:                                # %for.inc.2
-	end_block                       # label2:
-	block   	
-	i32.ge_u	$push6=, $2, $1
-	br_if   	0, $pop6        # 0: down to label3
-# BB#7:                                 # %cond.true.3
-	i32.const	$push7=, 1
-	i32.add 	$push25=, $2, $pop7
+	i32.load	$push37=, 0($0)
+	tee_local	$push36=, $2=, $pop37
+	i32.const	$push35=, 1
+	i32.add 	$push0=, $pop36, $pop35
+	i32.load	$push34=, 4($0)
+	tee_local	$push33=, $1=, $pop34
+	i32.lt_u	$push32=, $2, $pop33
+	tee_local	$push31=, $3=, $pop32
+	i32.select	$push30=, $pop0, $2, $pop31
+	tee_local	$push29=, $2=, $pop30
+	i32.const	$push28=, 1
+	i32.add 	$push1=, $pop29, $pop28
+	i32.lt_u	$push27=, $2, $1
+	tee_local	$push26=, $4=, $pop27
+	i32.select	$push25=, $pop1, $2, $pop26
 	tee_local	$push24=, $2=, $pop25
-	i32.store	0($0), $pop24
-.LBB1_8:                                # %for.inc.3
-	end_block                       # label3:
+	i32.const	$push23=, 1
+	i32.add 	$push2=, $pop24, $pop23
+	i32.lt_u	$push22=, $2, $1
+	tee_local	$push21=, $5=, $pop22
+	i32.select	$push20=, $pop2, $2, $pop21
+	tee_local	$push19=, $2=, $pop20
+	i32.const	$push18=, 1
+	i32.add 	$push3=, $pop19, $pop18
+	i32.lt_u	$push17=, $2, $1
+	tee_local	$push16=, $6=, $pop17
+	i32.select	$push15=, $pop3, $2, $pop16
+	tee_local	$push14=, $2=, $pop15
+	i32.const	$push13=, 1
+	i32.add 	$push4=, $pop14, $pop13
+	i32.lt_u	$push12=, $2, $1
+	tee_local	$push11=, $7=, $pop12
+	i32.select	$2=, $pop4, $2, $pop11
 	block   	
-	i32.ge_u	$push8=, $2, $1
-	br_if   	0, $pop8        # 0: down to label4
-# BB#9:                                 # %cond.true.4
+	br_if   	0, $3           # 0: down to label0
+# BB#1:                                 # %entry
+	br_if   	0, $4           # 0: down to label0
+# BB#2:                                 # %entry
+	br_if   	0, $5           # 0: down to label0
+# BB#3:                                 # %entry
+	br_if   	0, $6           # 0: down to label0
+# BB#4:                                 # %entry
+	br_if   	0, $7           # 0: down to label0
+# BB#5:                                 # %entry
+	i32.lt_u	$push5=, $2, $1
+	br_if   	0, $pop5        # 0: down to label0
+# BB#6:
+	i32.const	$push10=, 1
+	return  	$pop10
+.LBB1_7:
+	end_block                       # label0:
+	i32.const	$push38=, 1
+	i32.add 	$push7=, $2, $pop38
+	i32.lt_u	$push6=, $2, $1
+	i32.select	$push8=, $pop7, $2, $pop6
+	i32.store	0($0), $pop8
 	i32.const	$push9=, 1
-	i32.add 	$push27=, $2, $pop9
-	tee_local	$push26=, $2=, $pop27
-	i32.store	0($0), $pop26
-.LBB1_10:                               # %for.inc.4
-	end_block                       # label4:
-	block   	
-	i32.ge_u	$push10=, $2, $1
-	br_if   	0, $pop10       # 0: down to label5
-# BB#11:                                # %cond.true.5
-	i32.const	$push11=, 1
-	i32.add 	$push12=, $2, $pop11
-	i32.store	0($0), $pop12
-.LBB1_12:                               # %for.inc.5
-	end_block                       # label5:
-	i32.const	$push13=, 1
-                                        # fallthrough-return: $pop13
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end1:
 	.size	check_header, .Lfunc_end1-check_header
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -110,7 +103,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -129,4 +122,4 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20060929-1.c.s b/test/torture-s/20060929-1.c.s
index 26a5d29db..bc333efdb 100644
--- a/test/torture-s/20060929-1.c.s
+++ b/test/torture-s/20060929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060929-1.c"
+	.file	"20060929-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,9 +19,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -39,9 +39,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -59,9 +59,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -72,6 +72,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20060930-1.c.s b/test/torture-s/20060930-1.c.s
index 6a7295e50..dade2ac24 100644
--- a/test/torture-s/20060930-1.c.s
+++ b/test/torture-s/20060930-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060930-1.c"
+	.file	"20060930-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -21,9 +21,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -61,9 +61,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +77,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20060930-2.c.s b/test/torture-s/20060930-2.c.s
index c19ccfea2..2ce25e2fd 100644
--- a/test/torture-s/20060930-2.c.s
+++ b/test/torture-s/20060930-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20060930-2.c"
+	.file	"20060930-2.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -18,9 +18,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -66,5 +66,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20061031-1.c.s b/test/torture-s/20061031-1.c.s
index 52fa8b535..ea5d72267 100644
--- a/test/torture-s/20061031-1.c.s
+++ b/test/torture-s/20061031-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20061031-1.c"
+	.file	"20061031-1.c"
 	.section	.text.ff,"ax",@progbits
-	.hidden	ff
+	.hidden	ff                      # -- Begin function ff
 	.globl	ff
 	.type	ff,@function
 ff:                                     # @ff
@@ -13,9 +13,9 @@ ff:                                     # @ff
 	.endfunc
 .Lfunc_end0:
 	.size	ff, .Lfunc_end0-ff
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -40,19 +40,21 @@ f:                                      # @f
 	i32.add 	$push2=, $1, $0
 	i32.const	$push7=, 65535
 	i32.and 	$push3=, $pop2, $pop7
-	br_if   	0, $pop3        # 0: down to label1
-# BB#3:                                 # %if.then.1
+	i32.eqz 	$push8=, $pop3
+	br_if   	0, $pop8        # 0: down to label1
+# BB#3:                                 # %for.inc.1
+	return
+.LBB1_4:                                # %if.then.1
+	end_block                       # label1:
 	#APP
 	#NO_APP
-.LBB1_4:                                # %for.inc.1
-	end_block                       # label1:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,7 +67,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	nunmap                  # @nunmap
 	.type	nunmap,@object
 	.section	.rodata.nunmap,"a",@progbits
@@ -75,4 +77,4 @@ nunmap:
 	.size	nunmap, 3
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20061101-1.c.s b/test/torture-s/20061101-1.c.s
index f4f5b8770..f2d52d7b0 100644
--- a/test/torture-s/20061101-1.c.s
+++ b/test/torture-s/20061101-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20061101-1.c"
+	.file	"20061101-1.c"
 	.section	.text.tar,"ax",@progbits
-	.hidden	tar
+	.hidden	tar                     # -- Begin function tar
 	.globl	tar
 	.type	tar,@function
 tar:                                    # @tar
@@ -22,63 +22,48 @@ tar:                                    # @tar
 	.endfunc
 .Lfunc_end0:
 	.size	tar, .Lfunc_end0-tar
-
+                                        # -- End function
 	.section	.text.bug,"ax",@progbits
-	.hidden	bug
+	.hidden	bug                     # -- Begin function bug
 	.globl	bug
 	.type	bug,@function
 bug:                                    # @bug
 	.param  	i32, i32
-	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -1
-	i32.add 	$2=, $0, $pop0
-	i32.const	$0=, 0
-	i32.const	$3=, 1
-.LBB1_1:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label2:
-	i32.const	$push6=, 1
-	i32.and 	$push1=, $3, $pop6
-	i32.eqz 	$push11=, $pop1
-	br_if   	1, $pop11       # 1: down to label1
-# BB#2:                                 # %while.body
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$3=, 0
-	i32.const	$push10=, 1
-	i32.add 	$push3=, $0, $pop10
-	i32.lt_s	$push2=, $0, $2
-	i32.select	$push9=, $pop3, $2, $pop2
-	tee_local	$push8=, $0=, $pop9
-	i32.mul 	$push4=, $pop8, $1
-	i32.const	$push7=, 36863
-	i32.eq  	$push5=, $pop4, $pop7
-	br_if   	0, $pop5        # 0: up to label2
-# BB#3:                                 # %if.then.i
-	end_loop
+	i32.const	$push0=, 1
+	i32.const	$push2=, -1
+	i32.add 	$push3=, $0, $pop2
+	i32.const	$push8=, 1
+	i32.gt_s	$push1=, $0, $pop8
+	i32.select	$push4=, $pop0, $pop3, $pop1
+	i32.mul 	$push5=, $pop4, $1
+	i32.const	$push6=, 36863
+	i32.ne  	$push7=, $pop5, $pop6
+	br_if   	0, $pop7        # 0: down to label1
+# BB#1:                                 # %while.end
+	return
+.LBB1_2:                                # %if.then.i
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_4:                                # %while.end
-	end_block                       # label1:
-                                        # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	bug, .Lfunc_end1-bug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bug.exit
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20061101-2.c.s b/test/torture-s/20061101-2.c.s
index 8860695bf..cfb25950c 100644
--- a/test/torture-s/20061101-2.c.s
+++ b/test/torture-s/20061101-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20061101-2.c"
+	.file	"20061101-2.c"
 	.section	.text.tar,"ax",@progbits
-	.hidden	tar
+	.hidden	tar                     # -- Begin function tar
 	.globl	tar
 	.type	tar,@function
 tar:                                    # @tar
@@ -22,63 +22,48 @@ tar:                                    # @tar
 	.endfunc
 .Lfunc_end0:
 	.size	tar, .Lfunc_end0-tar
-
+                                        # -- End function
 	.section	.text.bug,"ax",@progbits
-	.hidden	bug
+	.hidden	bug                     # -- Begin function bug
 	.globl	bug
 	.type	bug,@function
 bug:                                    # @bug
 	.param  	i32, i32
-	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -1
-	i32.add 	$2=, $0, $pop0
-	i32.const	$0=, 0
-	i32.const	$3=, 1
-.LBB1_1:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label2:
-	i32.const	$push6=, 1
-	i32.and 	$push1=, $3, $pop6
-	i32.eqz 	$push11=, $pop1
-	br_if   	1, $pop11       # 1: down to label1
-# BB#2:                                 # %while.body
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$3=, 0
-	i32.const	$push10=, 1
-	i32.add 	$push3=, $0, $pop10
-	i32.lt_s	$push2=, $0, $2
-	i32.select	$push9=, $pop3, $2, $pop2
-	tee_local	$push8=, $0=, $pop9
-	i32.mul 	$push4=, $pop8, $1
-	i32.const	$push7=, 36863
-	i32.eq  	$push5=, $pop4, $pop7
-	br_if   	0, $pop5        # 0: up to label2
-# BB#3:                                 # %if.then.i
-	end_loop
+	i32.const	$push0=, 1
+	i32.const	$push2=, -1
+	i32.add 	$push3=, $0, $pop2
+	i32.const	$push8=, 1
+	i32.gt_s	$push1=, $0, $pop8
+	i32.select	$push4=, $pop0, $pop3, $pop1
+	i32.mul 	$push5=, $pop4, $1
+	i32.const	$push6=, 36863
+	i32.ne  	$push7=, $pop5, $pop6
+	br_if   	0, $pop7        # 0: down to label1
+# BB#1:                                 # %while.end
+	return
+.LBB1_2:                                # %if.then.i
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_4:                                # %while.end
-	end_block                       # label1:
-                                        # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	bug, .Lfunc_end1-bug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bug.exit
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20070201-1.c.s b/test/torture-s/20070201-1.c.s
index aa1756c47..376ab5b7f 100644
--- a/test/torture-s/20070201-1.c.s
+++ b/test/torture-s/20070201-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070201-1.c"
+	.file	"20070201-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,10 +10,10 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop4, $pop5
+	i32.sub 	$push11=, $pop3, $pop5
 	tee_local	$push10=, $2=, $pop11
 	i32.store	__stack_pointer($pop6), $pop10
 	i32.store	0($2), $1
@@ -29,9 +29,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,10 +39,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %if.end
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop5, $pop6
+	i32.sub 	$push14=, $pop4, $pop6
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop7), $pop13
 	i32.const	$push0=, 12
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -69,5 +69,5 @@ main:                                   # @main
 	.size	.L.str, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
diff --git a/test/torture-s/20070212-1.c.s b/test/torture-s/20070212-1.c.s
index e827f7cc5..f2be8e7bf 100644
--- a/test/torture-s/20070212-1.c.s
+++ b/test/torture-s/20070212-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070212-1.c"
+	.file	"20070212-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -25,9 +25,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,6 +38,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20070212-2.c.s b/test/torture-s/20070212-2.c.s
index 91ea13098..abc22d8fc 100644
--- a/test/torture-s/20070212-2.c.s
+++ b/test/torture-s/20070212-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070212-2.c"
+	.file	"20070212-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20070212-3.c.s b/test/torture-s/20070212-3.c.s
index 761d56309..e5512c264 100644
--- a/test/torture-s/20070212-3.c.s
+++ b/test/torture-s/20070212-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070212-3.c"
+	.file	"20070212-3.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,9 +28,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,6 +41,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20070424-1.c.s b/test/torture-s/20070424-1.c.s
index cee8b076a..502de556e 100644
--- a/test/torture-s/20070424-1.c.s
+++ b/test/torture-s/20070424-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070424-1.c"
+	.file	"20070424-1.c"
 	.section	.text.do_exit,"ax",@progbits
-	.hidden	do_exit
+	.hidden	do_exit                 # -- Begin function do_exit
 	.globl	do_exit
 	.type	do_exit,@function
 do_exit:                                # @do_exit
@@ -12,9 +12,9 @@ do_exit:                                # @do_exit
 	.endfunc
 .Lfunc_end0:
 	.size	do_exit, .Lfunc_end0-do_exit
-
+                                        # -- End function
 	.section	.text.do_abort,"ax",@progbits
-	.hidden	do_abort
+	.hidden	do_abort                # -- Begin function do_abort
 	.globl	do_abort
 	.type	do_abort,@function
 do_abort:                               # @do_abort
@@ -24,9 +24,9 @@ do_abort:                               # @do_abort
 	.endfunc
 .Lfunc_end1:
 	.size	do_abort, .Lfunc_end1-do_abort
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -45,9 +45,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,8 +58,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/20070517-1.c.s b/test/torture-s/20070517-1.c.s
index 7cd22d687..30d653189 100644
--- a/test/torture-s/20070517-1.c.s
+++ b/test/torture-s/20070517-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070517-1.c"
+	.file	"20070517-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,17 +39,17 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.get_kind,"ax",@progbits
-	.type	get_kind,@function
+	.type	get_kind,@function      # -- Begin function get_kind
 get_kind:                               # @get_kind
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push6=, $pop3, $pop4
+	i32.sub 	$push6=, $pop2, $pop4
 	tee_local	$push5=, $0=, $pop6
 	i32.const	$push0=, 10
 	i32.store	12($pop5), $pop0
@@ -58,7 +58,7 @@ get_kind:                               # @get_kind
 	.endfunc
 .Lfunc_end1:
 	.size	get_kind, .Lfunc_end1-get_kind
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20070614-1.c.s b/test/torture-s/20070614-1.c.s
index ab4336f79..5c596b4a0 100644
--- a/test/torture-s/20070614-1.c.s
+++ b/test/torture-s/20070614-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070614-1.c"
+	.file	"20070614-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -28,9 +28,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -46,9 +46,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -66,7 +66,7 @@ baz:                                    # @baz
 	f64.ne  	$push0=, $pop3, $0
 	i32.or  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %entry.split
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB2_2:                                # %if.then.i.split
@@ -76,9 +76,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -107,7 +107,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -119,5 +119,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20070623-1.c.s b/test/torture-s/20070623-1.c.s
index bc6c29ce5..9f27c10ba 100644
--- a/test/torture-s/20070623-1.c.s
+++ b/test/torture-s/20070623-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070623-1.c"
+	.file	"20070623-1.c"
 	.section	.text.nge,"ax",@progbits
-	.hidden	nge
+	.hidden	nge                     # -- Begin function nge
 	.globl	nge
 	.type	nge,@function
 nge:                                    # @nge
@@ -16,9 +16,9 @@ nge:                                    # @nge
 	.endfunc
 .Lfunc_end0:
 	.size	nge, .Lfunc_end0-nge
-
+                                        # -- End function
 	.section	.text.ngt,"ax",@progbits
-	.hidden	ngt
+	.hidden	ngt                     # -- Begin function ngt
 	.globl	ngt
 	.type	ngt,@function
 ngt:                                    # @ngt
@@ -33,9 +33,9 @@ ngt:                                    # @ngt
 	.endfunc
 .Lfunc_end1:
 	.size	ngt, .Lfunc_end1-ngt
-
+                                        # -- End function
 	.section	.text.nle,"ax",@progbits
-	.hidden	nle
+	.hidden	nle                     # -- Begin function nle
 	.globl	nle
 	.type	nle,@function
 nle:                                    # @nle
@@ -50,9 +50,9 @@ nle:                                    # @nle
 	.endfunc
 .Lfunc_end2:
 	.size	nle, .Lfunc_end2-nle
-
+                                        # -- End function
 	.section	.text.nlt,"ax",@progbits
-	.hidden	nlt
+	.hidden	nlt                     # -- Begin function nlt
 	.globl	nlt
 	.type	nlt,@function
 nlt:                                    # @nlt
@@ -67,9 +67,9 @@ nlt:                                    # @nlt
 	.endfunc
 .Lfunc_end3:
 	.size	nlt, .Lfunc_end3-nlt
-
+                                        # -- End function
 	.section	.text.neq,"ax",@progbits
-	.hidden	neq
+	.hidden	neq                     # -- Begin function neq
 	.globl	neq
 	.type	neq,@function
 neq:                                    # @neq
@@ -84,9 +84,9 @@ neq:                                    # @neq
 	.endfunc
 .Lfunc_end4:
 	.size	neq, .Lfunc_end4-neq
-
+                                        # -- End function
 	.section	.text.nne,"ax",@progbits
-	.hidden	nne
+	.hidden	nne                     # -- Begin function nne
 	.globl	nne
 	.type	nne,@function
 nne:                                    # @nne
@@ -101,9 +101,9 @@ nne:                                    # @nne
 	.endfunc
 .Lfunc_end5:
 	.size	nne, .Lfunc_end5-nne
-
+                                        # -- End function
 	.section	.text.ngeu,"ax",@progbits
-	.hidden	ngeu
+	.hidden	ngeu                    # -- Begin function ngeu
 	.globl	ngeu
 	.type	ngeu,@function
 ngeu:                                   # @ngeu
@@ -118,9 +118,9 @@ ngeu:                                   # @ngeu
 	.endfunc
 .Lfunc_end6:
 	.size	ngeu, .Lfunc_end6-ngeu
-
+                                        # -- End function
 	.section	.text.ngtu,"ax",@progbits
-	.hidden	ngtu
+	.hidden	ngtu                    # -- Begin function ngtu
 	.globl	ngtu
 	.type	ngtu,@function
 ngtu:                                   # @ngtu
@@ -135,9 +135,9 @@ ngtu:                                   # @ngtu
 	.endfunc
 .Lfunc_end7:
 	.size	ngtu, .Lfunc_end7-ngtu
-
+                                        # -- End function
 	.section	.text.nleu,"ax",@progbits
-	.hidden	nleu
+	.hidden	nleu                    # -- Begin function nleu
 	.globl	nleu
 	.type	nleu,@function
 nleu:                                   # @nleu
@@ -152,9 +152,9 @@ nleu:                                   # @nleu
 	.endfunc
 .Lfunc_end8:
 	.size	nleu, .Lfunc_end8-nleu
-
+                                        # -- End function
 	.section	.text.nltu,"ax",@progbits
-	.hidden	nltu
+	.hidden	nltu                    # -- Begin function nltu
 	.globl	nltu
 	.type	nltu,@function
 nltu:                                   # @nltu
@@ -169,9 +169,9 @@ nltu:                                   # @nltu
 	.endfunc
 .Lfunc_end9:
 	.size	nltu, .Lfunc_end9-nltu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -301,15 +301,15 @@ main:                                   # @main
 	i32.const	$push32=, 0
 	call    	exit@FUNCTION, $pop32
 	unreachable
-.LBB10_21:                              # %if.then75
+.LBB10_21:                              # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	main, .Lfunc_end10-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20070724-1.c.s b/test/torture-s/20070724-1.c.s
index f6ae47283..934614980 100644
--- a/test/torture-s/20070724-1.c.s
+++ b/test/torture-s/20070724-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070724-1.c"
+	.file	"20070724-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20070824-1.c.s b/test/torture-s/20070824-1.c.s
index ab01cd26c..08b62d5b1 100644
--- a/test/torture-s/20070824-1.c.s
+++ b/test/torture-s/20070824-1.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20070824-1.c"
+	.file	"20070824-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.end
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20071011-1.c.s b/test/torture-s/20071011-1.c.s
index edefd845c..b0abe6a1c 100644
--- a/test/torture-s/20071011-1.c.s
+++ b/test/torture-s/20071011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071011-1.c"
+	.file	"20071011-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -23,9 +23,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071018-1.c.s b/test/torture-s/20071018-1.c.s
index 815d90231..87c7160ef 100644
--- a/test/torture-s/20071018-1.c.s
+++ b/test/torture-s/20071018-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071018-1.c"
+	.file	"20071018-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -14,9 +14,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -39,9 +39,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,8 +62,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	__builtin_malloc, i32
 	.functype	abort, void
diff --git a/test/torture-s/20071029-1.c.s b/test/torture-s/20071029-1.c.s
index a0029492a..9c2f1d5b6 100644
--- a/test/torture-s/20071029-1.c.s
+++ b/test/torture-s/20071029-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071029-1.c"
+	.file	"20071029-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -57,7 +57,7 @@ test:                                   # @test
 	br_if   	1, $pop14       # 1: down to label0
 # BB#12:                                # %if.end37
 	return
-.LBB0_13:                               # %if.then33
+.LBB0_13:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
@@ -69,49 +69,73 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-	.local  	i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
-	i32.const	$push3=, 64
-	i32.sub 	$push11=, $pop2, $pop3
-	tee_local	$push10=, $2=, $pop11
-	i32.store	__stack_pointer($pop4), $pop10
-	i32.const	$push9=, 1
-	i32.add 	$0=, $0, $pop9
-	i32.const	$push5=, 8
-	i32.add 	$push6=, $2, $pop5
+	i32.const	$push10=, 0
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 64
+	i32.sub 	$push19=, $pop7, $pop9
+	tee_local	$push18=, $8=, $pop19
+	i32.store	__stack_pointer($pop10), $pop18
+	i32.const	$push17=, 1
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push11=, 8
+	i32.add 	$push12=, $8, $pop11
 	i32.const	$push0=, 4
-	i32.or  	$1=, $pop6, $pop0
+	i32.or  	$push16=, $pop12, $pop0
+	tee_local	$push15=, $1=, $pop16
+	i32.const	$push1=, 48
+	i32.add 	$2=, $pop15, $pop1
+	i32.const	$push2=, 40
+	i32.add 	$3=, $1, $pop2
+	i32.const	$push3=, 32
+	i32.add 	$4=, $1, $pop3
+	i32.const	$push4=, 24
+	i32.add 	$5=, $1, $pop4
+	i32.const	$push5=, 16
+	i32.add 	$6=, $1, $pop5
+	i32.const	$push6=, 8
+	i32.add 	$7=, $1, $pop6
 .LBB1_1:                                # %again
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.store	8($2), $0
-	i32.const	$push14=, 0
-	i32.const	$push13=, 52
-	i32.call	$drop=, memset@FUNCTION, $1, $pop14, $pop13
-	i32.const	$push12=, 1
-	i32.add 	$0=, $0, $pop12
-	i32.const	$push7=, 8
-	i32.add 	$push8=, $2, $pop7
-	call    	test@FUNCTION, $pop8
+	i64.const	$push27=, 0
+	i64.store	0($1):p2align=2, $pop27
+	i32.const	$push26=, 0
+	i32.store	0($2), $pop26
+	i64.const	$push25=, 0
+	i64.store	0($3):p2align=2, $pop25
+	i64.const	$push24=, 0
+	i64.store	0($4):p2align=2, $pop24
+	i64.const	$push23=, 0
+	i64.store	0($5):p2align=2, $pop23
+	i64.const	$push22=, 0
+	i64.store	0($6):p2align=2, $pop22
+	i64.const	$push21=, 0
+	i64.store	0($7):p2align=2, $pop21
+	i32.store	8($8), $0
+	i32.const	$push20=, 1
+	i32.add 	$0=, $0, $pop20
+	i32.const	$push13=, 8
+	i32.add 	$push14=, $8, $pop13
+	call    	test@FUNCTION, $pop14
 	br      	0               # 0: up to label2
 .LBB1_2:
 	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -123,7 +147,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	test.i,@object          # @test.i
 	.section	.data.test.i,"aw",@progbits
 	.p2align	2
@@ -132,6 +156,6 @@ test.i:
 	.size	test.i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20071030-1.c.s b/test/torture-s/20071030-1.c.s
index 7c2885e5e..ed02d31f3 100644
--- a/test/torture-s/20071030-1.c.s
+++ b/test/torture-s/20071030-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071030-1.c"
+	.file	"20071030-1.c"
 	.section	.text.CalcPing,"ax",@progbits
-	.hidden	CalcPing
+	.hidden	CalcPing                # -- Begin function CalcPing
 	.globl	CalcPing
 	.type	CalcPing,@function
 CalcPing:                               # @CalcPing
@@ -33,7 +33,7 @@ CalcPing:                               # @CalcPing
 	f32.gt  	$push18=, $1, $pop19
 	tee_local	$push17=, $2=, $pop18
 	f32.select	$5=, $pop4, $5, $pop17
-	i32.add 	$4=, $2, $4
+	i32.add 	$4=, $4, $2
 	i32.const	$push16=, 24
 	i32.add 	$push15=, $3, $pop16
 	tee_local	$push14=, $3=, $pop15
@@ -59,9 +59,9 @@ CalcPing:                               # @CalcPing
 	.endfunc
 .Lfunc_end0:
 	.size	CalcPing, .Lfunc_end0-CalcPing
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,10 +69,10 @@ main:                                   # @main
 	.local  	f32, i32, i32, i32, f32, i32
 # BB#0:                                 # %if.end.i
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 1552
-	i32.sub 	$push30=, $pop15, $pop16
+	i32.sub 	$push30=, $pop14, $pop16
 	tee_local	$push29=, $5=, $pop30
 	i32.store	__stack_pointer($pop17), $pop29
 	i32.const	$3=, 0
@@ -102,7 +102,7 @@ main:                                   # @main
 	f32.gt  	$push36=, $0, $pop37
 	tee_local	$push35=, $1=, $pop36
 	f32.select	$4=, $pop4, $4, $pop35
-	i32.add 	$3=, $1, $3
+	i32.add 	$3=, $3, $1
 	i32.const	$push34=, 24
 	i32.add 	$push33=, $2, $pop34
 	tee_local	$push32=, $2=, $pop33
@@ -137,7 +137,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071108-1.c.s b/test/torture-s/20071108-1.c.s
index 59c8bfd91..ae9ef8d8c 100644
--- a/test/torture-s/20071108-1.c.s
+++ b/test/torture-s/20071108-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071108-1.c"
+	.file	"20071108-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -25,9 +25,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -43,9 +43,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end2:
 	.size	test, .Lfunc_end2-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,10 +53,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %lor.lhs.false
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push25=, $pop8, $pop9
+	i32.sub 	$push25=, $pop7, $pop9
 	tee_local	$push24=, $1=, $pop25
 	i32.store	__stack_pointer($pop10), $pop24
 	block   	
@@ -97,7 +97,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	foo.s,@object           # @foo.s
 	.section	.bss.foo.s,"aw",@nobits
 	.p2align	2
@@ -106,5 +106,5 @@ foo.s:
 	.size	foo.s, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071120-1.c.s b/test/torture-s/20071120-1.c.s
index 249af9c9f..4dd571df7 100644
--- a/test/torture-s/20071120-1.c.s
+++ b/test/torture-s/20071120-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071120-1.c"
+	.file	"20071120-1.c"
 	.section	.text.vec_assert_fail,"ax",@progbits
-	.hidden	vec_assert_fail
+	.hidden	vec_assert_fail         # -- Begin function vec_assert_fail
 	.globl	vec_assert_fail
 	.type	vec_assert_fail,@function
 vec_assert_fail:                        # @vec_assert_fail
@@ -11,9 +11,9 @@ vec_assert_fail:                        # @vec_assert_fail
 	.endfunc
 .Lfunc_end0:
 	.size	vec_assert_fail, .Lfunc_end0-vec_assert_fail
-
+                                        # -- End function
 	.section	.text.perform_access_checks,"ax",@progbits
-	.hidden	perform_access_checks
+	.hidden	perform_access_checks   # -- Begin function perform_access_checks
 	.globl	perform_access_checks
 	.type	perform_access_checks,@function
 perform_access_checks:                  # @perform_access_checks
@@ -24,9 +24,9 @@ perform_access_checks:                  # @perform_access_checks
 	.endfunc
 .Lfunc_end1:
 	.size	perform_access_checks, .Lfunc_end1-perform_access_checks
-
+                                        # -- End function
 	.section	.text.pop_to_parent_deferring_access_checks,"ax",@progbits
-	.hidden	pop_to_parent_deferring_access_checks
+	.hidden	pop_to_parent_deferring_access_checks # -- Begin function pop_to_parent_deferring_access_checks
 	.globl	pop_to_parent_deferring_access_checks
 	.type	pop_to_parent_deferring_access_checks,@function
 pop_to_parent_deferring_access_checks:  # @pop_to_parent_deferring_access_checks
@@ -76,7 +76,7 @@ pop_to_parent_deferring_access_checks:  # @pop_to_parent_deferring_access_checks
 	br_if   	1, $pop24       # 1: down to label1
 # BB#6:                                 # %if.end16
 	return
-.LBB2_7:                                # %cond.false.i26
+.LBB2_7:                                # %cond.false.i
 	end_block                       # label2:
 	call    	vec_assert_fail@FUNCTION
 	unreachable
@@ -87,9 +87,9 @@ pop_to_parent_deferring_access_checks:  # @pop_to_parent_deferring_access_checks
 	.endfunc
 .Lfunc_end2:
 	.size	pop_to_parent_deferring_access_checks, .Lfunc_end2-pop_to_parent_deferring_access_checks
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -113,7 +113,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	deferred_access_no_check,@object # @deferred_access_no_check
 	.section	.bss.deferred_access_no_check,"aw",@nobits
 	.p2align	2
@@ -138,6 +138,6 @@ deferred_access_stack:
 	.size	deferred_access_stack, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	__builtin_malloc, i32
diff --git a/test/torture-s/20071202-1.c.s b/test/torture-s/20071202-1.c.s
index c0c335d83..cddc43977 100644
--- a/test/torture-s/20071202-1.c.s
+++ b/test/torture-s/20071202-1.c.s
@@ -1,19 +1,19 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071202-1.c"
+	.file	"20071202-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32
 # BB#0:                                 # %entry
+	i64.const	$push0=, 0
+	i64.store	8($0):p2align=2, $pop0
 	i32.load	$1=, 0($0)
-	i32.load	$push0=, 4($0)
-	i32.store	0($0), $pop0
+	i32.load	$push1=, 4($0)
+	i32.store	0($0), $pop1
 	i32.store	4($0), $1
-	i64.const	$push1=, 0
-	i64.store	8($0):p2align=2, $pop1
 	i32.const	$push2=, 24
 	i32.add 	$push3=, $0, $pop2
 	i64.const	$push7=, 0
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,10 +36,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push71=, 0
-	i32.const	$push68=, 0
-	i32.load	$push69=, __stack_pointer($pop68)
+	i32.const	$push69=, 0
+	i32.load	$push68=, __stack_pointer($pop69)
 	i32.const	$push70=, 80
-	i32.sub 	$push80=, $pop69, $pop70
+	i32.sub 	$push80=, $pop68, $pop70
 	tee_local	$push79=, $0=, $pop80
 	i32.store	__stack_pointer($pop71), $pop79
 	i32.const	$push75=, 8
@@ -156,14 +156,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop74), $pop73
 	i32.const	$push67=, 0
 	return  	$pop67
-.LBB1_18:                               # %if.then63
+.LBB1_18:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.s,@object        # @main.s
 	.section	.rodata..Lmain.s,"a",@progbits
 	.p2align	2
@@ -188,5 +188,5 @@ main:                                   # @main
 	.size	.Lmain.s, 68
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071205-1.c.s b/test/torture-s/20071205-1.c.s
index c0eb1f391..44e9fa534 100644
--- a/test/torture-s/20071205-1.c.s
+++ b/test/torture-s/20071205-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071205-1.c"
+	.file	"20071205-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,6 +31,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20071211-1.c.s b/test/torture-s/20071211-1.c.s
index 3075ae377..0d18f2bea 100644
--- a/test/torture-s/20071211-1.c.s
+++ b/test/torture-s/20071211-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071211-1.c"
+	.file	"20071211-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,7 +47,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	sv                      # @sv
 	.type	sv,@object
 	.section	.bss.sv,"aw",@nobits
@@ -58,5 +58,5 @@ sv:
 	.size	sv, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071213-1.c.s b/test/torture-s/20071213-1.c.s
index 06a4cd38e..117a6c658 100644
--- a/test/torture-s/20071213-1.c.s
+++ b/test/torture-s/20071213-1.c.s
@@ -1,14 +1,12 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071213-1.c"
+	.file	"20071213-1.c"
 	.section	.text.h,"ax",@progbits
-	.hidden	h
+	.hidden	h                       # -- Begin function h
 	.globl	h
 	.type	h,@function
 h:                                      # @h
 	.param  	i32, i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.load	$2=, 0($1)
 	block   	
 	block   	
 	block   	
@@ -18,194 +16,184 @@ h:                                      # @h
 # BB#1:                                 # %entry
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $0, $pop2
-	br_if   	2, $pop3        # 2: down to label0
+	br_if   	1, $pop3        # 1: down to label1
 # BB#2:                                 # %sw.bb
-	block   	
-	i32.const	$push9=, 3
-	i32.ne  	$push10=, $2, $pop9
-	br_if   	0, $pop10       # 0: down to label3
+	i32.load	$push10=, 0($1)
+	i32.const	$push11=, 3
+	i32.ne  	$push12=, $pop10, $pop11
+	br_if   	1, $pop12       # 1: down to label1
 # BB#3:                                 # %lor.lhs.false
-	i32.load	$push11=, 4($1)
-	i32.const	$push12=, 4
-	i32.eq  	$push13=, $pop11, $pop12
-	br_if   	2, $pop13       # 2: down to label1
-.LBB0_4:                                # %if.then
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_5:                                # %sw.bb4
+	i32.load	$push13=, 4($1)
+	i32.const	$push14=, 4
+	i32.ne  	$push15=, $pop13, $pop14
+	br_if   	1, $pop15       # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_4:                                # %sw.bb4
 	end_block                       # label2:
-	i32.const	$push4=, 9
-	i32.ne  	$push5=, $2, $pop4
-	br_if   	1, $pop5        # 1: down to label0
-# BB#6:                                 # %lor.lhs.false8
-	i32.load	$push6=, 4($1)
-	i32.const	$push7=, 10
-	i32.ne  	$push8=, $pop6, $pop7
-	br_if   	1, $pop8        # 1: down to label0
-.LBB0_7:                                # %return
+	i32.load	$push4=, 0($1)
+	i32.const	$push5=, 9
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	0, $pop6        # 0: down to label1
+# BB#5:                                 # %lor.lhs.false8
+	i32.load	$push7=, 4($1)
+	i32.const	$push8=, 10
+	i32.eq  	$push9=, $pop7, $pop8
+	br_if   	1, $pop9        # 1: down to label0
+.LBB0_6:                                # %if.then
 	end_block                       # label1:
-	return
-.LBB0_8:                                # %sw.default
-	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
+.LBB0_7:                                # %return
+	end_block                       # label0:
+                                        # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	h, .Lfunc_end0-h
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i64, i32
-	.local  	i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
-	i32.const	$push18=, 16
-	i32.sub 	$push24=, $pop17, $pop18
-	tee_local	$push23=, $4=, $pop24
-	i32.store	__stack_pointer($pop19), $pop23
-	i32.store	12($4), $2
-	i32.load	$3=, 0($2)
-	block   	
+	i32.const	$push20=, 0
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
+	i32.const	$push19=, 16
+	i32.sub 	$push25=, $pop17, $pop19
+	tee_local	$push24=, $3=, $pop25
+	i32.store	__stack_pointer($pop20), $pop24
+	i32.store	12($3), $2
 	block   	
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label6
+	br_if   	0, $pop1        # 0: down to label4
 # BB#1:                                 # %sw.bb.i
-	i32.const	$push9=, 3
-	i32.ne  	$push10=, $3, $pop9
-	br_if   	1, $pop10       # 1: down to label5
+	i32.load	$push9=, 0($2)
+	i32.const	$push10=, 3
+	i32.ne  	$push11=, $pop9, $pop10
+	br_if   	1, $pop11       # 1: down to label3
 # BB#2:                                 # %lor.lhs.false.i
-	i32.load	$push11=, 4($2)
-	i32.const	$push12=, 4
-	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label5
+	i32.load	$push12=, 4($2)
+	i32.const	$push13=, 4
+	i32.ne  	$push14=, $pop12, $pop13
+	br_if   	1, $pop14       # 1: down to label3
 # BB#3:                                 # %h.exit
-	i64.const	$push14=, 2
-	i64.ne  	$push15=, $1, $pop14
-	br_if   	1, $pop15       # 1: down to label5
+	i64.const	$push15=, 2
+	i64.ne  	$push16=, $1, $pop15
+	br_if   	1, $pop16       # 1: down to label3
 # BB#4:                                 # %if.end
-	i32.const	$push22=, 0
-	i32.const	$push20=, 16
-	i32.add 	$push21=, $4, $pop20
-	i32.store	__stack_pointer($pop22), $pop21
+	i32.const	$push23=, 0
+	i32.const	$push21=, 16
+	i32.add 	$push22=, $3, $pop21
+	i32.store	__stack_pointer($pop23), $pop22
 	return
 .LBB1_5:                                # %entry
-	end_block                       # label6:
+	end_block                       # label4:
 	i32.const	$push2=, 5
 	i32.ne  	$push3=, $0, $pop2
-	br_if   	1, $pop3        # 1: down to label4
+	br_if   	0, $pop3        # 0: down to label3
 # BB#6:                                 # %sw.bb4.i
-	i32.const	$push4=, 9
-	i32.ne  	$push5=, $3, $pop4
-	br_if   	1, $pop5        # 1: down to label4
+	i32.load	$push4=, 0($2)
+	i32.const	$push5=, 9
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	0, $pop6        # 0: down to label3
 # BB#7:                                 # %lor.lhs.false8.i
-	i32.load	$push6=, 4($2)
-	i32.const	$push7=, 10
-	i32.ne  	$push8=, $pop6, $pop7
-	br_if   	1, $pop8        # 1: down to label4
-.LBB1_8:                                # %if.then
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_9:                                # %sw.default.i
-	end_block                       # label4:
+	i32.load	$push7=, 4($2)
+	i32.const	$push8=, 10
+	i32.eq  	$drop=, $pop7, $pop8
+.LBB1_8:                                # %if.then.i
+	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32, i32, i64, i32
-	.local  	i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
+	i32.const	$push27=, 0
 	i32.const	$push25=, 0
-	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
-	i32.const	$push24=, 16
-	i32.sub 	$push30=, $pop23, $pop24
-	tee_local	$push29=, $6=, $pop30
-	i32.store	__stack_pointer($pop25), $pop29
-	i32.store	12($6), $4
-	i32.load	$5=, 0($4)
+	i32.load	$push24=, __stack_pointer($pop25)
+	i32.const	$push26=, 16
+	i32.sub 	$push32=, $pop24, $pop26
+	tee_local	$push31=, $5=, $pop32
+	i32.store	__stack_pointer($pop27), $pop31
+	i32.store	12($5), $4
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 5
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label9
+	br_if   	0, $pop1        # 0: down to label7
 # BB#1:                                 # %entry
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $0, $pop2
-	br_if   	2, $pop3        # 2: down to label7
+	br_if   	2, $pop3        # 2: down to label5
 # BB#2:                                 # %sw.bb.i
-	block   	
-	i32.const	$push9=, 3
-	i32.ne  	$push10=, $5, $pop9
-	br_if   	0, $pop10       # 0: down to label10
+	i32.load	$push10=, 0($4)
+	i32.const	$push11=, 3
+	i32.ne  	$push12=, $pop10, $pop11
+	br_if   	2, $pop12       # 2: down to label5
 # BB#3:                                 # %lor.lhs.false.i
-	i32.load	$push11=, 4($4)
-	i32.const	$push12=, 4
-	i32.eq  	$push13=, $pop11, $pop12
-	br_if   	2, $pop13       # 2: down to label8
-.LBB2_4:                                # %if.then.i
-	end_block                       # label10:
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_5:                                # %sw.bb4.i
-	end_block                       # label9:
-	i32.const	$push4=, 9
-	i32.ne  	$push5=, $5, $pop4
-	br_if   	1, $pop5        # 1: down to label7
-# BB#6:                                 # %lor.lhs.false8.i
-	i32.load	$push6=, 4($4)
-	i32.const	$push7=, 10
-	i32.ne  	$push8=, $pop6, $pop7
-	br_if   	1, $pop8        # 1: down to label7
-.LBB2_7:                                # %h.exit
-	end_block                       # label8:
-	i32.const	$push14=, 5
-	i32.ne  	$push15=, $0, $pop14
-	br_if   	0, $pop15       # 0: down to label7
+	i32.load	$push13=, 4($4)
+	i32.const	$push14=, 4
+	i32.eq  	$push15=, $pop13, $pop14
+	br_if   	1, $pop15       # 1: down to label6
+	br      	2               # 2: down to label5
+.LBB2_4:                                # %sw.bb4.i
+	end_block                       # label7:
+	i32.load	$push4=, 0($4)
+	i32.const	$push5=, 9
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	1, $pop6        # 1: down to label5
+# BB#5:                                 # %lor.lhs.false8.i
+	i32.load	$push7=, 4($4)
+	i32.const	$push8=, 10
+	i32.ne  	$push9=, $pop7, $pop8
+	br_if   	1, $pop9        # 1: down to label5
+.LBB2_6:                                # %h.exit
+	end_block                       # label6:
+	i32.const	$push16=, 5
+	i32.ne  	$push17=, $0, $pop16
+	br_if   	0, $pop17       # 0: down to label5
+# BB#7:                                 # %h.exit
+	i32.const	$push18=, 6
+	i32.ne  	$push19=, $1, $pop18
+	br_if   	0, $pop19       # 0: down to label5
 # BB#8:                                 # %h.exit
-	i32.const	$push16=, 6
-	i32.ne  	$push17=, $1, $pop16
-	br_if   	0, $pop17       # 0: down to label7
+	i32.const	$push20=, 7
+	i32.ne  	$push21=, $2, $pop20
+	br_if   	0, $pop21       # 0: down to label5
 # BB#9:                                 # %h.exit
-	i32.const	$push18=, 7
-	i32.ne  	$push19=, $2, $pop18
-	br_if   	0, $pop19       # 0: down to label7
-# BB#10:                                # %h.exit
-	i64.const	$push20=, 8
-	i64.ne  	$push21=, $3, $pop20
-	br_if   	0, $pop21       # 0: down to label7
-# BB#11:                                # %if.end
-	i32.const	$push28=, 0
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $6, $pop26
-	i32.store	__stack_pointer($pop28), $pop27
+	i64.const	$push22=, 8
+	i64.ne  	$push23=, $3, $pop22
+	br_if   	0, $pop23       # 0: down to label5
+# BB#10:                                # %if.end
+	i32.const	$push30=, 0
+	i32.const	$push28=, 16
+	i32.add 	$push29=, $5, $pop28
+	i32.store	__stack_pointer($pop30), $pop29
 	return
-.LBB2_12:                               # %if.then
-	end_block                       # label7:
+.LBB2_11:                               # %if.then.i
+	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	f2, .Lfunc_end2-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -213,10 +201,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 32
-	i32.sub 	$push19=, $pop10, $pop11
+	i32.sub 	$push19=, $pop9, $pop11
 	tee_local	$push18=, $0=, $pop19
 	i32.store	__stack_pointer($pop12), $pop18
 	i64.const	$push0=, 17179869187
@@ -242,7 +230,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071216-1.c.s b/test/torture-s/20071216-1.c.s
index c4bbf9ffd..269d178de 100644
--- a/test/torture-s/20071216-1.c.s
+++ b/test/torture-s/20071216-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071216-1.c"
+	.file	"20071216-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -36,9 +36,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -99,14 +99,14 @@ main:                                   # @main
 # BB#3:                                 # %if.end8
 	i32.const	$push42=, 0
 	return  	$pop42
-.LBB2_4:                                # %if.then7
+.LBB2_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	x,@object               # @x
 	.section	.bss.x,"aw",@nobits
 	.p2align	2
@@ -115,5 +115,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071219-1.c.s b/test/torture-s/20071219-1.c.s
index d147343b3..ea1f7ceec 100644
--- a/test/torture-s/20071219-1.c.s
+++ b/test/torture-s/20071219-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071219-1.c"
+	.file	"20071219-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -46,19 +46,19 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
 	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 64
-	i32.sub 	$push49=, $pop15, $pop16
+	i32.sub 	$push49=, $pop14, $pop16
 	tee_local	$push48=, $6=, $pop49
 	i32.store	__stack_pointer($pop17), $pop48
 	i32.const	$push21=, 32
@@ -125,19 +125,19 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end1:
 	.size	test1, .Lfunc_end1-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
 	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push24=, 0
-	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
+	i32.const	$push22=, 0
+	i32.load	$push21=, __stack_pointer($pop22)
 	i32.const	$push23=, 64
-	i32.sub 	$push62=, $pop22, $pop23
+	i32.sub 	$push62=, $pop21, $pop23
 	tee_local	$push61=, $6=, $pop62
 	i32.store	__stack_pointer($pop24), $pop61
 	i32.const	$push28=, 32
@@ -197,18 +197,18 @@ test2:                                  # @test2
 	i32.const	$push42=, 0
 	i32.load	$push41=, p($pop42)
 	tee_local	$push40=, $5=, $pop41
-	i32.const	$push39=, 24
+	i32.const	$push39=, 8
 	i32.add 	$push14=, $pop40, $pop39
-	i32.load8_u	$push15=, 0($pop14)
-	i32.store8	0($2), $pop15
+	i64.load	$push15=, 0($pop14):p2align=0
+	i64.store	0($4), $pop15
 	i32.const	$push38=, 16
 	i32.add 	$push16=, $5, $pop38
 	i64.load	$push17=, 0($pop16):p2align=0
 	i64.store	0($3), $pop17
-	i32.const	$push37=, 8
+	i32.const	$push37=, 24
 	i32.add 	$push18=, $5, $pop37
-	i64.load	$push19=, 0($pop18):p2align=0
-	i64.store	0($4), $pop19
+	i32.load8_u	$push19=, 0($pop18)
+	i32.store8	0($2), $pop19
 	i64.load	$push20=, 0($5):p2align=0
 	i64.store	0($6), $pop20
 	i32.const	$push36=, 0
@@ -221,128 +221,108 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push32=, 0
-	i32.const	$push29=, 0
-	i32.load	$push30=, __stack_pointer($pop29)
-	i32.const	$push31=, 64
-	i32.sub 	$push82=, $pop30, $pop31
-	tee_local	$push81=, $8=, $pop82
-	i32.store	__stack_pointer($pop32), $pop81
-	i32.const	$push36=, 32
-	i32.add 	$push37=, $8, $pop36
+	i32.const	$push21=, 0
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 64
+	i32.sub 	$push65=, $pop18, $pop20
+	tee_local	$push64=, $8=, $pop65
+	i32.store	__stack_pointer($pop21), $pop64
+	i32.const	$push25=, 32
+	i32.add 	$push26=, $8, $pop25
 	i32.const	$push0=, 24
-	i32.add 	$push80=, $pop37, $pop0
-	tee_local	$push79=, $0=, $pop80
+	i32.add 	$push63=, $pop26, $pop0
+	tee_local	$push62=, $0=, $pop63
 	i32.const	$push1=, 0
-	i32.store8	0($pop79), $pop1
-	i32.const	$push38=, 32
-	i32.add 	$push39=, $8, $pop38
+	i32.store8	0($pop62), $pop1
+	i32.const	$push27=, 32
+	i32.add 	$push28=, $8, $pop27
 	i32.const	$push2=, 16
-	i32.add 	$push78=, $pop39, $pop2
-	tee_local	$push77=, $1=, $pop78
+	i32.add 	$push61=, $pop28, $pop2
+	tee_local	$push60=, $1=, $pop61
 	i64.const	$push3=, 0
-	i64.store	0($pop77), $pop3
-	i32.const	$push40=, 32
-	i32.add 	$push41=, $8, $pop40
+	i64.store	0($pop60), $pop3
+	i32.const	$push29=, 32
+	i32.add 	$push30=, $8, $pop29
 	i32.const	$push4=, 8
-	i32.add 	$push76=, $pop41, $pop4
-	tee_local	$push75=, $2=, $pop76
-	i64.const	$push74=, 0
-	i64.store	0($pop75), $pop74
-	i64.const	$push73=, 0
-	i64.store	32($8), $pop73
-	i32.const	$push42=, 32
-	i32.add 	$push43=, $8, $pop42
-	i32.const	$push72=, 0
-	call    	foo@FUNCTION, $pop43, $pop72
-	i32.const	$push71=, 24
-	i32.add 	$push70=, $8, $pop71
-	tee_local	$push69=, $3=, $pop70
+	i32.add 	$push59=, $pop30, $pop4
+	tee_local	$push58=, $2=, $pop59
+	i64.const	$push57=, 0
+	i64.store	0($pop58), $pop57
+	i64.const	$push56=, 0
+	i64.store	32($8), $pop56
+	i32.const	$push31=, 32
+	i32.add 	$push32=, $8, $pop31
+	i32.const	$push55=, 0
+	call    	foo@FUNCTION, $pop32, $pop55
+	i32.const	$push54=, 24
+	i32.add 	$push53=, $8, $pop54
+	tee_local	$push52=, $3=, $pop53
 	i32.load8_u	$push5=, 0($0)
-	i32.store8	0($pop69), $pop5
-	i32.const	$push68=, 16
-	i32.add 	$push67=, $8, $pop68
-	tee_local	$push66=, $4=, $pop67
+	i32.store8	0($pop52), $pop5
+	i32.const	$push51=, 16
+	i32.add 	$push50=, $8, $pop51
+	tee_local	$push49=, $4=, $pop50
 	i64.load	$push6=, 0($1)
-	i64.store	0($pop66), $pop6
-	i32.const	$push65=, 8
-	i32.add 	$push64=, $8, $pop65
-	tee_local	$push63=, $5=, $pop64
+	i64.store	0($pop49), $pop6
+	i32.const	$push48=, 8
+	i32.add 	$push47=, $8, $pop48
+	tee_local	$push46=, $5=, $pop47
 	i64.load	$push7=, 0($2)
-	i64.store	0($pop63), $pop7
+	i64.store	0($pop46), $pop7
 	i64.load	$push8=, 32($8)
 	i64.store	0($8), $pop8
 	i32.const	$push9=, 1
 	call    	foo@FUNCTION, $8, $pop9
-	i32.const	$push62=, 0
-	i32.load	$push61=, p($pop62)
-	tee_local	$push60=, $6=, $pop61
-	i32.load	$push10=, 32($8)
-	i32.store	0($pop60):p2align=0, $pop10
-	i32.const	$push59=, 24
-	i32.add 	$push58=, $6, $pop59
-	tee_local	$push57=, $7=, $pop58
-	i32.load8_u	$push11=, 0($0)
-	i32.store8	0($pop57), $pop11
-	i32.const	$push12=, 20
-	i32.add 	$push13=, $6, $pop12
-	i32.const	$push44=, 32
-	i32.add 	$push45=, $8, $pop44
-	i32.const	$push56=, 20
-	i32.add 	$push14=, $pop45, $pop56
-	i32.load	$push15=, 0($pop14)
-	i32.store	0($pop13):p2align=0, $pop15
-	i32.const	$push55=, 16
-	i32.add 	$push54=, $6, $pop55
-	tee_local	$push53=, $0=, $pop54
-	i32.load	$push16=, 0($1)
-	i32.store	0($pop53):p2align=0, $pop16
-	i32.const	$push17=, 12
-	i32.add 	$push18=, $6, $pop17
-	i32.const	$push46=, 32
-	i32.add 	$push47=, $8, $pop46
-	i32.const	$push52=, 12
-	i32.add 	$push19=, $pop47, $pop52
-	i32.load	$push20=, 0($pop19)
-	i32.store	0($pop18):p2align=0, $pop20
-	i32.const	$push51=, 8
-	i32.add 	$push50=, $6, $pop51
-	tee_local	$push49=, $1=, $pop50
-	i32.load	$push21=, 0($2)
-	i32.store	0($pop49):p2align=0, $pop21
-	i32.const	$push22=, 4
-	i32.add 	$push23=, $6, $pop22
-	i32.load	$push24=, 36($8)
-	i32.store	0($pop23):p2align=0, $pop24
-	i32.load8_u	$push25=, 0($3)
-	i32.store8	0($7), $pop25
-	i64.load	$push26=, 0($4)
-	i64.store	0($0):p2align=0, $pop26
-	i64.load	$push27=, 0($5)
-	i64.store	0($1):p2align=0, $pop27
-	i64.load	$push28=, 0($8)
-	i64.store	0($6):p2align=0, $pop28
-	i32.const	$push48=, 0
-	call    	foo@FUNCTION, $8, $pop48
-	i32.const	$push35=, 0
-	i32.const	$push33=, 64
-	i32.add 	$push34=, $8, $pop33
-	i32.store	__stack_pointer($pop35), $pop34
+	i32.const	$push45=, 0
+	i32.load	$push44=, p($pop45)
+	tee_local	$push43=, $6=, $pop44
+	i64.load	$push10=, 32($8)
+	i64.store	0($pop43):p2align=0, $pop10
+	i32.const	$push42=, 16
+	i32.add 	$push41=, $6, $pop42
+	tee_local	$push40=, $7=, $pop41
+	i64.load	$push11=, 0($1)
+	i64.store	0($pop40):p2align=0, $pop11
+	i32.const	$push39=, 8
+	i32.add 	$push38=, $6, $pop39
+	tee_local	$push37=, $1=, $pop38
+	i64.load	$push12=, 0($2)
+	i64.store	0($pop37):p2align=0, $pop12
+	i32.const	$push36=, 24
+	i32.add 	$push35=, $6, $pop36
+	tee_local	$push34=, $2=, $pop35
+	i32.load8_u	$push13=, 0($0)
+	i32.store8	0($pop34), $pop13
+	i64.load	$push14=, 0($8)
+	i64.store	0($6):p2align=0, $pop14
+	i32.load8_u	$push15=, 0($3)
+	i32.store8	0($2), $pop15
+	i64.load	$push16=, 0($4)
+	i64.store	0($7):p2align=0, $pop16
+	i64.load	$push17=, 0($5)
+	i64.store	0($1):p2align=0, $pop17
+	i32.const	$push33=, 0
+	call    	foo@FUNCTION, $8, $pop33
+	i32.const	$push24=, 0
+	i32.const	$push22=, 64
+	i32.add 	$push23=, $8, $pop22
+	i32.store	__stack_pointer($pop24), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
 	.size	test3, .Lfunc_end3-test3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -356,7 +336,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -367,5 +347,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20071220-1.c.s b/test/torture-s/20071220-1.c.s
index e25bc1349..3b5739857 100644
--- a/test/torture-s/20071220-1.c.s
+++ b/test/torture-s/20071220-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071220-1.c"
+	.file	"20071220-1.c"
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -15,9 +15,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end0:
 	.size	baz, .Lfunc_end0-baz
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -29,9 +29,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.type	bar,@function
+	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32
@@ -45,9 +45,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -59,9 +59,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -76,7 +76,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.type	bar.b,@object           # @bar.b
 	.section	.data.bar.b,"aw",@progbits
 	.p2align	2
@@ -85,4 +85,4 @@ bar.b:
 	.size	bar.b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20071220-2.c.s b/test/torture-s/20071220-2.c.s
index c95ec90f6..2d9c27e21 100644
--- a/test/torture-s/20071220-2.c.s
+++ b/test/torture-s/20071220-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20071220-2.c"
+	.file	"20071220-2.c"
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -15,9 +15,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end0:
 	.size	baz, .Lfunc_end0-baz
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -29,9 +29,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.type	bar,@function
+	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32
@@ -45,9 +45,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -59,9 +59,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -76,7 +76,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.type	bar.b,@object           # @bar.b
 	.section	.data.bar.b,"aw",@progbits
 	.p2align	2
@@ -85,4 +85,4 @@ bar.b:
 	.size	bar.b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080117-1.c.s b/test/torture-s/20080117-1.c.s
index 495ade378..2b5b8a4e5 100644
--- a/test/torture-s/20080117-1.c.s
+++ b/test/torture-s/20080117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080117-1.c"
+	.file	"20080117-1.c"
 	.section	.text.gstate_path_memory,"ax",@progbits
-	.hidden	gstate_path_memory
+	.hidden	gstate_path_memory      # -- Begin function gstate_path_memory
 	.globl	gstate_path_memory
 	.type	gstate_path_memory,@function
 gstate_path_memory:                     # @gstate_path_memory
@@ -19,9 +19,9 @@ gstate_path_memory:                     # @gstate_path_memory
 	.endfunc
 .Lfunc_end0:
 	.size	gstate_path_memory, .Lfunc_end0-gstate_path_memory
-
+                                        # -- End function
 	.section	.text.gs_state_update_overprint,"ax",@progbits
-	.hidden	gs_state_update_overprint
+	.hidden	gs_state_update_overprint # -- Begin function gs_state_update_overprint
 	.globl	gs_state_update_overprint
 	.type	gs_state_update_overprint,@function
 gs_state_update_overprint:              # @gs_state_update_overprint
@@ -32,9 +32,9 @@ gs_state_update_overprint:              # @gs_state_update_overprint
 	.endfunc
 .Lfunc_end1:
 	.size	gs_state_update_overprint, .Lfunc_end1-gs_state_update_overprint
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	gstate_initial,@object  # @gstate_initial
 	.section	.rodata.gstate_initial,"a",@progbits
 	.p2align	2
@@ -56,4 +56,4 @@ gstate_initial:
 	.size	gstate_initial, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080122-1.c.s b/test/torture-s/20080122-1.c.s
index 2b236ebe4..5f61af1d5 100644
--- a/test/torture-s/20080122-1.c.s
+++ b/test/torture-s/20080122-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080122-1.c"
+	.file	"20080122-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -89,6 +89,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080222-1.c.s b/test/torture-s/20080222-1.c.s
index 4760cf30e..f6b275753 100644
--- a/test/torture-s/20080222-1.c.s
+++ b/test/torture-s/20080222-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080222-1.c"
+	.file	"20080222-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	space                   # @space
 	.type	space,@object
 	.section	.data.space,"aw",@progbits
@@ -47,5 +47,5 @@ space:
 	.size	space, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080408-1.c.s b/test/torture-s/20080408-1.c.s
index 6443e4802..a81a2bce7 100644
--- a/test/torture-s/20080408-1.c.s
+++ b/test/torture-s/20080408-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080408-1.c"
+	.file	"20080408-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080424-1.c.s b/test/torture-s/20080424-1.c.s
index 43f7a8dd4..8d1ef6a86 100644
--- a/test/torture-s/20080424-1.c.s
+++ b/test/torture-s/20080424-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080424-1.c"
+	.file	"20080424-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -37,9 +37,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	bar.i,@object           # @bar.i
 	.section	.bss.bar.i,"aw",@nobits
 	.p2align	2
@@ -92,5 +92,5 @@ g:
 	.size	g, 1728
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080502-1.c.s b/test/torture-s/20080502-1.c.s
index 57cef5866..2f49cf5b2 100644
--- a/test/torture-s/20080502-1.c.s
+++ b/test/torture-s/20080502-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080502-1.c"
+	.file	"20080502-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,10 +32,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
+	i32.sub 	$push16=, $pop8, $pop10
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop11), $pop15
 	i64.const	$push1=, 0
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080506-1.c.s b/test/torture-s/20080506-1.c.s
index b9424d2e8..55490909d 100644
--- a/test/torture-s/20080506-1.c.s
+++ b/test/torture-s/20080506-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080506-1.c"
+	.file	"20080506-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080506-2.c.s b/test/torture-s/20080506-2.c.s
index d5e22750f..64f3a88b5 100644
--- a/test/torture-s/20080506-2.c.s
+++ b/test/torture-s/20080506-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080506-2.c"
+	.file	"20080506-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -28,9 +28,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,10 +38,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push17=, $pop2, $pop3
+	i32.sub 	$push17=, $pop1, $pop3
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop4), $pop16
 	i32.const	$push8=, 12
@@ -64,7 +64,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080519-1.c.s b/test/torture-s/20080519-1.c.s
index 43654ab21..167a6114e 100644
--- a/test/torture-s/20080519-1.c.s
+++ b/test/torture-s/20080519-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080519-1.c"
+	.file	"20080519-1.c"
 	.section	.text.merge_overlapping_regs,"ax",@progbits
-	.hidden	merge_overlapping_regs
+	.hidden	merge_overlapping_regs  # -- Begin function merge_overlapping_regs
 	.globl	merge_overlapping_regs
 	.type	merge_overlapping_regs,@function
 merge_overlapping_regs:                 # @merge_overlapping_regs
@@ -26,9 +26,9 @@ merge_overlapping_regs:                 # @merge_overlapping_regs
 	.endfunc
 .Lfunc_end0:
 	.size	merge_overlapping_regs, .Lfunc_end0-merge_overlapping_regs
-
+                                        # -- End function
 	.section	.text.regrename_optimize,"ax",@progbits
-	.hidden	regrename_optimize
+	.hidden	regrename_optimize      # -- Begin function regrename_optimize
 	.globl	regrename_optimize
 	.type	regrename_optimize,@function
 regrename_optimize:                     # @regrename_optimize
@@ -36,10 +36,10 @@ regrename_optimize:                     # @regrename_optimize
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 16
-	i32.sub 	$push36=, $pop25, $pop26
+	i32.sub 	$push36=, $pop24, $pop26
 	tee_local	$push35=, $6=, $pop36
 	i32.store	__stack_pointer($pop27), $pop35
 	i64.const	$push0=, 0
@@ -122,9 +122,9 @@ regrename_optimize:                     # @regrename_optimize
 	.endfunc
 .Lfunc_end1:
 	.size	regrename_optimize, .Lfunc_end1-regrename_optimize
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -132,10 +132,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push17=, $pop5, $pop6
+	i32.sub 	$push17=, $pop4, $pop6
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop7), $pop16
 	i64.const	$push0=, 0
@@ -161,7 +161,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	reg_class_contents      # @reg_class_contents
 	.type	reg_class_contents,@object
 	.section	.bss.reg_class_contents,"aw",@nobits
@@ -172,5 +172,5 @@ reg_class_contents:
 	.size	reg_class_contents, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080522-1.c.s b/test/torture-s/20080522-1.c.s
index 5f35359ce..51689d2af 100644
--- a/test/torture-s/20080522-1.c.s
+++ b/test/torture-s/20080522-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080522-1.c"
+	.file	"20080522-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,9 +19,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -38,9 +38,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,10 +48,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 16
-	i32.sub 	$push29=, $pop17, $pop18
+	i32.sub 	$push29=, $pop16, $pop18
 	tee_local	$push28=, $0=, $pop29
 	i32.store	__stack_pointer($pop19), $pop28
 	i32.const	$push0=, 0
@@ -99,14 +99,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop22), $pop21
 	i32.const	$push15=, 0
 	return  	$pop15
-.LBB2_7:                                # %if.then17
+.LBB2_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	i,@object               # @i
 	.section	.bss.i,"aw",@nobits
 	.p2align	2
@@ -115,5 +115,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080529-1.c.s b/test/torture-s/20080529-1.c.s
index eebf1f2f4..89f1808db 100644
--- a/test/torture-s/20080529-1.c.s
+++ b/test/torture-s/20080529-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080529-1.c"
+	.file	"20080529-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -14,9 +14,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080604-1.c.s b/test/torture-s/20080604-1.c.s
index e4d0642f4..d56aa6ab6 100644
--- a/test/torture-s/20080604-1.c.s
+++ b/test/torture-s/20080604-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080604-1.c"
+	.file	"20080604-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -30,10 +30,10 @@ baz:                                    # @baz
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push15=, $pop3, $pop4
+	i32.sub 	$push15=, $pop2, $pop4
 	tee_local	$push14=, $1=, $pop15
 	i32.store	__stack_pointer($pop5), $pop14
 	i32.const	$push9=, 12
@@ -54,9 +54,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -91,5 +91,5 @@ x:
 	.size	.L.str, 14
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20080719-1.c.s b/test/torture-s/20080719-1.c.s
index c3edce937..cf346dd89 100644
--- a/test/torture-s/20080719-1.c.s
+++ b/test/torture-s/20080719-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080719-1.c"
+	.file	"20080719-1.c"
 	.section	.text.xxx,"ax",@progbits
-	.hidden	xxx
+	.hidden	xxx                     # -- Begin function xxx
 	.globl	xxx
 	.type	xxx,@function
 xxx:                                    # @xxx
@@ -21,9 +21,9 @@ xxx:                                    # @xxx
 	.endfunc
 .Lfunc_end0:
 	.size	xxx, .Lfunc_end0-xxx
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	cfb_tab8_be,@object     # @cfb_tab8_be
 	.section	.rodata.cfb_tab8_be,"a",@progbits
 	.p2align	4
@@ -76,4 +76,4 @@ cfb_tab32:
 	.size	cfb_tab32, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20080813-1.c.s b/test/torture-s/20080813-1.c.s
index 723269321..7879644ca 100644
--- a/test/torture-s/20080813-1.c.s
+++ b/test/torture-s/20080813-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20080813-1.c"
+	.file	"20080813-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -32,9 +32,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20081103-1.c.s b/test/torture-s/20081103-1.c.s
index 08da86fd0..1420f0b57 100644
--- a/test/torture-s/20081103-1.c.s
+++ b/test/torture-s/20081103-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20081103-1.c"
+	.file	"20081103-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,10 +32,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop3, $pop4
+	i32.sub 	$push14=, $pop2, $pop4
 	tee_local	$push13=, $1=, $pop14
 	i32.store	__stack_pointer($pop5), $pop13
 	i32.const	$push12=, 0
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	A                       # @A
 	.type	A,@object
 	.section	.data.A,"aw",@progbits
@@ -72,6 +72,6 @@ A:
 	.size	A, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20081112-1.c.s b/test/torture-s/20081112-1.c.s
index 0aa87a423..2de9c8c93 100644
--- a/test/torture-s/20081112-1.c.s
+++ b/test/torture-s/20081112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20081112-1.c"
+	.file	"20081112-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20081117-1.c.s b/test/torture-s/20081117-1.c.s
index 53ff7aa71..a52280764 100644
--- a/test/torture-s/20081117-1.c.s
+++ b/test/torture-s/20081117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20081117-1.c"
+	.file	"20081117-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,10 +27,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push14=, $pop4, $pop5
+	i32.sub 	$push14=, $pop3, $pop5
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop6), $pop13
 	i32.const	$push12=, 0
@@ -57,7 +57,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -75,5 +75,5 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20081218-1.c.s b/test/torture-s/20081218-1.c.s
index 6ed395726..31f2d3956 100644
--- a/test/torture-s/20081218-1.c.s
+++ b/test/torture-s/20081218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20081218-1.c"
+	.file	"20081218-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -34,9 +34,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,24 +44,21 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	block   	
 	i32.call	$push1=, foo@FUNCTION
 	i32.const	$push0=, 640034342
 	i32.ne  	$push2=, $pop1, $pop0
-	br_if   	0, $pop2        # 0: down to label1
+	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %for.body.preheader
 	i32.const	$0=, 0
 .LBB2_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	block   	
-	loop    	                # label4:
+	loop    	                # label1:
 	i32.const	$push17=, a
 	i32.add 	$push3=, $0, $pop17
 	i32.load8_u	$push4=, 0($pop3)
 	i32.const	$push16=, 38
 	i32.ne  	$push5=, $pop4, $pop16
-	br_if   	1, $pop5        # 1: down to label3
+	br_if   	1, $pop5        # 1: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB2_2 Depth=1
 	i32.const	$push21=, 1
@@ -69,7 +66,7 @@ main:                                   # @main
 	tee_local	$push19=, $0=, $pop20
 	i32.const	$push18=, 519
 	i32.le_u	$push6=, $pop19, $pop18
-	br_if   	0, $pop6        # 0: up to label4
+	br_if   	0, $pop6        # 0: up to label1
 # BB#4:                                 # %for.end
 	end_loop
 	call    	bar@FUNCTION
@@ -78,20 +75,20 @@ main:                                   # @main
 	i32.load	$push7=, a+4($pop22)
 	i32.const	$push8=, 909588022
 	i32.ne  	$push9=, $pop7, $pop8
-	br_if   	3, $pop9        # 3: down to label0
+	br_if   	0, $pop9        # 0: down to label0
 # BB#5:                                 # %if.end9
 	i32.const	$push23=, 0
 	i32.const	$push10=, 909522486
 	i32.store	a+4($pop23), $pop10
 .LBB2_6:                                # %for.body13
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label5:
+	loop    	                # label2:
 	i32.const	$push25=, a
 	i32.add 	$push11=, $0, $pop25
 	i32.load8_u	$push12=, 0($pop11)
 	i32.const	$push24=, 54
 	i32.ne  	$push13=, $pop12, $pop24
-	br_if   	2, $pop13       # 2: down to label2
+	br_if   	1, $pop13       # 1: down to label0
 # BB#7:                                 # %for.cond10
                                         #   in Loop: Header=BB2_6 Depth=1
 	i32.const	$push29=, 1
@@ -99,31 +96,19 @@ main:                                   # @main
 	tee_local	$push27=, $0=, $pop28
 	i32.const	$push26=, 519
 	i32.le_u	$push14=, $pop27, $pop26
-	br_if   	0, $pop14       # 0: up to label5
+	br_if   	0, $pop14       # 0: up to label2
 # BB#8:                                 # %for.end22
 	end_loop
 	i32.const	$push15=, 0
 	return  	$pop15
-.LBB2_9:                                # %if.then4
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_10:                               # %if.then18
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_11:                               # %if.then
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_12:                               # %if.then8
+.LBB2_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -134,5 +119,5 @@ a:
 	.size	a, 520
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20090113-1.c.s b/test/torture-s/20090113-1.c.s
index 6d6507550..d820f4a91 100644
--- a/test/torture-s/20090113-1.c.s
+++ b/test/torture-s/20090113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090113-1.c"
+	.file	"20090113-1.c"
 	.section	.text.msum_i4,"ax",@progbits
-	.hidden	msum_i4
+	.hidden	msum_i4                 # -- Begin function msum_i4
 	.globl	msum_i4
 	.type	msum_i4,@function
 msum_i4:                                # @msum_i4
@@ -9,10 +9,10 @@ msum_i4:                                # @msum_i4
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push23=, 0
-	i32.const	$push20=, 0
-	i32.load	$push21=, __stack_pointer($pop20)
+	i32.const	$push21=, 0
+	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 64
-	i32.sub 	$push42=, $pop21, $pop22
+	i32.sub 	$push42=, $pop20, $pop22
 	tee_local	$push41=, $8=, $pop42
 	i32.store	__stack_pointer($pop23), $pop41
 	i32.load	$push40=, 0($2)
@@ -37,7 +37,7 @@ msum_i4:                                # @msum_i4
 	i32.const	$push29=, 2
 	i32.lt_s	$push7=, $2, $pop29
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push27=, 32
 	i32.add 	$push28=, $8, $pop27
 	i32.const	$push10=, 0
@@ -134,19 +134,19 @@ msum_i4:                                # @msum_i4
 	.endfunc
 .Lfunc_end0:
 	.size	msum_i4, .Lfunc_end0-msum_i4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.body18.i.2
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20090113-2.c.s b/test/torture-s/20090113-2.c.s
index 37f430307..bbc18a7be 100644
--- a/test/torture-s/20090113-2.c.s
+++ b/test/torture-s/20090113-2.c.s
@@ -1,20 +1,20 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090113-2.c"
+	.file	"20090113-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 48
-	i32.sub 	$push27=, $pop9, $pop10
-	tee_local	$push26=, $0=, $pop27
-	i32.store	__stack_pointer($pop11), $pop26
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 48
+	i32.sub 	$push26=, $pop9, $pop11
+	tee_local	$push25=, $0=, $pop26
+	i32.store	__stack_pointer($pop12), $pop25
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -22,46 +22,44 @@ main:                                   # @main
 	i32.store	0($pop3), $pop1
 	i32.const	$push5=, 32
 	i32.add 	$push6=, $0, $pop5
-	i32.const	$push25=, 0
-	i64.load	$push4=, .Lmain.elem+8($pop25):p2align=2
-	i64.store	0($pop6), $pop4
 	i32.const	$push24=, 0
-	i64.load	$push7=, .Lmain.elem($pop24):p2align=2
-	i64.store	24($0), $pop7
+	i64.load	$push4=, .Lmain.elem+8($pop24):p2align=2
+	i64.store	0($pop6), $pop4
 	i32.const	$push23=, 0
-	i32.store	16($0), $pop23
+	i64.load	$push7=, .Lmain.elem($pop23):p2align=2
+	i64.store	24($0), $pop7
+	i64.const	$push8=, 0
+	i64.store	16($0), $pop8
+	i32.const	$push16=, 24
+	i32.add 	$push17=, $0, $pop16
+	i32.store	12($0), $pop17
+	i32.const	$push18=, 24
+	i32.add 	$push19=, $0, $pop18
+	i32.store	8($0), $pop19
+	i32.const	$push20=, 8
+	i32.add 	$push21=, $0, $pop20
+	call    	foobar@FUNCTION, $pop21
+	i32.const	$push15=, 0
+	i32.const	$push13=, 48
+	i32.add 	$push14=, $0, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	i32.const	$push22=, 0
-	i32.store	20($0), $pop22
-	i32.const	$push15=, 24
-	i32.add 	$push16=, $0, $pop15
-	i32.store	12($0), $pop16
-	i32.const	$push17=, 24
-	i32.add 	$push18=, $0, $pop17
-	i32.store	8($0), $pop18
-	i32.const	$push19=, 8
-	i32.add 	$push20=, $0, $pop19
-	call    	foobar@FUNCTION, $pop20
-	i32.const	$push14=, 0
-	i32.const	$push12=, 48
-	i32.add 	$push13=, $0, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
-	i32.const	$push21=, 0
-                                        # fallthrough-return: $pop21
+                                        # fallthrough-return: $pop22
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foobar,"ax",@progbits
-	.type	foobar,@function
+	.type	foobar,@function        # -- Begin function foobar
 foobar:                                 # @foobar
 	.param  	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push34=, $pop12, $pop13
+	i32.sub 	$push34=, $pop11, $pop13
 	tee_local	$push33=, $7=, $pop34
 	i32.store	__stack_pointer($pop14), $pop33
 	i32.const	$push18=, 16
@@ -84,20 +82,21 @@ foobar:                                 # @foobar
 	block   	
 	block   	
 	block   	
+	block   	
 	i32.load	$push36=, 0($2)
 	tee_local	$push35=, $5=, $pop36
-	i32.eqz 	$push72=, $pop35
-	br_if   	0, $pop72       # 0: down to label3
-# BB#2:                                 # %while.cond.preheader.i
+	i32.eqz 	$push66=, $pop35
+	br_if   	0, $pop66       # 0: down to label4
+# BB#2:                                 # %if.then.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	block   	
 	i32.const	$push37=, 1
 	i32.and 	$push0=, $5, $pop37
-	br_if   	0, $pop0        # 0: down to label4
+	br_if   	0, $pop0        # 0: down to label5
 .LBB1_3:                                # %while.body.i
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label5:
+	loop    	                # label6:
 	i32.const	$push42=, 1
 	i32.add 	$0=, $0, $pop42
 	i32.const	$push41=, 1
@@ -105,39 +104,38 @@ foobar:                                 # @foobar
 	tee_local	$push39=, $5=, $pop40
 	i32.const	$push38=, 1
 	i32.and 	$push1=, $pop39, $pop38
-	i32.eqz 	$push73=, $pop1
-	br_if   	0, $pop73       # 0: up to label5
+	i32.eqz 	$push67=, $pop1
+	br_if   	0, $pop67       # 0: up to label6
 .LBB1_4:                                # %while.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	end_block                       # label4:
+	end_block                       # label5:
 	i32.store	12($7), $0
-	br      	1               # 1: down to label2
+	br      	1               # 1: down to label3
 .LBB1_5:                                # %if.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label3:
+	end_block                       # label4:
 	i32.load	$push3=, 0($3)
 	i32.const	$push50=, 1
 	i32.add 	$push49=, $pop3, $pop50
-	tee_local	$push48=, $1=, $pop49
+	tee_local	$push48=, $5=, $pop49
 	i32.store	0($3), $pop48
 	i32.const	$push47=, 63
 	i32.add 	$push4=, $0, $pop47
 	i32.const	$push46=, -64
 	i32.and 	$push45=, $pop4, $pop46
-	tee_local	$push44=, $0=, $pop45
+	tee_local	$push44=, $6=, $pop45
 	i32.store	12($7), $pop44
 	i32.load	$4=, 16($7)
-	block   	
 	i32.const	$push43=, 2
-	i32.ne  	$push5=, $1, $pop43
-	br_if   	0, $pop5        # 0: down to label6
+	i32.ne  	$push5=, $5, $pop43
+	br_if   	1, $pop5        # 1: down to label2
 # BB#6:                                 #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$8=, 1
+	i32.const	$8=, 4
 	br      	2               # 2: down to label1
 .LBB1_7:                                #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label6:
-	i32.const	$8=, 3
+	end_block                       # label3:
+	i32.const	$8=, 2
 	br      	1               # 1: down to label1
 .LBB1_8:                                #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label2:
@@ -145,8 +143,8 @@ foobar:                                 # @foobar
 .LBB1_9:                                #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	end_block                       # label1:
+	loop    	                # label7:
 	block   	
-	loop    	                # label8:
 	block   	
 	block   	
 	block   	
@@ -158,95 +156,19 @@ foobar:                                 # @foobar
 	block   	
 	block   	
 	block   	
-	block   	
-	block   	
-	br_table 	$8, 4, 5, 0, 1, 2, 6, 14, 3, 3 # 4: down to label17
-                                        # 5: down to label16
-                                        # 0: down to label21
-                                        # 1: down to label20
-                                        # 2: down to label19
-                                        # 6: down to label15
-                                        # 14: down to label7
-                                        # 3: down to label18
-.LBB1_10:                               # %if.end25.i
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label21:
-	i32.const	$1=, 0
-	i32.const	$push56=, 0
-	i32.store	0($3), $pop56
-	i32.load	$push10=, 8($4)
-	i32.const	$push55=, 7
-	i32.shl 	$push54=, $pop10, $pop55
-	tee_local	$push53=, $0=, $pop54
-	i32.store	12($7), $pop53
-	i32.const	$push52=, 0
-	i32.const	$push51=, 2
-	i32.eq  	$push6=, $pop52, $pop51
-	br_if   	8, $pop6        # 8: down to label12
-# BB#11:                                #   in Loop: Header=BB1_9 Depth=2
-	i32.const	$8=, 3
-	br      	12              # 12: up to label8
-.LBB1_12:                               # %while.body9.i.preheader
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label20:
-	i32.const	$push60=, 1
-	i32.add 	$5=, $1, $pop60
-	i32.const	$push59=, 64
-	i32.add 	$6=, $0, $pop59
-	i32.const	$push58=, 2
-	i32.shl 	$push7=, $1, $pop58
-	i32.add 	$push8=, $4, $pop7
-	i32.const	$push57=, 12
-	i32.add 	$0=, $pop8, $pop57
-# BB#13:                                #   in Loop: Header=BB1_9 Depth=2
-	i32.const	$8=, 4
-	br      	11              # 11: up to label8
-.LBB1_14:                               # %while.body9.i
+	br_table 	$8, 5, 0, 1, 6, 2, 3, 4, 4 # 5: down to label14
+                                        # 0: down to label19
+                                        # 1: down to label18
+                                        # 6: down to label13
+                                        # 2: down to label17
+                                        # 3: down to label16
+                                        # 4: down to label15
+.LBB1_10:                               # %if.then15.i
                                         #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label19:
-	i32.load	$push62=, 0($0)
-	tee_local	$push61=, $1=, $pop62
-	br_if   	8, $pop61       # 8: down to label10
-# BB#15:                                #   in Loop: Header=BB1_9 Depth=2
-	i32.const	$8=, 7
-	br      	10              # 10: up to label8
-.LBB1_16:                               # %if.end17.i
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label18:
+	i32.store	0($2), $1
 	i32.store	0($3), $5
-	i32.const	$push68=, 4
-	i32.add 	$0=, $0, $pop68
 	i32.store	12($7), $6
-	i32.const	$push67=, 64
-	i32.add 	$6=, $6, $pop67
-	i32.const	$push66=, 1
-	i32.add 	$push65=, $5, $pop66
-	tee_local	$push64=, $5=, $pop65
-	i32.const	$push63=, 3
-	i32.ne  	$push9=, $pop64, $pop63
-	br_if   	4, $pop9        # 4: down to label13
-# BB#17:                                #   in Loop: Header=BB1_9 Depth=2
-	i32.const	$8=, 0
-	br      	9               # 9: up to label8
-.LBB1_18:                               # %while.end21.i.loopexit
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label17:
-	i32.const	$push69=, 0
-	i32.store	0($2), $pop69
-# BB#19:                                #   in Loop: Header=BB1_9 Depth=2
-	i32.const	$8=, 1
-	br      	8               # 8: up to label8
-.LBB1_20:                               # %while.end21.i
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label16:
-	i32.load	$push71=, 0($4)
-	tee_local	$push70=, $4=, $pop71
-	br_if   	4, $pop70       # 4: down to label11
-	br      	1               # 1: down to label14
-.LBB1_21:                               # %if.then15.i
-                                        #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label15:
-	i32.store	0($2), $1
 	i32.store	16($7), $4
 	i32.const	$push24=, 16
 	i32.add 	$push25=, $7, $pop24
@@ -254,53 +176,109 @@ foobar:                                 # @foobar
 	i32.add 	$push27=, $7, $pop26
 	call    	bmp_iter_set_tail@FUNCTION, $pop25, $pop27
 	i32.load	$0=, 12($7)
-	br      	5               # 5: down to label9
-.LBB1_22:                               # %for.end
+# BB#11:                                #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 2
+	br      	11              # 11: up to label7
+.LBB1_12:                               # %for.body
+                                        #   in Loop: Header=BB1_1 Depth=1
+	end_block                       # label18:
+	call    	catchme@FUNCTION, $0
+	i32.const	$push28=, 16
+	i32.add 	$push29=, $7, $pop28
+	i32.const	$push30=, 12
+	i32.add 	$push31=, $7, $pop30
+	call    	bmp_iter_next@FUNCTION, $pop29, $pop31
+	br      	11              # 11: up to label0
+.LBB1_13:                               # %while.end21.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label17:
+	i32.load	$push52=, 0($4)
+	tee_local	$push51=, $4=, $pop52
+	i32.eqz 	$push68=, $pop51
+	br_if   	4, $pop68       # 4: down to label12
+# BB#14:                                #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 5
+	br      	9               # 9: up to label7
+.LBB1_15:                               # %if.end25.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label16:
+	i32.load	$push10=, 8($4)
+	i32.const	$push55=, 7
+	i32.shl 	$6=, $pop10, $pop55
+	i32.const	$5=, 0
+	i32.const	$push54=, 0
+	i32.const	$push53=, 2
+	i32.eq  	$push6=, $pop54, $pop53
+	br_if   	7, $pop6        # 7: down to label8
+# BB#16:                                #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 6
+	br      	8               # 8: up to label7
+.LBB1_17:                               # %while.body9.i.preheader
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label15:
+	i32.const	$push57=, 2
+	i32.shl 	$push7=, $5, $pop57
+	i32.add 	$push8=, $4, $pop7
+	i32.const	$push56=, 12
+	i32.add 	$0=, $pop8, $pop56
+# BB#18:                                #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 0
+	br      	7               # 7: up to label7
+.LBB1_19:                               # %while.body9.i
+                                        #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label14:
+	i32.load	$push59=, 0($0)
+	tee_local	$push58=, $1=, $pop59
+	br_if   	2, $pop58       # 2: down to label11
+# BB#20:                                #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 3
+	br      	6               # 6: up to label7
+.LBB1_21:                               # %if.end17.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label13:
+	i32.const	$push65=, 4
+	i32.add 	$0=, $0, $pop65
+	i32.const	$push64=, 64
+	i32.add 	$6=, $6, $pop64
+	i32.const	$push63=, 1
+	i32.add 	$push62=, $5, $pop63
+	tee_local	$push61=, $5=, $pop62
+	i32.const	$push60=, 2
+	i32.ne  	$push9=, $pop61, $pop60
+	br_if   	3, $pop9        # 3: down to label9
+	br      	2               # 2: down to label10
+.LBB1_22:                               # %for.end
+	end_block                       # label12:
 	i32.const	$push17=, 0
 	i32.const	$push15=, 32
 	i32.add 	$push16=, $7, $pop15
 	i32.store	__stack_pointer($pop17), $pop16
 	return
 .LBB1_23:                               #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label13:
-	i32.const	$8=, 4
-	br      	4               # 4: up to label8
-.LBB1_24:                               #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label12:
-	i32.const	$8=, 1
-	br      	3               # 3: up to label8
-.LBB1_25:                               #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label11:
-	i32.const	$8=, 2
-	br      	2               # 2: up to label8
-.LBB1_26:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 1
+	br      	3               # 3: up to label7
+.LBB1_24:                               #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label10:
-	i32.const	$8=, 5
-	br      	1               # 1: up to label8
-.LBB1_27:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 4
+	br      	2               # 2: up to label7
+.LBB1_25:                               #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label9:
-	i32.const	$8=, 6
-	br      	0               # 0: up to label8
-.LBB1_28:                               # %for.body
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$8=, 0
+	br      	1               # 1: up to label7
+.LBB1_26:                               #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label8:
+	i32.const	$8=, 4
+	br      	0               # 0: up to label7
+.LBB1_27:
 	end_loop
-	end_block                       # label7:
-	call    	catchme@FUNCTION, $0
-	i32.const	$push28=, 16
-	i32.add 	$push29=, $7, $pop28
-	i32.const	$push30=, 12
-	i32.add 	$push31=, $7, $pop30
-	call    	bmp_iter_next@FUNCTION, $pop29, $pop31
-	br      	0               # 0: up to label0
-.LBB1_29:
 	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	foobar, .Lfunc_end1-foobar
-
+                                        # -- End function
 	.section	.text.bmp_iter_set_init,"ax",@progbits
-	.type	bmp_iter_set_init,@function
+	.type	bmp_iter_set_init,@function # -- Begin function bmp_iter_set_init
 bmp_iter_set_init:                      # @bmp_iter_set_init
 	.param  	i32, i32, i32
 	.local  	i32
@@ -311,31 +289,31 @@ bmp_iter_set_init:                      # @bmp_iter_set_init
 	tee_local	$push5=, $1=, $pop6
 	i32.store	0($0), $pop5
 	block   	
-	br_if   	0, $1           # 0: down to label22
+	br_if   	0, $1           # 0: down to label20
 # BB#1:                                 # %if.then
 	i32.const	$1=, bitmap_zero_bits
 	i32.const	$push8=, bitmap_zero_bits
 	i32.store	0($0), $pop8
 .LBB2_2:                                # %while.end
-	end_block                       # label22:
+	end_block                       # label20:
 	i32.const	$push11=, 0
 	i32.store	8($0), $pop11
 	i32.load	$push10=, 12($1)
 	tee_local	$push9=, $3=, $pop10
 	i32.store	12($0), $pop9
-	i32.eqz 	$push3=, $3
 	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.shl 	$push2=, $pop0, $pop1
-	i32.or  	$push4=, $pop3, $pop2
+	i32.eqz 	$push3=, $3
+	i32.or  	$push4=, $pop2, $pop3
 	i32.store	0($2), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	bmp_iter_set_init, .Lfunc_end2-bmp_iter_set_init
-
+                                        # -- End function
 	.section	.text.catchme,"ax",@progbits
-	.type	catchme,@function
+	.type	catchme,@function       # -- Begin function catchme
 catchme:                                # @catchme
 	.param  	i32
 # BB#0:                                 # %entry
@@ -344,19 +322,19 @@ catchme:                                # @catchme
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push3=, 64
 	i32.ne  	$push2=, $pop1, $pop3
-	br_if   	0, $pop2        # 0: down to label23
+	br_if   	0, $pop2        # 0: down to label21
 # BB#1:                                 # %if.end
 	return
 .LBB3_2:                                # %if.then
-	end_block                       # label23:
+	end_block                       # label21:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	catchme, .Lfunc_end3-catchme
-
+                                        # -- End function
 	.section	.text.bmp_iter_next,"ax",@progbits
-	.type	bmp_iter_next,@function
+	.type	bmp_iter_next,@function # -- Begin function bmp_iter_next
 bmp_iter_next:                          # @bmp_iter_next
 	.param  	i32, i32
 # BB#0:                                 # %entry
@@ -372,9 +350,9 @@ bmp_iter_next:                          # @bmp_iter_next
 	.endfunc
 .Lfunc_end4:
 	.size	bmp_iter_next, .Lfunc_end4-bmp_iter_next
-
+                                        # -- End function
 	.section	.text.bmp_iter_set_tail,"ax",@progbits
-	.type	bmp_iter_set_tail,@function
+	.type	bmp_iter_set_tail,@function # -- Begin function bmp_iter_set_tail
 bmp_iter_set_tail:                      # @bmp_iter_set_tail
 	.param  	i32, i32
 	.local  	i32, i32
@@ -384,12 +362,12 @@ bmp_iter_set_tail:                      # @bmp_iter_set_tail
 	tee_local	$push5=, $3=, $pop6
 	i32.const	$push4=, 1
 	i32.and 	$push0=, $pop5, $pop4
-	br_if   	0, $pop0        # 0: down to label24
+	br_if   	0, $pop0        # 0: down to label22
 # BB#1:                                 # %while.body.lr.ph
 	i32.load	$2=, 0($1)
 .LBB5_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label25:
+	loop    	                # label23:
 	i32.const	$push11=, 1
 	i32.add 	$2=, $2, $pop11
 	i32.const	$push10=, 1
@@ -398,7 +376,7 @@ bmp_iter_set_tail:                      # @bmp_iter_set_tail
 	i32.const	$push7=, 1
 	i32.and 	$push1=, $pop8, $pop7
 	i32.eqz 	$push12=, $pop1
-	br_if   	0, $pop12       # 0: up to label25
+	br_if   	0, $pop12       # 0: up to label23
 # BB#3:                                 # %while.cond.while.end_crit_edge
 	end_loop
 	i32.store	0($1), $2
@@ -406,12 +384,12 @@ bmp_iter_set_tail:                      # @bmp_iter_set_tail
 	i32.add 	$push3=, $0, $pop2
 	i32.store	0($pop3), $3
 .LBB5_4:                                # %while.end
-	end_block                       # label24:
+	end_block                       # label22:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
 	.size	bmp_iter_set_tail, .Lfunc_end5-bmp_iter_set_tail
-
+                                        # -- End function
 	.type	.Lmain.elem,@object     # @main.elem
 	.section	.rodata..Lmain.elem,"a",@progbits
 	.p2align	2
@@ -433,5 +411,5 @@ bitmap_zero_bits:
 	.size	bitmap_zero_bits, 20
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20090113-3.c.s b/test/torture-s/20090113-3.c.s
index bffc9cb47..1628a4bfe 100644
--- a/test/torture-s/20090113-3.c.s
+++ b/test/torture-s/20090113-3.c.s
@@ -1,20 +1,20 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090113-3.c"
+	.file	"20090113-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 48
-	i32.sub 	$push27=, $pop9, $pop10
-	tee_local	$push26=, $0=, $pop27
-	i32.store	__stack_pointer($pop11), $pop26
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 48
+	i32.sub 	$push26=, $pop9, $pop11
+	tee_local	$push25=, $0=, $pop26
+	i32.store	__stack_pointer($pop12), $pop25
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -22,67 +22,64 @@ main:                                   # @main
 	i32.store	0($pop3), $pop1
 	i32.const	$push5=, 32
 	i32.add 	$push6=, $0, $pop5
-	i32.const	$push25=, 0
-	i64.load	$push4=, .Lmain.elem+8($pop25):p2align=2
-	i64.store	0($pop6), $pop4
 	i32.const	$push24=, 0
-	i64.load	$push7=, .Lmain.elem($pop24):p2align=2
-	i64.store	24($0), $pop7
+	i64.load	$push4=, .Lmain.elem+8($pop24):p2align=2
+	i64.store	0($pop6), $pop4
 	i32.const	$push23=, 0
-	i32.store	16($0), $pop23
+	i64.load	$push7=, .Lmain.elem($pop23):p2align=2
+	i64.store	24($0), $pop7
+	i64.const	$push8=, 0
+	i64.store	16($0), $pop8
+	i32.const	$push16=, 24
+	i32.add 	$push17=, $0, $pop16
+	i32.store	12($0), $pop17
+	i32.const	$push18=, 24
+	i32.add 	$push19=, $0, $pop18
+	i32.store	8($0), $pop19
+	i32.const	$push20=, 8
+	i32.add 	$push21=, $0, $pop20
+	call    	foobar@FUNCTION, $pop21
+	i32.const	$push15=, 0
+	i32.const	$push13=, 48
+	i32.add 	$push14=, $0, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	i32.const	$push22=, 0
-	i32.store	20($0), $pop22
-	i32.const	$push15=, 24
-	i32.add 	$push16=, $0, $pop15
-	i32.store	12($0), $pop16
-	i32.const	$push17=, 24
-	i32.add 	$push18=, $0, $pop17
-	i32.store	8($0), $pop18
-	i32.const	$push19=, 8
-	i32.add 	$push20=, $0, $pop19
-	call    	foobar@FUNCTION, $pop20
-	i32.const	$push14=, 0
-	i32.const	$push12=, 48
-	i32.add 	$push13=, $0, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
-	i32.const	$push21=, 0
-                                        # fallthrough-return: $pop21
+                                        # fallthrough-return: $pop22
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foobar,"ax",@progbits
-	.type	foobar,@function
+	.type	foobar,@function        # -- Begin function foobar
 foobar:                                 # @foobar
 	.param  	i32
-	.local  	i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
-	i32.const	$push15=, 32
-	i32.sub 	$push35=, $pop14, $pop15
-	tee_local	$push34=, $5=, $pop35
-	i32.store	__stack_pointer($pop16), $pop34
-	i32.const	$push20=, 16
-	i32.add 	$push21=, $5, $pop20
-	i32.const	$push22=, 12
-	i32.add 	$push23=, $5, $pop22
-	call    	bmp_iter_set_init@FUNCTION, $pop21, $0, $pop23
-	i32.load	$4=, 16($5)
-	i32.const	$push3=, 24
-	i32.add 	$1=, $5, $pop3
+	i32.const	$push11=, 0
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
+	i32.const	$push10=, 32
+	i32.sub 	$push22=, $pop8, $pop10
+	tee_local	$push21=, $4=, $pop22
+	i32.store	__stack_pointer($pop11), $pop21
+	i32.const	$push15=, 16
+	i32.add 	$push16=, $4, $pop15
+	i32.const	$push17=, 12
+	i32.add 	$push18=, $4, $pop17
+	call    	bmp_iter_set_init@FUNCTION, $pop16, $0, $pop18
+	i32.load	$1=, 16($4)
+	i32.load	$2=, 24($4)
 	block   	
 	block   	
-	i32.load	$push33=, 28($5)
-	tee_local	$push32=, $0=, $pop33
-	br_if   	0, $pop32       # 0: down to label1
+	i32.load	$push20=, 28($4)
+	tee_local	$push19=, $0=, $pop20
+	br_if   	0, $pop19       # 0: down to label1
 # BB#1:
-	i32.const	$6=, 2
+	i32.const	$5=, 2
 	br      	1               # 1: down to label0
 .LBB1_2:
 	end_block                       # label1:
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB1_3:                                # =>This Inner Loop Header: Depth=1
 	end_block                       # label0:
 	loop    	                # label2:
@@ -110,240 +107,191 @@ foobar:                                 # @foobar
 	block   	
 	block   	
 	block   	
-	block   	
-	block   	
-	block   	
-	br_table 	$6, 1, 0, 4, 5, 6, 7, 11, 12, 13, 8, 9, 10, 14, 2, 3, 3 # 1: down to label28
-                                        # 0: down to label29
-                                        # 4: down to label25
-                                        # 5: down to label24
-                                        # 6: down to label23
-                                        # 7: down to label22
-                                        # 11: down to label18
-                                        # 12: down to label17
-                                        # 13: down to label16
-                                        # 8: down to label21
-                                        # 9: down to label20
-                                        # 10: down to label19
-                                        # 14: down to label15
-                                        # 2: down to label27
-                                        # 3: down to label26
+	br_table 	$5, 1, 0, 3, 4, 5, 6, 9, 10, 7, 8, 11, 2, 2 # 1: down to label25
+                                        # 0: down to label26
+                                        # 3: down to label23
+                                        # 4: down to label22
+                                        # 5: down to label21
+                                        # 6: down to label20
+                                        # 9: down to label17
+                                        # 10: down to label16
+                                        # 7: down to label19
+                                        # 8: down to label18
+                                        # 11: down to label15
+                                        # 2: down to label24
 .LBB1_4:                                # %for.inc
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label29:
-	i32.const	$push28=, 16
-	i32.add 	$push29=, $5, $pop28
-	i32.const	$push39=, 12
-	i32.add 	$push10=, $pop29, $pop39
-	i32.const	$push38=, 1
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $0=, $pop37
-	i32.store	0($pop10), $pop36
-	i32.eqz 	$push69=, $0
-	br_if   	14, $pop69      # 14: down to label14
-# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 0
-	br      	26              # 26: up to label2
-.LBB1_6:                                # %while.cond.preheader.i
-                                        #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label28:
-	i32.const	$push40=, 1
-	i32.and 	$push0=, $0, $pop40
-	br_if   	15, $pop0       # 15: down to label12
-# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 13
-	br      	25              # 25: up to label2
-.LBB1_8:                                # %while.body.i
-                                        #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label27:
-	i32.const	$push44=, 1
-	i32.shr_u	$push43=, $0, $pop44
-	tee_local	$push42=, $0=, $pop43
-	i32.const	$push41=, 1
-	i32.and 	$push1=, $pop42, $pop41
-	i32.eqz 	$push70=, $pop1
-	br_if   	23, $pop70      # 23: down to label3
-# BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 14
-	br      	24              # 24: up to label2
-.LBB1_10:                               # %while.cond.return.loopexit62_crit_edge.i
-                                        #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label26:
-	i32.const	$push30=, 16
-	i32.add 	$push31=, $5, $pop30
-	i32.const	$push45=, 12
-	i32.add 	$push2=, $pop31, $pop45
-	i32.store	0($pop2), $0
-	br      	12              # 12: down to label13
-.LBB1_11:                               # %if.end.i
+	i32.const	$push25=, 1
+	i32.shr_u	$push24=, $0, $pop25
+	tee_local	$push23=, $0=, $pop24
+	i32.eqz 	$push49=, $pop23
+	br_if   	11, $pop49      # 11: down to label14
+# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 0
+	br      	23              # 23: up to label2
+.LBB1_6:                                # %if.then.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label25:
-	i32.load	$push4=, 0($1)
-	i32.const	$push46=, 1
-	i32.add 	$3=, $pop4, $pop46
-# BB#12:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 3
+	i32.const	$push26=, 1
+	i32.and 	$push0=, $0, $pop26
+	br_if   	13, $pop0       # 13: down to label11
+# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 11
 	br      	22              # 22: up to label2
-.LBB1_13:                               # %while.body6.i
+.LBB1_8:                                # %while.body.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label24:
-	i32.const	$push47=, 2
-	i32.eq  	$push5=, $3, $pop47
-	br_if   	16, $pop5       # 16: down to label7
-# BB#14:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 4
-	br      	21              # 21: up to label2
-.LBB1_15:                               # %while.body9.i.preheader
+	i32.const	$push30=, 1
+	i32.shr_u	$push29=, $0, $pop30
+	tee_local	$push28=, $0=, $pop29
+	i32.const	$push27=, 1
+	i32.and 	$push1=, $pop28, $pop27
+	i32.eqz 	$push50=, $pop1
+	br_if   	10, $pop50      # 10: down to label13
+	br      	11              # 11: down to label12
+.LBB1_9:                                # %if.end.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label23:
-	i32.const	$push49=, 2
-	i32.shl 	$push6=, $3, $pop49
-	i32.add 	$push7=, $4, $pop6
-	i32.const	$push48=, 12
-	i32.add 	$2=, $pop7, $pop48
-# BB#16:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 5
+	i32.const	$push31=, 1
+	i32.add 	$2=, $2, $pop31
+# BB#10:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 3
 	br      	20              # 20: up to label2
-.LBB1_17:                               # %while.body9.i
+.LBB1_11:                               # %while.body6.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label22:
-	i32.load	$push51=, 0($2)
-	tee_local	$push50=, $0=, $pop51
-	br_if   	16, $pop50      # 16: down to label5
-# BB#18:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 9
+	i32.const	$push32=, 2
+	i32.eq  	$push2=, $2, $pop32
+	br_if   	16, $pop2       # 16: down to label5
+# BB#12:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 4
 	br      	19              # 19: up to label2
-.LBB1_19:                               # %if.end26.i
+.LBB1_13:                               # %while.body9.i.preheader
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label21:
-	i32.const	$push56=, 4
-	i32.add 	$2=, $2, $pop56
-	i32.const	$push55=, 1
-	i32.add 	$push54=, $3, $pop55
-	tee_local	$push53=, $3=, $pop54
-	i32.const	$push52=, 2
-	i32.ne  	$push11=, $pop53, $pop52
-	br_if   	14, $pop11      # 14: down to label6
-# BB#20:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 10
+	i32.const	$push34=, 2
+	i32.shl 	$push3=, $2, $pop34
+	i32.add 	$push4=, $1, $pop3
+	i32.const	$push33=, 12
+	i32.add 	$3=, $pop4, $pop33
+# BB#14:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 5
 	br      	18              # 18: up to label2
-.LBB1_21:                               # %while.end30.i.loopexit
+.LBB1_15:                               # %while.body9.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label20:
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $5, $pop24
-	i32.const	$push58=, 12
-	i32.add 	$push12=, $pop25, $pop58
-	i32.const	$push57=, 0
-	i32.store	0($pop12), $pop57
-# BB#22:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 11
+	i32.load	$push36=, 0($3)
+	tee_local	$push35=, $0=, $pop36
+	br_if   	16, $pop35      # 16: down to label3
+# BB#16:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 8
 	br      	17              # 17: up to label2
-.LBB1_23:                               # %while.end30.i
+.LBB1_17:                               # %if.end26.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label19:
-	i32.const	$3=, 0
-	i32.load	$push60=, 0($4)
-	tee_local	$push59=, $4=, $pop60
-	br_if   	10, $pop59      # 10: down to label8
-	br      	9               # 9: down to label9
-.LBB1_24:                               # %while.cond16.preheader.i
+	i32.const	$push41=, 4
+	i32.add 	$3=, $3, $pop41
+	i32.const	$push40=, 1
+	i32.add 	$push39=, $2, $pop40
+	tee_local	$push38=, $2=, $pop39
+	i32.const	$push37=, 2
+	i32.ne  	$push7=, $pop38, $pop37
+	br_if   	14, $pop7       # 14: down to label4
+# BB#18:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 9
+	br      	16              # 16: up to label2
+.LBB1_19:                               # %while.end30.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label18:
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $5, $pop26
-	i32.const	$push64=, 12
-	i32.add 	$push63=, $pop27, $pop64
-	tee_local	$push62=, $2=, $pop63
-	i32.store	0($pop62), $0
-	i32.store	0($1), $3
-	i32.const	$push61=, 1
-	i32.and 	$push8=, $0, $pop61
-	br_if   	7, $pop8        # 7: down to label10
-# BB#25:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 7
-	br      	15              # 15: up to label2
-.LBB1_26:                               # %while.body21.i
+	i32.const	$2=, 0
+	i32.load	$push43=, 0($1)
+	tee_local	$push42=, $1=, $pop43
+	br_if   	11, $pop42      # 11: down to label6
+	br      	10              # 10: down to label7
+.LBB1_20:                               # %if.then15.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label17:
-	i32.const	$push68=, 1
-	i32.shr_u	$push67=, $0, $pop68
-	tee_local	$push66=, $0=, $pop67
-	i32.const	$push65=, 1
-	i32.and 	$push9=, $pop66, $pop65
-	i32.eqz 	$push71=, $pop9
-	br_if   	12, $pop71      # 12: down to label4
-# BB#27:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$6=, 8
+	i32.const	$push44=, 1
+	i32.and 	$push5=, $0, $pop44
+	br_if   	6, $pop5        # 6: down to label10
+# BB#21:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 7
 	br      	14              # 14: up to label2
-.LBB1_28:                               # %while.cond16.return.loopexit_crit_edge.i
+.LBB1_22:                               # %while.body21.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label16:
-	i32.store	0($2), $0
-	br      	4               # 4: down to label11
-.LBB1_29:                               # %for.end
+	i32.const	$push48=, 1
+	i32.shr_u	$push47=, $0, $pop48
+	tee_local	$push46=, $0=, $pop47
+	i32.const	$push45=, 1
+	i32.and 	$push6=, $pop46, $pop45
+	i32.eqz 	$push51=, $pop6
+	br_if   	6, $pop51       # 6: down to label9
+	br      	7               # 7: down to label8
+.LBB1_23:                               # %for.end
 	end_block                       # label15:
-	i32.const	$push19=, 0
-	i32.const	$push17=, 32
-	i32.add 	$push18=, $5, $pop17
-	i32.store	__stack_pointer($pop19), $pop18
+	i32.const	$push14=, 0
+	i32.const	$push12=, 32
+	i32.add 	$push13=, $4, $pop12
+	i32.store	__stack_pointer($pop14), $pop13
 	return
-.LBB1_30:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_24:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label14:
-	i32.const	$6=, 2
+	i32.const	$5=, 2
 	br      	11              # 11: up to label2
-.LBB1_31:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_25:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label13:
-	i32.const	$6=, 1
+	i32.const	$5=, 11
 	br      	10              # 10: up to label2
-.LBB1_32:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_26:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label12:
-	i32.const	$6=, 1
+	i32.const	$5=, 1
 	br      	9               # 9: up to label2
-.LBB1_33:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_27:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label11:
-	i32.const	$6=, 1
+	i32.const	$5=, 1
 	br      	8               # 8: up to label2
-.LBB1_34:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_28:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label10:
-	i32.const	$6=, 1
+	i32.const	$5=, 1
 	br      	7               # 7: up to label2
-.LBB1_35:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_29:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label9:
-	i32.const	$6=, 12
+	i32.const	$5=, 7
 	br      	6               # 6: up to label2
-.LBB1_36:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_30:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label8:
-	i32.const	$6=, 3
+	i32.const	$5=, 1
 	br      	5               # 5: up to label2
-.LBB1_37:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_31:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label7:
-	i32.const	$6=, 11
+	i32.const	$5=, 10
 	br      	4               # 4: up to label2
-.LBB1_38:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_32:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label6:
-	i32.const	$6=, 5
+	i32.const	$5=, 3
 	br      	3               # 3: up to label2
-.LBB1_39:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_33:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label5:
-	i32.const	$6=, 6
+	i32.const	$5=, 9
 	br      	2               # 2: up to label2
-.LBB1_40:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_34:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label4:
-	i32.const	$6=, 7
+	i32.const	$5=, 5
 	br      	1               # 1: up to label2
-.LBB1_41:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_35:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label3:
-	i32.const	$6=, 13
+	i32.const	$5=, 6
 	br      	0               # 0: up to label2
-.LBB1_42:
+.LBB1_36:
 	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	foobar, .Lfunc_end1-foobar
-
+                                        # -- End function
 	.section	.text.bmp_iter_set_init,"ax",@progbits
-	.type	bmp_iter_set_init,@function
+	.type	bmp_iter_set_init,@function # -- Begin function bmp_iter_set_init
 bmp_iter_set_init:                      # @bmp_iter_set_init
 	.param  	i32, i32, i32
 	.local  	i32
@@ -354,29 +302,29 @@ bmp_iter_set_init:                      # @bmp_iter_set_init
 	tee_local	$push5=, $1=, $pop6
 	i32.store	0($0), $pop5
 	block   	
-	br_if   	0, $1           # 0: down to label30
+	br_if   	0, $1           # 0: down to label27
 # BB#1:                                 # %if.then
 	i32.const	$1=, bitmap_zero_bits
 	i32.const	$push8=, bitmap_zero_bits
 	i32.store	0($0), $pop8
 .LBB2_2:                                # %while.end
-	end_block                       # label30:
+	end_block                       # label27:
 	i32.const	$push11=, 0
 	i32.store	8($0), $pop11
 	i32.load	$push10=, 12($1)
 	tee_local	$push9=, $3=, $pop10
 	i32.store	12($0), $pop9
-	i32.eqz 	$push3=, $3
 	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.shl 	$push2=, $pop0, $pop1
-	i32.or  	$push4=, $pop3, $pop2
+	i32.eqz 	$push3=, $3
+	i32.or  	$push4=, $pop2, $pop3
 	i32.store	0($2), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	bmp_iter_set_init, .Lfunc_end2-bmp_iter_set_init
-
+                                        # -- End function
 	.type	.Lmain.elem,@object     # @main.elem
 	.section	.rodata..Lmain.elem,"a",@progbits
 	.p2align	2
@@ -398,4 +346,4 @@ bitmap_zero_bits:
 	.size	bitmap_zero_bits, 20
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20090207-1.c.s b/test/torture-s/20090207-1.c.s
index 6bba56ae5..87449e8d5 100644
--- a/test/torture-s/20090207-1.c.s
+++ b/test/torture-s/20090207-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090207-1.c"
+	.file	"20090207-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,10 +9,10 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 128
-	i32.sub 	$push10=, $pop6, $pop7
+	i32.sub 	$push10=, $pop5, $pop7
 	tee_local	$push9=, $1=, $pop10
 	i64.const	$push0=, 12884901889
 	i64.store	0($pop9), $pop0
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,6 +39,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20090527-1.c.s b/test/torture-s/20090527-1.c.s
index 0698e1c64..cea569e99 100644
--- a/test/torture-s/20090527-1.c.s
+++ b/test/torture-s/20090527-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090527-1.c"
+	.file	"20090527-1.c"
 	.section	.text.new_unit,"ax",@progbits
-	.hidden	new_unit
+	.hidden	new_unit                # -- Begin function new_unit
 	.globl	new_unit
 	.type	new_unit,@function
 new_unit:                               # @new_unit
@@ -43,9 +43,9 @@ new_unit:                               # @new_unit
 	.endfunc
 .Lfunc_end0:
 	.size	new_unit, .Lfunc_end0-new_unit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20090623-1.c.s b/test/torture-s/20090623-1.c.s
index c70e58004..c63361425 100644
--- a/test/torture-s/20090623-1.c.s
+++ b/test/torture-s/20090623-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090623-1.c"
+	.file	"20090623-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,19 +16,19 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop2, $pop3
+	i32.sub 	$push6=, $pop1, $pop3
 	i32.const	$push4=, 12
 	i32.add 	$push5=, $pop6, $pop4
 	i32.store	x($pop0), $pop5
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -48,4 +48,4 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20090711-1.c.s b/test/torture-s/20090711-1.c.s
index 95773d1f7..2f5c32bbe 100644
--- a/test/torture-s/20090711-1.c.s
+++ b/test/torture-s/20090711-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090711-1.c"
+	.file	"20090711-1.c"
 	.section	.text.div,"ax",@progbits
-	.hidden	div
+	.hidden	div                     # -- Begin function div
 	.globl	div
 	.type	div,@function
 div:                                    # @div
@@ -14,9 +14,9 @@ div:                                    # @div
 	.endfunc
 .Lfunc_end0:
 	.size	div, .Lfunc_end0-div
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20090814-1.c.s b/test/torture-s/20090814-1.c.s
index fceac870a..77200bbb3 100644
--- a/test/torture-s/20090814-1.c.s
+++ b/test/torture-s/20090814-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20090814-1.c"
+	.file	"20090814-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -32,9 +32,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -82,5 +82,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20091229-1.c.s b/test/torture-s/20091229-1.c.s
index 9151fd029..d0ddd4b57 100644
--- a/test/torture-s/20091229-1.c.s
+++ b/test/torture-s/20091229-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20091229-1.c"
+	.file	"20091229-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20100209-1.c.s b/test/torture-s/20100209-1.c.s
index 797827da4..8308a1ebe 100644
--- a/test/torture-s/20100209-1.c.s
+++ b/test/torture-s/20100209-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100209-1.c"
+	.file	"20100209-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -14,9 +14,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20100316-1.c.s b/test/torture-s/20100316-1.c.s
index 7c0a257f0..1544870cb 100644
--- a/test/torture-s/20100316-1.c.s
+++ b/test/torture-s/20100316-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100316-1.c"
+	.file	"20100316-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	f                       # @f
 	.type	f,@object
 	.section	.bss.f,"aw",@nobits
@@ -59,5 +59,5 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20100416-1.c.s b/test/torture-s/20100416-1.c.s
index 33cf87392..06cf4e7cc 100644
--- a/test/torture-s/20100416-1.c.s
+++ b/test/torture-s/20100416-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100416-1.c"
+	.file	"20100416-1.c"
 	.section	.text.movegt,"ax",@progbits
-	.hidden	movegt
+	.hidden	movegt                  # -- Begin function movegt
 	.globl	movegt
 	.type	movegt,@function
 movegt:                                 # @movegt
@@ -19,9 +19,9 @@ movegt:                                 # @movegt
 	.endfunc
 .Lfunc_end0:
 	.size	movegt, .Lfunc_end0-movegt
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -97,7 +97,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	tests                   # @tests
 	.type	tests,@object
 	.section	.data.tests,"aw",@progbits
@@ -122,5 +122,5 @@ tests:
 	.size	tests, 80
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20100430-1.c.s b/test/torture-s/20100430-1.c.s
index dc8a50521..7b0de98c5 100644
--- a/test/torture-s/20100430-1.c.s
+++ b/test/torture-s/20100430-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100430-1.c"
+	.file	"20100430-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20100708-1.c.s b/test/torture-s/20100708-1.c.s
index d10d15774..50fd2d313 100644
--- a/test/torture-s/20100708-1.c.s
+++ b/test/torture-s/20100708-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100708-1.c"
+	.file	"20100708-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,10 +26,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 208
-	i32.sub 	$push11=, $pop2, $pop3
+	i32.sub 	$push11=, $pop1, $pop3
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop4), $pop10
 	i32.const	$push8=, 8
@@ -44,6 +44,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20100805-1.c.s b/test/torture-s/20100805-1.c.s
index 3bdd2ca64..81f80cac0 100644
--- a/test/torture-s/20100805-1.c.s
+++ b/test/torture-s/20100805-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100805-1.c"
+	.file	"20100805-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -31,9 +31,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,6 +44,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20100827-1.c.s b/test/torture-s/20100827-1.c.s
index 6abea01aa..b33075c97 100644
--- a/test/torture-s/20100827-1.c.s
+++ b/test/torture-s/20100827-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20100827-1.c"
+	.file	"20100827-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -45,9 +45,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,7 +69,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -77,5 +77,5 @@ main:                                   # @main
 	.size	.L.str, 2
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20101011-1.c.s b/test/torture-s/20101011-1.c.s
index 97ed6de4c..8ed79eb99 100644
--- a/test/torture-s/20101011-1.c.s
+++ b/test/torture-s/20101011-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20101011-1.c"
+	.file	"20101011-1.c"
 	.section	.text.sigfpe,"ax",@progbits
-	.hidden	sigfpe
+	.hidden	sigfpe                  # -- Begin function sigfpe
 	.globl	sigfpe
 	.type	sigfpe,@function
 sigfpe:                                 # @sigfpe
@@ -13,9 +13,9 @@ sigfpe:                                 # @sigfpe
 	.endfunc
 .Lfunc_end0:
 	.size	sigfpe, .Lfunc_end0-sigfpe
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	k                       # @k
 	.type	k,@object
 	.section	.bss.k,"aw",@nobits
@@ -40,7 +40,7 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	signal, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/20101013-1.c.s b/test/torture-s/20101013-1.c.s
index 2e1e8e93a..f1b345ff4 100644
--- a/test/torture-s/20101013-1.c.s
+++ b/test/torture-s/20101013-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20101013-1.c"
+	.file	"20101013-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,17 +13,17 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.build_ref_for_offset,"ax",@progbits
-	.type	build_ref_for_offset,@function
+	.type	build_ref_for_offset,@function # -- Begin function build_ref_for_offset
 build_ref_for_offset:                   # @build_ref_for_offset
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop4, $pop5
+	i32.sub 	$push13=, $pop3, $pop5
 	tee_local	$push12=, $0=, $pop13
 	i32.store	__stack_pointer($pop6), $pop12
 	i32.const	$push10=, 8
@@ -41,9 +41,9 @@ build_ref_for_offset:                   # @build_ref_for_offset
 	.endfunc
 .Lfunc_end1:
 	.size	build_ref_for_offset, .Lfunc_end1-build_ref_for_offset
-
+                                        # -- End function
 	.section	.text.get_addr_base_and_unit_offset,"ax",@progbits
-	.type	get_addr_base_and_unit_offset,@function
+	.type	get_addr_base_and_unit_offset,@function # -- Begin function get_addr_base_and_unit_offset
 get_addr_base_and_unit_offset:          # @get_addr_base_and_unit_offset
 	.param  	i32
 # BB#0:                                 # %entry
@@ -53,9 +53,9 @@ get_addr_base_and_unit_offset:          # @get_addr_base_and_unit_offset
 	.endfunc
 .Lfunc_end2:
 	.size	get_addr_base_and_unit_offset, .Lfunc_end2-get_addr_base_and_unit_offset
-
+                                        # -- End function
 	.section	.text.build_int_cst,"ax",@progbits
-	.type	build_int_cst,@function
+	.type	build_int_cst,@function # -- Begin function build_int_cst
 build_int_cst:                          # @build_int_cst
 	.param  	i64
 # BB#0:                                 # %entry
@@ -72,7 +72,7 @@ build_int_cst:                          # @build_int_cst
 	.endfunc
 .Lfunc_end3:
 	.size	build_int_cst, .Lfunc_end3-build_int_cst
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20101025-1.c.s b/test/torture-s/20101025-1.c.s
index e14cfb4f5..f2a2a8ce5 100644
--- a/test/torture-s/20101025-1.c.s
+++ b/test/torture-s/20101025-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20101025-1.c"
+	.file	"20101025-1.c"
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -13,9 +13,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end0:
 	.size	f2, .Lfunc_end0-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -33,9 +33,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end1:
 	.size	f3, .Lfunc_end1-f3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -59,7 +59,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	g_3                     # @g_3
 	.type	g_3,@object
 	.section	.bss.g_3,"aw",@nobits
@@ -84,6 +84,6 @@ g_7:
 	.size	g_7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20111208-1.c.s b/test/torture-s/20111208-1.c.s
index a646c49fe..b318fd551 100644
--- a/test/torture-s/20111208-1.c.s
+++ b/test/torture-s/20111208-1.c.s
@@ -1,73 +1,73 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20111208-1.c"
+	.file	"20111208-1.c"
 	.section	.text.pack_unpack,"ax",@progbits
-	.hidden	pack_unpack
+	.hidden	pack_unpack             # -- Begin function pack_unpack
 	.globl	pack_unpack
 	.type	pack_unpack,@function
 pack_unpack:                            # @pack_unpack
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $1
-	i32.add 	$push10=, $1, $pop0
-	tee_local	$push9=, $2=, $pop10
-	i32.ge_u	$push1=, $1, $pop9
-	br_if   	0, $pop1        # 0: down to label0
-.LBB0_1:                                # %while.body
+	i32.call	$push10=, strlen@FUNCTION, $1
+	tee_local	$push9=, $3=, $pop10
+	i32.const	$push8=, 1
+	i32.lt_s	$push0=, $pop9, $pop8
+	br_if   	0, $pop0        # 0: down to label0
+# BB#1:                                 # %while.body.preheader
+	i32.add 	$2=, $1, $3
+.LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push15=, 1
-	i32.add 	$3=, $1, $pop15
+	copy_local	$push16=, $1
+	tee_local	$push15=, $3=, $pop16
+	i32.const	$push14=, 1
+	i32.add 	$1=, $pop15, $pop14
 	block   	
-	i32.load8_s	$push14=, 0($1)
-	tee_local	$push13=, $4=, $pop14
-	i32.const	$push12=, 108
-	i32.eq  	$push5=, $pop13, $pop12
-	br_if   	0, $pop5        # 0: down to label2
-# BB#2:                                 # %while.body
-                                        #   in Loop: Header=BB0_1 Depth=1
-	copy_local	$1=, $3
+	i32.load8_s	$push13=, 0($3)
+	tee_local	$push12=, $3=, $pop13
+	i32.const	$push11=, 108
+	i32.eq  	$push1=, $pop12, $pop11
+	br_if   	0, $pop1        # 0: down to label2
+# BB#3:                                 # %while.body
+                                        #   in Loop: Header=BB0_2 Depth=1
 	block   	
-	i32.const	$push16=, 115
-	i32.ne  	$push6=, $4, $pop16
-	br_if   	0, $pop6        # 0: down to label3
-# BB#3:                                 # %sw.bb4
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.load16_s	$push8=, 0($0):p2align=0
-	call    	do_something@FUNCTION, $pop8
-	i32.const	$push11=, 2
-	i32.add 	$0=, $0, $pop11
-	copy_local	$1=, $3
-.LBB0_4:                                # %while.cond
-                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push17=, 115
+	i32.ne  	$push2=, $3, $pop17
+	br_if   	0, $pop2        # 0: down to label3
+# BB#4:                                 # %sw.bb4
+                                        #   in Loop: Header=BB0_2 Depth=1
+	i32.load16_s	$push4=, 0($0):p2align=0
+	call    	do_something@FUNCTION, $pop4
+	i32.const	$push18=, 2
+	i32.add 	$0=, $0, $pop18
+.LBB0_5:                                # %sw.epilog13
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
-	i32.ge_u	$push3=, $1, $2
-	br_if   	2, $pop3        # 2: down to label0
-	br      	1               # 1: up to label1
-.LBB0_5:                                # %sw.bb7
-                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.lt_u	$push6=, $1, $2
+	br_if   	1, $pop6        # 1: up to label1
+	br      	2               # 2: down to label0
+.LBB0_6:                                # %sw.bb7
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label2:
-	i32.load	$push7=, 0($0):p2align=0
-	call    	do_something@FUNCTION, $pop7
+	i32.load	$push3=, 0($0):p2align=0
+	call    	do_something@FUNCTION, $pop3
 	i32.const	$push19=, 4
 	i32.add 	$0=, $0, $pop19
-	copy_local	$push18=, $3
-	tee_local	$push17=, $1=, $pop18
-	i32.lt_u	$push2=, $pop17, $2
-	br_if   	0, $pop2        # 0: up to label1
-.LBB0_6:                                # %while.end
+	i32.lt_u	$push5=, $1, $2
+	br_if   	0, $pop5        # 0: up to label1
+.LBB0_7:                                # %while.end
 	end_loop
 	end_block                       # label0:
-	i32.load8_s	$push4=, 0($0)
-                                        # fallthrough-return: $pop4
+	i32.load8_s	$push7=, 0($0)
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end0:
 	.size	pack_unpack, .Lfunc_end0-pack_unpack
-
+                                        # -- End function
 	.section	.text.do_something,"ax",@progbits
-	.type	do_something,@function
+	.type	do_something,@function  # -- Begin function do_something
 do_something:                           # @do_something
 	.param  	i32
 # BB#0:                                 # %entry
@@ -77,97 +77,24 @@ do_something:                           # @do_something
 	.endfunc
 .Lfunc_end1:
 	.size	do_something, .Lfunc_end1-do_something
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$3=, .L.str
-	i32.const	$2=, .L.str.1
-	block   	
-	i32.const	$push10=, .L.str.1
-	i32.const	$push9=, .L.str.1+2
-	i32.ge_u	$push0=, $pop10, $pop9
-	br_if   	0, $pop0        # 0: down to label4
-.LBB2_1:                                # %while.body.i
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label5:
-	i32.const	$push16=, 1
-	i32.add 	$0=, $2, $pop16
-	block   	
-	block   	
-	block   	
-	i32.load8_s	$push15=, 0($2)
-	tee_local	$push14=, $1=, $pop15
-	i32.const	$push13=, 108
-	i32.ne  	$push5=, $pop14, $pop13
-	br_if   	0, $pop5        # 0: down to label8
-# BB#2:                                 # %sw.bb7.i
-                                        #   in Loop: Header=BB2_1 Depth=1
-	i32.load	$push7=, 0($3):p2align=0
-	call    	do_something@FUNCTION, $pop7
-	i32.const	$push11=, 4
-	i32.add 	$3=, $3, $pop11
-	copy_local	$2=, $0
-	br      	1               # 1: down to label7
-.LBB2_3:                                # %while.body.i
-                                        #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label8:
-	copy_local	$2=, $0
-	i32.const	$push17=, 115
-	i32.eq  	$push6=, $1, $pop17
-	br_if   	1, $pop6        # 1: down to label6
-.LBB2_4:                                # %while.cond.i
-                                        #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label7:
-	i32.const	$push12=, .L.str.1+2
-	i32.ge_u	$push2=, $2, $pop12
-	br_if   	2, $pop2        # 2: down to label4
-	br      	1               # 1: up to label5
-.LBB2_5:                                # %sw.bb4.i
-                                        #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label6:
-	i32.load16_s	$push8=, 0($3):p2align=0
-	call    	do_something@FUNCTION, $pop8
-	i32.const	$push21=, 2
-	i32.add 	$3=, $3, $pop21
-	copy_local	$push20=, $0
-	tee_local	$push19=, $2=, $pop20
-	i32.const	$push18=, .L.str.1+2
-	i32.lt_u	$push1=, $pop19, $pop18
-	br_if   	0, $pop1        # 0: up to label5
-.LBB2_6:                                # %pack_unpack.exit
-	end_loop
-	end_block                       # label4:
-	block   	
-	i32.load8_u	$push3=, 0($3)
-	br_if   	0, $pop3        # 0: down to label9
-# BB#7:                                 # %if.end
-	i32.const	$push4=, 0
-	return  	$pop4
-.LBB2_8:                                # %if.then
-	end_block                       # label9:
-	call    	abort@FUNCTION
-	unreachable
+# BB#0:                                 # %if.end
+	i32.const	$push0=, 384
+	call    	do_something@FUNCTION, $pop0
+	i32.const	$push1=, -1071776001
+	call    	do_something@FUNCTION, $pop1
+	i32.const	$push2=, 0
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
-	.type	.L.str,@object          # @.str
-	.section	.rodata.str1.1,"aMS",@progbits,1
-.L.str:
-	.asciz	"\200\001\377\376\035\300"
-	.size	.L.str, 7
-
-	.type	.L.str.1,@object        # @.str.1
-.L.str.1:
-	.asciz	"sl"
-	.size	.L.str.1, 3
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -178,6 +105,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strlen, i32, i32
-	.functype	abort, void
diff --git a/test/torture-s/20111212-1.c.s b/test/torture-s/20111212-1.c.s
index 0f2e8a4c5..24fd4e49b 100644
--- a/test/torture-s/20111212-1.c.s
+++ b/test/torture-s/20111212-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20111212-1.c"
+	.file	"20111212-1.c"
 	.section	.text.frob_entry,"ax",@progbits
-	.hidden	frob_entry
+	.hidden	frob_entry              # -- Begin function frob_entry
 	.globl	frob_entry
 	.type	frob_entry,@function
 frob_entry:                             # @frob_entry
@@ -21,9 +21,9 @@ frob_entry:                             # @frob_entry
 	.endfunc
 .Lfunc_end0:
 	.size	frob_entry, .Lfunc_end0-frob_entry
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,10 +31,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop5, $pop6
+	i32.sub 	$push14=, $pop4, $pop6
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop7), $pop13
 	i64.const	$push0=, 0
@@ -53,6 +53,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20111227-1.c.s b/test/torture-s/20111227-1.c.s
index 43f684789..9ef6a5c02 100644
--- a/test/torture-s/20111227-1.c.s
+++ b/test/torture-s/20111227-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20111227-1.c"
+	.file	"20111227-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -20,9 +20,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -46,9 +46,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -73,5 +73,5 @@ v:
 	.size	v, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20111227-2.c.s b/test/torture-s/20111227-2.c.s
index 19b7b0421..ac4fedd19 100644
--- a/test/torture-s/20111227-2.c.s
+++ b/test/torture-s/20111227-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20111227-2.c"
+	.file	"20111227-2.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -45,16 +45,16 @@ bar:                                    # @bar
 .LBB0_6:                                # %if.end16
 	end_block                       # label3:
 	return
-.LBB0_7:                                # %if.then15
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -98,9 +98,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -118,7 +118,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -155,5 +155,5 @@ l:
 	.size	l, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20111227-3.c.s b/test/torture-s/20111227-3.c.s
index 075384325..cff3e52e7 100644
--- a/test/torture-s/20111227-3.c.s
+++ b/test/torture-s/20111227-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20111227-3.c"
+	.file	"20111227-3.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -45,16 +45,16 @@ bar:                                    # @bar
 .LBB0_6:                                # %if.end16
 	end_block                       # label3:
 	return
-.LBB0_7:                                # %if.then15
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -98,9 +98,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -118,7 +118,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -155,5 +155,5 @@ l:
 	.size	l, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120105-1.c.s b/test/torture-s/20120105-1.c.s
index 1105f9426..9b4a34e7b 100644
--- a/test/torture-s/20120105-1.c.s
+++ b/test/torture-s/20120105-1.c.s
@@ -1,47 +1,41 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120105-1.c"
+	.file	"20120105-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
+	i32.const	$push8=, 0
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
+	i32.const	$push7=, 16
+	i32.sub 	$push15=, $pop5, $pop7
+	tee_local	$push14=, $0=, $pop15
+	i32.store	__stack_pointer($pop8), $pop14
+	i64.const	$push0=, 0
+	i64.store	5($0):p2align=0, $pop0
+	i64.const	$push13=, 0
+	i64.store	0($0), $pop13
+	i32.const	$push4=, 0
+	i32.const	$push1=, 1
+	i32.or  	$push2=, $0, $pop1
+	i32.call	$push3=, extract@FUNCTION, $pop2
+	i32.store	i($pop4), $pop3
+	i32.const	$push11=, 0
+	i32.const	$push9=, 16
+	i32.add 	$push10=, $0, $pop9
+	i32.store	__stack_pointer($pop11), $pop10
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
-	i32.const	$push11=, 16
-	i32.sub 	$push20=, $pop10, $pop11
-	tee_local	$push19=, $0=, $pop20
-	i32.store	__stack_pointer($pop12), $pop19
-	i32.const	$push0=, 12
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, 0
-	i32.store8	0($pop1), $pop2
-	i32.const	$push3=, 8
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push18=, 0
-	i32.store	0($pop4), $pop18
-	i64.const	$push5=, 0
-	i64.store	0($0):p2align=2, $pop5
-	i32.const	$push17=, 0
-	i32.const	$push6=, 1
-	i32.or  	$push7=, $0, $pop6
-	i32.call	$push8=, extract@FUNCTION, $pop7
-	i32.store	i($pop17), $pop8
-	i32.const	$push15=, 0
-	i32.const	$push13=, 16
-	i32.add 	$push14=, $0, $pop13
-	i32.store	__stack_pointer($pop15), $pop14
-	i32.const	$push16=, 0
-                                        # fallthrough-return: $pop16
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.extract,"ax",@progbits
-	.type	extract,@function
+	.type	extract,@function       # -- Begin function extract
 extract:                                # @extract
 	.param  	i32
 	.result 	i32
@@ -51,7 +45,7 @@ extract:                                # @extract
 	.endfunc
 .Lfunc_end1:
 	.size	extract, .Lfunc_end1-extract
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -62,4 +56,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20120111-1.c.s b/test/torture-s/20120111-1.c.s
index 9f53ff147..beb262771 100644
--- a/test/torture-s/20120111-1.c.s
+++ b/test/torture-s/20120111-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120111-1.c"
+	.file	"20120111-1.c"
 	.section	.text.f0a,"ax",@progbits
-	.hidden	f0a
+	.hidden	f0a                     # -- Begin function f0a
 	.globl	f0a
 	.type	f0a,@function
 f0a:                                    # @f0a
@@ -16,9 +16,9 @@ f0a:                                    # @f0a
 	.endfunc
 .Lfunc_end0:
 	.size	f0a, .Lfunc_end0-f0a
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120207-1.c.s b/test/torture-s/20120207-1.c.s
index 91aa64ab3..5f6c635c1 100644
--- a/test/torture-s/20120207-1.c.s
+++ b/test/torture-s/20120207-1.c.s
@@ -1,23 +1,39 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120207-1.c"
+	.file	"20120207-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32
 	.result 	i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, .L.str-1
-	i32.add 	$push1=, $0, $pop0
-	i32.load8_s	$push2=, 0($pop1)
-                                        # fallthrough-return: $pop2
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
+	i32.const	$push10=, 16
+	i32.sub 	$push14=, $pop8, $pop10
+	tee_local	$push13=, $1=, $pop14
+	i32.const	$push0=, 0
+	i32.load8_u	$push1=, .L.str+10($pop0)
+	i32.store8	10($pop13), $pop1
+	i32.const	$push12=, 0
+	i32.load16_u	$push2=, .L.str+8($pop12)
+	i32.store16	8($1), $pop2
+	i32.const	$push11=, 0
+	i64.load	$push3=, .L.str($pop11)
+	i64.store	0($1), $pop3
+	i32.add 	$push4=, $1, $0
+	i32.const	$push5=, -1
+	i32.add 	$push6=, $pop4, $pop5
+	i32.load8_s	$push7=, 0($pop6)
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +55,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.16,"aMS",@progbits,1
 	.p2align	4
@@ -48,5 +64,5 @@ main:                                   # @main
 	.size	.L.str, 11
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120427-1.c.s b/test/torture-s/20120427-1.c.s
index a9ece088b..9f5f46785 100644
--- a/test/torture-s/20120427-1.c.s
+++ b/test/torture-s/20120427-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120427-1.c"
+	.file	"20120427-1.c"
 	.section	.text.sreal_compare,"ax",@progbits
-	.hidden	sreal_compare
+	.hidden	sreal_compare           # -- Begin function sreal_compare
 	.globl	sreal_compare
 	.type	sreal_compare,@function
 sreal_compare:                          # @sreal_compare
@@ -41,227 +41,215 @@ sreal_compare:                          # @sreal_compare
 	.endfunc
 .Lfunc_end0:
 	.size	sreal_compare, .Lfunc_end0-sreal_compare
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$6=, 0
-	i32.const	$push47=, 0
-	i32.load	$5=, a+16($pop47)
-	i32.const	$push46=, 0
-	i32.load	$4=, a+20($pop46)
-	i32.const	$push45=, 0
-	i32.load	$3=, a+8($pop45)
-	i32.const	$push44=, 0
-	i32.load	$2=, a+12($pop44)
-	i32.const	$push43=, 0
-	i32.load	$1=, a($pop43)
-	i32.const	$push42=, 0
-	i32.load	$0=, a+4($pop42)
-.LBB1_1:                                # %if.end
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label2:
-	i32.const	$push52=, 3
-	i32.shl 	$push51=, $6, $pop52
-	tee_local	$push50=, $7=, $pop51
-	i32.const	$push49=, a
-	i32.add 	$8=, $pop50, $pop49
-	i32.const	$push48=, a+4
-	i32.add 	$7=, $7, $pop48
-	block   	
+	.local  	i32, i32
+# BB#0:                                 # %land.lhs.true.1
 	block   	
+	i32.const	$push0=, 0
+	i32.load	$push60=, a+4($pop0)
+	tee_local	$push59=, $0=, $pop60
+	i32.const	$push58=, 0
+	i32.load	$push57=, a+12($pop58)
+	tee_local	$push56=, $1=, $pop57
+	i32.gt_s	$push1=, $pop59, $pop56
+	br_if   	0, $pop1        # 0: down to label1
+# BB#1:                                 # %if.end.i.1
 	block   	
+	i32.lt_s	$push2=, $0, $1
+	br_if   	0, $pop2        # 0: down to label2
+# BB#2:                                 # %if.end6.i.1
+	i32.const	$push3=, 0
+	i32.load	$push5=, a($pop3)
+	i32.const	$push61=, 0
+	i32.load	$push4=, a+8($pop61)
+	i32.ge_u	$push6=, $pop5, $pop4
+	br_if   	1, $pop6        # 1: down to label1
+.LBB1_3:                                # %land.lhs.true.2
+	end_block                       # label2:
+	i32.const	$push7=, 0
+	i32.load	$push66=, a+4($pop7)
+	tee_local	$push65=, $0=, $pop66
+	i32.const	$push64=, 0
+	i32.load	$push63=, a+20($pop64)
+	tee_local	$push62=, $1=, $pop63
+	i32.gt_s	$push8=, $pop65, $pop62
+	br_if   	0, $pop8        # 0: down to label1
+# BB#4:                                 # %if.end.i.2
 	block   	
+	i32.lt_s	$push9=, $0, $1
+	br_if   	0, $pop9        # 0: down to label3
+# BB#5:                                 # %if.end6.i.2
+	i32.const	$push10=, 0
+	i32.load	$push12=, a($pop10)
+	i32.const	$push67=, 0
+	i32.load	$push11=, a+16($pop67)
+	i32.ge_u	$push13=, $pop12, $pop11
+	br_if   	1, $pop13       # 1: down to label1
+.LBB1_6:                                # %land.lhs.true16.190
+	end_block                       # label3:
 	block   	
+	i32.const	$push73=, 0
+	i32.load	$push72=, a+12($pop73)
+	tee_local	$push71=, $0=, $pop72
+	i32.const	$push70=, 0
+	i32.load	$push69=, a+4($pop70)
+	tee_local	$push68=, $1=, $pop69
+	i32.gt_s	$push14=, $pop71, $pop68
+	br_if   	0, $pop14       # 0: down to label4
+# BB#7:                                 # %if.end.i45.192
+	i32.lt_s	$push15=, $0, $1
+	br_if   	1, $pop15       # 1: down to label1
+# BB#8:                                 # %if.end6.i49.194
+	i32.const	$push16=, 0
+	i32.load	$push18=, a+8($pop16)
+	i32.const	$push74=, 0
+	i32.load	$push17=, a($pop74)
+	i32.le_u	$push19=, $pop18, $pop17
+	br_if   	1, $pop19       # 1: down to label1
+.LBB1_9:                                # %land.lhs.true.2.1
+	end_block                       # label4:
+	i32.const	$push80=, 0
+	i32.load	$push79=, a+12($pop80)
+	tee_local	$push78=, $0=, $pop79
+	i32.const	$push77=, 0
+	i32.load	$push76=, a+20($pop77)
+	tee_local	$push75=, $1=, $pop76
+	i32.gt_s	$push20=, $pop78, $pop75
+	br_if   	0, $pop20       # 0: down to label1
+# BB#10:                                # %if.end.i.2.1
 	block   	
+	i32.lt_s	$push21=, $0, $1
+	br_if   	0, $pop21       # 0: down to label5
+# BB#11:                                # %if.end6.i.2.1
+	i32.const	$push22=, 0
+	i32.load	$push24=, a+8($pop22)
+	i32.const	$push81=, 0
+	i32.load	$push23=, a+16($pop81)
+	i32.ge_u	$push25=, $pop24, $pop23
+	br_if   	1, $pop25       # 1: down to label1
+.LBB1_12:                               # %land.lhs.true16.2109
+	end_block                       # label5:
 	block   	
+	i32.const	$push87=, 0
+	i32.load	$push86=, a+20($pop87)
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 0
+	i32.load	$push83=, a+4($pop84)
+	tee_local	$push82=, $1=, $pop83
+	i32.gt_s	$push26=, $pop85, $pop82
+	br_if   	0, $pop26       # 0: down to label6
+# BB#13:                                # %if.end.i45.2111
+	i32.lt_s	$push27=, $0, $1
+	br_if   	1, $pop27       # 1: down to label1
+# BB#14:                                # %if.end6.i49.2113
+	i32.const	$push28=, 0
+	i32.load	$push30=, a+16($pop28)
+	i32.const	$push88=, 0
+	i32.load	$push29=, a($pop88)
+	i32.le_u	$push31=, $pop30, $pop29
+	br_if   	1, $pop31       # 1: down to label1
+.LBB1_15:                               # %land.lhs.true16.1.2
+	end_block                       # label6:
 	block   	
+	i32.const	$push94=, 0
+	i32.load	$push93=, a+20($pop94)
+	tee_local	$push92=, $0=, $pop93
+	i32.const	$push91=, 0
+	i32.load	$push90=, a+12($pop91)
+	tee_local	$push89=, $1=, $pop90
+	i32.gt_s	$push32=, $pop92, $pop89
+	br_if   	0, $pop32       # 0: down to label7
+# BB#16:                                # %if.end.i45.1.2
+	i32.lt_s	$push33=, $0, $1
+	br_if   	1, $pop33       # 1: down to label1
+# BB#17:                                # %if.end6.i49.1.2
+	i32.const	$push34=, 0
+	i32.load	$push36=, a+16($pop34)
+	i32.const	$push95=, 0
+	i32.load	$push35=, a+8($pop95)
+	i32.le_u	$push37=, $pop36, $pop35
+	br_if   	1, $pop37       # 1: down to label1
+.LBB1_18:                               # %land.lhs.true16.3
+	end_block                       # label7:
 	block   	
-	i32.eqz 	$push74=, $6
-	br_if   	0, $pop74       # 0: down to label11
-# BB#2:                                 # %if.end14
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push53=, 1
-	i32.lt_s	$push0=, $6, $pop53
-	br_if   	1, $pop0        # 1: down to label10
-# BB#3:                                 # %land.lhs.true16
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push101=, 0
+	i32.load	$push100=, a+28($pop101)
+	tee_local	$push99=, $0=, $pop100
+	i32.const	$push98=, 0
+	i32.load	$push97=, a+4($pop98)
+	tee_local	$push96=, $1=, $pop97
+	i32.gt_s	$push38=, $pop99, $pop96
+	br_if   	0, $pop38       # 0: down to label8
+# BB#19:                                # %if.end.i45.3
+	i32.lt_s	$push39=, $0, $1
+	br_if   	1, $pop39       # 1: down to label1
+# BB#20:                                # %if.end6.i49.3
+	i32.const	$push40=, 0
+	i32.load	$push42=, a+24($pop40)
+	i32.const	$push102=, 0
+	i32.load	$push41=, a($pop102)
+	i32.le_u	$push43=, $pop42, $pop41
+	br_if   	1, $pop43       # 1: down to label1
+.LBB1_21:                               # %land.lhs.true16.1.3
+	end_block                       # label8:
 	block   	
-	i32.load	$push55=, 0($7)
-	tee_local	$push54=, $9=, $pop55
-	i32.gt_s	$push1=, $pop54, $0
-	br_if   	0, $pop1        # 0: down to label12
-# BB#4:                                 # %if.end.i45
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push2=, $9, $0
-	br_if   	8, $pop2        # 8: down to label4
-# BB#5:                                 # %if.end6.i49
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push3=, 0($8)
-	i32.le_u	$push4=, $pop3, $1
-	br_if   	8, $pop4        # 8: down to label4
-.LBB1_6:                                # %if.end.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label12:
-	i32.const	$push56=, 1
-	i32.ne  	$push5=, $6, $pop56
-	br_if   	2, $pop5        # 2: down to label9
-# BB#7:                                 # %land.lhs.true8.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push24=, 0($7)
-	i32.ne  	$push25=, $pop24, $2
-	br_if   	6, $pop25       # 6: down to label5
-# BB#8:                                 # %if.end6.i63.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push26=, 0($8)
-	i32.eq  	$push27=, $pop26, $3
-	br_if   	3, $pop27       # 3: down to label8
-	br      	6               # 6: down to label5
-.LBB1_9:                                # %land.lhs.true8
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label11:
-	i32.load	$push28=, 0($7)
-	i32.ne  	$push29=, $pop28, $0
-	br_if   	5, $pop29       # 5: down to label5
-# BB#10:                                # %if.end6.i63
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push30=, 0($8)
-	i32.ne  	$push31=, $pop30, $1
-	br_if   	5, $pop31       # 5: down to label5
-.LBB1_11:                               # %land.lhs.true.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label10:
-	i32.load	$push58=, 0($7)
-	tee_local	$push57=, $9=, $pop58
-	i32.gt_s	$push32=, $pop57, $2
-	br_if   	3, $pop32       # 3: down to label6
-# BB#12:                                # %if.end.i.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push33=, $9, $2
-	br_if   	1, $pop33       # 1: down to label8
-# BB#13:                                # %if.end6.i.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push34=, 0($8)
-	i32.lt_u	$push35=, $pop34, $3
-	br_if   	1, $pop35       # 1: down to label8
-	br      	3               # 3: down to label6
-.LBB1_14:                               # %if.end14.1
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push108=, 0
+	i32.load	$push107=, a+28($pop108)
+	tee_local	$push106=, $0=, $pop107
+	i32.const	$push105=, 0
+	i32.load	$push104=, a+12($pop105)
+	tee_local	$push103=, $1=, $pop104
+	i32.gt_s	$push44=, $pop106, $pop103
+	br_if   	0, $pop44       # 0: down to label9
+# BB#22:                                # %if.end.i45.1.3
+	i32.lt_s	$push45=, $0, $1
+	br_if   	1, $pop45       # 1: down to label1
+# BB#23:                                # %if.end6.i49.1.3
+	i32.const	$push46=, 0
+	i32.load	$push48=, a+24($pop46)
+	i32.const	$push109=, 0
+	i32.load	$push47=, a+8($pop109)
+	i32.le_u	$push49=, $pop48, $pop47
+	br_if   	1, $pop49       # 1: down to label1
+.LBB1_24:                               # %land.lhs.true16.2.3
 	end_block                       # label9:
-	i32.const	$push59=, 2
-	i32.lt_s	$push6=, $6, $pop59
-	br_if   	0, $pop6        # 0: down to label8
-# BB#15:                                # %land.lhs.true16.1
-                                        #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	i32.load	$push61=, 0($7)
-	tee_local	$push60=, $9=, $pop61
-	i32.gt_s	$push7=, $pop60, $2
-	br_if   	0, $pop7        # 0: down to label13
-# BB#16:                                # %if.end.i45.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push8=, $9, $2
-	br_if   	5, $pop8        # 5: down to label4
-# BB#17:                                # %if.end6.i49.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push9=, 0($8)
-	i32.le_u	$push10=, $pop9, $3
-	br_if   	5, $pop10       # 5: down to label4
-.LBB1_18:                               # %if.end.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label13:
-	i32.const	$push62=, 2
-	i32.ne  	$push11=, $6, $pop62
-	br_if   	1, $pop11       # 1: down to label7
-# BB#19:                                # %land.lhs.true8.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push20=, 0($7)
-	i32.ne  	$push21=, $pop20, $4
-	br_if   	3, $pop21       # 3: down to label5
-# BB#20:                                # %if.end6.i63.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$6=, 3
-	i32.load	$push22=, 0($8)
-	i32.eq  	$push23=, $pop22, $5
-	br_if   	6, $pop23       # 6: up to label2
-	br      	3               # 3: down to label5
-.LBB1_21:                               # %land.lhs.true.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label8:
-	i32.load	$push64=, 0($7)
-	tee_local	$push63=, $7=, $pop64
-	i32.gt_s	$push36=, $pop63, $4
-	br_if   	1, $pop36       # 1: down to label6
-# BB#22:                                # %if.end.i.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push37=, $7, $4
-	br_if   	4, $pop37       # 4: down to label3
-# BB#23:                                # %if.end6.i.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push38=, 0($8)
-	i32.ge_u	$push39=, $pop38, $5
-	br_if   	1, $pop39       # 1: down to label6
-	br      	4               # 4: down to label3
-.LBB1_24:                               # %if.end14.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label7:
-	i32.const	$push69=, 3
-	i32.lt_s	$push12=, $6, $pop69
-	br_if   	3, $pop12       # 3: down to label3
-# BB#25:                                # %land.lhs.true16.2
-	i32.load	$push73=, 0($7)
-	tee_local	$push72=, $6=, $pop73
-	i32.const	$push13=, 0
-	i32.load	$push71=, a+20($pop13)
-	tee_local	$push70=, $7=, $pop71
-	i32.gt_s	$push14=, $pop72, $pop70
-	br_if   	5, $pop14       # 5: down to label1
-# BB#26:                                # %if.end.i45.2
-	i32.lt_s	$push15=, $6, $7
-	br_if   	2, $pop15       # 2: down to label4
-# BB#27:                                # %if.end6.i49.2
-	i32.load	$push18=, 0($8)
-	i32.const	$push16=, 0
-	i32.load	$push17=, a+16($pop16)
-	i32.le_u	$push19=, $pop18, $pop17
-	br_if   	2, $pop19       # 2: down to label4
-	br      	5               # 5: down to label1
-.LBB1_28:                               # %if.then
-	end_block                       # label6:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_29:                               # %if.then13
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_30:                               # %if.then21
-	end_block                       # label4:
+	i32.const	$push115=, 0
+	i32.load	$push114=, a+28($pop115)
+	tee_local	$push113=, $0=, $pop114
+	i32.const	$push112=, 0
+	i32.load	$push111=, a+20($pop112)
+	tee_local	$push110=, $1=, $pop111
+	i32.gt_s	$push50=, $pop113, $pop110
+	br_if   	0, $pop50       # 0: down to label10
+# BB#25:                                # %if.end.i45.2.3
+	i32.lt_s	$push51=, $0, $1
+	br_if   	1, $pop51       # 1: down to label1
+# BB#26:                                # %if.end6.i49.2.3
+	i32.const	$push52=, 0
+	i32.load	$push54=, a+24($pop52)
+	i32.const	$push116=, 0
+	i32.load	$push53=, a+16($pop116)
+	i32.le_u	$push55=, $pop54, $pop53
+	br_if   	1, $pop55       # 1: down to label1
+.LBB1_27:                               # %for.inc.2.3
+	end_block                       # label10:
+	i32.const	$push117=, 0
+	return  	$pop117
+.LBB1_28:                               # %if.then21
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_31:                               # %for.inc.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label3:
-	i32.const	$push68=, 1
-	i32.add 	$push67=, $6, $pop68
-	tee_local	$push66=, $6=, $pop67
-	i32.const	$push65=, 4
-	i32.lt_s	$push40=, $pop66, $pop65
-	br_if   	0, $pop40       # 0: up to label2
-.LBB1_32:                               # %for.end25
-	end_loop
-	end_block                       # label1:
-	i32.const	$push41=, 0
-                                        # fallthrough-return: $pop41
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -278,5 +266,5 @@ a:
 	.size	a, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120427-2.c.s b/test/torture-s/20120427-2.c.s
index 4fa1427c5..259ffc3b3 100644
--- a/test/torture-s/20120427-2.c.s
+++ b/test/torture-s/20120427-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120427-2.c"
+	.file	"20120427-2.c"
 	.section	.text.sreal_compare,"ax",@progbits
-	.hidden	sreal_compare
+	.hidden	sreal_compare           # -- Begin function sreal_compare
 	.globl	sreal_compare
 	.type	sreal_compare,@function
 sreal_compare:                          # @sreal_compare
@@ -41,227 +41,215 @@ sreal_compare:                          # @sreal_compare
 	.endfunc
 .Lfunc_end0:
 	.size	sreal_compare, .Lfunc_end0-sreal_compare
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$6=, 0
-	i32.const	$push47=, 0
-	i32.load	$5=, a+16($pop47)
-	i32.const	$push46=, 0
-	i32.load	$4=, a+20($pop46)
-	i32.const	$push45=, 0
-	i32.load	$3=, a+8($pop45)
-	i32.const	$push44=, 0
-	i32.load	$2=, a+12($pop44)
-	i32.const	$push43=, 0
-	i32.load	$1=, a($pop43)
-	i32.const	$push42=, 0
-	i32.load	$0=, a+4($pop42)
-.LBB1_1:                                # %if.end
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label2:
-	i32.const	$push52=, 3
-	i32.shl 	$push51=, $6, $pop52
-	tee_local	$push50=, $7=, $pop51
-	i32.const	$push49=, a
-	i32.add 	$8=, $pop50, $pop49
-	i32.const	$push48=, a+4
-	i32.add 	$7=, $7, $pop48
-	block   	
+	.local  	i32, i32
+# BB#0:                                 # %land.lhs.true.1
 	block   	
+	i32.const	$push0=, 0
+	i32.load	$push60=, a+4($pop0)
+	tee_local	$push59=, $0=, $pop60
+	i32.const	$push58=, 0
+	i32.load	$push57=, a+12($pop58)
+	tee_local	$push56=, $1=, $pop57
+	i32.gt_s	$push1=, $pop59, $pop56
+	br_if   	0, $pop1        # 0: down to label1
+# BB#1:                                 # %if.end.i.1
 	block   	
+	i32.lt_s	$push2=, $0, $1
+	br_if   	0, $pop2        # 0: down to label2
+# BB#2:                                 # %if.end6.i.1
+	i32.const	$push3=, 0
+	i32.load	$push5=, a($pop3)
+	i32.const	$push61=, 0
+	i32.load	$push4=, a+8($pop61)
+	i32.ge_u	$push6=, $pop5, $pop4
+	br_if   	1, $pop6        # 1: down to label1
+.LBB1_3:                                # %land.lhs.true.2
+	end_block                       # label2:
+	i32.const	$push7=, 0
+	i32.load	$push66=, a+4($pop7)
+	tee_local	$push65=, $0=, $pop66
+	i32.const	$push64=, 0
+	i32.load	$push63=, a+20($pop64)
+	tee_local	$push62=, $1=, $pop63
+	i32.gt_s	$push8=, $pop65, $pop62
+	br_if   	0, $pop8        # 0: down to label1
+# BB#4:                                 # %if.end.i.2
 	block   	
+	i32.lt_s	$push9=, $0, $1
+	br_if   	0, $pop9        # 0: down to label3
+# BB#5:                                 # %if.end6.i.2
+	i32.const	$push10=, 0
+	i32.load	$push12=, a($pop10)
+	i32.const	$push67=, 0
+	i32.load	$push11=, a+16($pop67)
+	i32.ge_u	$push13=, $pop12, $pop11
+	br_if   	1, $pop13       # 1: down to label1
+.LBB1_6:                                # %land.lhs.true16.190
+	end_block                       # label3:
 	block   	
+	i32.const	$push73=, 0
+	i32.load	$push72=, a+12($pop73)
+	tee_local	$push71=, $0=, $pop72
+	i32.const	$push70=, 0
+	i32.load	$push69=, a+4($pop70)
+	tee_local	$push68=, $1=, $pop69
+	i32.gt_s	$push14=, $pop71, $pop68
+	br_if   	0, $pop14       # 0: down to label4
+# BB#7:                                 # %if.end.i45.192
+	i32.lt_s	$push15=, $0, $1
+	br_if   	1, $pop15       # 1: down to label1
+# BB#8:                                 # %if.end6.i49.194
+	i32.const	$push16=, 0
+	i32.load	$push18=, a+8($pop16)
+	i32.const	$push74=, 0
+	i32.load	$push17=, a($pop74)
+	i32.le_u	$push19=, $pop18, $pop17
+	br_if   	1, $pop19       # 1: down to label1
+.LBB1_9:                                # %land.lhs.true.2.1
+	end_block                       # label4:
+	i32.const	$push80=, 0
+	i32.load	$push79=, a+12($pop80)
+	tee_local	$push78=, $0=, $pop79
+	i32.const	$push77=, 0
+	i32.load	$push76=, a+20($pop77)
+	tee_local	$push75=, $1=, $pop76
+	i32.gt_s	$push20=, $pop78, $pop75
+	br_if   	0, $pop20       # 0: down to label1
+# BB#10:                                # %if.end.i.2.1
 	block   	
+	i32.lt_s	$push21=, $0, $1
+	br_if   	0, $pop21       # 0: down to label5
+# BB#11:                                # %if.end6.i.2.1
+	i32.const	$push22=, 0
+	i32.load	$push24=, a+8($pop22)
+	i32.const	$push81=, 0
+	i32.load	$push23=, a+16($pop81)
+	i32.ge_u	$push25=, $pop24, $pop23
+	br_if   	1, $pop25       # 1: down to label1
+.LBB1_12:                               # %land.lhs.true16.2109
+	end_block                       # label5:
 	block   	
+	i32.const	$push87=, 0
+	i32.load	$push86=, a+20($pop87)
+	tee_local	$push85=, $0=, $pop86
+	i32.const	$push84=, 0
+	i32.load	$push83=, a+4($pop84)
+	tee_local	$push82=, $1=, $pop83
+	i32.gt_s	$push26=, $pop85, $pop82
+	br_if   	0, $pop26       # 0: down to label6
+# BB#13:                                # %if.end.i45.2111
+	i32.lt_s	$push27=, $0, $1
+	br_if   	1, $pop27       # 1: down to label1
+# BB#14:                                # %if.end6.i49.2113
+	i32.const	$push28=, 0
+	i32.load	$push30=, a+16($pop28)
+	i32.const	$push88=, 0
+	i32.load	$push29=, a($pop88)
+	i32.le_u	$push31=, $pop30, $pop29
+	br_if   	1, $pop31       # 1: down to label1
+.LBB1_15:                               # %land.lhs.true16.1.2
+	end_block                       # label6:
 	block   	
+	i32.const	$push94=, 0
+	i32.load	$push93=, a+20($pop94)
+	tee_local	$push92=, $0=, $pop93
+	i32.const	$push91=, 0
+	i32.load	$push90=, a+12($pop91)
+	tee_local	$push89=, $1=, $pop90
+	i32.gt_s	$push32=, $pop92, $pop89
+	br_if   	0, $pop32       # 0: down to label7
+# BB#16:                                # %if.end.i45.1.2
+	i32.lt_s	$push33=, $0, $1
+	br_if   	1, $pop33       # 1: down to label1
+# BB#17:                                # %if.end6.i49.1.2
+	i32.const	$push34=, 0
+	i32.load	$push36=, a+16($pop34)
+	i32.const	$push95=, 0
+	i32.load	$push35=, a+8($pop95)
+	i32.le_u	$push37=, $pop36, $pop35
+	br_if   	1, $pop37       # 1: down to label1
+.LBB1_18:                               # %land.lhs.true16.3
+	end_block                       # label7:
 	block   	
-	i32.eqz 	$push74=, $6
-	br_if   	0, $pop74       # 0: down to label11
-# BB#2:                                 # %if.end14
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push53=, 1
-	i32.lt_s	$push0=, $6, $pop53
-	br_if   	1, $pop0        # 1: down to label10
-# BB#3:                                 # %land.lhs.true16
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push101=, 0
+	i32.load	$push100=, a+28($pop101)
+	tee_local	$push99=, $0=, $pop100
+	i32.const	$push98=, 0
+	i32.load	$push97=, a+4($pop98)
+	tee_local	$push96=, $1=, $pop97
+	i32.gt_s	$push38=, $pop99, $pop96
+	br_if   	0, $pop38       # 0: down to label8
+# BB#19:                                # %if.end.i45.3
+	i32.lt_s	$push39=, $0, $1
+	br_if   	1, $pop39       # 1: down to label1
+# BB#20:                                # %if.end6.i49.3
+	i32.const	$push40=, 0
+	i32.load	$push42=, a+24($pop40)
+	i32.const	$push102=, 0
+	i32.load	$push41=, a($pop102)
+	i32.le_u	$push43=, $pop42, $pop41
+	br_if   	1, $pop43       # 1: down to label1
+.LBB1_21:                               # %land.lhs.true16.1.3
+	end_block                       # label8:
 	block   	
-	i32.load	$push55=, 0($7)
-	tee_local	$push54=, $9=, $pop55
-	i32.gt_s	$push1=, $pop54, $0
-	br_if   	0, $pop1        # 0: down to label12
-# BB#4:                                 # %if.end.i45
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push2=, $9, $0
-	br_if   	8, $pop2        # 8: down to label4
-# BB#5:                                 # %if.end6.i49
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push3=, 0($8)
-	i32.le_u	$push4=, $pop3, $1
-	br_if   	8, $pop4        # 8: down to label4
-.LBB1_6:                                # %if.end.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label12:
-	i32.const	$push56=, 1
-	i32.ne  	$push5=, $6, $pop56
-	br_if   	2, $pop5        # 2: down to label9
-# BB#7:                                 # %land.lhs.true8.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push24=, 0($7)
-	i32.ne  	$push25=, $pop24, $2
-	br_if   	6, $pop25       # 6: down to label5
-# BB#8:                                 # %if.end6.i63.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push26=, 0($8)
-	i32.eq  	$push27=, $pop26, $3
-	br_if   	3, $pop27       # 3: down to label8
-	br      	6               # 6: down to label5
-.LBB1_9:                                # %land.lhs.true8
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label11:
-	i32.load	$push28=, 0($7)
-	i32.ne  	$push29=, $pop28, $0
-	br_if   	5, $pop29       # 5: down to label5
-# BB#10:                                # %if.end6.i63
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push30=, 0($8)
-	i32.ne  	$push31=, $pop30, $1
-	br_if   	5, $pop31       # 5: down to label5
-.LBB1_11:                               # %land.lhs.true.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label10:
-	i32.load	$push58=, 0($7)
-	tee_local	$push57=, $9=, $pop58
-	i32.gt_s	$push32=, $pop57, $2
-	br_if   	3, $pop32       # 3: down to label6
-# BB#12:                                # %if.end.i.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push33=, $9, $2
-	br_if   	1, $pop33       # 1: down to label8
-# BB#13:                                # %if.end6.i.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push34=, 0($8)
-	i32.lt_u	$push35=, $pop34, $3
-	br_if   	1, $pop35       # 1: down to label8
-	br      	3               # 3: down to label6
-.LBB1_14:                               # %if.end14.1
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push108=, 0
+	i32.load	$push107=, a+28($pop108)
+	tee_local	$push106=, $0=, $pop107
+	i32.const	$push105=, 0
+	i32.load	$push104=, a+12($pop105)
+	tee_local	$push103=, $1=, $pop104
+	i32.gt_s	$push44=, $pop106, $pop103
+	br_if   	0, $pop44       # 0: down to label9
+# BB#22:                                # %if.end.i45.1.3
+	i32.lt_s	$push45=, $0, $1
+	br_if   	1, $pop45       # 1: down to label1
+# BB#23:                                # %if.end6.i49.1.3
+	i32.const	$push46=, 0
+	i32.load	$push48=, a+24($pop46)
+	i32.const	$push109=, 0
+	i32.load	$push47=, a+8($pop109)
+	i32.le_u	$push49=, $pop48, $pop47
+	br_if   	1, $pop49       # 1: down to label1
+.LBB1_24:                               # %land.lhs.true16.2.3
 	end_block                       # label9:
-	i32.const	$push59=, 2
-	i32.lt_s	$push6=, $6, $pop59
-	br_if   	0, $pop6        # 0: down to label8
-# BB#15:                                # %land.lhs.true16.1
-                                        #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	i32.load	$push61=, 0($7)
-	tee_local	$push60=, $9=, $pop61
-	i32.gt_s	$push7=, $pop60, $2
-	br_if   	0, $pop7        # 0: down to label13
-# BB#16:                                # %if.end.i45.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push8=, $9, $2
-	br_if   	5, $pop8        # 5: down to label4
-# BB#17:                                # %if.end6.i49.1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push9=, 0($8)
-	i32.le_u	$push10=, $pop9, $3
-	br_if   	5, $pop10       # 5: down to label4
-.LBB1_18:                               # %if.end.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label13:
-	i32.const	$push62=, 2
-	i32.ne  	$push11=, $6, $pop62
-	br_if   	1, $pop11       # 1: down to label7
-# BB#19:                                # %land.lhs.true8.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push20=, 0($7)
-	i32.ne  	$push21=, $pop20, $4
-	br_if   	3, $pop21       # 3: down to label5
-# BB#20:                                # %if.end6.i63.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$6=, 3
-	i32.load	$push22=, 0($8)
-	i32.eq  	$push23=, $pop22, $5
-	br_if   	6, $pop23       # 6: up to label2
-	br      	3               # 3: down to label5
-.LBB1_21:                               # %land.lhs.true.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label8:
-	i32.load	$push64=, 0($7)
-	tee_local	$push63=, $7=, $pop64
-	i32.gt_s	$push36=, $pop63, $4
-	br_if   	1, $pop36       # 1: down to label6
-# BB#22:                                # %if.end.i.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.lt_s	$push37=, $7, $4
-	br_if   	4, $pop37       # 4: down to label3
-# BB#23:                                # %if.end6.i.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push38=, 0($8)
-	i32.ge_u	$push39=, $pop38, $5
-	br_if   	1, $pop39       # 1: down to label6
-	br      	4               # 4: down to label3
-.LBB1_24:                               # %if.end14.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label7:
-	i32.const	$push69=, 3
-	i32.lt_s	$push12=, $6, $pop69
-	br_if   	3, $pop12       # 3: down to label3
-# BB#25:                                # %land.lhs.true16.2
-	i32.load	$push73=, 0($7)
-	tee_local	$push72=, $6=, $pop73
-	i32.const	$push13=, 0
-	i32.load	$push71=, a+20($pop13)
-	tee_local	$push70=, $7=, $pop71
-	i32.gt_s	$push14=, $pop72, $pop70
-	br_if   	5, $pop14       # 5: down to label1
-# BB#26:                                # %if.end.i45.2
-	i32.lt_s	$push15=, $6, $7
-	br_if   	2, $pop15       # 2: down to label4
-# BB#27:                                # %if.end6.i49.2
-	i32.load	$push18=, 0($8)
-	i32.const	$push16=, 0
-	i32.load	$push17=, a+16($pop16)
-	i32.le_u	$push19=, $pop18, $pop17
-	br_if   	2, $pop19       # 2: down to label4
-	br      	5               # 5: down to label1
-.LBB1_28:                               # %if.then
-	end_block                       # label6:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_29:                               # %if.then13
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_30:                               # %if.then21
-	end_block                       # label4:
+	i32.const	$push115=, 0
+	i32.load	$push114=, a+28($pop115)
+	tee_local	$push113=, $0=, $pop114
+	i32.const	$push112=, 0
+	i32.load	$push111=, a+20($pop112)
+	tee_local	$push110=, $1=, $pop111
+	i32.gt_s	$push50=, $pop113, $pop110
+	br_if   	0, $pop50       # 0: down to label10
+# BB#25:                                # %if.end.i45.2.3
+	i32.lt_s	$push51=, $0, $1
+	br_if   	1, $pop51       # 1: down to label1
+# BB#26:                                # %if.end6.i49.2.3
+	i32.const	$push52=, 0
+	i32.load	$push54=, a+24($pop52)
+	i32.const	$push116=, 0
+	i32.load	$push53=, a+16($pop116)
+	i32.le_u	$push55=, $pop54, $pop53
+	br_if   	1, $pop55       # 1: down to label1
+.LBB1_27:                               # %for.inc.2.3
+	end_block                       # label10:
+	i32.const	$push117=, 0
+	return  	$pop117
+.LBB1_28:                               # %if.then21
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_31:                               # %for.inc.2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label3:
-	i32.const	$push68=, 1
-	i32.add 	$push67=, $6, $pop68
-	tee_local	$push66=, $6=, $pop67
-	i32.const	$push65=, 4
-	i32.lt_s	$push40=, $pop66, $pop65
-	br_if   	0, $pop40       # 0: up to label2
-.LBB1_32:                               # %for.end25
-	end_loop
-	end_block                       # label1:
-	i32.const	$push41=, 0
-                                        # fallthrough-return: $pop41
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -278,5 +266,5 @@ a:
 	.size	a, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120615-1.c.s b/test/torture-s/20120615-1.c.s
index 3100ac6d1..7f61e95e7 100644
--- a/test/torture-s/20120615-1.c.s
+++ b/test/torture-s/20120615-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120615-1.c"
+	.file	"20120615-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -27,9 +27,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20120808-1.c.s b/test/torture-s/20120808-1.c.s
index 524741020..7f9fd516f 100644
--- a/test/torture-s/20120808-1.c.s
+++ b/test/torture-s/20120808-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120808-1.c"
+	.file	"20120808-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push35=, 0
-	i32.const	$push32=, 0
-	i32.load	$push33=, __stack_pointer($pop32)
+	i32.const	$push33=, 0
+	i32.load	$push32=, __stack_pointer($pop33)
 	i32.const	$push34=, 32
-	i32.sub 	$push41=, $pop33, $pop34
+	i32.sub 	$push41=, $pop32, $pop34
 	tee_local	$push40=, $5=, $pop41
 	i32.store	__stack_pointer($pop35), $pop40
 	i32.const	$push0=, 24
@@ -131,7 +131,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.bss.d,"aw",@nobits
@@ -160,6 +160,6 @@ cp:
 	.size	cp, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20120817-1.c.s b/test/torture-s/20120817-1.c.s
index 16f5f9f20..42d62c39c 100644
--- a/test/torture-s/20120817-1.c.s
+++ b/test/torture-s/20120817-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120817-1.c"
+	.file	"20120817-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -55,6 +55,6 @@ foo:
 	.size	foo, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20120919-1.c.s b/test/torture-s/20120919-1.c.s
index 4c1e09d42..d24c9d733 100644
--- a/test/torture-s/20120919-1.c.s
+++ b/test/torture-s/20120919-1.c.s
@@ -1,59 +1,61 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20120919-1.c"
+	.file	"20120919-1.c"
 	.section	.text.init,"ax",@progbits
-	.hidden	init
+	.hidden	init                    # -- Begin function init
 	.globl	init
 	.type	init,@function
 init:                                   # @init
 	.param  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.then
+	i32.eqz 	$push1=, $0
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %if.end
+	return
+.LBB0_2:                                # %if.then
+	end_block                       # label0:
 	i32.const	$push0=, 0
 	i32.store	0($1), $pop0
-.LBB0_2:                                # %if.end
-	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	init, .Lfunc_end0-init
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, f64, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, f64, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
-	i32.const	$push12=, 6144
-	i32.sub 	$push26=, $pop11, $pop12
-	tee_local	$push25=, $7=, $pop26
-	i32.store	__stack_pointer($pop13), $pop25
-	i32.const	$push24=, 1
-	i32.store	12($7), $pop24
-	i32.const	$push17=, 12
-	i32.add 	$push18=, $7, $pop17
-	i32.const	$push19=, 16
-	i32.add 	$push20=, $7, $pop19
-	call    	init@FUNCTION, $pop18, $pop20
+	i32.const	$push14=, 0
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
+	i32.const	$push13=, 6144
+	i32.sub 	$push27=, $pop11, $pop13
+	tee_local	$push26=, $7=, $pop27
+	i32.store	__stack_pointer($pop14), $pop26
+	i32.const	$push25=, 1
+	i32.store	12($7), $pop25
+	i32.const	$push18=, 12
+	i32.add 	$push19=, $7, $pop18
+	i32.const	$push20=, 16
+	i32.add 	$push21=, $7, $pop20
+	call    	init@FUNCTION, $pop19, $pop21
 	block   	
-	i32.load	$push23=, 12($7)
-	tee_local	$push22=, $0=, $pop23
-	i32.const	$push21=, 0
-	i32.lt_s	$push0=, $pop22, $pop21
+	i32.load	$push24=, 12($7)
+	tee_local	$push23=, $0=, $pop24
+	i32.const	$push22=, 0
+	i32.lt_s	$push0=, $pop23, $pop22
 	br_if   	0, $pop0        # 0: down to label1
 # BB#1:                                 # %while.body.lr.ph
+	i32.const	$push29=, 0
+	i32.load	$2=, pi($pop29)
 	i32.const	$push28=, 0
-	i32.load	$2=, pi($pop28)
-	i32.const	$push27=, 0
-	i32.load	$1=, pd($pop27)
+	i32.load	$1=, pd($pop28)
 	i32.const	$6=, -1
-	i32.const	$5=, 0
+	i32.const	$3=, 0
 .LBB1_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
@@ -61,48 +63,55 @@ main:                                   # @main
 	br_if   	0, $6           # 0: down to label3
 # BB#3:                                 # %if.then
                                         #   in Loop: Header=BB1_2 Depth=1
-	f64.load	$3=, 0($1)
-	i32.load	$push34=, 0($2)
-	tee_local	$push33=, $4=, $pop34
-	f64.convert_s/i32	$push1=, $pop33
-	f64.store	0($1), $pop1
-	i32.const	$push32=, 0
-	i32.const	$push31=, 0
-	i32.gt_s	$push2=, $4, $pop31
-	i32.select	$push3=, $4, $pop32, $pop2
-	i32.const	$push30=, 0
-	f64.const	$push29=, 0x0p0
-	f64.gt  	$push4=, $3, $pop29
-	i32.select	$push5=, $pop3, $pop30, $pop4
-	i32.add 	$5=, $pop5, $5
-.LBB1_4:                                # %if.end11
+	i32.load	$4=, 0($2)
+	block   	
+	f64.load	$push32=, 0($1)
+	tee_local	$push31=, $5=, $pop32
+	f64.const	$push30=, 0x0p0
+	f64.le  	$push1=, $pop31, $pop30
+	f64.ne  	$push2=, $5, $5
+	i32.or  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label4
+# BB#4:                                 # %if.then3
+                                        #   in Loop: Header=BB1_2 Depth=1
+	i32.const	$push34=, 0
+	i32.const	$push33=, 0
+	i32.gt_s	$push4=, $4, $pop33
+	i32.select	$push5=, $4, $pop34, $pop4
+	i32.add 	$3=, $pop5, $3
+.LBB1_5:                                # %if.end8
+                                        #   in Loop: Header=BB1_2 Depth=1
+	end_block                       # label4:
+	f64.convert_s/i32	$push6=, $4
+	f64.store	0($1), $pop6
+.LBB1_6:                                # %if.end11
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label3:
 	i32.const	$push37=, 1
 	i32.add 	$push36=, $6, $pop37
 	tee_local	$push35=, $6=, $pop36
-	i32.lt_s	$push6=, $pop35, $0
-	br_if   	0, $pop6        # 0: up to label2
-# BB#5:                                 # %while.end
+	i32.lt_s	$push7=, $pop35, $0
+	br_if   	0, $pop7        # 0: up to label2
+# BB#7:                                 # %while.end
 	end_loop
-	i32.const	$push7=, 1234567890
-	i32.ne  	$push8=, $5, $pop7
-	br_if   	0, $pop8        # 0: down to label1
-# BB#6:                                 # %if.end15
-	i32.const	$push16=, 0
-	i32.const	$push14=, 6144
-	i32.add 	$push15=, $7, $pop14
-	i32.store	__stack_pointer($pop16), $pop15
-	i32.const	$push9=, 0
-	return  	$pop9
-.LBB1_7:                                # %if.then14
+	i32.const	$push8=, 1234567890
+	i32.ne  	$push9=, $3, $pop8
+	br_if   	0, $pop9        # 0: down to label1
+# BB#8:                                 # %if.end15
+	i32.const	$push17=, 0
+	i32.const	$push15=, 6144
+	i32.add 	$push16=, $7, $pop15
+	i32.store	__stack_pointer($pop17), $pop16
+	i32.const	$push10=, 0
+	return  	$pop10
+.LBB1_9:                                # %if.then14
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	vd                      # @vd
 	.type	vd,@object
 	.section	.data.vd,"aw",@progbits
@@ -142,5 +151,5 @@ pi:
 	.size	pi, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20121108-1.c.s b/test/torture-s/20121108-1.c.s
index df40c8742..606c46f88 100644
--- a/test/torture-s/20121108-1.c.s
+++ b/test/torture-s/20121108-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20121108-1.c"
+	.file	"20121108-1.c"
 	.section	.text.strtoul1,"ax",@progbits
-	.hidden	strtoul1
+	.hidden	strtoul1                # -- Begin function strtoul1
 	.globl	strtoul1
 	.type	strtoul1,@function
 strtoul1:                               # @strtoul1
@@ -21,39 +21,40 @@ strtoul1:                               # @strtoul1
 # BB#1:                                 # %if.else
 	i32.const	$push4=, temp+4
 	i32.eq  	$push5=, $0, $pop4
-	br_if   	2, $pop5        # 2: down to label1
+	br_if   	1, $pop5        # 1: down to label2
 # BB#2:                                 # %if.else3
 	i32.const	$push6=, temp+8
 	i32.eq  	$push7=, $0, $pop6
-	br_if   	3, $pop7        # 3: down to label0
+	br_if   	2, $pop7        # 2: down to label1
 # BB#3:                                 # %if.else6
-	i32.const	$1=, 160
 	i32.const	$push8=, temp+12
-	i32.eq  	$push9=, $0, $pop8
-	br_if   	1, $pop9        # 1: down to label2
-# BB#4:                                 # %if.end11
-	call    	abort@FUNCTION
-	unreachable
+	i32.ne  	$push9=, $0, $pop8
+	br_if   	3, $pop9        # 3: down to label0
+# BB#4:                                 # %return
+	i32.const	$push13=, 160
+	return  	$pop13
 .LBB0_5:
 	end_block                       # label3:
-	i32.const	$1=, 192
-.LBB0_6:                                # %return
+	i32.const	$push12=, 192
+	return  	$pop12
+.LBB0_6:
 	end_block                       # label2:
-	return  	$1
-.LBB0_7:
-	end_block                       # label1:
 	i32.const	$push11=, 168
 	return  	$pop11
-.LBB0_8:
-	end_block                       # label0:
+.LBB0_7:
+	end_block                       # label1:
 	i32.const	$push10=, 190
-                                        # fallthrough-return: $pop10
+	return  	$pop10
+.LBB0_8:                                # %if.end11
+	end_block                       # label0:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	strtoul1, .Lfunc_end0-strtoul1
-
+                                        # -- End function
 	.section	.text.string_to_ip,"ax",@progbits
-	.hidden	string_to_ip
+	.hidden	string_to_ip            # -- Begin function string_to_ip
 	.globl	string_to_ip
 	.type	string_to_ip,@function
 string_to_ip:                           # @string_to_ip
@@ -62,10 +63,10 @@ string_to_ip:                           # @string_to_ip
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push23=, 0
-	i32.const	$push20=, 0
-	i32.load	$push21=, __stack_pointer($pop20)
+	i32.const	$push21=, 0
+	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 16
-	i32.sub 	$push36=, $pop21, $pop22
+	i32.sub 	$push36=, $pop20, $pop22
 	tee_local	$push35=, $2=, $pop36
 	i32.store	__stack_pointer($pop23), $pop35
 	block   	
@@ -158,9 +159,9 @@ string_to_ip:                           # @string_to_ip
 	.endfunc
 .Lfunc_end1:
 	.size	string_to_ip, .Lfunc_end1-string_to_ip
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -168,10 +169,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push21=, $pop7, $pop8
+	i32.sub 	$push21=, $pop6, $pop8
 	tee_local	$push20=, $1=, $pop21
 	i32.store	__stack_pointer($pop9), $pop20
 	i32.const	$push0=, temp
@@ -208,7 +209,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	temp                    # @temp
 	.type	temp,@object
 	.section	.data.temp,"aw",@progbits
@@ -239,7 +240,7 @@ result:
 	.size	.Lstr, 7
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	printf, i32, i32
 	.functype	puts, i32, i32
diff --git a/test/torture-s/20131127-1.c.s b/test/torture-s/20131127-1.c.s
index 1bb747907..ddd481d0d 100644
--- a/test/torture-s/20131127-1.c.s
+++ b/test/torture-s/20131127-1.c.s
@@ -1,108 +1,87 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20131127-1.c"
+	.file	"20131127-1.c"
 	.section	.text.fn1,"ax",@progbits
-	.hidden	fn1
+	.hidden	fn1                     # -- Begin function fn1
 	.globl	fn1
 	.type	fn1,@function
 fn1:                                    # @fn1
 	.param  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 12
+	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
-	i32.load16_u	$push3=, c+12($pop2):p2align=0
-	i32.store16	0($pop1):p2align=0, $pop3
-	i32.const	$push4=, 8
-	i32.add 	$push5=, $0, $pop4
-	i32.const	$push9=, 0
-	i32.load	$push6=, c+8($pop9):p2align=0
-	i32.store	0($pop5):p2align=0, $pop6
-	i32.const	$push8=, 0
-	i64.load	$push7=, c($pop8):p2align=0
-	i64.store	0($0):p2align=0, $pop7
+	i64.load	$push3=, c+6($pop2):p2align=0
+	i64.store	0($pop1):p2align=0, $pop3
+	i32.const	$push5=, 0
+	i64.load	$push4=, c($pop5):p2align=0
+	i64.store	0($0):p2align=0, $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	fn1, .Lfunc_end0-fn1
-
+                                        # -- End function
 	.section	.text.fn2,"ax",@progbits
-	.hidden	fn2
+	.hidden	fn2                     # -- Begin function fn2
 	.globl	fn2
 	.type	fn2,@function
 fn2:                                    # @fn2
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push19=, 0
-	i32.load16_u	$push1=, c+12($pop19):p2align=0
-	i32.store16	b+12($pop0):p2align=0, $pop1
-	i32.const	$push18=, 0
-	i32.const	$push17=, 0
-	i32.load	$push2=, c+8($pop17):p2align=0
-	i32.store	b+8($pop18):p2align=0, $pop2
-	i32.const	$push16=, 0
-	i32.const	$push15=, 0
-	i64.load	$push3=, c($pop15):p2align=0
-	i64.store	b($pop16):p2align=0, $pop3
-	i32.const	$push14=, 0
 	i32.const	$push13=, 0
-	i32.store16	a($pop14), $pop13
+	i64.load	$push1=, c+6($pop13):p2align=0
+	i64.store	b+6($pop0):p2align=0, $pop1
 	i32.const	$push12=, 0
 	i32.const	$push11=, 0
-	i32.load16_u	$push4=, e+12($pop11):p2align=0
-	i32.store16	d+12($pop12):p2align=0, $pop4
+	i64.load	$push2=, c($pop11):p2align=0
+	i64.store	b($pop12):p2align=0, $pop2
 	i32.const	$push10=, 0
 	i32.const	$push9=, 0
-	i32.load	$push5=, e+8($pop9):p2align=0
-	i32.store	d+8($pop10):p2align=0, $pop5
+	i64.load	$push3=, e($pop9):p2align=0
+	i64.store	d($pop10):p2align=0, $pop3
 	i32.const	$push8=, 0
 	i32.const	$push7=, 0
-	i64.load	$push6=, e($pop7):p2align=0
-	i64.store	d($pop8):p2align=0, $pop6
+	i64.load	$push4=, e+6($pop7):p2align=0
+	i64.store	d+6($pop8):p2align=0, $pop4
+	i32.const	$push6=, 0
+	i32.const	$push5=, 0
+	i32.store16	a($pop6), $pop5
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	fn2, .Lfunc_end1-fn2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push20=, 0
-	i32.load16_u	$push1=, c+12($pop20):p2align=0
-	i32.store16	b+12($pop0):p2align=0, $pop1
-	i32.const	$push19=, 0
-	i32.const	$push18=, 0
-	i32.load	$push2=, c+8($pop18):p2align=0
-	i32.store	b+8($pop19):p2align=0, $pop2
-	i32.const	$push17=, 0
-	i32.const	$push16=, 0
-	i64.load	$push3=, c($pop16):p2align=0
-	i64.store	b($pop17):p2align=0, $pop3
-	i32.const	$push15=, 0
 	i32.const	$push14=, 0
-	i32.store16	a($pop15), $pop14
+	i64.load	$push1=, c+6($pop14):p2align=0
+	i64.store	b+6($pop0):p2align=0, $pop1
 	i32.const	$push13=, 0
 	i32.const	$push12=, 0
-	i32.load16_u	$push4=, e+12($pop12):p2align=0
-	i32.store16	d+12($pop13):p2align=0, $pop4
+	i64.load	$push2=, c($pop12):p2align=0
+	i64.store	b($pop13):p2align=0, $pop2
 	i32.const	$push11=, 0
 	i32.const	$push10=, 0
-	i32.load	$push5=, e+8($pop10):p2align=0
-	i32.store	d+8($pop11):p2align=0, $pop5
+	i64.load	$push3=, e($pop10):p2align=0
+	i64.store	d($pop11):p2align=0, $pop3
 	i32.const	$push9=, 0
 	i32.const	$push8=, 0
-	i64.load	$push6=, e($pop8):p2align=0
-	i64.store	d($pop9):p2align=0, $pop6
+	i64.load	$push4=, e+6($pop8):p2align=0
+	i64.store	d+6($pop9):p2align=0, $pop4
 	i32.const	$push7=, 0
-                                        # fallthrough-return: $pop7
+	i32.const	$push6=, 0
+	i32.store16	a($pop7), $pop6
+	i32.const	$push5=, 0
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -148,4 +127,4 @@ e:
 	.size	e, 14
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20140212-1.c.s b/test/torture-s/20140212-1.c.s
index 7959f7fa5..25049a5ba 100644
--- a/test/torture-s/20140212-1.c.s
+++ b/test/torture-s/20140212-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20140212-1.c"
+	.file	"20140212-1.c"
 	.section	.text.fn1,"ax",@progbits
-	.hidden	fn1
+	.hidden	fn1                     # -- Begin function fn1
 	.globl	fn1
 	.type	fn1,@function
 fn1:                                    # @fn1
@@ -72,9 +72,9 @@ fn1:                                    # @fn1
 	.endfunc
 .Lfunc_end0:
 	.size	fn1, .Lfunc_end0-fn1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -157,7 +157,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.data.d,"aw",@progbits
@@ -256,5 +256,5 @@ h:
 	.size	h, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/20140326-1.c.s b/test/torture-s/20140326-1.c.s
index ea5a25eb1..bb0f92ca5 100644
--- a/test/torture-s/20140326-1.c.s
+++ b/test/torture-s/20140326-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20140326-1.c"
+	.file	"20140326-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -23,4 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/20140425-1.c.s b/test/torture-s/20140425-1.c.s
index dc0307242..ad29d91de 100644
--- a/test/torture-s/20140425-1.c.s
+++ b/test/torture-s/20140425-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/20140425-1.c"
+	.file	"20140425-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push17=, $pop6, $pop7
+	i32.sub 	$push17=, $pop5, $pop7
 	tee_local	$push16=, $1=, $pop17
 	i32.store	__stack_pointer($pop8), $pop16
 	i32.const	$push12=, 12
@@ -41,9 +41,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.set,"ax",@progbits
-	.type	set,@function
+	.type	set,@function           # -- Begin function set
 set:                                    # @set
 	.param  	i32
 # BB#0:                                 # %entry
@@ -53,7 +53,7 @@ set:                                    # @set
 	.endfunc
 .Lfunc_end1:
 	.size	set, .Lfunc_end1-set
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/900409-1.c.s b/test/torture-s/900409-1.c.s
index 492b1ef90..e9f451df7 100644
--- a/test/torture-s/900409-1.c.s
+++ b/test/torture-s/900409-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/900409-1.c"
+	.file	"900409-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -14,9 +14,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -29,9 +29,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -44,9 +44,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -59,9 +59,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -74,9 +74,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -89,9 +89,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -103,7 +103,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920202-1.c.s b/test/torture-s/920202-1.c.s
index 4b0f3726e..efa89b56d 100644
--- a/test/torture-s/920202-1.c.s
+++ b/test/torture-s/920202-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920202-1.c"
+	.file	"920202-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920409-1.c.s b/test/torture-s/920409-1.c.s
index 52a682710..15f7a63f5 100644
--- a/test/torture-s/920409-1.c.s
+++ b/test/torture-s/920409-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920409-1.c"
+	.file	"920409-1.c"
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -12,9 +12,9 @@ x:                                      # @x
 	.endfunc
 .Lfunc_end0:
 	.size	x, .Lfunc_end0-x
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920410-1.c.s b/test/torture-s/920410-1.c.s
index cb98da048..ded487757 100644
--- a/test/torture-s/920410-1.c.s
+++ b/test/torture-s/920410-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920410-1.c"
+	.file	"920410-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920411-1.c.s b/test/torture-s/920411-1.c.s
index 1f9cd7b7c..0db42b63e 100644
--- a/test/torture-s/920411-1.c.s
+++ b/test/torture-s/920411-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920411-1.c"
+	.file	"920411-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920428-1.c.s b/test/torture-s/920428-1.c.s
index b167b3118..68a5432dd 100644
--- a/test/torture-s/920428-1.c.s
+++ b/test/torture-s/920428-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920428-1.c"
+	.file	"920428-1.c"
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -13,9 +13,9 @@ x:                                      # @x
 	.endfunc
 .Lfunc_end0:
 	.size	x, .Lfunc_end0-x
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -44,6 +44,6 @@ main:                                   # @main
 	.size	.L.str, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920429-1.c.s b/test/torture-s/920429-1.c.s
index fd7bfe3bf..3d41ff322 100644
--- a/test/torture-s/920429-1.c.s
+++ b/test/torture-s/920429-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920429-1.c"
+	.file	"920429-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -69,5 +69,5 @@ j:
 	.size	j, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-1.c.s b/test/torture-s/920501-1.c.s
index d15441bdf..e9e693a87 100644
--- a/test/torture-s/920501-1.c.s
+++ b/test/torture-s/920501-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920501-1.c"
+	.file	"920501-1.c"
 	.section	.text.x,"ax",@progbits
-	.hidden	x
+	.hidden	x                       # -- Begin function x
 	.globl	x
 	.type	x,@function
 x:                                      # @x
@@ -9,28 +9,31 @@ x:                                      # @x
 	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push6=, 0
-	i32.load	$push0=, s($pop6)
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push9=, 0
-	i32.load	$push8=, s+4($pop9)
-	tee_local	$push7=, $0=, $pop8
+	i32.const	$push7=, 0
+	i32.load	$push0=, s($pop7)
+	i32.eqz 	$push11=, $pop0
+	br_if   	0, $pop11       # 0: down to label0
+# BB#1:                                 # %if.end
+	i32.const	$push6=, 1
+	return  	$pop6
+.LBB0_2:                                # %if.then
+	end_block                       # label0:
+	i32.const	$push10=, 0
+	i32.load	$push9=, s+4($pop10)
+	tee_local	$push8=, $0=, $pop9
 	i32.const	$push1=, 2
-	i32.shl 	$push2=, $pop7, $pop1
+	i32.shl 	$push2=, $pop8, $pop1
 	i32.const	$push3=, s+4
 	i32.add 	$push4=, $pop2, $pop3
 	i32.store	0($pop4), $0
-.LBB0_2:                                # %if.end
-	end_block                       # label0:
 	i32.const	$push5=, 1
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	x, .Lfunc_end0-x
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -56,5 +59,5 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-2.c.s b/test/torture-s/920501-2.c.s
index ef99f1535..3f51b0e7f 100644
--- a/test/torture-s/920501-2.c.s
+++ b/test/torture-s/920501-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920501-2.c"
+	.file	"920501-2.c"
 	.section	.text.gcd_ll,"ax",@progbits
-	.hidden	gcd_ll
+	.hidden	gcd_ll                  # -- Begin function gcd_ll
 	.globl	gcd_ll
 	.type	gcd_ll,@function
 gcd_ll:                                 # @gcd_ll
@@ -40,9 +40,9 @@ gcd_ll:                                 # @gcd_ll
 	.endfunc
 .Lfunc_end0:
 	.size	gcd_ll, .Lfunc_end0-gcd_ll
-
+                                        # -- End function
 	.section	.text.powmod_ll,"ax",@progbits
-	.hidden	powmod_ll
+	.hidden	powmod_ll               # -- Begin function powmod_ll
 	.globl	powmod_ll
 	.type	powmod_ll,@function
 powmod_ll:                              # @powmod_ll
@@ -115,14 +115,14 @@ powmod_ll:                              # @powmod_ll
 	.endfunc
 .Lfunc_end1:
 	.size	powmod_ll, .Lfunc_end1-powmod_ll
-
+                                        # -- End function
 	.section	.text.facts,"ax",@progbits
-	.hidden	facts
+	.hidden	facts                   # -- Begin function facts
 	.globl	facts
 	.type	facts,@function
 facts:                                  # @facts
 	.param  	i64, i32, i32, i32
-	.local  	i64, i64, i64, i32, i64, i64, i32, i32, i64, i64, i64, i32, i32, i32
+	.local  	i64, i64, i32, i64, i64, i64, i32, i32, i64, i64, i64, i32, i32, i32
 # BB#0:                                 # %entry
 	i64.extend_s/i32	$push40=, $1
 	tee_local	$push39=, $4=, $pop40
@@ -131,7 +131,7 @@ facts:                                  # @facts
 	i32.const	$15=, factab
 	i32.const	$17=, 0
 	i32.const	$16=, 1
-	i32.const	$7=, 1
+	i32.const	$1=, 1
 	i64.const	$8=, 1
 	i64.extend_s/i32	$push37=, $2
 	tee_local	$push36=, $9=, $pop37
@@ -146,15 +146,16 @@ facts:                                  # @facts
                                         #     Child Loop BB2_22 Depth 2
                                         #     Child Loop BB2_29 Depth 2
 	loop    	                # label8:
-	copy_local	$6=, $13
+	copy_local	$7=, $13
+	copy_local	$6=, $1
 	copy_local	$13=, $5
 	i64.const	$14=, 1
 	block   	
-	i32.eqz 	$push106=, $3
-	br_if   	0, $pop106      # 0: down to label9
+	i32.eqz 	$push104=, $3
+	br_if   	0, $pop104      # 0: down to label9
 # BB#2:                                 # %for.body.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$1=, -1
+	i32.const	$2=, -1
 	i32.const	$10=, 1
 	copy_local	$11=, $3
 .LBB2_3:                                # %for.body.i
@@ -162,11 +163,11 @@ facts:                                  # @facts
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label10:
 	copy_local	$push47=, $10
-	tee_local	$push46=, $2=, $pop47
+	tee_local	$push46=, $1=, $pop47
 	i32.const	$push45=, 1
 	i32.add 	$10=, $pop46, $pop45
 	i32.const	$push44=, 1
-	i32.add 	$1=, $1, $pop44
+	i32.add 	$2=, $2, $pop44
 	i32.const	$push43=, 1
 	i32.shr_u	$push42=, $11, $pop43
 	tee_local	$push41=, $11=, $pop42
@@ -177,11 +178,11 @@ facts:                                  # @facts
 	block   	
 	block   	
 	i32.const	$push48=, 1
-	i32.lt_s	$push0=, $1, $pop48
+	i32.lt_s	$push0=, $2, $pop48
 	br_if   	0, $pop0        # 0: down to label12
 # BB#5:                                 # %for.body4.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	copy_local	$12=, $6
+	copy_local	$12=, $7
 .LBB2_6:                                # %for.body4.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
@@ -191,21 +192,21 @@ facts:                                  # @facts
 	block   	
 	i32.const	$push50=, 1
 	i32.const	$push49=, -2
-	i32.add 	$push2=, $2, $pop49
+	i32.add 	$push2=, $1, $pop49
 	i32.shl 	$push3=, $pop50, $pop2
 	i32.and 	$push4=, $pop3, $3
-	i32.eqz 	$push107=, $pop4
-	br_if   	0, $pop107      # 0: down to label14
+	i32.eqz 	$push105=, $pop4
+	br_if   	0, $pop105      # 0: down to label14
 # BB#7:                                 # %if.then5.i
                                         #   in Loop: Header=BB2_6 Depth=2
-	i64.mul 	$push5=, $12, $6
+	i64.mul 	$push5=, $12, $7
 	i64.rem_u	$12=, $pop5, $0
 .LBB2_8:                                # %for.inc9.i
                                         #   in Loop: Header=BB2_6 Depth=2
 	end_block                       # label14:
 	i32.const	$push54=, -1
-	i32.add 	$push53=, $2, $pop54
-	tee_local	$push52=, $2=, $pop53
+	i32.add 	$push53=, $1, $pop54
+	tee_local	$push52=, $1=, $pop53
 	i32.const	$push51=, 1
 	i32.gt_s	$push6=, $pop52, $pop51
 	br_if   	0, $pop6        # 0: up to label13
@@ -213,40 +214,40 @@ facts:                                  # @facts
 .LBB2_9:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	end_block                       # label12:
-	copy_local	$12=, $6
-.LBB2_10:                               # %for.body.i114.preheader
+	copy_local	$12=, $7
+.LBB2_10:                               # %for.body.lr.ph.i110
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label11:
 	i64.add 	$13=, $12, $4
-	i32.const	$1=, -1
+	i32.const	$2=, -1
 	i32.const	$10=, 1
 	copy_local	$11=, $3
-.LBB2_11:                               # %for.body.i114
+.LBB2_11:                               # %for.body.i116
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label15:
 	copy_local	$push61=, $10
-	tee_local	$push60=, $2=, $pop61
+	tee_local	$push60=, $1=, $pop61
 	i32.const	$push59=, 1
 	i32.add 	$10=, $pop60, $pop59
 	i32.const	$push58=, 1
-	i32.add 	$1=, $1, $pop58
+	i32.add 	$2=, $2, $pop58
 	i32.const	$push57=, 1
 	i32.shr_u	$push56=, $11, $pop57
 	tee_local	$push55=, $11=, $pop56
 	br_if   	0, $pop55       # 0: up to label15
-# BB#12:                                # %for.end.i116
+# BB#12:                                # %for.end.i118
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	block   	
 	block   	
 	i32.const	$push62=, 1
-	i32.lt_s	$push7=, $1, $pop62
+	i32.lt_s	$push7=, $2, $pop62
 	br_if   	0, $pop7        # 0: down to label17
-# BB#13:                                # %for.body4.i125.preheader
+# BB#13:                                # %for.body4.i128.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	copy_local	$12=, $9
-.LBB2_14:                               # %for.body4.i125
+.LBB2_14:                               # %for.body4.i128
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label18:
@@ -255,21 +256,21 @@ facts:                                  # @facts
 	block   	
 	i32.const	$push64=, 1
 	i32.const	$push63=, -2
-	i32.add 	$push9=, $2, $pop63
+	i32.add 	$push9=, $1, $pop63
 	i32.shl 	$push10=, $pop64, $pop9
 	i32.and 	$push11=, $pop10, $3
-	i32.eqz 	$push108=, $pop11
-	br_if   	0, $pop108      # 0: down to label19
-# BB#15:                                # %if.then5.i128
+	i32.eqz 	$push106=, $pop11
+	br_if   	0, $pop106      # 0: down to label19
+# BB#15:                                # %if.then5.i131
                                         #   in Loop: Header=BB2_14 Depth=2
 	i64.mul 	$push12=, $12, $9
 	i64.rem_u	$12=, $pop12, $0
-.LBB2_16:                               # %for.inc9.i131
+.LBB2_16:                               # %for.inc9.i134
                                         #   in Loop: Header=BB2_14 Depth=2
 	end_block                       # label19:
 	i32.const	$push68=, -1
-	i32.add 	$push67=, $2, $pop68
-	tee_local	$push66=, $2=, $pop67
+	i32.add 	$push67=, $1, $pop68
+	tee_local	$push66=, $1=, $pop67
 	i32.const	$push65=, 1
 	i32.gt_s	$push13=, $pop66, $pop65
 	br_if   	0, $pop13       # 0: up to label18
@@ -278,11 +279,11 @@ facts:                                  # @facts
 	end_loop
 	end_block                       # label17:
 	copy_local	$12=, $9
-.LBB2_18:                               # %for.body.i88.preheader
+.LBB2_18:                               # %for.body.lr.ph.i82
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label16:
 	i64.add 	$14=, $12, $4
-	i32.const	$1=, -1
+	i32.const	$2=, -1
 	i32.const	$10=, 1
 	copy_local	$11=, $3
 .LBB2_19:                               # %for.body.i88
@@ -290,11 +291,11 @@ facts:                                  # @facts
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label20:
 	copy_local	$push75=, $10
-	tee_local	$push74=, $2=, $pop75
+	tee_local	$push74=, $1=, $pop75
 	i32.const	$push73=, 1
 	i32.add 	$10=, $pop74, $pop73
 	i32.const	$push72=, 1
-	i32.add 	$1=, $1, $pop72
+	i32.add 	$2=, $2, $pop72
 	i32.const	$push71=, 1
 	i32.shr_u	$push70=, $11, $pop71
 	tee_local	$push69=, $11=, $pop70
@@ -303,12 +304,12 @@ facts:                                  # @facts
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	i32.const	$push76=, 1
-	i32.lt_s	$push14=, $1, $pop76
+	i32.lt_s	$push14=, $2, $pop76
 	br_if   	0, $pop14       # 0: down to label9
-# BB#21:                                # %for.body4.i99.preheader
+# BB#21:                                # %for.body4.i100.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	copy_local	$12=, $14
-.LBB2_22:                               # %for.body4.i99
+.LBB2_22:                               # %for.body4.i100
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label21:
@@ -317,28 +318,28 @@ facts:                                  # @facts
 	block   	
 	i32.const	$push78=, 1
 	i32.const	$push77=, -2
-	i32.add 	$push16=, $2, $pop77
+	i32.add 	$push16=, $1, $pop77
 	i32.shl 	$push17=, $pop78, $pop16
 	i32.and 	$push18=, $pop17, $3
-	i32.eqz 	$push109=, $pop18
-	br_if   	0, $pop109      # 0: down to label22
-# BB#23:                                # %if.then5.i102
+	i32.eqz 	$push107=, $pop18
+	br_if   	0, $pop107      # 0: down to label22
+# BB#23:                                # %if.then5.i103
                                         #   in Loop: Header=BB2_22 Depth=2
 	i64.mul 	$push19=, $12, $14
 	i64.rem_u	$12=, $pop19, $0
-.LBB2_24:                               # %for.inc9.i105
+.LBB2_24:                               # %for.inc9.i106
                                         #   in Loop: Header=BB2_22 Depth=2
 	end_block                       # label22:
 	i32.const	$push82=, -1
-	i32.add 	$push81=, $2, $pop82
-	tee_local	$push80=, $2=, $pop81
+	i32.add 	$push81=, $1, $pop82
+	tee_local	$push80=, $1=, $pop81
 	i32.const	$push79=, 1
 	i32.gt_s	$push20=, $pop80, $pop79
 	br_if   	0, $pop20       # 0: up to label21
 # BB#25:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	copy_local	$14=, $12
-.LBB2_26:                               # %powmod_ll.exit107
+.LBB2_26:                               # %powmod_ll.exit108
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label9:
 	block   	
@@ -355,9 +356,9 @@ facts:                                  # @facts
 	i64.mul 	$push27=, $pop25, $pop26
 	i64.rem_u	$8=, $pop27, $0
 	block   	
-	i32.ne  	$push28=, $7, $16
+	i32.ne  	$push28=, $6, $16
 	br_if   	0, $pop28       # 0: down to label24
-# BB#27:                                # %if.then19
+# BB#27:                                # %if.then18
                                         #   in Loop: Header=BB2_1 Depth=1
 	i64.const	$push88=, 4294967295
 	i64.and 	$12=, $8, $pop88
@@ -395,13 +396,13 @@ facts:                                  # @facts
 	end_block                       # label25:
 	i32.add 	$16=, $17, $16
 	i32.wrap/i64	$push96=, $12
-	tee_local	$push95=, $2=, $pop96
+	tee_local	$push95=, $1=, $pop96
 	i32.const	$push94=, 1
 	i32.eq  	$push32=, $pop95, $pop94
 	br_if   	0, $pop32       # 0: down to label24
-# BB#33:                                # %if.then26
+# BB#33:                                # %if.then25
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.store	0($15), $2
+	i32.store	0($15), $1
 	i64.const	$push100=, 4294967295
 	i64.and 	$push33=, $12, $pop100
 	i64.div_u	$push99=, $0, $pop33
@@ -415,11 +416,10 @@ facts:                                  # @facts
 .LBB2_35:                               # %for.inc
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label24:
-	i32.const	$push105=, 1
-	i32.add 	$push104=, $7, $pop105
-	tee_local	$push103=, $7=, $pop104
-	i32.const	$push102=, 10000
-	i32.lt_s	$push35=, $pop103, $pop102
+	i32.const	$push103=, 1
+	i32.add 	$1=, $6, $pop103
+	i32.const	$push102=, 9999
+	i32.lt_u	$push35=, $6, $pop102
 	br_if   	1, $pop35       # 1: up to label8
 .LBB2_36:                               # %cleanup
 	end_block                       # label23:
@@ -428,9 +428,9 @@ facts:                                  # @facts
 	.endfunc
 .Lfunc_end2:
 	.size	facts, .Lfunc_end2-facts
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -470,7 +470,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	factab                  # @factab
 	.type	factab,@object
 	.section	.bss.factab,"aw",@nobits
@@ -481,6 +481,6 @@ factab:
 	.size	factab, 40
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-6.c.s b/test/torture-s/920501-6.c.s
index 96474e4bf..5ab254cab 100644
--- a/test/torture-s/920501-6.c.s
+++ b/test/torture-s/920501-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920501-6.c"
+	.file	"920501-6.c"
 	.section	.text.str2llu,"ax",@progbits
-	.hidden	str2llu
+	.hidden	str2llu                 # -- Begin function str2llu
 	.globl	str2llu
 	.type	str2llu,@function
 str2llu:                                # @str2llu
@@ -46,9 +46,9 @@ str2llu:                                # @str2llu
 	.endfunc
 .Lfunc_end0:
 	.size	str2llu, .Lfunc_end0-str2llu
-
+                                        # -- End function
 	.section	.text.sqrtllu,"ax",@progbits
-	.hidden	sqrtllu
+	.hidden	sqrtllu                 # -- Begin function sqrtllu
 	.globl	sqrtllu
 	.type	sqrtllu,@function
 sqrtllu:                                # @sqrtllu
@@ -71,19 +71,19 @@ sqrtllu:                                # @sqrtllu
 	br_if   	0, $pop0        # 0: up to label2
 # BB#2:                                 # %for.end
 	end_loop
-	i64.const	$push20=, 1
-	i64.const	$push19=, 1
-	i64.shr_u	$push4=, $2, $pop19
-	i64.shl 	$push18=, $pop20, $pop4
-	tee_local	$push17=, $1=, $pop18
 	i64.const	$push2=, 0
-	i64.const	$push16=, 1
-	i64.and 	$push1=, $2, $pop16
+	i64.const	$push20=, 1
+	i64.and 	$push1=, $2, $pop20
 	i64.sub 	$push3=, $pop2, $pop1
+	i64.const	$push19=, 1
+	i64.const	$push18=, 1
+	i64.shr_u	$push4=, $2, $pop18
+	i64.shl 	$push17=, $pop19, $pop4
+	tee_local	$push16=, $2=, $pop17
 	i64.const	$push15=, 1
-	i64.shr_u	$push5=, $1, $pop15
+	i64.shr_u	$push5=, $pop16, $pop15
 	i64.and 	$push6=, $pop3, $pop5
-	i64.add 	$2=, $pop17, $pop6
+	i64.add 	$2=, $pop6, $2
 .LBB1_3:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
@@ -102,9 +102,9 @@ sqrtllu:                                # @sqrtllu
 	.endfunc
 .Lfunc_end1:
 	.size	sqrtllu, .Lfunc_end1-sqrtllu
-
+                                        # -- End function
 	.section	.text.plist,"ax",@progbits
-	.hidden	plist
+	.hidden	plist                   # -- Begin function plist
 	.globl	plist
 	.type	plist,@function
 plist:                                  # @plist
@@ -116,9 +116,9 @@ plist:                                  # @plist
 	block   	
 	i64.gt_u	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label4
-# BB#1:                                 # %for.cond.i.preheader.preheader
+# BB#1:                                 # %for.body.preheader
 	copy_local	$4=, $2
-.LBB2_2:                                # %for.cond.i.preheader
+.LBB2_2:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
                                         #     Child Loop BB2_5 Depth 2
@@ -221,26 +221,26 @@ plist:                                  # @plist
 	.endfunc
 .Lfunc_end2:
 	.size	plist, .Lfunc_end2-plist
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i64, i64, i64, i32, i32
-# BB#0:                                 # %for.cond.i.preheader.i.preheader
+# BB#0:                                 # %for.body.lr.ph.i
 	i32.const	$push30=, 0
-	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 80
-	i32.sub 	$push32=, $pop28, $pop29
+	i32.sub 	$push32=, $pop27, $pop29
 	tee_local	$push31=, $8=, $pop32
 	i32.store	__stack_pointer($pop30), $pop31
 	i64.const	$4=, 1234111111
 	copy_local	$3=, $8
-.LBB3_1:                                # %for.cond.i.preheader.i
+.LBB3_1:                                # %for.body.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB3_2 Depth 2
                                         #     Child Loop BB3_4 Depth 2
@@ -367,8 +367,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-8.c.s b/test/torture-s/920501-8.c.s
index 991fdd6fa..5679cb2b2 100644
--- a/test/torture-s/920501-8.c.s
+++ b/test/torture-s/920501-8.c.s
@@ -1,100 +1,73 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920501-8.c"
+	.file	"920501-8.c"
 	.section	.text.va,"ax",@progbits
-	.hidden	va
+	.hidden	va                      # -- Begin function va
 	.globl	va
 	.type	va,@function
 va:                                     # @va
 	.param  	i32, f64, i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i64, i64, i64, i64, i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
-	i32.const	$push36=, 80
-	i32.sub 	$push43=, $pop35, $pop36
-	tee_local	$push42=, $16=, $pop43
-	i32.store	__stack_pointer($pop37), $pop42
-	i32.store	76($16), $3
-	i32.const	$push0=, 4
-	i32.add 	$push1=, $3, $pop0
-	i32.store	76($16), $pop1
-	i32.load	$4=, 0($3)
-	i32.load	$5=, 4($3)
-	i32.load	$6=, 8($3)
-	i32.load	$7=, 12($3)
-	i32.load	$8=, 16($3)
-	i32.load	$9=, 20($3)
-	i32.load	$10=, 24($3)
-	i32.load	$11=, 28($3)
-	i32.load	$12=, 32($3)
-	i32.load	$13=, 36($3)
-	i32.load	$14=, 40($3)
-	i32.load	$15=, 44($3)
-	i32.const	$push2=, 52
-	i32.add 	$push3=, $3, $pop2
-	i32.store	76($16), $pop3
-	i32.const	$push4=, 68
-	i32.add 	$push5=, $16, $pop4
-	i32.load	$push6=, 48($3)
-	i32.store	0($pop5), $pop6
-	i32.const	$push7=, 64
-	i32.add 	$push8=, $16, $pop7
-	i32.store	0($pop8), $15
-	i32.const	$push9=, 60
-	i32.add 	$push10=, $16, $pop9
-	i32.store	0($pop10), $14
-	i32.const	$push11=, 56
-	i32.add 	$push12=, $16, $pop11
-	i32.store	0($pop12), $13
-	i32.const	$push41=, 52
-	i32.add 	$push13=, $16, $pop41
-	i32.store	0($pop13), $12
-	i32.const	$push14=, 48
-	i32.add 	$push15=, $16, $pop14
-	i32.store	0($pop15), $11
-	i32.const	$push16=, 44
-	i32.add 	$push17=, $16, $pop16
-	i32.store	0($pop17), $10
-	i32.const	$push18=, 40
-	i32.add 	$push19=, $16, $pop18
-	i32.store	0($pop19), $9
-	i32.const	$push20=, 36
-	i32.add 	$push21=, $16, $pop20
-	i32.store	0($pop21), $8
-	i32.const	$push22=, 32
-	i32.add 	$push23=, $16, $pop22
-	i32.store	0($pop23), $7
-	i32.const	$push24=, 28
-	i32.add 	$push25=, $16, $pop24
-	i32.store	0($pop25), $6
-	i32.const	$push26=, 24
-	i32.add 	$push27=, $16, $pop26
-	i32.store	0($pop27), $5
-	i32.const	$push28=, 20
-	i32.add 	$push29=, $16, $pop28
-	i32.store	0($pop29), $4
-	i32.const	$push30=, 16
-	i32.add 	$push31=, $16, $pop30
-	i32.store	0($pop31), $2
-	f64.store	8($16), $1
-	i32.store	0($16), $0
-	i32.const	$push33=, buf
-	i32.const	$push32=, .L.str
-	i32.call	$drop=, sprintf@FUNCTION, $pop33, $pop32, $16
-	i32.const	$push40=, 0
-	i32.const	$push38=, 80
-	i32.add 	$push39=, $16, $pop38
-	i32.store	__stack_pointer($pop40), $pop39
-	copy_local	$push44=, $16
-                                        # fallthrough-return: $pop44
+	i32.const	$push23=, 0
+	i32.const	$push21=, 0
+	i32.load	$push20=, __stack_pointer($pop21)
+	i32.const	$push22=, 80
+	i32.sub 	$push29=, $pop20, $pop22
+	tee_local	$push28=, $10=, $pop29
+	i32.store	__stack_pointer($pop23), $pop28
+	i32.store	76($10), $3
+	i32.load	$4=, 48($3)
+	i64.load	$5=, 8($3):p2align=2
+	i64.load	$6=, 16($3):p2align=2
+	i64.load	$7=, 24($3):p2align=2
+	i64.load	$8=, 32($3):p2align=2
+	i64.load	$9=, 40($3):p2align=2
+	i32.const	$push1=, 20
+	i32.add 	$push2=, $10, $pop1
+	i64.load	$push0=, 0($3):p2align=2
+	i64.store	0($pop2):p2align=2, $pop0
+	i32.const	$push3=, 60
+	i32.add 	$push4=, $10, $pop3
+	i64.store	0($pop4):p2align=2, $9
+	i32.const	$push5=, 52
+	i32.add 	$push6=, $10, $pop5
+	i64.store	0($pop6):p2align=2, $8
+	i32.const	$push7=, 44
+	i32.add 	$push8=, $10, $pop7
+	i64.store	0($pop8):p2align=2, $7
+	i32.const	$push9=, 36
+	i32.add 	$push10=, $10, $pop9
+	i64.store	0($pop10):p2align=2, $6
+	i32.const	$push11=, 28
+	i32.add 	$push12=, $10, $pop11
+	i64.store	0($pop12):p2align=2, $5
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $10, $pop13
+	i32.store	0($pop14), $2
+	i32.const	$push15=, 68
+	i32.add 	$push16=, $10, $pop15
+	i32.store	0($pop16), $4
+	f64.store	8($10), $1
+	i32.store	0($10), $0
+	i32.const	$push27=, 52
+	i32.add 	$push17=, $3, $pop27
+	i32.store	76($10), $pop17
+	i32.const	$push19=, buf
+	i32.const	$push18=, .L.str
+	i32.call	$drop=, sprintf@FUNCTION, $pop19, $pop18, $10
+	i32.const	$push26=, 0
+	i32.const	$push24=, 80
+	i32.add 	$push25=, $10, $pop24
+	i32.store	__stack_pointer($pop26), $pop25
+	copy_local	$push30=, $10
+                                        # fallthrough-return: $pop30
 	.endfunc
 .Lfunc_end0:
 	.size	va, .Lfunc_end0-va
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -102,10 +75,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 64
-	i32.sub 	$push29=, $pop25, $pop26
+	i32.sub 	$push29=, $pop24, $pop26
 	tee_local	$push28=, $0=, $pop29
 	i32.store	__stack_pointer($pop27), $pop28
 	i32.const	$push0=, 48
@@ -152,7 +125,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -174,7 +147,7 @@ buf:
 	.size	.L.str.1, 45
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/920501-9.c.s b/test/torture-s/920501-9.c.s
index 212c77fa7..d82709b02 100644
--- a/test/torture-s/920501-9.c.s
+++ b/test/torture-s/920501-9.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920501-9.c"
+	.file	"920501-9.c"
 	.section	.text.proc1,"ax",@progbits
-	.hidden	proc1
+	.hidden	proc1                   # -- Begin function proc1
 	.globl	proc1
 	.type	proc1,@function
 proc1:                                  # @proc1
@@ -12,9 +12,9 @@ proc1:                                  # @proc1
 	.endfunc
 .Lfunc_end0:
 	.size	proc1, .Lfunc_end0-proc1
-
+                                        # -- End function
 	.section	.text.proc2,"ax",@progbits
-	.hidden	proc2
+	.hidden	proc2                   # -- Begin function proc2
 	.globl	proc2
 	.type	proc2,@function
 proc2:                                  # @proc2
@@ -25,9 +25,9 @@ proc2:                                  # @proc2
 	.endfunc
 .Lfunc_end1:
 	.size	proc2, .Lfunc_end1-proc2
-
+                                        # -- End function
 	.section	.text.proc3,"ax",@progbits
-	.hidden	proc3
+	.hidden	proc3                   # -- Begin function proc3
 	.globl	proc3
 	.type	proc3,@function
 proc3:                                  # @proc3
@@ -38,9 +38,9 @@ proc3:                                  # @proc3
 	.endfunc
 .Lfunc_end2:
 	.size	proc3, .Lfunc_end2-proc3
-
+                                        # -- End function
 	.section	.text.proc4,"ax",@progbits
-	.hidden	proc4
+	.hidden	proc4                   # -- Begin function proc4
 	.globl	proc4
 	.type	proc4,@function
 proc4:                                  # @proc4
@@ -51,9 +51,9 @@ proc4:                                  # @proc4
 	.endfunc
 .Lfunc_end3:
 	.size	proc4, .Lfunc_end3-proc4
-
+                                        # -- End function
 	.section	.text.proc5,"ax",@progbits
-	.hidden	proc5
+	.hidden	proc5                   # -- Begin function proc5
 	.globl	proc5
 	.type	proc5,@function
 proc5:                                  # @proc5
@@ -64,9 +64,9 @@ proc5:                                  # @proc5
 	.endfunc
 .Lfunc_end4:
 	.size	proc5, .Lfunc_end4-proc5
-
+                                        # -- End function
 	.section	.text.print_longlong,"ax",@progbits
-	.hidden	print_longlong
+	.hidden	print_longlong          # -- Begin function print_longlong
 	.globl	print_longlong
 	.type	print_longlong,@function
 print_longlong:                         # @print_longlong
@@ -75,10 +75,10 @@ print_longlong:                         # @print_longlong
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 32
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $4=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i32.wrap/i64	$3=, $0
@@ -114,9 +114,9 @@ print_longlong:                         # @print_longlong
 	.endfunc
 .Lfunc_end5:
 	.size	print_longlong, .Lfunc_end5-print_longlong
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -124,10 +124,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 192
-	i32.sub 	$push51=, $pop18, $pop19
+	i32.sub 	$push51=, $pop17, $pop19
 	tee_local	$push50=, $0=, $pop51
 	i32.store	__stack_pointer($pop20), $pop50
 	i32.const	$push0=, 1
@@ -202,14 +202,14 @@ main:                                   # @main
 	i32.const	$push16=, 0
 	call    	exit@FUNCTION, $pop16
 	unreachable
-.LBB6_6:                                # %if.then34
+.LBB6_6:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -247,7 +247,7 @@ main:                                   # @main
 	.size	.L.str.6, 9
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/920506-1.c.s b/test/torture-s/920506-1.c.s
index d380e859b..bf228a3d9 100644
--- a/test/torture-s/920506-1.c.s
+++ b/test/torture-s/920506-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920506-1.c"
+	.file	"920506-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -22,7 +22,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	l                       # @l
 	.type	l,@object
 	.section	.data.l,"aw",@progbits
@@ -34,6 +34,6 @@ l:
 	.size	l, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/920520-1.c.s b/test/torture-s/920520-1.c.s
index 67772685c..796d590dc 100644
--- a/test/torture-s/920520-1.c.s
+++ b/test/torture-s/920520-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920520-1.c"
+	.file	"920520-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bugger,"ax",@progbits
-	.hidden	bugger
+	.hidden	bugger                  # -- Begin function bugger
 	.globl	bugger
 	.type	bugger,@function
 bugger:                                 # @bugger
@@ -28,9 +28,9 @@ bugger:                                 # @bugger
 	.endfunc
 .Lfunc_end1:
 	.size	bugger, .Lfunc_end1-bugger
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920603-1.c.s b/test/torture-s/920603-1.c.s
index 45b5db861..9ae38eb73 100644
--- a/test/torture-s/920603-1.c.s
+++ b/test/torture-s/920603-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920603-1.c"
+	.file	"920603-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -21,9 +21,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,8 +35,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920604-1.c.s b/test/torture-s/920604-1.c.s
index 87c9f7fcf..f6a597811 100644
--- a/test/torture-s/920604-1.c.s
+++ b/test/torture-s/920604-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920604-1.c"
+	.file	"920604-1.c"
 	.section	.text.mod,"ax",@progbits
-	.hidden	mod
+	.hidden	mod                     # -- Begin function mod
 	.globl	mod
 	.type	mod,@function
 mod:                                    # @mod
@@ -13,9 +13,9 @@ mod:                                    # @mod
 	.endfunc
 .Lfunc_end0:
 	.size	mod, .Lfunc_end0-mod
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920612-1.c.s b/test/torture-s/920612-1.c.s
index 4bb154764..7dc8a6fe1 100644
--- a/test/torture-s/920612-1.c.s
+++ b/test/torture-s/920612-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920612-1.c"
+	.file	"920612-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/920618-1.c.s b/test/torture-s/920618-1.c.s
index 7e78bb2c0..04062f4fe 100644
--- a/test/torture-s/920618-1.c.s
+++ b/test/torture-s/920618-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920618-1.c"
+	.file	"920618-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920625-1.c.s b/test/torture-s/920625-1.c.s
index c4603b5e5..4192ec9a8 100644
--- a/test/torture-s/920625-1.c.s
+++ b/test/torture-s/920625-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920625-1.c"
+	.file	"920625-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push21=, 0
-	i32.const	$push18=, 0
-	i32.load	$push19=, __stack_pointer($pop18)
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
 	i32.const	$push20=, 128
-	i32.sub 	$push64=, $pop19, $pop20
+	i32.sub 	$push64=, $pop18, $pop20
 	tee_local	$push63=, $0=, $pop64
 	i32.store	__stack_pointer($pop21), $pop63
 	i32.const	$push22=, 112
@@ -29,29 +29,29 @@ main:                                   # @main
 	i32.const	$push61=, 0
 	i64.load	$push4=, pts+24($pop61)
 	i64.store	0($pop5), $pop4
-	i32.const	$push60=, 0
-	i64.load	$push6=, pts($pop60)
-	i64.store	112($0), $pop6
-	i32.const	$push59=, 0
-	i64.load	$push7=, pts+16($pop59)
-	i64.store	96($0), $pop7
 	i32.const	$push26=, 80
 	i32.add 	$push27=, $0, $pop26
+	i32.const	$push60=, 8
+	i32.add 	$push7=, $pop27, $pop60
+	i32.const	$push59=, 0
+	i64.load	$push6=, pts+40($pop59)
+	i64.store	0($pop7), $pop6
+	i32.const	$push28=, 64
+	i32.add 	$push29=, $0, $pop28
 	i32.const	$push58=, 8
-	i32.add 	$push8=, $pop27, $pop58
+	i32.add 	$push9=, $pop29, $pop58
 	i32.const	$push57=, 0
-	i64.load	$push9=, pts+40($pop57)
-	i64.store	0($pop8), $pop9
+	i64.load	$push8=, pts+56($pop57)
+	i64.store	0($pop9), $pop8
 	i32.const	$push56=, 0
-	i64.load	$push10=, pts+32($pop56)
-	i64.store	80($0), $pop10
-	i32.const	$push28=, 64
-	i32.add 	$push29=, $0, $pop28
-	i32.const	$push55=, 8
-	i32.add 	$push11=, $pop29, $pop55
+	i64.load	$push10=, pts($pop56)
+	i64.store	112($0), $pop10
+	i32.const	$push55=, 0
+	i64.load	$push11=, pts+16($pop55)
+	i64.store	96($0), $pop11
 	i32.const	$push54=, 0
-	i64.load	$push12=, pts+56($pop54)
-	i64.store	0($pop11), $pop12
+	i64.load	$push12=, pts+32($pop54)
+	i64.store	80($0), $pop12
 	i32.const	$push53=, 0
 	i64.load	$push13=, pts+48($pop53)
 	i64.store	64($0), $pop13
@@ -72,16 +72,16 @@ main:                                   # @main
 	call    	va1@FUNCTION, $0, $pop39
 	i32.const	$push52=, 0
 	i64.load	$push14=, ipts($pop52)
-	i64.store	40($0):p2align=2, $pop14
+	i64.store	40($0), $pop14
 	i32.const	$push51=, 0
 	i64.load	$push15=, ipts+8($pop51)
-	i64.store	32($0):p2align=2, $pop15
+	i64.store	32($0), $pop15
 	i32.const	$push50=, 0
 	i64.load	$push16=, ipts+16($pop50)
-	i64.store	24($0):p2align=2, $pop16
+	i64.store	24($0), $pop16
 	i32.const	$push49=, 0
 	i64.load	$push17=, ipts+24($pop49)
-	i64.store	16($0):p2align=2, $pop17
+	i64.store	16($0), $pop17
 	i32.const	$push40=, 16
 	i32.add 	$push41=, $0, $pop40
 	i32.store	12($0), $pop41
@@ -101,18 +101,18 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.va1,"ax",@progbits
-	.type	va1,@function
+	.type	va1,@function           # -- Begin function va1
 va1:                                    # @va1
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push44=, 0
-	i32.const	$push41=, 0
-	i32.load	$push42=, __stack_pointer($pop41)
+	i32.const	$push42=, 0
+	i32.load	$push41=, __stack_pointer($pop42)
 	i32.const	$push43=, 16
-	i32.sub 	$push52=, $pop42, $pop43
+	i32.sub 	$push52=, $pop41, $pop43
 	tee_local	$push51=, $2=, $pop52
 	i32.store	__stack_pointer($pop44), $pop51
 	i32.store	12($2), $1
@@ -200,18 +200,18 @@ va1:                                    # @va1
 	.endfunc
 .Lfunc_end1:
 	.size	va1, .Lfunc_end1-va1
-
+                                        # -- End function
 	.section	.text.va2,"ax",@progbits
-	.type	va2,@function
+	.type	va2,@function           # -- Begin function va2
 va2:                                    # @va2
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push41=, 0
-	i32.const	$push38=, 0
-	i32.load	$push39=, __stack_pointer($pop38)
+	i32.const	$push39=, 0
+	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 16
-	i32.sub 	$push47=, $pop39, $pop40
+	i32.sub 	$push47=, $pop38, $pop40
 	tee_local	$push46=, $2=, $pop47
 	i32.store	__stack_pointer($pop41), $pop46
 	i32.store	12($2), $1
@@ -294,7 +294,7 @@ va2:                                    # @va2
 	.endfunc
 .Lfunc_end2:
 	.size	va2, .Lfunc_end2-va2
-
+                                        # -- End function
 	.hidden	pts                     # @pts
 	.type	pts,@object
 	.section	.data.pts,"aw",@progbits
@@ -328,6 +328,6 @@ ipts:
 	.size	ipts, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/920710-1.c.s b/test/torture-s/920710-1.c.s
index da522ea33..7ac085b41 100644
--- a/test/torture-s/920710-1.c.s
+++ b/test/torture-s/920710-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920710-1.c"
+	.file	"920710-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920711-1.c.s b/test/torture-s/920711-1.c.s
index baa2002ec..3cded62e4 100644
--- a/test/torture-s/920711-1.c.s
+++ b/test/torture-s/920711-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920711-1.c"
+	.file	"920711-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/920721-1.c.s b/test/torture-s/920721-1.c.s
index 4e3269611..08e7dc640 100644
--- a/test/torture-s/920721-1.c.s
+++ b/test/torture-s/920721-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920721-1.c"
+	.file	"920721-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920721-2.c.s b/test/torture-s/920721-2.c.s
index b0580ba41..9d704d8a7 100644
--- a/test/torture-s/920721-2.c.s
+++ b/test/torture-s/920721-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920721-2.c"
+	.file	"920721-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920721-3.c.s b/test/torture-s/920721-3.c.s
index 2ffccdaea..3707b2070 100644
--- a/test/torture-s/920721-3.c.s
+++ b/test/torture-s/920721-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920721-3.c"
+	.file	"920721-3.c"
 	.section	.text.ru,"ax",@progbits
-	.hidden	ru
+	.hidden	ru                      # -- Begin function ru
 	.globl	ru
 	.type	ru,@function
 ru:                                     # @ru
@@ -24,16 +24,16 @@ ru:                                     # @ru
 	br_if   	0, $pop7        # 0: down to label0
 # BB#2:                                 # %if.end8
 	return  	$0
-.LBB0_3:                                # %if.then7
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	ru, .Lfunc_end0-ru
-
+                                        # -- End function
 	.section	.text.rs,"ax",@progbits
-	.hidden	rs
+	.hidden	rs                      # -- Begin function rs
 	.globl	rs
 	.type	rs,@function
 rs:                                     # @rs
@@ -55,9 +55,9 @@ rs:                                     # @rs
 	.endfunc
 .Lfunc_end1:
 	.size	rs, .Lfunc_end1-rs
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,8 +69,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920726-1.c.s b/test/torture-s/920726-1.c.s
index 1772497f5..80bdbbfe1 100644
--- a/test/torture-s/920726-1.c.s
+++ b/test/torture-s/920726-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920726-1.c"
+	.file	"920726-1.c"
 	.section	.text.first,"ax",@progbits
-	.hidden	first
+	.hidden	first                   # -- Begin function first
 	.globl	first
 	.type	first,@function
 first:                                  # @first
@@ -10,10 +10,10 @@ first:                                  # @first
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop6, $pop7
+	i32.sub 	$push13=, $pop5, $pop7
 	tee_local	$push12=, $3=, $pop13
 	i32.store	__stack_pointer($pop8), $pop12
 	i32.store	12($3), $2
@@ -70,9 +70,9 @@ first:                                  # @first
 	.endfunc
 .Lfunc_end0:
 	.size	first, .Lfunc_end0-first
-
+                                        # -- End function
 	.section	.text.second,"ax",@progbits
-	.hidden	second
+	.hidden	second                  # -- Begin function second
 	.globl	second
 	.type	second,@function
 second:                                 # @second
@@ -81,10 +81,10 @@ second:                                 # @second
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop6, $pop7
+	i32.sub 	$push13=, $pop5, $pop7
 	tee_local	$push12=, $3=, $pop13
 	i32.store	__stack_pointer($pop8), $pop12
 	i32.store	12($3), $2
@@ -141,9 +141,9 @@ second:                                 # @second
 	.endfunc
 .Lfunc_end1:
 	.size	second, .Lfunc_end1-second
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -151,10 +151,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 256
-	i32.sub 	$push23=, $pop6, $pop7
+	i32.sub 	$push23=, $pop5, $pop7
 	tee_local	$push22=, $0=, $pop23
 	i32.store	__stack_pointer($pop8), $pop22
 	i64.const	$push0=, 85899345925
@@ -194,7 +194,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -212,7 +212,7 @@ main:                                   # @main
 	.size	.L.str.2, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	strlen, i32, i32
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/920730-1.c.s b/test/torture-s/920730-1.c.s
index 83574be03..f6d893cb8 100644
--- a/test/torture-s/920730-1.c.s
+++ b/test/torture-s/920730-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920730-1.c"
+	.file	"920730-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -12,9 +12,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -25,9 +25,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -38,9 +38,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -51,9 +51,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,7 +65,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920731-1.c.s b/test/torture-s/920731-1.c.s
index 8e6cec49a..0fa9390f0 100644
--- a/test/torture-s/920731-1.c.s
+++ b/test/torture-s/920731-1.c.s
@@ -1,15 +1,15 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920731-1.c"
+	.file	"920731-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 0
+	i32.const	$2=, 0
 	block   	
 	i32.const	$push3=, 1
 	i32.and 	$push0=, $0, $pop3
@@ -19,32 +19,32 @@ f:                                      # @f
 .LBB0_2:                                # %for.inc
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $1, $pop7
-	tee_local	$push5=, $1=, $pop6
-	i32.const	$push4=, 7
-	i32.gt_s	$push2=, $pop5, $pop4
+	i32.const	$push5=, 1
+	i32.add 	$2=, $1, $pop5
+	i32.const	$push4=, 6
+	i32.gt_u	$push2=, $1, $pop4
 	br_if   	1, $pop2        # 1: down to label0
 # BB#3:                                 # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push11=, 1
-	i32.shr_s	$push10=, $0, $pop11
-	tee_local	$push9=, $0=, $pop10
-	i32.const	$push8=, 1
-	i32.and 	$push1=, $pop9, $pop8
-	i32.eqz 	$push12=, $pop1
-	br_if   	0, $pop12       # 0: up to label1
+	copy_local	$1=, $2
+	i32.const	$push9=, 1
+	i32.shr_s	$push8=, $0, $pop9
+	tee_local	$push7=, $0=, $pop8
+	i32.const	$push6=, 1
+	i32.and 	$push1=, $pop7, $pop6
+	i32.eqz 	$push10=, $pop1
+	br_if   	0, $pop10       # 0: up to label1
 .LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push13=, $1
-                                        # fallthrough-return: $pop13
+	copy_local	$push11=, $2
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920810-1.c.s b/test/torture-s/920810-1.c.s
index c4db1099b..9c7ca8a24 100644
--- a/test/torture-s/920810-1.c.s
+++ b/test/torture-s/920810-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920810-1.c"
+	.file	"920810-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -22,9 +22,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,8 +36,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/920812-1.c.s b/test/torture-s/920812-1.c.s
index fd6476aa1..8a1fa1080 100644
--- a/test/torture-s/920812-1.c.s
+++ b/test/torture-s/920812-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920812-1.c"
+	.file	"920812-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920829-1.c.s b/test/torture-s/920829-1.c.s
index 693811cff..ff772b21e 100644
--- a/test/torture-s/920829-1.c.s
+++ b/test/torture-s/920829-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920829-1.c"
+	.file	"920829-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -47,6 +47,6 @@ c3:
 	.size	c3, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920908-1.c.s b/test/torture-s/920908-1.c.s
index de4e2f971..e0f211cf0 100644
--- a/test/torture-s/920908-1.c.s
+++ b/test/torture-s/920908-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920908-1.c"
+	.file	"920908-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,13 +10,12 @@ f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop9, $pop10
+	i32.sub 	$push18=, $pop8, $pop10
 	tee_local	$push17=, $3=, $pop18
 	i32.store	__stack_pointer($pop11), $pop17
-	i32.store	12($3), $1
 	i32.const	$push0=, 4
 	i32.add 	$push16=, $1, $pop0
 	tee_local	$push15=, $2=, $pop16
@@ -41,16 +40,16 @@ f:                                      # @f
 	i32.store	__stack_pointer($pop14), $pop13
 	i32.const	$push20=, 20
 	return  	$pop20
-.LBB0_3:                                # %if.then6
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,10 +57,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop3, $pop4
+	i32.sub 	$push7=, $pop2, $pop4
 	tee_local	$push6=, $0=, $pop7
 	i32.store	__stack_pointer($pop5), $pop6
 	i64.const	$push0=, 85899345930
@@ -73,8 +72,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/920908-2.c.s b/test/torture-s/920908-2.c.s
index 699d1beca..147d9e50e 100644
--- a/test/torture-s/920908-2.c.s
+++ b/test/torture-s/920908-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920908-2.c"
+	.file	"920908-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920909-1.c.s b/test/torture-s/920909-1.c.s
index df523dfcf..8dccba5b4 100644
--- a/test/torture-s/920909-1.c.s
+++ b/test/torture-s/920909-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920909-1.c"
+	.file	"920909-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -18,7 +18,7 @@ f:                                      # @f
 # BB#1:                                 # %switch.lookup
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $0, $pop4
-	i32.const	$push6=, .Lswitch.table
+	i32.const	$push6=, .Lswitch.table.f
 	i32.add 	$push7=, $pop5, $pop6
 	i32.load	$push8=, 0($pop7)
 	return  	$pop8
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,19 +43,19 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+                                        # -- End function
+	.type	.Lswitch.table.f,@object # @switch.table.f
+	.section	.rodata..Lswitch.table.f,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.f:
 	.int32	1027                    # 0x403
 	.int32	1029                    # 0x405
 	.int32	1031                    # 0x407
 	.int32	1033                    # 0x409
 	.int32	1                       # 0x1
 	.int32	4                       # 0x4
-	.size	.Lswitch.table, 24
+	.size	.Lswitch.table.f, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920922-1.c.s b/test/torture-s/920922-1.c.s
index cec74727d..de515e602 100644
--- a/test/torture-s/920922-1.c.s
+++ b/test/torture-s/920922-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920922-1.c"
+	.file	"920922-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920929-1.c.s b/test/torture-s/920929-1.c.s
index 2c6f5a72b..ea8e0a4b9 100644
--- a/test/torture-s/920929-1.c.s
+++ b/test/torture-s/920929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/920929-1.c"
+	.file	"920929-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921006-1.c.s b/test/torture-s/921006-1.c.s
index 2fd32b45b..09fee2f01 100644
--- a/test/torture-s/921006-1.c.s
+++ b/test/torture-s/921006-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921006-1.c"
+	.file	"921006-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921007-1.c.s b/test/torture-s/921007-1.c.s
index 3bbbb0d53..e776017d4 100644
--- a/test/torture-s/921007-1.c.s
+++ b/test/torture-s/921007-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921007-1.c"
+	.file	"921007-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921013-1.c.s b/test/torture-s/921013-1.c.s
index 10dc4d161..37762dad5 100644
--- a/test/torture-s/921013-1.c.s
+++ b/test/torture-s/921013-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921013-1.c"
+	.file	"921013-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -37,9 +37,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921016-1.c.s b/test/torture-s/921016-1.c.s
index 71ccb6db4..2a7d1f767 100644
--- a/test/torture-s/921016-1.c.s
+++ b/test/torture-s/921016-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921016-1.c"
+	.file	"921016-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921019-1.c.s b/test/torture-s/921019-1.c.s
index fd5da0611..89e4a5862 100644
--- a/test/torture-s/921019-1.c.s
+++ b/test/torture-s/921019-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921019-1.c"
+	.file	"921019-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,7 +25,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -42,6 +42,6 @@ foo:
 	.size	foo, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/921019-2.c.s b/test/torture-s/921019-2.c.s
index 3adfd78a2..876856d65 100644
--- a/test/torture-s/921019-2.c.s
+++ b/test/torture-s/921019-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921019-2.c"
+	.file	"921019-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921029-1.c.s b/test/torture-s/921029-1.c.s
index ed6542f5f..54778a250 100644
--- a/test/torture-s/921029-1.c.s
+++ b/test/torture-s/921029-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921029-1.c"
+	.file	"921029-1.c"
 	.section	.text.build,"ax",@progbits
-	.hidden	build
+	.hidden	build                   # -- Begin function build
 	.globl	build
 	.type	build,@function
 build:                                  # @build
@@ -28,9 +28,9 @@ build:                                  # @build
 	.endfunc
 .Lfunc_end0:
 	.size	build, .Lfunc_end0-build
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	hpart                   # @hpart
 	.type	hpart,@object
 	.section	.bss.hpart,"aw",@nobits
@@ -80,5 +80,5 @@ back:
 	.size	back, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921104-1.c.s b/test/torture-s/921104-1.c.s
index 93098208a..6d1f004d2 100644
--- a/test/torture-s/921104-1.c.s
+++ b/test/torture-s/921104-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921104-1.c"
+	.file	"921104-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921110-1.c.s b/test/torture-s/921110-1.c.s
index 9b994ae1b..8dc1d1769 100644
--- a/test/torture-s/921110-1.c.s
+++ b/test/torture-s/921110-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921110-1.c"
+	.file	"921110-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	f                       # @f
 	.type	f,@object
 	.section	.data.f,"aw",@progbits
@@ -24,6 +24,6 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/921112-1.c.s b/test/torture-s/921112-1.c.s
index f10e785ef..c372047b4 100644
--- a/test/torture-s/921112-1.c.s
+++ b/test/torture-s/921112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921112-1.c"
+	.file	"921112-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -68,6 +68,6 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/921113-1.c.s b/test/torture-s/921113-1.c.s
index 3de7ce123..e2a597729 100644
--- a/test/torture-s/921113-1.c.s
+++ b/test/torture-s/921113-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921113-1.c"
+	.file	"921113-1.c"
 	.section	.text.w,"ax",@progbits
-	.hidden	w
+	.hidden	w                       # -- Begin function w
 	.globl	w
 	.type	w,@function
 w:                                      # @w
@@ -14,9 +14,9 @@ w:                                      # @w
 	.endfunc
 .Lfunc_end0:
 	.size	w, .Lfunc_end0-w
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -41,9 +41,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -68,9 +68,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end2:
 	.size	f2, .Lfunc_end2-f2
-
+                                        # -- End function
 	.section	.text.gitter,"ax",@progbits
-	.hidden	gitter
+	.hidden	gitter                  # -- Begin function gitter
 	.globl	gitter
 	.type	gitter,@function
 gitter:                                 # @gitter
@@ -112,16 +112,16 @@ gitter:                                 # @gitter
 	i32.or  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label3
 # BB#5:                                 # %if.then
-	f64.promote/f32	$push32=, $6
-	tee_local	$push31=, $8=, $pop32
 	f64.promote/f32	$push15=, $5
 	f64.const	$push16=, 0x1p-1
-	f64.mul 	$push30=, $pop15, $pop16
-	tee_local	$push29=, $7=, $pop30
-	f64.gt  	$push17=, $pop31, $pop29
-	f64.ne  	$push19=, $8, $8
+	f64.mul 	$push32=, $pop15, $pop16
+	tee_local	$push31=, $7=, $pop32
+	f64.promote/f32	$push30=, $6
+	tee_local	$push29=, $8=, $pop30
+	f64.lt  	$push17=, $pop31, $pop29
 	f64.ne  	$push18=, $7, $7
-	i32.or  	$push20=, $pop19, $pop18
+	f64.ne  	$push19=, $8, $8
+	i32.or  	$push20=, $pop18, $pop19
 	i32.or  	$push21=, $pop17, $pop20
 	br_if   	0, $pop21       # 0: down to label3
 # BB#6:                                 # %if.then15
@@ -130,16 +130,16 @@ gitter:                                 # @gitter
 .LBB3_7:                                # %if.end18
 	end_block                       # label3:
 	return  	$4
-.LBB3_8:                                # %if.then.i32
+.LBB3_8:                                # %if.then.i
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	gitter, .Lfunc_end3-gitter
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -147,10 +147,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push13=, $pop5, $pop6
+	i32.sub 	$push13=, $pop4, $pop6
 	tee_local	$push12=, $0=, $pop13
 	i32.store	__stack_pointer($pop7), $pop12
 	i32.const	$push2=, pos
@@ -167,7 +167,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	pos                     # @pos
 	.type	pos,@object
 	.section	.bss.pos,"aw",@nobits
@@ -189,6 +189,6 @@ limit:
 	.size	limit, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/921117-1.c.s b/test/torture-s/921117-1.c.s
index a8557c34b..45737f623 100644
--- a/test/torture-s/921117-1.c.s
+++ b/test/torture-s/921117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921117-1.c"
+	.file	"921117-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -25,41 +25,37 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
-	i32.const	$push0=, 99
-	i32.store	cell+12($pop16), $pop0
-	i32.const	$push15=, 0
-	i32.const	$push14=, 0
-	i32.load8_u	$push1=, .L.str+10($pop14)
-	i32.store8	cell+10($pop15), $pop1
+# BB#0:                                 # %check.exit
 	i32.const	$push13=, 0
+	i32.const	$push0=, 99
+	i32.store	cell+12($pop13), $pop0
 	i32.const	$push12=, 0
-	i32.load16_u	$push2=, .L.str+8($pop12):p2align=0
-	i32.store16	cell+8($pop13), $pop2
 	i32.const	$push11=, 0
+	i64.load	$push1=, .L.str($pop11):p2align=0
+	i64.store	cell($pop12):p2align=2, $pop1
 	i32.const	$push10=, 0
-	i32.load	$push3=, .L.str+4($pop10):p2align=0
-	i32.store	cell+4($pop11), $pop3
 	i32.const	$push9=, 0
+	i32.load16_u	$push2=, .L.str+8($pop9):p2align=0
+	i32.store16	cell+8($pop10), $pop2
 	i32.const	$push8=, 0
-	i32.load	$push4=, .L.str($pop8):p2align=0
-	i32.store	cell($pop9), $pop4
+	i32.const	$push7=, 0
+	i32.load8_u	$push3=, .L.str+10($pop7)
+	i32.store8	cell+10($pop8), $pop3
 	block   	
-	i32.const	$push6=, cell
-	i32.const	$push5=, .L.str
-	i32.call	$push7=, strcmp@FUNCTION, $pop6, $pop5
-	br_if   	0, $pop7        # 0: down to label1
+	i32.const	$push5=, cell
+	i32.const	$push4=, .L.str
+	i32.call	$push6=, strcmp@FUNCTION, $pop5, $pop4
+	br_if   	0, $pop6        # 0: down to label1
 # BB#1:                                 # %if.end
-	i32.const	$push17=, 0
-	call    	exit@FUNCTION, $pop17
+	i32.const	$push14=, 0
+	call    	exit@FUNCTION, $pop14
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -68,7 +64,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -85,7 +81,7 @@ cell:
 	.size	cell, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/921123-1.c.s b/test/torture-s/921123-1.c.s
index 7a4a2e76d..d94fab15d 100644
--- a/test/torture-s/921123-1.c.s
+++ b/test/torture-s/921123-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921123-1.c"
+	.file	"921123-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921123-2.c.s b/test/torture-s/921123-2.c.s
index ee3f4102f..002a9713f 100644
--- a/test/torture-s/921123-2.c.s
+++ b/test/torture-s/921123-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921123-2.c"
+	.file	"921123-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -66,5 +66,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921124-1.c.s b/test/torture-s/921124-1.c.s
index 5eec66d72..4d5c8fb18 100644
--- a/test/torture-s/921124-1.c.s
+++ b/test/torture-s/921124-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921124-1.c"
+	.file	"921124-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -47,22 +47,22 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %g.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/921202-1.c.s b/test/torture-s/921202-1.c.s
index 2c5122d70..0bfbd9ef4 100644
--- a/test/torture-s/921202-1.c.s
+++ b/test/torture-s/921202-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921202-1.c"
+	.file	"921202-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,9 +12,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.mpn_mul_1,"ax",@progbits
-	.hidden	mpn_mul_1
+	.hidden	mpn_mul_1               # -- Begin function mpn_mul_1
 	.globl	mpn_mul_1
 	.type	mpn_mul_1,@function
 mpn_mul_1:                              # @mpn_mul_1
@@ -40,9 +40,9 @@ mpn_mul_1:                              # @mpn_mul_1
 	.endfunc
 .Lfunc_end2:
 	.size	mpn_mul_1, .Lfunc_end2-mpn_mul_1
-
+                                        # -- End function
 	.section	.text.mpn_print,"ax",@progbits
-	.hidden	mpn_print
+	.hidden	mpn_print               # -- Begin function mpn_print
 	.globl	mpn_print
 	.type	mpn_print,@function
 mpn_print:                              # @mpn_print
@@ -54,9 +54,9 @@ mpn_print:                              # @mpn_print
 	.endfunc
 .Lfunc_end3:
 	.size	mpn_print, .Lfunc_end3-mpn_print
-
+                                        # -- End function
 	.section	.text.mpn_random2,"ax",@progbits
-	.hidden	mpn_random2
+	.hidden	mpn_random2             # -- Begin function mpn_random2
 	.globl	mpn_random2
 	.type	mpn_random2,@function
 mpn_random2:                            # @mpn_random2
@@ -68,9 +68,9 @@ mpn_random2:                            # @mpn_random2
 	.endfunc
 .Lfunc_end4:
 	.size	mpn_random2, .Lfunc_end4-mpn_random2
-
+                                        # -- End function
 	.section	.text.mpn_cmp,"ax",@progbits
-	.hidden	mpn_cmp
+	.hidden	mpn_cmp                 # -- Begin function mpn_cmp
 	.globl	mpn_cmp
 	.type	mpn_cmp,@function
 mpn_cmp:                                # @mpn_cmp
@@ -82,9 +82,9 @@ mpn_cmp:                                # @mpn_cmp
 	.endfunc
 .Lfunc_end5:
 	.size	mpn_cmp, .Lfunc_end5-mpn_cmp
-
+                                        # -- End function
 	.section	.text.exxit,"ax",@progbits
-	.hidden	exxit
+	.hidden	exxit                   # -- Begin function exxit
 	.globl	exxit
 	.type	exxit,@function
 exxit:                                  # @exxit
@@ -96,7 +96,7 @@ exxit:                                  # @exxit
 	.endfunc
 .Lfunc_end6:
 	.size	exxit, .Lfunc_end6-exxit
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921202-2.c.s b/test/torture-s/921202-2.c.s
index 85c0ca157..c1b9a783d 100644
--- a/test/torture-s/921202-2.c.s
+++ b/test/torture-s/921202-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921202-2.c"
+	.file	"921202-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921204-1.c.s b/test/torture-s/921204-1.c.s
index 761e45266..3d1ae8b92 100644
--- a/test/torture-s/921204-1.c.s
+++ b/test/torture-s/921204-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921204-1.c"
+	.file	"921204-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -21,9 +21,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921207-1.c.s b/test/torture-s/921207-1.c.s
index 4db4708db..09b0455f3 100644
--- a/test/torture-s/921207-1.c.s
+++ b/test/torture-s/921207-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921207-1.c"
+	.file	"921207-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921208-1.c.s b/test/torture-s/921208-1.c.s
index 6bb42f4d8..024c21c3c 100644
--- a/test/torture-s/921208-1.c.s
+++ b/test/torture-s/921208-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921208-1.c"
+	.file	"921208-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.Int,"ax",@progbits
-	.hidden	Int
+	.hidden	Int                     # -- Begin function Int
 	.globl	Int
 	.type	Int,@function
 Int:                                    # @Int
@@ -27,9 +27,9 @@ Int:                                    # @Int
 	.endfunc
 .Lfunc_end1:
 	.size	Int, .Lfunc_end1-Int
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921208-2.c.s b/test/torture-s/921208-2.c.s
index ae125e9df..f5f896497 100644
--- a/test/torture-s/921208-2.c.s
+++ b/test/torture-s/921208-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921208-2.c"
+	.file	"921208-2.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -13,9 +13,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,9 +27,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921218-1.c.s b/test/torture-s/921218-1.c.s
index 659e5d332..a78a80a19 100644
--- a/test/torture-s/921218-1.c.s
+++ b/test/torture-s/921218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921218-1.c"
+	.file	"921218-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921218-2.c.s b/test/torture-s/921218-2.c.s
index 8feea1d3b..d86b7ccfc 100644
--- a/test/torture-s/921218-2.c.s
+++ b/test/torture-s/921218-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/921218-2.c"
+	.file	"921218-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930106-1.c.s b/test/torture-s/930106-1.c.s
index 9330c828a..2e808200d 100644
--- a/test/torture-s/930106-1.c.s
+++ b/test/torture-s/930106-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930106-1.c"
+	.file	"930106-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -12,9 +12,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -25,9 +25,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930111-1.c.s b/test/torture-s/930111-1.c.s
index 02315d174..3b8c31855 100644
--- a/test/torture-s/930111-1.c.s
+++ b/test/torture-s/930111-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930111-1.c"
+	.file	"930111-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,40 +13,39 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.wwrite,"ax",@progbits
-	.hidden	wwrite
+	.hidden	wwrite                  # -- Begin function wwrite
 	.globl	wwrite
 	.type	wwrite,@function
 wwrite:                                 # @wwrite
 	.param  	i64
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	block   	
 	i64.const	$push1=, -3
-	i64.add 	$push5=, $0, $pop1
-	tee_local	$push4=, $0=, $pop5
+	i64.add 	$push6=, $0, $pop1
+	tee_local	$push5=, $0=, $pop6
 	i64.const	$push2=, 44
-	i64.gt_u	$push3=, $pop4, $pop2
-	br_if   	0, $pop3        # 0: down to label1
+	i64.gt_u	$push3=, $pop5, $pop2
+	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %entry
-	i32.const	$1=, 0
+	block   	
 	i32.wrap/i64	$push0=, $0
-	br_table 	$pop0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 # 1: down to label0
-                                        # 0: down to label1
-.LBB1_2:                                # %sw.default
+	br_table 	$pop0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 # 0: down to label1
+                                        # 1: down to label0
+.LBB1_2:                                # %return
 	end_block                       # label1:
-	i32.const	$1=, 123
-.LBB1_3:                                # %return
+	i32.const	$push7=, 0
+	return  	$pop7
+.LBB1_3:                                # %sw.default
 	end_block                       # label0:
-	copy_local	$push6=, $1
-                                        # fallthrough-return: $pop6
+	i32.const	$push4=, 123
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	wwrite, .Lfunc_end1-wwrite
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930123-1.c.s b/test/torture-s/930123-1.c.s
index 91ebf6b5d..50055aa4b 100644
--- a/test/torture-s/930123-1.c.s
+++ b/test/torture-s/930123-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930123-1.c"
+	.file	"930123-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930126-1.c.s b/test/torture-s/930126-1.c.s
index 0ece47210..2ae241c14 100644
--- a/test/torture-s/930126-1.c.s
+++ b/test/torture-s/930126-1.c.s
@@ -1,61 +1,45 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930126-1.c"
+	.file	"930126-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 4
-	i32.add 	$push1=, $0, $pop0
-	i64.const	$push2=, 205
-	i64.store8	0($pop1), $pop2
-	i64.load8_u	$push3=, 0($1)
-	i64.const	$push4=, 4010947584
-	i64.or  	$push5=, $pop3, $pop4
-	i64.store32	0($0), $pop5
+	i64.load	$push0=, 0($1)
+	i64.const	$push1=, -1099511627521
+	i64.and 	$push2=, $pop0, $pop1
+	i64.const	$push3=, 884479243264
+	i64.or  	$push4=, $pop2, $pop3
+	i64.store	0($0), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push0=, 12
-	i32.store8	main.i($pop11), $pop0
-	i32.const	$push10=, 0
-	i64.const	$push1=, 205
-	i64.store8	main.i+4($pop10), $pop1
-	i32.const	$push9=, 0
-	i64.const	$push2=, 4010947596
-	i64.store32	main.i($pop9), $pop2
-	block   	
-	i32.const	$push8=, 0
-	i64.load	$push3=, main.i($pop8)
-	i64.const	$push4=, 1099511627775
-	i64.and 	$push5=, $pop3, $pop4
-	i64.const	$push6=, 884479243276
-	i64.ne  	$push7=, $pop5, $pop6
-	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
-	unreachable
-.LBB1_2:                                # %if.then
-	end_block                       # label0:
-	call    	abort@FUNCTION
+# BB#0:                                 # %if.end
+	i32.const	$push0=, 0
+	i32.const	$push7=, 0
+	i64.load	$push1=, main.i($pop7)
+	i64.const	$push2=, -1099511627776
+	i64.and 	$push3=, $pop1, $pop2
+	i64.const	$push4=, 884479243276
+	i64.or  	$push5=, $pop3, $pop4
+	i64.store	main.i($pop0), $pop5
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.i,@object          # @main.i
 	.section	.bss.main.i,"aw",@nobits
 	.p2align	3
@@ -64,6 +48,5 @@ main.i:
 	.size	main.i, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
-	.functype	abort, void
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930208-1.c.s b/test/torture-s/930208-1.c.s
index 9745390e6..54484d5fa 100644
--- a/test/torture-s/930208-1.c.s
+++ b/test/torture-s/930208-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930208-1.c"
+	.file	"930208-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,9 +27,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930406-1.c.s b/test/torture-s/930406-1.c.s
index 52c13e107..c5e513e11 100644
--- a/test/torture-s/930406-1.c.s
+++ b/test/torture-s/930406-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930406-1.c"
+	.file	"930406-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930408-1.c.s b/test/torture-s/930408-1.c.s
index 42649be15..2a6b65351 100644
--- a/test/torture-s/930408-1.c.s
+++ b/test/torture-s/930408-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930408-1.c"
+	.file	"930408-1.c"
 	.section	.text.p,"ax",@progbits
-	.hidden	p
+	.hidden	p                       # -- Begin function p
 	.globl	p
 	.type	p,@function
 p:                                      # @p
@@ -12,9 +12,9 @@ p:                                      # @p
 	.endfunc
 .Lfunc_end0:
 	.size	p, .Lfunc_end0-p
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,9 +35,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,7 +53,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -64,6 +64,6 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930429-1.c.s b/test/torture-s/930429-1.c.s
index c50b254a9..935fabe88 100644
--- a/test/torture-s/930429-1.c.s
+++ b/test/torture-s/930429-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930429-1.c"
+	.file	"930429-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,21 +14,21 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930429-2.c.s b/test/torture-s/930429-2.c.s
index 4e2fd0060..32e063fe2 100644
--- a/test/torture-s/930429-2.c.s
+++ b/test/torture-s/930429-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930429-2.c"
+	.file	"930429-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930513-1.c.s b/test/torture-s/930513-1.c.s
index 846843002..714a0df07 100644
--- a/test/torture-s/930513-1.c.s
+++ b/test/torture-s/930513-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930513-1.c"
+	.file	"930513-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,10 +10,10 @@ f:                                      # @f
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop4, $pop5
+	i32.sub 	$push11=, $pop3, $pop5
 	tee_local	$push10=, $1=, $pop11
 	i32.store	__stack_pointer($pop6), $pop10
 	i64.const	$push0=, 4617315517961601024
@@ -30,9 +30,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,10 +40,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push16=, $pop11, $pop12
+	i32.sub 	$push16=, $pop10, $pop12
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop13), $pop15
 	i64.const	$push1=, 4617315517961601024
@@ -74,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -90,7 +90,7 @@ buf:
 	.size	.L.str, 5
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930513-2.c.s b/test/torture-s/930513-2.c.s
index 45797ac26..dc2e60d33 100644
--- a/test/torture-s/930513-2.c.s
+++ b/test/torture-s/930513-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930513-2.c"
+	.file	"930513-2.c"
 	.section	.text.sub3,"ax",@progbits
-	.hidden	sub3
+	.hidden	sub3                    # -- Begin function sub3
 	.globl	sub3
 	.type	sub3,@function
 sub3:                                   # @sub3
@@ -14,9 +14,9 @@ sub3:                                   # @sub3
 	.endfunc
 .Lfunc_end0:
 	.size	sub3, .Lfunc_end0-sub3
-
+                                        # -- End function
 	.section	.text.eq,"ax",@progbits
-	.hidden	eq
+	.hidden	eq                      # -- Begin function eq
 	.globl	eq
 	.type	eq,@function
 eq:                                     # @eq
@@ -41,9 +41,9 @@ eq:                                     # @eq
 	.endfunc
 .Lfunc_end1:
 	.size	eq, .Lfunc_end1-eq
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -67,7 +67,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	eq.i,@object            # @eq.i
 	.section	.bss.eq.i,"aw",@nobits
 	.p2align	2
@@ -76,6 +76,6 @@ eq.i:
 	.size	eq.i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930518-1.c.s b/test/torture-s/930518-1.c.s
index a28feeecb..b7076d5ee 100644
--- a/test/torture-s/930518-1.c.s
+++ b/test/torture-s/930518-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930518-1.c"
+	.file	"930518-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,107 +10,136 @@ f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push5=, 0
-	i32.load	$push4=, bar($pop5)
-	tee_local	$push3=, $1=, $pop4
-	i32.const	$push0=, 1
-	i32.gt_s	$push1=, $pop3, $pop0
+	i32.const	$push10=, 0
+	i32.load	$push9=, bar($pop10)
+	tee_local	$push8=, $2=, $pop9
+	i32.const	$push7=, 1
+	i32.gt_s	$push0=, $pop8, $pop7
+	br_if   	0, $pop0        # 0: down to label0
+# BB#1:                                 # %while.body.lr.ph
+	i32.const	$push16=, 2
+	i32.sub 	$push15=, $pop16, $2
+	tee_local	$push14=, $1=, $pop15
+	i32.store	0($0), $pop14
+	i32.const	$push13=, 0
+	i32.const	$push12=, 1
+	i32.store	bar($pop13), $pop12
+	i32.const	$push11=, 2
+	i32.lt_s	$push1=, $1, $pop11
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
-	i32.const	$2=, 2
-.LBB0_2:                                # %while.body
+# BB#2:                                 # %while.body.preheader
+	i32.const	$push17=, 4
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push2=, 3
+	i32.sub 	$2=, $pop2, $2
+.LBB0_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.sub 	$push11=, $2, $1
-	tee_local	$push10=, $2=, $pop11
-	i32.store	0($0), $pop10
-	i32.const	$1=, 1
-	i32.const	$push9=, 0
-	i32.const	$push8=, 1
-	i32.store	bar($pop9), $pop8
-	i32.const	$push7=, 4
-	i32.add 	$0=, $0, $pop7
-	i32.const	$push6=, 1
-	i32.gt_s	$push2=, $2, $pop6
-	br_if   	0, $pop2        # 0: up to label1
-.LBB0_3:                                # %while.end
+	i32.const	$push23=, -2
+	i32.add 	$push3=, $2, $pop23
+	i32.store	0($0), $pop3
+	i32.const	$push22=, 4
+	i32.add 	$0=, $0, $pop22
+	i32.const	$push21=, -1
+	i32.add 	$push20=, $2, $pop21
+	tee_local	$push19=, $2=, $pop20
+	i32.const	$push18=, 2
+	i32.gt_s	$push4=, $pop19, $pop18
+	br_if   	0, $pop4        # 0: up to label1
+# BB#4:                                 # %while.end.loopexit
 	end_loop
+	i32.const	$push6=, 0
+	i32.const	$push5=, 1
+	i32.store	bar($pop6), $pop5
+.LBB0_5:                                # %while.end
 	end_block                       # label0:
-	copy_local	$push12=, $0
-                                        # fallthrough-return: $pop12
+	copy_local	$push24=, $0
+                                        # fallthrough-return: $pop24
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$push23=, $pop15, $pop16
+	i32.const	$push15=, 0
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
+	i32.const	$push14=, 16
+	i32.sub 	$push23=, $pop12, $pop14
 	tee_local	$push22=, $3=, $pop23
-	i32.store	__stack_pointer($pop17), $pop22
+	i32.store	__stack_pointer($pop15), $pop22
 	i64.const	$push0=, 0
 	i64.store	8($3):p2align=2, $pop0
 	block   	
-	i32.const	$push1=, 0
-	i32.load	$push21=, bar($pop1)
-	tee_local	$push20=, $0=, $pop21
-	i32.const	$push2=, 1
-	i32.gt_s	$push3=, $pop20, $pop2
-	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %while.body.i.preheader
-	i32.const	$1=, 2
-	i32.const	$push18=, 8
-	i32.add 	$push19=, $3, $pop18
-	copy_local	$2=, $pop19
-.LBB1_2:                                # %while.body.i
+	i32.const	$push21=, 0
+	i32.load	$push20=, bar($pop21)
+	tee_local	$push19=, $0=, $pop20
+	i32.const	$push18=, 1
+	i32.gt_s	$push1=, $pop19, $pop18
+	br_if   	0, $pop1        # 0: down to label2
+# BB#1:                                 # %while.body.lr.ph.i
+	i32.const	$push29=, 0
+	i32.const	$push28=, 1
+	i32.store	bar($pop29), $pop28
+	i32.const	$push27=, 2
+	i32.sub 	$push26=, $pop27, $0
+	tee_local	$push25=, $2=, $pop26
+	i32.store	8($3), $pop25
+	i32.const	$push24=, 2
+	i32.lt_s	$push2=, $2, $pop24
+	br_if   	0, $pop2        # 0: down to label2
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push3=, 3
+	i32.sub 	$2=, $pop3, $0
+	i32.const	$push16=, 8
+	i32.add 	$push17=, $3, $pop16
+	i32.const	$push30=, 4
+	i32.add 	$1=, $pop17, $pop30
+.LBB1_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.sub 	$push27=, $1, $0
-	tee_local	$push26=, $1=, $pop27
-	i32.store	0($2), $pop26
-	i32.const	$push25=, 4
-	i32.add 	$2=, $2, $pop25
-	i32.const	$0=, 1
-	i32.const	$push24=, 1
-	i32.gt_s	$push4=, $1, $pop24
-	br_if   	0, $pop4        # 0: up to label3
-# BB#3:                                 # %f.exit
-	end_loop
-	i32.const	$push6=, 0
-	i32.const	$push28=, 1
-	i32.store	bar($pop6), $pop28
-	i32.load	$push8=, 8($3)
-	i32.const	$push7=, 2
-	i32.ne  	$push9=, $pop8, $pop7
-	br_if   	0, $pop9        # 0: down to label2
+	i32.const	$push36=, -2
+	i32.add 	$push4=, $2, $pop36
+	i32.store	0($1), $pop4
+	i32.const	$push35=, 4
+	i32.add 	$1=, $1, $pop35
+	i32.const	$push34=, -1
+	i32.add 	$push33=, $2, $pop34
+	tee_local	$push32=, $2=, $pop33
+	i32.const	$push31=, 2
+	i32.gt_s	$push5=, $pop32, $pop31
+	br_if   	0, $pop5        # 0: up to label3
 # BB#4:                                 # %f.exit
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $3, $pop10
-	i32.load	$push5=, 0($pop11)
-	i32.const	$push29=, 1
-	i32.ne  	$push12=, $pop5, $pop29
-	br_if   	0, $pop12       # 0: down to label2
-# BB#5:                                 # %if.end
-	i32.const	$push13=, 0
-	call    	exit@FUNCTION, $pop13
+	end_loop
+	i32.const	$push7=, 0
+	i32.const	$push37=, 1
+	i32.store	bar($pop7), $pop37
+	br_if   	0, $0           # 0: down to label2
+# BB#5:                                 # %f.exit
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $3, $pop8
+	i32.load	$push6=, 0($pop9)
+	i32.const	$push38=, 1
+	i32.ne  	$push10=, $pop6, $pop38
+	br_if   	0, $pop10       # 0: down to label2
+# BB#6:                                 # %if.end
+	i32.const	$push11=, 0
+	call    	exit@FUNCTION, $pop11
 	unreachable
-.LBB1_6:                                # %if.then
+.LBB1_7:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	bar                     # @bar
 	.type	bar,@object
 	.section	.bss.bar,"aw",@nobits
@@ -121,6 +150,6 @@ bar:
 	.size	bar, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930526-1.c.s b/test/torture-s/930526-1.c.s
index a681c746a..8b73030cf 100644
--- a/test/torture-s/930526-1.c.s
+++ b/test/torture-s/930526-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930526-1.c"
+	.file	"930526-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930527-1.c.s b/test/torture-s/930527-1.c.s
index c2774cf37..cb26a5126 100644
--- a/test/torture-s/930527-1.c.s
+++ b/test/torture-s/930527-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930527-1.c"
+	.file	"930527-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930529-1.c.s b/test/torture-s/930529-1.c.s
index 8973d2e86..808d27f1c 100644
--- a/test/torture-s/930529-1.c.s
+++ b/test/torture-s/930529-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930529-1.c"
+	.file	"930529-1.c"
 	.section	.text.dd,"ax",@progbits
-	.hidden	dd
+	.hidden	dd                      # -- Begin function dd
 	.globl	dd
 	.type	dd,@function
 dd:                                     # @dd
@@ -13,9 +13,9 @@ dd:                                     # @dd
 	.endfunc
 .Lfunc_end0:
 	.size	dd, .Lfunc_end0-dd
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930603-1.c.s b/test/torture-s/930603-1.c.s
index 96ac810ae..a7425cd5d 100644
--- a/test/torture-s/930603-1.c.s
+++ b/test/torture-s/930603-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930603-1.c"
+	.file	"930603-1.c"
 	.section	.text.fx,"ax",@progbits
-	.hidden	fx
+	.hidden	fx                      # -- Begin function fx
 	.globl	fx
 	.type	fx,@function
 fx:                                     # @fx
@@ -21,23 +21,23 @@ fx:                                     # @fx
 	.endfunc
 .Lfunc_end0:
 	.size	fx, .Lfunc_end0-fx
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.section	.text.inita,"ax",@progbits
-	.hidden	inita
+	.hidden	inita                   # -- Begin function inita
 	.globl	inita
 	.type	inita,@function
 inita:                                  # @inita
@@ -48,9 +48,9 @@ inita:                                  # @inita
 	.endfunc
 .Lfunc_end2:
 	.size	inita, .Lfunc_end2-inita
-
+                                        # -- End function
 	.section	.text.initc,"ax",@progbits
-	.hidden	initc
+	.hidden	initc                   # -- Begin function initc
 	.globl	initc
 	.type	initc,@function
 initc:                                  # @initc
@@ -61,9 +61,9 @@ initc:                                  # @initc
 	.endfunc
 .Lfunc_end3:
 	.size	initc, .Lfunc_end3-initc
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -75,7 +75,7 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end4:
 	.size	f, .Lfunc_end4-f
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930603-2.c.s b/test/torture-s/930603-2.c.s
index ed4549c3d..ddb66a2ef 100644
--- a/test/torture-s/930603-2.c.s
+++ b/test/torture-s/930603-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930603-2.c"
+	.file	"930603-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	w                       # @w
 	.type	w,@object
 	.section	.bss.w,"aw",@nobits
@@ -62,6 +62,6 @@ w:
 	.size	w, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930603-3.c.s b/test/torture-s/930603-3.c.s
index 101a06e28..355021faf 100644
--- a/test/torture-s/930603-3.c.s
+++ b/test/torture-s/930603-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930603-3.c"
+	.file	"930603-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,9 +35,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,8 +49,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930608-1.c.s b/test/torture-s/930608-1.c.s
index 99f313943..58a361b34 100644
--- a/test/torture-s/930608-1.c.s
+++ b/test/torture-s/930608-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930608-1.c"
+	.file	"930608-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.rodata.a,"a",@progbits
@@ -39,5 +39,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930614-1.c.s b/test/torture-s/930614-1.c.s
index 0f792a745..9f1fffd1d 100644
--- a/test/torture-s/930614-1.c.s
+++ b/test/torture-s/930614-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930614-1.c"
+	.file	"930614-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930614-2.c.s b/test/torture-s/930614-2.c.s
index d9ae57133..8d701a926 100644
--- a/test/torture-s/930614-2.c.s
+++ b/test/torture-s/930614-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930614-2.c"
+	.file	"930614-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930621-1.c.s b/test/torture-s/930621-1.c.s
index 69e661614..cee504883 100644
--- a/test/torture-s/930621-1.c.s
+++ b/test/torture-s/930621-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930621-1.c"
+	.file	"930621-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930622-1.c.s b/test/torture-s/930622-1.c.s
index 81a04265a..b01c75bb4 100644
--- a/test/torture-s/930622-1.c.s
+++ b/test/torture-s/930622-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930622-1.c"
+	.file	"930622-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -12,9 +12,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.h,"ax",@progbits
-	.hidden	h
+	.hidden	h                       # -- Begin function h
 	.globl	h
 	.type	h,@function
 h:                                      # @h
@@ -27,9 +27,9 @@ h:                                      # @h
 	.endfunc
 .Lfunc_end1:
 	.size	h, .Lfunc_end1-h
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -43,9 +43,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end2:
 	.size	f, .Lfunc_end2-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -80,5 +80,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930622-2.c.s b/test/torture-s/930622-2.c.s
index def845cf7..8e295ce4d 100644
--- a/test/torture-s/930622-2.c.s
+++ b/test/torture-s/930622-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930622-2.c"
+	.file	"930622-2.c"
 	.section	.text.ll_to_ld,"ax",@progbits
-	.hidden	ll_to_ld
+	.hidden	ll_to_ld                # -- Begin function ll_to_ld
 	.globl	ll_to_ld
 	.type	ll_to_ld,@function
 ll_to_ld:                               # @ll_to_ld
@@ -9,10 +9,10 @@ ll_to_ld:                               # @ll_to_ld
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
+	i32.sub 	$push14=, $pop5, $pop7
 	tee_local	$push13=, $2=, $pop14
 	i32.store	__stack_pointer($pop8), $pop13
 	call    	__floatditf@FUNCTION, $2, $1
@@ -32,9 +32,9 @@ ll_to_ld:                               # @ll_to_ld
 	.endfunc
 .Lfunc_end0:
 	.size	ll_to_ld, .Lfunc_end0-ll_to_ld
-
+                                        # -- End function
 	.section	.text.ld_to_ll,"ax",@progbits
-	.hidden	ld_to_ll
+	.hidden	ld_to_ll                # -- Begin function ld_to_ll
 	.globl	ld_to_ll
 	.type	ld_to_ll,@function
 ld_to_ll:                               # @ld_to_ll
@@ -46,9 +46,9 @@ ld_to_ll:                               # @ld_to_ll
 	.endfunc
 .Lfunc_end1:
 	.size	ld_to_ll, .Lfunc_end1-ld_to_ll
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930628-1.c.s b/test/torture-s/930628-1.c.s
index ae103d372..7f04299c8 100644
--- a/test/torture-s/930628-1.c.s
+++ b/test/torture-s/930628-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930628-1.c"
+	.file	"930628-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,25 +20,25 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
+	i32.const	$1=, -1
 	i32.const	$0=, 0
-	i32.const	$1=, 0
-.LBB1_1:                                # %for.cond4.preheader
+.LBB1_1:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
 	block   	
 	i32.eqz 	$push25=, $0
 	br_if   	0, $pop25       # 0: down to label3
-# BB#2:                                 # %for.cond15.preheader
+# BB#2:                                 # %if.else
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.eqz 	$push26=, $0
 	br_if   	2, $pop26       # 2: down to label1
@@ -50,20 +50,20 @@ main:                                   # @main
 	i32.const	$push8=, 1
 	i32.add 	$push7=, $1, $pop8
 	tee_local	$push6=, $1=, $pop7
-	i32.const	$push5=, 4
-	i32.lt_s	$push0=, $pop6, $pop5
+	i32.const	$push5=, 3
+	i32.lt_u	$push0=, $pop6, $pop5
 	br_if   	0, $pop0        # 0: up to label2
 # BB#4:                                 # %for.inc45
 	end_loop
 	i32.const	$0=, 0
-	i32.const	$1=, 1
-.LBB1_5:                                # %for.cond4.preheader.1
+	i32.const	$1=, 0
+.LBB1_5:                                # %for.body3.1
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
 	block   	
 	i32.eqz 	$push27=, $0
 	br_if   	0, $pop27       # 0: down to label5
-# BB#6:                                 # %for.cond15.preheader.1
+# BB#6:                                 # %if.else.1
                                         #   in Loop: Header=BB1_5 Depth=1
 	i32.eqz 	$push28=, $0
 	br_if   	2, $pop28       # 2: down to label1
@@ -75,20 +75,20 @@ main:                                   # @main
 	i32.const	$push13=, 1
 	i32.add 	$push12=, $1, $pop13
 	tee_local	$push11=, $1=, $pop12
-	i32.const	$push10=, 4
-	i32.lt_s	$push1=, $pop11, $pop10
+	i32.const	$push10=, 3
+	i32.lt_u	$push1=, $pop11, $pop10
 	br_if   	0, $pop1        # 0: up to label4
 # BB#8:                                 # %for.inc45.1
 	end_loop
-	i32.const	$1=, 2
 	i32.const	$0=, 0
-.LBB1_9:                                # %for.cond4.preheader.2
+	i32.const	$1=, 1
+.LBB1_9:                                # %for.body3.2
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
 	block   	
 	i32.eqz 	$push29=, $0
 	br_if   	0, $pop29       # 0: down to label7
-# BB#10:                                # %for.cond15.preheader.2
+# BB#10:                                # %if.else.2
                                         #   in Loop: Header=BB1_9 Depth=1
 	i32.eqz 	$push30=, $0
 	br_if   	2, $pop30       # 2: down to label1
@@ -100,20 +100,20 @@ main:                                   # @main
 	i32.const	$push18=, 1
 	i32.add 	$push17=, $1, $pop18
 	tee_local	$push16=, $1=, $pop17
-	i32.const	$push15=, 4
-	i32.lt_s	$push2=, $pop16, $pop15
+	i32.const	$push15=, 3
+	i32.lt_u	$push2=, $pop16, $pop15
 	br_if   	0, $pop2        # 0: up to label6
 # BB#12:                                # %for.inc45.2
 	end_loop
-	i32.const	$1=, 3
+	i32.const	$1=, 2
 	i32.const	$0=, 0
-.LBB1_13:                               # %for.cond4.preheader.3
+.LBB1_13:                               # %for.body3.3
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
 	block   	
 	i32.eqz 	$push31=, $0
 	br_if   	0, $pop31       # 0: down to label9
-# BB#14:                                # %for.cond15.preheader.3
+# BB#14:                                # %if.else.3
                                         #   in Loop: Header=BB1_13 Depth=1
 	i32.eqz 	$push32=, $0
 	br_if   	2, $pop32       # 2: down to label1
@@ -125,8 +125,8 @@ main:                                   # @main
 	i32.const	$push23=, 1
 	i32.add 	$push22=, $1, $pop23
 	tee_local	$push21=, $1=, $pop22
-	i32.const	$push20=, 4
-	i32.lt_s	$push3=, $pop21, $pop20
+	i32.const	$push20=, 3
+	i32.lt_u	$push3=, $pop21, $pop20
 	br_if   	0, $pop3        # 0: up to label8
 # BB#16:                                # %for.inc45.3
 	end_loop
@@ -140,8 +140,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930630-1.c.s b/test/torture-s/930630-1.c.s
index 0500c3787..c2c870bb2 100644
--- a/test/torture-s/930630-1.c.s
+++ b/test/torture-s/930630-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930630-1.c"
+	.file	"930630-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,8 +35,8 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/930702-1.c.s b/test/torture-s/930702-1.c.s
index be56038df..153e0446d 100644
--- a/test/torture-s/930702-1.c.s
+++ b/test/torture-s/930702-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930702-1.c"
+	.file	"930702-1.c"
 	.section	.text.fp,"ax",@progbits
-	.hidden	fp
+	.hidden	fp                      # -- Begin function fp
 	.globl	fp
 	.type	fp,@function
 fp:                                     # @fp
@@ -25,9 +25,9 @@ fp:                                     # @fp
 	.endfunc
 .Lfunc_end0:
 	.size	fp, .Lfunc_end0-fp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,8 +39,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930713-1.c.s b/test/torture-s/930713-1.c.s
index b06f87a5e..470315739 100644
--- a/test/torture-s/930713-1.c.s
+++ b/test/torture-s/930713-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930713-1.c"
+	.file	"930713-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930718-1.c.s b/test/torture-s/930718-1.c.s
index e80d6dcf0..9bae59cde 100644
--- a/test/torture-s/930718-1.c.s
+++ b/test/torture-s/930718-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930718-1.c"
+	.file	"930718-1.c"
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -11,9 +11,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end0:
 	.size	f2, .Lfunc_end0-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,8 +25,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930719-1.c.s b/test/torture-s/930719-1.c.s
index 5f34b8074..eea024e30 100644
--- a/test/torture-s/930719-1.c.s
+++ b/test/torture-s/930719-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930719-1.c"
+	.file	"930719-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	block   	
 	block   	
 	br_if   	0, $0           # 0: down to label2
-# BB#1:                                 # %while.cond.preheader
+# BB#1:                                 # %if.end
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	1, $pop1        # 1: down to label1
@@ -36,9 +36,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930725-1.c.s b/test/torture-s/930725-1.c.s
index 104f8e712..19e707cde 100644
--- a/test/torture-s/930725-1.c.s
+++ b/test/torture-s/930725-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930725-1.c"
+	.file	"930725-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -12,9 +12,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -69,5 +69,5 @@ v:
 	.size	.L.str.1, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930818-1.c.s b/test/torture-s/930818-1.c.s
index aebcccdab..2b4aaf562 100644
--- a/test/torture-s/930818-1.c.s
+++ b/test/torture-s/930818-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930818-1.c"
+	.file	"930818-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930916-1.c.s b/test/torture-s/930916-1.c.s
index 5a4cd2806..783de5195 100644
--- a/test/torture-s/930916-1.c.s
+++ b/test/torture-s/930916-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930916-1.c"
+	.file	"930916-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -21,9 +21,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,8 +35,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930921-1.c.s b/test/torture-s/930921-1.c.s
index 29c2548ea..fa776d7f9 100644
--- a/test/torture-s/930921-1.c.s
+++ b/test/torture-s/930921-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930921-1.c"
+	.file	"930921-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -18,40 +18,37 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i64
+	.local  	i64, i32
 # BB#0:                                 # %entry
 	i32.const	$1=, 0
 	i64.const	$0=, 0
-	i64.const	$2=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i64.const	$push7=, 33
-	i64.shr_u	$push1=, $0, $pop7
+	i32.const	$push7=, 3
+	i32.div_u	$push0=, $1, $pop7
+	i64.const	$push6=, 33
+	i64.shr_u	$push1=, $0, $pop6
 	i32.wrap/i64	$push2=, $pop1
-	i32.const	$push6=, 3
-	i32.div_u	$push0=, $1, $pop6
-	i32.ne  	$push3=, $pop2, $pop0
+	i32.ne  	$push3=, $pop0, $pop2
 	br_if   	1, $pop3        # 1: down to label0
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i64.const	$push13=, 2863311531
-	i64.add 	$0=, $0, $pop13
-	i32.const	$push12=, 1
-	i32.add 	$1=, $1, $pop12
-	i64.const	$push11=, 1
-	i64.add 	$push10=, $2, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i64.const	$push8=, 9999
-	i64.le_u	$push4=, $pop9, $pop8
+	i64.const	$push12=, 2863311531
+	i64.add 	$0=, $0, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$push10=, $1, $pop11
+	tee_local	$push9=, $1=, $pop10
+	i32.const	$push8=, 9999
+	i32.le_u	$push4=, $pop9, $pop8
 	br_if   	0, $pop4        # 0: up to label1
 # BB#3:                                 # %for.end
 	end_loop
@@ -65,8 +62,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930929-1.c.s b/test/torture-s/930929-1.c.s
index 6250d9a29..993e6977f 100644
--- a/test/torture-s/930929-1.c.s
+++ b/test/torture-s/930929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930929-1.c"
+	.file	"930929-1.c"
 	.section	.text.sub1,"ax",@progbits
-	.hidden	sub1
+	.hidden	sub1                    # -- Begin function sub1
 	.globl	sub1
 	.type	sub1,@function
 sub1:                                   # @sub1
@@ -16,9 +16,9 @@ sub1:                                   # @sub1
 	.endfunc
 .Lfunc_end0:
 	.size	sub1, .Lfunc_end0-sub1
-
+                                        # -- End function
 	.section	.text.sub2,"ax",@progbits
-	.hidden	sub2
+	.hidden	sub2                    # -- Begin function sub2
 	.globl	sub2
 	.type	sub2,@function
 sub2:                                   # @sub2
@@ -33,9 +33,9 @@ sub2:                                   # @sub2
 	.endfunc
 .Lfunc_end1:
 	.size	sub2, .Lfunc_end1-sub2
-
+                                        # -- End function
 	.section	.text.sub3,"ax",@progbits
-	.hidden	sub3
+	.hidden	sub3                    # -- Begin function sub3
 	.globl	sub3
 	.type	sub3,@function
 sub3:                                   # @sub3
@@ -47,9 +47,9 @@ sub3:                                   # @sub3
 	.endfunc
 .Lfunc_end2:
 	.size	sub3, .Lfunc_end2-sub3
-
+                                        # -- End function
 	.section	.text.sub4,"ax",@progbits
-	.hidden	sub4
+	.hidden	sub4                    # -- Begin function sub4
 	.globl	sub4
 	.type	sub4,@function
 sub4:                                   # @sub4
@@ -61,9 +61,9 @@ sub4:                                   # @sub4
 	.endfunc
 .Lfunc_end3:
 	.size	sub4, .Lfunc_end3-sub4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930930-1.c.s b/test/torture-s/930930-1.c.s
index e10d1c78b..ac62e3fdc 100644
--- a/test/torture-s/930930-1.c.s
+++ b/test/torture-s/930930-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930930-1.c"
+	.file	"930930-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -55,9 +55,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -78,7 +78,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	mem                     # @mem
 	.type	mem,@object
 	.section	.bss.mem,"aw",@nobits
@@ -116,6 +116,6 @@ wm_SPB:
 	.size	wm_SPB, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/930930-2.c.s b/test/torture-s/930930-2.c.s
index 4c2c14b6a..d1289e52b 100644
--- a/test/torture-s/930930-2.c.s
+++ b/test/torture-s/930930-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/930930-2.c"
+	.file	"930930-2.c"
 	.section	.text.test_endianness,"ax",@progbits
-	.hidden	test_endianness
+	.hidden	test_endianness         # -- Begin function test_endianness
 	.globl	test_endianness
 	.type	test_endianness,@function
 test_endianness:                        # @test_endianness
@@ -12,19 +12,19 @@ test_endianness:                        # @test_endianness
 	.endfunc
 .Lfunc_end0:
 	.size	test_endianness, .Lfunc_end0-test_endianness
-
+                                        # -- End function
 	.section	.text.test_endianness_vol,"ax",@progbits
-	.hidden	test_endianness_vol
+	.hidden	test_endianness_vol     # -- Begin function test_endianness_vol
 	.globl	test_endianness_vol
 	.type	test_endianness_vol,@function
 test_endianness_vol:                    # @test_endianness_vol
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push8=, $pop5, $pop6
+	i32.sub 	$push8=, $pop4, $pop6
 	tee_local	$push7=, $0=, $pop8
 	i64.const	$push0=, 4621819117588971520
 	i64.store	8($pop7), $pop0
@@ -35,9 +35,9 @@ test_endianness_vol:                    # @test_endianness_vol
 	.endfunc
 .Lfunc_end1:
 	.size	test_endianness_vol, .Lfunc_end1-test_endianness_vol
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,10 +45,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i64.const	$push0=, 4621819117588971520
@@ -67,8 +67,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-1.c.s b/test/torture-s/931004-1.c.s
index bad870888..271f51f2f 100644
--- a/test/torture-s/931004-1.c.s
+++ b/test/torture-s/931004-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-1.c"
+	.file	"931004-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -25,17 +25,17 @@ f:                                      # @f
 	i32.ne  	$push7=, $4, $pop6
 	br_if   	0, $pop7        # 0: down to label0
 # BB#4:                                 # %if.end13
-	return  	$1
-.LBB0_5:                                # %if.then12
+	return  	$2
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,8 +47,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-10.c.s b/test/torture-s/931004-10.c.s
index 3c282fa87..e0cde6274 100644
--- a/test/torture-s/931004-10.c.s
+++ b/test/torture-s/931004-10.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-10.c"
+	.file	"931004-10.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,30 +10,28 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push24=, $pop15, $pop16
+	i32.sub 	$push24=, $pop14, $pop16
 	tee_local	$push23=, $4=, $pop24
 	i32.store	__stack_pointer($pop17), $pop23
-	i32.store	12($4), $1
 	i32.const	$push22=, 4
 	i32.add 	$push1=, $1, $pop22
 	i32.store	12($4), $pop1
 	block   	
 	block   	
-	block   	
 	i32.const	$push21=, 1
 	i32.lt_s	$push2=, $0, $pop21
-	br_if   	0, $pop2        # 0: down to label2
+	br_if   	0, $pop2        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
 	i32.const	$2=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
+	loop    	                # label2:
 	i32.load8_s	$push3=, 0($1)
 	i32.ne  	$push4=, $2, $pop3
-	br_if   	3, $pop4        # 3: down to label0
+	br_if   	2, $pop4        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push26=, 10
@@ -42,7 +40,7 @@ f:                                      # @f
 	i32.add 	$push6=, $1, $pop25
 	i32.load8_s	$push7=, 0($pop6)
 	i32.ne  	$push8=, $pop5, $pop7
-	br_if   	2, $pop8        # 2: down to label1
+	br_if   	2, $pop8        # 2: down to label0
 # BB#4:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push30=, 8
@@ -56,84 +54,74 @@ f:                                      # @f
 	i32.add 	$push0=, $2, $pop27
 	copy_local	$2=, $pop0
 	i32.lt_s	$push10=, $3, $0
-	br_if   	0, $pop10       # 0: up to label3
+	br_if   	0, $pop10       # 0: up to label2
 .LBB0_5:                                # %for.end
 	end_loop
-	end_block                       # label2:
+	end_block                       # label1:
 	i32.load	$push11=, 0($1)
 	i32.const	$push12=, 123
 	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label0
+	br_if   	0, $pop13       # 0: down to label0
 # BB#6:                                 # %if.end16
 	i32.const	$push20=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $4, $pop18
 	i32.store	__stack_pointer($pop20), $pop19
 	return  	$1
-.LBB0_7:                                # %if.then8
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_8:                                # %if.then15
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push14=, 0
 	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
-	i32.const	$push13=, 32
-	i32.sub 	$push22=, $pop12, $pop13
-	tee_local	$push21=, $0=, $pop22
-	i32.store	__stack_pointer($pop14), $pop21
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
+	i32.const	$push10=, 32
+	i32.sub 	$push19=, $pop8, $pop10
+	tee_local	$push18=, $0=, $pop19
+	i32.store	__stack_pointer($pop11), $pop18
 	i32.const	$push0=, 5130
 	i32.store16	24($0), $pop0
-	i32.const	$push1=, 21
-	i32.store8	27($0), $pop1
-	i32.const	$push2=, 22
-	i32.store8	29($0), $pop2
-	i32.const	$push3=, 11
-	i32.store8	26($0), $pop3
-	i32.const	$push4=, 12
-	i32.store8	28($0), $pop4
-	i32.load16_u	$push5=, 24($0)
-	i32.store16	22($0), $pop5
-	i32.load16_u	$push6=, 26($0)
-	i32.store16	20($0), $pop6
-	i32.load16_u	$push7=, 28($0)
-	i32.store16	18($0), $pop7
-	i32.const	$push8=, 123
-	i32.store	12($0), $pop8
-	i32.const	$push15=, 22
-	i32.add 	$push16=, $0, $pop15
-	i32.store	0($0), $pop16
-	i32.const	$push17=, 18
-	i32.add 	$push18=, $0, $pop17
-	i32.store	8($0), $pop18
-	i32.const	$push19=, 20
-	i32.add 	$push20=, $0, $pop19
-	i32.store	4($0), $pop20
-	i32.const	$push9=, 3
-	i32.call	$drop=, f@FUNCTION, $pop9, $0
-	i32.const	$push10=, 0
-	call    	exit@FUNCTION, $pop10
+	i32.const	$push1=, 369890571
+	i32.store	26($0):p2align=1, $pop1
+	i32.const	$push2=, 123
+	i32.store	12($0), $pop2
+	i32.load16_u	$push3=, 24($0)
+	i32.store16	22($0), $pop3
+	i32.load16_u	$push4=, 26($0)
+	i32.store16	20($0), $pop4
+	i32.load16_u	$push5=, 28($0)
+	i32.store16	18($0), $pop5
+	i32.const	$push12=, 18
+	i32.add 	$push13=, $0, $pop12
+	i32.store	8($0), $pop13
+	i32.const	$push14=, 20
+	i32.add 	$push15=, $0, $pop14
+	i32.store	4($0), $pop15
+	i32.const	$push16=, 22
+	i32.add 	$push17=, $0, $pop16
+	i32.store	0($0), $pop17
+	i32.const	$push6=, 3
+	i32.call	$drop=, f@FUNCTION, $pop6, $0
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-11.c.s b/test/torture-s/931004-11.c.s
index dcc66aad1..87a107793 100644
--- a/test/torture-s/931004-11.c.s
+++ b/test/torture-s/931004-11.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-11.c"
+	.file	"931004-11.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -58,89 +58,80 @@ f:                                      # @f
 	i32.ne  	$push28=, $4, $pop27
 	br_if   	0, $pop28       # 0: down to label0
 # BB#10:                                # %if.end51
-	return  	$1
-.LBB0_11:                               # %if.then50
+	return  	$2
+.LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push24=, 0
 	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
-	i32.const	$push23=, 32
-	i32.sub 	$push42=, $pop22, $pop23
-	tee_local	$push41=, $1=, $pop42
-	i32.store	__stack_pointer($pop24), $pop41
-	i32.const	$push0=, 30
-	i32.store8	18($1), $pop0
-	i32.const	$push1=, 11
-	i32.store8	19($1), $pop1
-	i32.const	$push2=, 12
-	i32.store8	22($1), $pop2
-	i32.const	$push3=, 5130
-	i32.store16	16($1), $pop3
-	i32.const	$push4=, 21
-	i32.store8	20($1), $pop4
-	i32.const	$push5=, 22
-	i32.store8	23($1), $pop5
-	i32.const	$push25=, 12
-	i32.add 	$push26=, $1, $pop25
-	i32.const	$push6=, 2
-	i32.add 	$push7=, $pop26, $pop6
-	i32.load8_u	$push8=, 18($1)
-	i32.store8	0($pop7), $pop8
-	i32.const	$push9=, 31
-	i32.store8	21($1), $pop9
-	i32.const	$push10=, 24
-	i32.add 	$push40=, $1, $pop10
-	tee_local	$push39=, $0=, $pop40
-	i32.const	$push11=, 32
-	i32.store8	0($pop39), $pop11
-	i32.const	$push27=, 8
-	i32.add 	$push28=, $1, $pop27
-	i32.const	$push38=, 2
-	i32.add 	$push12=, $pop28, $pop38
-	i32.load8_u	$push13=, 21($1)
-	i32.store8	0($pop12), $pop13
-	i32.load16_u	$push14=, 16($1)
-	i32.store16	12($1), $pop14
-	i32.load16_u	$push15=, 19($1):p2align=0
-	i32.store16	8($1), $pop15
-	i32.const	$push29=, 4
-	i32.add 	$push30=, $1, $pop29
-	i32.const	$push37=, 2
-	i32.add 	$push16=, $pop30, $pop37
-	i32.load8_u	$push17=, 0($0)
-	i32.store8	0($pop16), $pop17
-	i32.load16_u	$push18=, 22($1)
-	i32.store16	4($1), $pop18
-	i32.const	$push31=, 12
-	i32.add 	$push32=, $1, $pop31
-	i32.const	$push33=, 8
-	i32.add 	$push34=, $1, $pop33
-	i32.const	$push35=, 4
-	i32.add 	$push36=, $1, $pop35
-	i32.const	$push19=, 123
-	i32.call	$drop=, f@FUNCTION, $1, $pop32, $pop34, $pop36, $pop19
-	i32.const	$push20=, 0
-	call    	exit@FUNCTION, $pop20
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 32
+	i32.sub 	$push37=, $pop18, $pop20
+	tee_local	$push36=, $0=, $pop37
+	i32.store	__stack_pointer($pop21), $pop36
+	i32.const	$push0=, 186520586
+	i32.store	16($0), $pop0
+	i32.const	$push22=, 12
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push1=, 2
+	i32.add 	$push2=, $pop23, $pop1
+	i32.load8_u	$push3=, 18($0)
+	i32.store8	0($pop2), $pop3
+	i32.const	$push4=, 7957
+	i32.store16	20($0), $pop4
+	i32.const	$push24=, 8
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push35=, 2
+	i32.add 	$push5=, $pop25, $pop35
+	i32.load8_u	$push6=, 21($0)
+	i32.store8	0($pop5), $pop6
+	i32.const	$push7=, 8214
+	i32.store16	23($0):p2align=0, $pop7
+	i32.const	$push26=, 4
+	i32.add 	$push27=, $0, $pop26
+	i32.const	$push34=, 2
+	i32.add 	$push8=, $pop27, $pop34
+	i32.const	$push9=, 24
+	i32.add 	$push10=, $0, $pop9
+	i32.load8_u	$push11=, 0($pop10)
+	i32.store8	0($pop8), $pop11
+	i32.const	$push12=, 12
+	i32.store8	22($0), $pop12
+	i32.load16_u	$push13=, 16($0)
+	i32.store16	12($0), $pop13
+	i32.load16_u	$push14=, 19($0):p2align=0
+	i32.store16	8($0), $pop14
+	i32.load16_u	$push15=, 22($0)
+	i32.store16	4($0), $pop15
+	i32.const	$push28=, 12
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push30=, 8
+	i32.add 	$push31=, $0, $pop30
+	i32.const	$push32=, 4
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push16=, 123
+	i32.call	$drop=, f@FUNCTION, $0, $pop29, $pop31, $pop33, $pop16
+	i32.const	$push17=, 0
+	call    	exit@FUNCTION, $pop17
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-12.c.s b/test/torture-s/931004-12.c.s
index 38488d5f9..48bfc7320 100644
--- a/test/torture-s/931004-12.c.s
+++ b/test/torture-s/931004-12.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-12.c"
+	.file	"931004-12.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,172 +9,152 @@ f:                                      # @f
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push23=, 0
-	i32.const	$push20=, 0
-	i32.load	$push21=, __stack_pointer($pop20)
-	i32.const	$push22=, 16
-	i32.sub 	$push30=, $pop21, $pop22
-	tee_local	$push29=, $3=, $pop30
-	i32.store	__stack_pointer($pop23), $pop29
-	i32.store	12($3), $1
-	i32.const	$push28=, 4
-	i32.add 	$push1=, $1, $pop28
+	i32.const	$push21=, 0
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 16
+	i32.sub 	$push28=, $pop18, $pop20
+	tee_local	$push27=, $3=, $pop28
+	i32.store	__stack_pointer($pop21), $pop27
+	i32.const	$push26=, 4
+	i32.add 	$push1=, $1, $pop26
 	i32.store	12($3), $pop1
 	block   	
 	block   	
-	block   	
-	i32.const	$push27=, 1
-	i32.lt_s	$push2=, $0, $pop27
-	br_if   	0, $pop2        # 0: down to label2
+	i32.const	$push25=, 1
+	i32.lt_s	$push2=, $0, $pop25
+	br_if   	0, $pop2        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
-	i32.const	$push3=, 8
-	i32.add 	$1=, $1, $pop3
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i32.const	$push32=, 10
-	i32.add 	$push4=, $2, $pop32
-	i32.const	$push31=, -8
-	i32.add 	$push5=, $1, $pop31
-	i32.load8_s	$push6=, 0($pop5)
-	i32.ne  	$push7=, $pop4, $pop6
-	br_if   	2, $pop7        # 2: down to label1
+	loop    	                # label2:
+	i32.const	$push29=, 10
+	i32.add 	$push3=, $2, $pop29
+	i32.load8_s	$push4=, 0($1)
+	i32.ne  	$push5=, $pop3, $pop4
+	br_if   	2, $pop5        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push34=, 20
-	i32.add 	$push9=, $2, $pop34
-	i32.const	$push33=, -7
-	i32.add 	$push10=, $1, $pop33
-	i32.load8_s	$push11=, 0($pop10)
-	i32.ne  	$push12=, $pop9, $pop11
-	br_if   	2, $pop12       # 2: down to label1
+	i32.const	$push31=, 20
+	i32.add 	$push7=, $2, $pop31
+	i32.const	$push30=, 1
+	i32.add 	$push8=, $1, $pop30
+	i32.load8_s	$push9=, 0($pop8)
+	i32.ne  	$push10=, $pop7, $pop9
+	br_if   	2, $pop10       # 2: down to label0
 # BB#4:                                 # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push36=, 30
-	i32.add 	$push13=, $2, $pop36
-	i32.const	$push35=, -6
-	i32.add 	$push8=, $1, $pop35
-	i32.load8_s	$push0=, 0($pop8)
-	i32.ne  	$push14=, $pop13, $pop0
-	br_if   	3, $pop14       # 3: down to label0
+	i32.const	$push33=, 30
+	i32.add 	$push11=, $2, $pop33
+	i32.const	$push32=, 2
+	i32.add 	$push6=, $1, $pop32
+	i32.load8_s	$push0=, 0($pop6)
+	i32.ne  	$push12=, $pop11, $pop0
+	br_if   	2, $pop12       # 2: down to label0
 # BB#5:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.store	12($3), $1
-	i32.const	$push40=, 4
-	i32.add 	$1=, $1, $pop40
-	i32.const	$push39=, 1
-	i32.add 	$push38=, $2, $pop39
-	tee_local	$push37=, $2=, $pop38
-	i32.lt_s	$push15=, $pop37, $0
-	br_if   	0, $pop15       # 0: up to label3
-# BB#6:                                 # %for.end.loopexit
+	i32.const	$push38=, 8
+	i32.add 	$push13=, $1, $pop38
+	i32.store	12($3), $pop13
+	i32.const	$push37=, 4
+	i32.add 	$1=, $1, $pop37
+	i32.const	$push36=, 1
+	i32.add 	$push35=, $2, $pop36
+	tee_local	$push34=, $2=, $pop35
+	i32.lt_s	$push14=, $pop34, $0
+	br_if   	0, $pop14       # 0: up to label2
+.LBB0_6:                                # %for.end
 	end_loop
-	i32.const	$push16=, -8
-	i32.add 	$1=, $1, $pop16
-.LBB0_7:                                # %for.end
-	end_block                       # label2:
-	i32.load	$push17=, 0($1)
-	i32.const	$push18=, 123
-	i32.ne  	$push19=, $pop17, $pop18
-	br_if   	0, $pop19       # 0: down to label1
-# BB#8:                                 # %if.end22
-	i32.const	$push26=, 0
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $3, $pop24
-	i32.store	__stack_pointer($pop26), $pop25
-	return  	$1
-.LBB0_9:                                # %if.then21
 	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_10:                               # %if.then14
+	i32.load	$push15=, 0($1)
+	i32.const	$push16=, 123
+	i32.ne  	$push17=, $pop15, $pop16
+	br_if   	0, $pop17       # 0: down to label0
+# BB#7:                                 # %if.end22
+	i32.const	$push24=, 0
+	i32.const	$push22=, 16
+	i32.add 	$push23=, $3, $pop22
+	i32.store	__stack_pointer($pop24), $pop23
+	return  	$1
+.LBB0_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push25=, 0
 	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
-	i32.const	$push24=, 48
-	i32.sub 	$push43=, $pop23, $pop24
-	tee_local	$push42=, $1=, $pop43
-	i32.store	__stack_pointer($pop25), $pop42
-	i32.const	$push0=, 30
-	i32.store8	34($1), $pop0
-	i32.const	$push1=, 11
-	i32.store8	35($1), $pop1
-	i32.const	$push2=, 12
-	i32.store8	38($1), $pop2
-	i32.const	$push3=, 5130
-	i32.store16	32($1), $pop3
-	i32.const	$push4=, 21
-	i32.store8	36($1), $pop4
-	i32.const	$push5=, 22
-	i32.store8	39($1), $pop5
-	i32.const	$push26=, 28
-	i32.add 	$push27=, $1, $pop26
-	i32.const	$push6=, 2
-	i32.add 	$push7=, $pop27, $pop6
-	i32.load8_u	$push8=, 34($1)
-	i32.store8	0($pop7), $pop8
-	i32.const	$push9=, 31
-	i32.store8	37($1), $pop9
-	i32.const	$push10=, 40
-	i32.add 	$push41=, $1, $pop10
-	tee_local	$push40=, $0=, $pop41
-	i32.const	$push11=, 32
-	i32.store8	0($pop40), $pop11
-	i32.const	$push28=, 24
-	i32.add 	$push29=, $1, $pop28
-	i32.const	$push39=, 2
-	i32.add 	$push12=, $pop29, $pop39
-	i32.load8_u	$push13=, 37($1)
-	i32.store8	0($pop12), $pop13
-	i32.load16_u	$push14=, 32($1)
-	i32.store16	28($1), $pop14
-	i32.load16_u	$push15=, 35($1):p2align=0
-	i32.store16	24($1), $pop15
-	i32.const	$push30=, 20
-	i32.add 	$push31=, $1, $pop30
-	i32.const	$push38=, 2
-	i32.add 	$push16=, $pop31, $pop38
-	i32.load8_u	$push17=, 0($0)
-	i32.store8	0($pop16), $pop17
-	i32.load16_u	$push18=, 38($1)
-	i32.store16	20($1), $pop18
-	i32.const	$push19=, 123
-	i32.store	12($1), $pop19
-	i32.const	$push32=, 28
-	i32.add 	$push33=, $1, $pop32
-	i32.store	0($1), $pop33
-	i32.const	$push34=, 20
-	i32.add 	$push35=, $1, $pop34
-	i32.store	8($1), $pop35
-	i32.const	$push36=, 24
-	i32.add 	$push37=, $1, $pop36
-	i32.store	4($1), $pop37
-	i32.const	$push20=, 3
-	i32.call	$drop=, f@FUNCTION, $pop20, $1
-	i32.const	$push21=, 0
-	call    	exit@FUNCTION, $pop21
+	i32.const	$push20=, 0
+	i32.load	$push19=, __stack_pointer($pop20)
+	i32.const	$push21=, 48
+	i32.sub 	$push38=, $pop19, $pop21
+	tee_local	$push37=, $0=, $pop38
+	i32.store	__stack_pointer($pop22), $pop37
+	i32.const	$push0=, 186520586
+	i32.store	32($0), $pop0
+	i32.const	$push23=, 28
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push1=, 2
+	i32.add 	$push2=, $pop24, $pop1
+	i32.load8_u	$push3=, 34($0)
+	i32.store8	0($pop2), $pop3
+	i32.const	$push4=, 7957
+	i32.store16	36($0), $pop4
+	i32.const	$push25=, 24
+	i32.add 	$push26=, $0, $pop25
+	i32.const	$push36=, 2
+	i32.add 	$push5=, $pop26, $pop36
+	i32.load8_u	$push6=, 37($0)
+	i32.store8	0($pop5), $pop6
+	i32.const	$push7=, 8214
+	i32.store16	39($0):p2align=0, $pop7
+	i32.const	$push27=, 20
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push35=, 2
+	i32.add 	$push8=, $pop28, $pop35
+	i32.const	$push9=, 40
+	i32.add 	$push10=, $0, $pop9
+	i32.load8_u	$push11=, 0($pop10)
+	i32.store8	0($pop8), $pop11
+	i32.const	$push12=, 12
+	i32.store8	38($0), $pop12
+	i32.load16_u	$push13=, 32($0)
+	i32.store16	28($0), $pop13
+	i32.load16_u	$push14=, 35($0):p2align=0
+	i32.store16	24($0), $pop14
+	i32.load16_u	$push15=, 38($0)
+	i32.store16	20($0), $pop15
+	i32.const	$push16=, 123
+	i32.store	12($0), $pop16
+	i32.const	$push29=, 20
+	i32.add 	$push30=, $0, $pop29
+	i32.store	8($0), $pop30
+	i32.const	$push31=, 24
+	i32.add 	$push32=, $0, $pop31
+	i32.store	4($0), $pop32
+	i32.const	$push33=, 28
+	i32.add 	$push34=, $0, $pop33
+	i32.store	0($0), $pop34
+	i32.const	$push17=, 3
+	i32.call	$drop=, f@FUNCTION, $pop17, $0
+	i32.const	$push18=, 0
+	call    	exit@FUNCTION, $pop18
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-13.c.s b/test/torture-s/931004-13.c.s
index 788ee2f59..1bd14a12d 100644
--- a/test/torture-s/931004-13.c.s
+++ b/test/torture-s/931004-13.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-13.c"
+	.file	"931004-13.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -73,82 +73,56 @@ f:                                      # @f
 	i32.ne  	$push37=, $4, $pop36
 	br_if   	0, $pop37       # 0: down to label0
 # BB#13:                                # %if.end68
-	return  	$1
-.LBB0_14:                               # %if.then67
+	return  	$2
+.LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push24=, 0
-	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
-	i32.const	$push23=, 32
-	i32.sub 	$push35=, $pop22, $pop23
-	tee_local	$push34=, $0=, $pop35
-	i32.store	__stack_pointer($pop24), $pop34
-	i32.const	$push0=, 25
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, 22
-	i32.store8	0($pop1), $pop2
-	i32.const	$push3=, 12
-	i32.store8	24($0), $pop3
-	i32.const	$push4=, 5130
-	i32.store16	16($0), $pop4
-	i32.const	$push5=, 21
-	i32.store8	21($0), $pop5
-	i32.const	$push6=, 30
-	i32.store8	18($0), $pop6
-	i32.const	$push7=, 11
-	i32.store8	20($0), $pop7
-	i32.const	$push8=, 31
-	i32.store8	22($0), $pop8
-	i32.const	$push9=, 26
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push11=, 32
-	i32.store8	0($pop10), $pop11
-	i32.const	$push12=, 40
-	i32.store8	19($0), $pop12
-	i32.const	$push13=, 41
-	i32.store8	23($0), $pop13
-	i32.const	$push25=, 16
-	i32.add 	$push26=, $0, $pop25
-	i32.const	$push33=, 11
-	i32.add 	$push14=, $pop26, $pop33
-	i32.const	$push15=, 42
-	i32.store8	0($pop14), $pop15
-	i32.load	$push16=, 16($0)
-	i32.store	12($0), $pop16
-	i32.load	$push17=, 20($0)
-	i32.store	8($0), $pop17
-	i32.load	$push18=, 24($0)
-	i32.store	4($0), $pop18
-	i32.const	$push27=, 12
-	i32.add 	$push28=, $0, $pop27
-	i32.const	$push29=, 8
-	i32.add 	$push30=, $0, $pop29
-	i32.const	$push31=, 4
-	i32.add 	$push32=, $0, $pop31
-	i32.const	$push19=, 123
-	i32.call	$drop=, f@FUNCTION, $0, $pop28, $pop30, $pop32, $pop19
-	i32.const	$push20=, 0
-	call    	exit@FUNCTION, $pop20
+	i32.const	$push9=, 0
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 32
+	i32.sub 	$push18=, $pop6, $pop8
+	tee_local	$push17=, $0=, $pop18
+	i32.store	__stack_pointer($pop9), $pop17
+	i64.const	$push0=, 2963110217494959114
+	i64.store	16($0), $pop0
+	i32.const	$push1=, 706745868
+	i32.store	24($0), $pop1
+	i32.const	$push16=, 706745868
+	i32.store	4($0), $pop16
+	i32.load	$push2=, 16($0)
+	i32.store	12($0), $pop2
+	i32.load	$push3=, 20($0)
+	i32.store	8($0), $pop3
+	i32.const	$push10=, 12
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push12=, 8
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push14=, 4
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push4=, 123
+	i32.call	$drop=, f@FUNCTION, $0, $pop11, $pop13, $pop15, $pop4
+	i32.const	$push5=, 0
+	call    	exit@FUNCTION, $pop5
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-14.c.s b/test/torture-s/931004-14.c.s
index 1734133fc..9be722a36 100644
--- a/test/torture-s/931004-14.c.s
+++ b/test/torture-s/931004-14.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-14.c"
+	.file	"931004-14.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,174 +9,137 @@ f:                                      # @f
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
-	i32.const	$push26=, 16
-	i32.sub 	$push34=, $pop25, $pop26
-	tee_local	$push33=, $3=, $pop34
-	i32.store	__stack_pointer($pop27), $pop33
-	i32.store	12($3), $1
-	i32.const	$push32=, 4
-	i32.add 	$push2=, $1, $pop32
+	i32.const	$push25=, 0
+	i32.const	$push23=, 0
+	i32.load	$push22=, __stack_pointer($pop23)
+	i32.const	$push24=, 16
+	i32.sub 	$push32=, $pop22, $pop24
+	tee_local	$push31=, $3=, $pop32
+	i32.store	__stack_pointer($pop25), $pop31
+	i32.const	$push30=, 4
+	i32.add 	$push2=, $1, $pop30
 	i32.store	12($3), $pop2
 	block   	
 	block   	
-	block   	
-	i32.const	$push31=, 1
-	i32.lt_s	$push3=, $0, $pop31
-	br_if   	0, $pop3        # 0: down to label2
+	i32.const	$push29=, 1
+	i32.lt_s	$push3=, $0, $pop29
+	br_if   	0, $pop3        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
-	i32.const	$push4=, 8
-	i32.add 	$1=, $1, $pop4
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i32.const	$push36=, 10
-	i32.add 	$push5=, $2, $pop36
-	i32.const	$push35=, -8
-	i32.add 	$push6=, $1, $pop35
-	i32.load8_s	$push7=, 0($pop6)
-	i32.ne  	$push8=, $pop5, $pop7
-	br_if   	2, $pop8        # 2: down to label1
+	loop    	                # label2:
+	i32.const	$push33=, 10
+	i32.add 	$push4=, $2, $pop33
+	i32.load8_s	$push5=, 0($1)
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	2, $pop6        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push38=, 20
-	i32.add 	$push11=, $2, $pop38
-	i32.const	$push37=, -7
-	i32.add 	$push12=, $1, $pop37
-	i32.load8_s	$push13=, 0($pop12)
-	i32.ne  	$push14=, $pop11, $pop13
-	br_if   	2, $pop14       # 2: down to label1
+	i32.const	$push35=, 20
+	i32.add 	$push9=, $2, $pop35
+	i32.const	$push34=, 1
+	i32.add 	$push10=, $1, $pop34
+	i32.load8_s	$push11=, 0($pop10)
+	i32.ne  	$push12=, $pop9, $pop11
+	br_if   	2, $pop12       # 2: down to label0
 # BB#4:                                 # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push40=, 30
-	i32.add 	$push15=, $2, $pop40
-	i32.const	$push39=, -6
-	i32.add 	$push10=, $1, $pop39
-	i32.load8_s	$push0=, 0($pop10)
-	i32.ne  	$push16=, $pop15, $pop0
-	br_if   	2, $pop16       # 2: down to label1
+	i32.const	$push37=, 30
+	i32.add 	$push13=, $2, $pop37
+	i32.const	$push36=, 2
+	i32.add 	$push8=, $1, $pop36
+	i32.load8_s	$push0=, 0($pop8)
+	i32.ne  	$push14=, $pop13, $pop0
+	br_if   	2, $pop14       # 2: down to label0
 # BB#5:                                 # %if.end15
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push42=, 40
-	i32.add 	$push17=, $2, $pop42
-	i32.const	$push41=, -5
-	i32.add 	$push9=, $1, $pop41
-	i32.load8_s	$push1=, 0($pop9)
-	i32.ne  	$push18=, $pop17, $pop1
-	br_if   	3, $pop18       # 3: down to label0
+	i32.const	$push39=, 40
+	i32.add 	$push15=, $2, $pop39
+	i32.const	$push38=, 3
+	i32.add 	$push7=, $1, $pop38
+	i32.load8_s	$push1=, 0($pop7)
+	i32.ne  	$push16=, $pop15, $pop1
+	br_if   	2, $pop16       # 2: down to label0
 # BB#6:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.store	12($3), $1
-	i32.const	$push46=, 4
-	i32.add 	$1=, $1, $pop46
-	i32.const	$push45=, 1
-	i32.add 	$push44=, $2, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.lt_s	$push19=, $pop43, $0
-	br_if   	0, $pop19       # 0: up to label3
-# BB#7:                                 # %for.end.loopexit
+	i32.const	$push44=, 8
+	i32.add 	$push17=, $1, $pop44
+	i32.store	12($3), $pop17
+	i32.const	$push43=, 4
+	i32.add 	$1=, $1, $pop43
+	i32.const	$push42=, 1
+	i32.add 	$push41=, $2, $pop42
+	tee_local	$push40=, $2=, $pop41
+	i32.lt_s	$push18=, $pop40, $0
+	br_if   	0, $pop18       # 0: up to label2
+.LBB0_7:                                # %for.end
 	end_loop
-	i32.const	$push20=, -8
-	i32.add 	$1=, $1, $pop20
-.LBB0_8:                                # %for.end
-	end_block                       # label2:
-	i32.load	$push21=, 0($1)
-	i32.const	$push22=, 123
-	i32.ne  	$push23=, $pop21, $pop22
-	br_if   	0, $pop23       # 0: down to label1
-# BB#9:                                 # %if.end28
-	i32.const	$push30=, 0
-	i32.const	$push28=, 16
-	i32.add 	$push29=, $3, $pop28
-	i32.store	__stack_pointer($pop30), $pop29
-	return  	$1
-.LBB0_10:                               # %if.then27
 	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_11:                               # %if.then20
+	i32.load	$push19=, 0($1)
+	i32.const	$push20=, 123
+	i32.ne  	$push21=, $pop19, $pop20
+	br_if   	0, $pop21       # 0: down to label0
+# BB#8:                                 # %if.end28
+	i32.const	$push28=, 0
+	i32.const	$push26=, 16
+	i32.add 	$push27=, $3, $pop26
+	i32.store	__stack_pointer($pop28), $pop27
+	return  	$1
+.LBB0_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push25=, 0
-	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
-	i32.const	$push24=, 48
-	i32.sub 	$push36=, $pop23, $pop24
-	tee_local	$push35=, $0=, $pop36
-	i32.store	__stack_pointer($pop25), $pop35
-	i32.const	$push0=, 41
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, 22
-	i32.store8	0($pop1), $pop2
-	i32.const	$push3=, 12
-	i32.store8	40($0), $pop3
-	i32.const	$push4=, 5130
-	i32.store16	32($0), $pop4
-	i32.const	$push5=, 21
-	i32.store8	37($0), $pop5
-	i32.const	$push6=, 30
-	i32.store8	34($0), $pop6
-	i32.const	$push7=, 11
-	i32.store8	36($0), $pop7
-	i32.const	$push8=, 31
-	i32.store8	38($0), $pop8
-	i32.const	$push9=, 42
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push11=, 32
-	i32.store8	0($pop10), $pop11
-	i32.const	$push12=, 40
-	i32.store8	35($0), $pop12
-	i32.const	$push13=, 41
-	i32.store8	39($0), $pop13
-	i32.const	$push26=, 32
-	i32.add 	$push27=, $0, $pop26
-	i32.const	$push34=, 11
-	i32.add 	$push14=, $pop27, $pop34
-	i32.const	$push15=, 42
-	i32.store8	0($pop14), $pop15
-	i32.load	$push16=, 32($0)
-	i32.store	28($0), $pop16
-	i32.load	$push17=, 36($0)
-	i32.store	24($0), $pop17
-	i32.load	$push18=, 40($0)
-	i32.store	20($0), $pop18
-	i32.const	$push19=, 123
-	i32.store	12($0), $pop19
-	i32.const	$push28=, 20
-	i32.add 	$push29=, $0, $pop28
-	i32.store	8($0), $pop29
-	i32.const	$push30=, 24
-	i32.add 	$push31=, $0, $pop30
-	i32.store	4($0), $pop31
-	i32.const	$push32=, 28
-	i32.add 	$push33=, $0, $pop32
-	i32.store	0($0), $pop33
-	i32.const	$push20=, 3
-	i32.call	$drop=, f@FUNCTION, $pop20, $0
-	i32.const	$push21=, 0
-	call    	exit@FUNCTION, $pop21
+	i32.const	$push10=, 0
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 48
+	i32.sub 	$push19=, $pop7, $pop9
+	tee_local	$push18=, $0=, $pop19
+	i32.store	__stack_pointer($pop10), $pop18
+	i64.const	$push0=, 2963110217494959114
+	i64.store	32($0), $pop0
+	i32.const	$push1=, 706745868
+	i32.store	40($0), $pop1
+	i32.const	$push17=, 706745868
+	i32.store	20($0), $pop17
+	i32.const	$push2=, 123
+	i32.store	12($0), $pop2
+	i32.load	$push3=, 32($0)
+	i32.store	28($0), $pop3
+	i32.load	$push4=, 36($0)
+	i32.store	24($0), $pop4
+	i32.const	$push11=, 20
+	i32.add 	$push12=, $0, $pop11
+	i32.store	8($0), $pop12
+	i32.const	$push13=, 24
+	i32.add 	$push14=, $0, $pop13
+	i32.store	4($0), $pop14
+	i32.const	$push15=, 28
+	i32.add 	$push16=, $0, $pop15
+	i32.store	0($0), $pop16
+	i32.const	$push5=, 3
+	i32.call	$drop=, f@FUNCTION, $pop5, $0
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-2.c.s b/test/torture-s/931004-2.c.s
index baf432a2f..9e4a5d8d5 100644
--- a/test/torture-s/931004-2.c.s
+++ b/test/torture-s/931004-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-2.c"
+	.file	"931004-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,54 +10,52 @@ f:                                      # @f
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop11, $pop12
+	i32.sub 	$push20=, $pop10, $pop12
 	tee_local	$push19=, $5=, $pop20
 	i32.store	__stack_pointer($pop13), $pop19
-	i32.store	12($5), $1
 	i32.const	$push18=, 4
 	i32.add 	$push2=, $1, $pop18
 	i32.store	12($5), $pop2
 	i32.load	$4=, 0($1)
 	block   	
 	block   	
-	block   	
 	i32.const	$push17=, 1
 	i32.lt_s	$push3=, $0, $pop17
-	br_if   	0, $pop3        # 0: down to label2
+	br_if   	0, $pop3        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
 	i32.const	$push4=, 8
-	i32.add 	$3=, $1, $pop4
-	i32.const	$1=, 10
+	i32.add 	$1=, $1, $pop4
+	i32.const	$3=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i32.ne  	$push5=, $1, $4
-	br_if   	2, $pop5        # 2: down to label1
+	loop    	                # label2:
+	i32.ne  	$push5=, $3, $4
+	br_if   	2, $pop5        # 2: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.store	12($5), $3
+	i32.store	12($5), $1
 	i32.const	$push24=, -9
-	i32.add 	$2=, $1, $pop24
+	i32.add 	$2=, $3, $pop24
 	i32.const	$push23=, -4
-	i32.add 	$push7=, $3, $pop23
+	i32.add 	$push7=, $1, $pop23
 	i32.load	$4=, 0($pop7)
 	i32.const	$push22=, 1
-	i32.add 	$push1=, $1, $pop22
-	copy_local	$1=, $pop1
+	i32.add 	$push1=, $3, $pop22
+	copy_local	$3=, $pop1
 	i32.const	$push21=, 4
-	i32.add 	$push0=, $3, $pop21
-	copy_local	$3=, $pop0
+	i32.add 	$push0=, $1, $pop21
+	copy_local	$1=, $pop0
 	i32.lt_s	$push6=, $2, $0
-	br_if   	0, $pop6        # 0: up to label3
+	br_if   	0, $pop6        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
-	end_block                       # label2:
+	end_block                       # label1:
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $4, $pop8
-	br_if   	1, $pop9        # 1: down to label0
+	br_if   	0, $pop9        # 0: down to label0
 # BB#5:                                 # %if.end8
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
@@ -65,19 +63,15 @@ f:                                      # @f
 	i32.store	__stack_pointer($pop16), $pop15
 	return  	$1
 .LBB0_6:                                # %if.then
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_7:                                # %if.then7
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -85,10 +79,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop5, $pop6
+	i32.sub 	$push9=, $pop4, $pop6
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop7), $pop8
 	i64.const	$push0=, 528280977420
@@ -103,8 +97,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-3.c.s b/test/torture-s/931004-3.c.s
index 024815b04..eee259749 100644
--- a/test/torture-s/931004-3.c.s
+++ b/test/torture-s/931004-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-3.c"
+	.file	"931004-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -31,17 +31,17 @@ f:                                      # @f
 	i32.ne  	$push11=, $4, $pop10
 	br_if   	0, $pop11       # 0: down to label0
 # BB#4:                                 # %if.end19
-	return  	$1
-.LBB0_5:                                # %if.then18
+	return  	$2
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,8 +53,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-4.c.s b/test/torture-s/931004-4.c.s
index f002da323..68ed0c569 100644
--- a/test/torture-s/931004-4.c.s
+++ b/test/torture-s/931004-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-4.c"
+	.file	"931004-4.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,30 +10,28 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop11, $pop12
+	i32.sub 	$push20=, $pop10, $pop12
 	tee_local	$push19=, $4=, $pop20
 	i32.store	__stack_pointer($pop13), $pop19
-	i32.store	12($4), $1
 	i32.const	$push18=, 4
 	i32.add 	$push1=, $1, $pop18
 	i32.store	12($4), $pop1
 	block   	
 	block   	
-	block   	
 	i32.const	$push17=, 1
 	i32.lt_s	$push2=, $0, $pop17
-	br_if   	0, $pop2        # 0: down to label2
+	br_if   	0, $pop2        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
 	i32.const	$3=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
+	loop    	                # label2:
 	i32.load16_s	$push3=, 0($1)
 	i32.ne  	$push4=, $3, $pop3
-	br_if   	2, $pop4        # 2: down to label1
+	br_if   	2, $pop4        # 2: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push24=, 8
@@ -47,14 +45,14 @@ f:                                      # @f
 	i32.add 	$push0=, $3, $pop21
 	copy_local	$3=, $pop0
 	i32.lt_s	$push6=, $2, $0
-	br_if   	0, $pop6        # 0: up to label3
+	br_if   	0, $pop6        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
-	end_block                       # label2:
+	end_block                       # label1:
 	i32.load	$push7=, 0($1)
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $pop7, $pop8
-	br_if   	1, $pop9        # 1: down to label0
+	br_if   	0, $pop9        # 0: down to label0
 # BB#5:                                 # %if.end10
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
@@ -62,19 +60,15 @@ f:                                      # @f
 	i32.store	__stack_pointer($pop16), $pop15
 	return  	$1
 .LBB0_6:                                # %if.then
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_7:                                # %if.then9
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -82,10 +76,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop5, $pop6
+	i32.sub 	$push9=, $pop4, $pop6
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop7), $pop8
 	i64.const	$push0=, 528280977420
@@ -100,8 +94,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-5.c.s b/test/torture-s/931004-5.c.s
index aab17aaa8..be32c8598 100644
--- a/test/torture-s/931004-5.c.s
+++ b/test/torture-s/931004-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-5.c"
+	.file	"931004-5.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -43,60 +43,56 @@ f:                                      # @f
 	i32.ne  	$push19=, $4, $pop18
 	br_if   	0, $pop19       # 0: down to label0
 # BB#7:                                 # %if.end34
-	return  	$1
-.LBB0_8:                                # %if.then33
+	return  	$2
+.LBB0_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push12=, 0
 	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
-	i32.const	$push11=, 32
-	i32.sub 	$push20=, $pop10, $pop11
-	tee_local	$push19=, $0=, $pop20
-	i32.store	__stack_pointer($pop12), $pop19
-	i32.const	$push0=, 1310730
-	i32.store	16($0), $pop0
-	i32.const	$push1=, 21
-	i32.store16	22($0), $pop1
-	i32.const	$push2=, 11
-	i32.store16	20($0), $pop2
-	i32.const	$push3=, 1441804
-	i32.store	24($0), $pop3
-	i32.load	$push4=, 16($0)
-	i32.store	12($0), $pop4
-	i32.load	$push5=, 20($0)
-	i32.store	8($0), $pop5
-	i32.load	$push6=, 24($0)
-	i32.store	4($0), $pop6
-	i32.const	$push13=, 12
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push15=, 8
-	i32.add 	$push16=, $0, $pop15
-	i32.const	$push17=, 4
-	i32.add 	$push18=, $0, $pop17
-	i32.const	$push7=, 123
-	i32.call	$drop=, f@FUNCTION, $0, $pop14, $pop16, $pop18, $pop7
-	i32.const	$push8=, 0
-	call    	exit@FUNCTION, $pop8
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 32
+	i32.sub 	$push18=, $pop6, $pop8
+	tee_local	$push17=, $0=, $pop18
+	i32.store	__stack_pointer($pop9), $pop17
+	i64.const	$push0=, 6192501028618251
+	i64.store	20($0):p2align=2, $pop0
+	i32.const	$push1=, 1310730
+	i32.store	16($0), $pop1
+	i32.const	$push16=, 1310730
+	i32.store	12($0), $pop16
+	i32.load	$push2=, 20($0)
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 24($0)
+	i32.store	4($0), $pop3
+	i32.const	$push10=, 12
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push12=, 8
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push14=, 4
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push4=, 123
+	i32.call	$drop=, f@FUNCTION, $0, $pop11, $pop13, $pop15, $pop4
+	i32.const	$push5=, 0
+	call    	exit@FUNCTION, $pop5
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-6.c.s b/test/torture-s/931004-6.c.s
index cc11c64f5..3d325f7ec 100644
--- a/test/torture-s/931004-6.c.s
+++ b/test/torture-s/931004-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-6.c"
+	.file	"931004-6.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,30 +10,28 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push24=, $pop15, $pop16
+	i32.sub 	$push24=, $pop14, $pop16
 	tee_local	$push23=, $4=, $pop24
 	i32.store	__stack_pointer($pop17), $pop23
-	i32.store	12($4), $1
 	i32.const	$push22=, 4
 	i32.add 	$push1=, $1, $pop22
 	i32.store	12($4), $pop1
 	block   	
 	block   	
-	block   	
 	i32.const	$push21=, 1
 	i32.lt_s	$push2=, $0, $pop21
-	br_if   	0, $pop2        # 0: down to label2
+	br_if   	0, $pop2        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
 	i32.const	$2=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
+	loop    	                # label2:
 	i32.load16_s	$push3=, 0($1)
 	i32.ne  	$push4=, $2, $pop3
-	br_if   	3, $pop4        # 3: down to label0
+	br_if   	2, $pop4        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push26=, 10
@@ -42,7 +40,7 @@ f:                                      # @f
 	i32.add 	$push6=, $1, $pop25
 	i32.load16_s	$push7=, 0($pop6)
 	i32.ne  	$push8=, $pop5, $pop7
-	br_if   	2, $pop8        # 2: down to label1
+	br_if   	2, $pop8        # 2: down to label0
 # BB#4:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push30=, 8
@@ -56,82 +54,74 @@ f:                                      # @f
 	i32.add 	$push0=, $2, $pop27
 	copy_local	$2=, $pop0
 	i32.lt_s	$push10=, $3, $0
-	br_if   	0, $pop10       # 0: up to label3
+	br_if   	0, $pop10       # 0: up to label2
 .LBB0_5:                                # %for.end
 	end_loop
-	end_block                       # label2:
+	end_block                       # label1:
 	i32.load	$push11=, 0($1)
 	i32.const	$push12=, 123
 	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label0
+	br_if   	0, $pop13       # 0: down to label0
 # BB#6:                                 # %if.end16
 	i32.const	$push20=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $4, $pop18
 	i32.store	__stack_pointer($pop20), $pop19
 	return  	$1
-.LBB0_7:                                # %if.then8
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_8:                                # %if.then15
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push13=, 0
 	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
-	i32.const	$push12=, 48
-	i32.sub 	$push21=, $pop11, $pop12
-	tee_local	$push20=, $0=, $pop21
-	i32.store	__stack_pointer($pop13), $pop20
-	i32.const	$push0=, 1310730
-	i32.store	32($0), $pop0
-	i32.const	$push1=, 21
-	i32.store16	38($0), $pop1
-	i32.const	$push2=, 11
-	i32.store16	36($0), $pop2
-	i32.const	$push3=, 1441804
-	i32.store	40($0), $pop3
-	i32.load	$push4=, 32($0)
-	i32.store	28($0), $pop4
-	i32.load	$push5=, 36($0)
-	i32.store	24($0), $pop5
-	i32.load	$push6=, 40($0)
-	i32.store	20($0), $pop6
-	i32.const	$push7=, 123
-	i32.store	12($0), $pop7
-	i32.const	$push14=, 28
-	i32.add 	$push15=, $0, $pop14
-	i32.store	0($0), $pop15
-	i32.const	$push16=, 20
-	i32.add 	$push17=, $0, $pop16
-	i32.store	8($0), $pop17
-	i32.const	$push18=, 24
-	i32.add 	$push19=, $0, $pop18
-	i32.store	4($0), $pop19
-	i32.const	$push8=, 3
-	i32.call	$drop=, f@FUNCTION, $pop8, $0
-	i32.const	$push9=, 0
-	call    	exit@FUNCTION, $pop9
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 48
+	i32.sub 	$push19=, $pop7, $pop9
+	tee_local	$push18=, $0=, $pop19
+	i32.store	__stack_pointer($pop10), $pop18
+	i64.const	$push0=, 6192501028618251
+	i64.store	36($0):p2align=2, $pop0
+	i32.const	$push1=, 1310730
+	i32.store	32($0), $pop1
+	i32.const	$push17=, 1310730
+	i32.store	28($0), $pop17
+	i32.const	$push2=, 123
+	i32.store	12($0), $pop2
+	i32.load	$push3=, 36($0)
+	i32.store	24($0), $pop3
+	i32.load	$push4=, 40($0)
+	i32.store	20($0), $pop4
+	i32.const	$push11=, 20
+	i32.add 	$push12=, $0, $pop11
+	i32.store	8($0), $pop12
+	i32.const	$push13=, 24
+	i32.add 	$push14=, $0, $pop13
+	i32.store	4($0), $pop14
+	i32.const	$push15=, 28
+	i32.add 	$push16=, $0, $pop15
+	i32.store	0($0), $pop16
+	i32.const	$push5=, 3
+	i32.call	$drop=, f@FUNCTION, $pop5, $0
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-7.c.s b/test/torture-s/931004-7.c.s
index 6df0c9fcc..c6a0a7764 100644
--- a/test/torture-s/931004-7.c.s
+++ b/test/torture-s/931004-7.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-7.c"
+	.file	"931004-7.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -31,17 +31,17 @@ f:                                      # @f
 	i32.ne  	$push11=, $4, $pop10
 	br_if   	0, $pop11       # 0: down to label0
 # BB#4:                                 # %if.end19
-	return  	$1
-.LBB0_5:                                # %if.then18
+	return  	$2
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,8 +53,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-8.c.s b/test/torture-s/931004-8.c.s
index 76318a9cd..b4b339291 100644
--- a/test/torture-s/931004-8.c.s
+++ b/test/torture-s/931004-8.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-8.c"
+	.file	"931004-8.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,30 +10,28 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop11, $pop12
+	i32.sub 	$push20=, $pop10, $pop12
 	tee_local	$push19=, $4=, $pop20
 	i32.store	__stack_pointer($pop13), $pop19
-	i32.store	12($4), $1
 	i32.const	$push18=, 4
 	i32.add 	$push1=, $1, $pop18
 	i32.store	12($4), $pop1
 	block   	
 	block   	
-	block   	
 	i32.const	$push17=, 1
 	i32.lt_s	$push2=, $0, $pop17
-	br_if   	0, $pop2        # 0: down to label2
+	br_if   	0, $pop2        # 0: down to label1
 # BB#1:                                 # %for.body.preheader
 	i32.const	$3=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
+	loop    	                # label2:
 	i32.load8_s	$push3=, 0($1)
 	i32.ne  	$push4=, $3, $pop3
-	br_if   	2, $pop4        # 2: down to label1
+	br_if   	2, $pop4        # 2: down to label0
 # BB#3:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push24=, 8
@@ -47,14 +45,14 @@ f:                                      # @f
 	i32.add 	$push0=, $3, $pop21
 	copy_local	$3=, $pop0
 	i32.lt_s	$push6=, $2, $0
-	br_if   	0, $pop6        # 0: up to label3
+	br_if   	0, $pop6        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
-	end_block                       # label2:
+	end_block                       # label1:
 	i32.load	$push7=, 0($1)
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $pop7, $pop8
-	br_if   	1, $pop9        # 1: down to label0
+	br_if   	0, $pop9        # 0: down to label0
 # BB#5:                                 # %if.end10
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
@@ -62,19 +60,15 @@ f:                                      # @f
 	i32.store	__stack_pointer($pop16), $pop15
 	return  	$1
 .LBB0_6:                                # %if.then
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_7:                                # %if.then9
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -82,10 +76,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop5, $pop6
+	i32.sub 	$push9=, $pop4, $pop6
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop7), $pop8
 	i64.const	$push0=, 528280977420
@@ -100,8 +94,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931004-9.c.s b/test/torture-s/931004-9.c.s
index 9f80b9969..9ac6a5313 100644
--- a/test/torture-s/931004-9.c.s
+++ b/test/torture-s/931004-9.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931004-9.c"
+	.file	"931004-9.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -43,62 +43,56 @@ f:                                      # @f
 	i32.ne  	$push19=, $4, $pop18
 	br_if   	0, $pop19       # 0: down to label0
 # BB#7:                                 # %if.end34
-	return  	$1
-.LBB0_8:                                # %if.then33
+	return  	$2
+.LBB0_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push13=, 0
 	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
-	i32.const	$push12=, 16
-	i32.sub 	$push21=, $pop11, $pop12
-	tee_local	$push20=, $0=, $pop21
-	i32.store	__stack_pointer($pop13), $pop20
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 16
+	i32.sub 	$push18=, $pop7, $pop9
+	tee_local	$push17=, $0=, $pop18
+	i32.store	__stack_pointer($pop10), $pop17
 	i32.const	$push0=, 5130
 	i32.store16	8($0), $pop0
-	i32.const	$push1=, 21
-	i32.store8	11($0), $pop1
-	i32.const	$push2=, 22
-	i32.store8	13($0), $pop2
-	i32.const	$push3=, 11
-	i32.store8	10($0), $pop3
-	i32.const	$push4=, 12
-	i32.store8	12($0), $pop4
-	i32.load16_u	$push5=, 8($0)
-	i32.store16	6($0), $pop5
-	i32.load16_u	$push6=, 10($0)
-	i32.store16	4($0), $pop6
-	i32.load16_u	$push7=, 12($0)
-	i32.store16	2($0), $pop7
-	i32.const	$push14=, 6
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push16=, 4
-	i32.add 	$push17=, $0, $pop16
-	i32.const	$push18=, 2
-	i32.add 	$push19=, $0, $pop18
-	i32.const	$push8=, 123
-	i32.call	$drop=, f@FUNCTION, $0, $pop15, $pop17, $pop19, $pop8
-	i32.const	$push9=, 0
-	call    	exit@FUNCTION, $pop9
+	i32.const	$push1=, 369890571
+	i32.store	10($0):p2align=1, $pop1
+	i32.load16_u	$push2=, 8($0)
+	i32.store16	6($0), $pop2
+	i32.load16_u	$push3=, 10($0)
+	i32.store16	4($0), $pop3
+	i32.load16_u	$push4=, 12($0)
+	i32.store16	2($0), $pop4
+	i32.const	$push11=, 6
+	i32.add 	$push12=, $0, $pop11
+	i32.const	$push13=, 4
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push15=, 2
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push5=, 123
+	i32.call	$drop=, f@FUNCTION, $0, $pop12, $pop14, $pop16, $pop5
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/931005-1.c.s b/test/torture-s/931005-1.c.s
index 2fcfa20f0..fce2ae08d 100644
--- a/test/torture-s/931005-1.c.s
+++ b/test/torture-s/931005-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931005-1.c"
+	.file	"931005-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931009-1.c.s b/test/torture-s/931009-1.c.s
index 4854a5ccd..b0bf3356b 100644
--- a/test/torture-s/931009-1.c.s
+++ b/test/torture-s/931009-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931009-1.c"
+	.file	"931009-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,7 +27,7 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931012-1.c.s b/test/torture-s/931012-1.c.s
index 102529f79..aa12e3196 100644
--- a/test/torture-s/931012-1.c.s
+++ b/test/torture-s/931012-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931012-1.c"
+	.file	"931012-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931017-1.c.s b/test/torture-s/931017-1.c.s
index 9999acef5..050a83d9b 100644
--- a/test/torture-s/931017-1.c.s
+++ b/test/torture-s/931017-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931017-1.c"
+	.file	"931017-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.h1,"ax",@progbits
-	.hidden	h1
+	.hidden	h1                      # -- Begin function h1
 	.globl	h1
 	.type	h1,@function
 h1:                                     # @h1
@@ -26,9 +26,9 @@ h1:                                     # @h1
 	.endfunc
 .Lfunc_end1:
 	.size	h1, .Lfunc_end1-h1
-
+                                        # -- End function
 	.section	.text.h2,"ax",@progbits
-	.hidden	h2
+	.hidden	h2                      # -- Begin function h2
 	.globl	h2
 	.type	h2,@function
 h2:                                     # @h2
@@ -49,9 +49,9 @@ h2:                                     # @h2
 	.endfunc
 .Lfunc_end2:
 	.size	h2, .Lfunc_end2-h2
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -63,9 +63,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end3:
 	.size	g, .Lfunc_end3-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -77,7 +77,7 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end4:
 	.size	f, .Lfunc_end4-f
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -88,6 +88,6 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/931018-1.c.s b/test/torture-s/931018-1.c.s
index 1b2e3e139..05c8a251b 100644
--- a/test/torture-s/931018-1.c.s
+++ b/test/torture-s/931018-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931018-1.c"
+	.file	"931018-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,7 +35,7 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.rodata.v,"a",@progbits
@@ -55,6 +55,6 @@ a:
 	.size	a, 16384
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/931031-1.c.s b/test/torture-s/931031-1.c.s
index 0211eb969..936678a96 100644
--- a/test/torture-s/931031-1.c.s
+++ b/test/torture-s/931031-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931031-1.c"
+	.file	"931031-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931102-1.c.s b/test/torture-s/931102-1.c.s
index 5b25baf81..06a007620 100644
--- a/test/torture-s/931102-1.c.s
+++ b/test/torture-s/931102-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931102-1.c"
+	.file	"931102-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -38,9 +38,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931102-2.c.s b/test/torture-s/931102-2.c.s
index d8ed845f0..a5dde0c3c 100644
--- a/test/torture-s/931102-2.c.s
+++ b/test/torture-s/931102-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931102-2.c"
+	.file	"931102-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -38,9 +38,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931110-1.c.s b/test/torture-s/931110-1.c.s
index 3768ec9ac..288ff52b4 100644
--- a/test/torture-s/931110-1.c.s
+++ b/test/torture-s/931110-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931110-1.c"
+	.file	"931110-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -84,5 +84,5 @@ x:
 	.size	x, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931110-2.c.s b/test/torture-s/931110-2.c.s
index 786655655..d572f847d 100644
--- a/test/torture-s/931110-2.c.s
+++ b/test/torture-s/931110-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931110-2.c"
+	.file	"931110-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931208-1.c.s b/test/torture-s/931208-1.c.s
index b4cb8d517..43de2e643 100644
--- a/test/torture-s/931208-1.c.s
+++ b/test/torture-s/931208-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931208-1.c"
+	.file	"931208-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931228-1.c.s b/test/torture-s/931228-1.c.s
index 874fce97a..6b10f2005 100644
--- a/test/torture-s/931228-1.c.s
+++ b/test/torture-s/931228-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/931228-1.c"
+	.file	"931228-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/940115-1.c.s b/test/torture-s/940115-1.c.s
index 2a6f1b3a1..d7ed7a084 100644
--- a/test/torture-s/940115-1.c.s
+++ b/test/torture-s/940115-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/940115-1.c"
+	.file	"940115-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,21 +13,21 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/940122-1.c.s b/test/torture-s/940122-1.c.s
index 476c4093a..92f841f96 100644
--- a/test/torture-s/940122-1.c.s
+++ b/test/torture-s/940122-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/940122-1.c"
+	.file	"940122-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -29,9 +29,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -59,9 +59,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -95,6 +95,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/941014-1.c.s b/test/torture-s/941014-1.c.s
index 714b8f2fb..4c5b44595 100644
--- a/test/torture-s/941014-1.c.s
+++ b/test/torture-s/941014-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941014-1.c"
+	.file	"941014-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941014-2.c.s b/test/torture-s/941014-2.c.s
index 9873f37ba..8cceaa8d5 100644
--- a/test/torture-s/941014-2.c.s
+++ b/test/torture-s/941014-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941014-2.c"
+	.file	"941014-2.c"
 	.section	.text.a1,"ax",@progbits
-	.hidden	a1
+	.hidden	a1                      # -- Begin function a1
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
@@ -11,9 +11,9 @@ a1:                                     # @a1
 	.endfunc
 .Lfunc_end0:
 	.size	a1, .Lfunc_end0-a1
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -21,10 +21,10 @@ f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push17=, $pop8, $pop9
+	i32.sub 	$push17=, $pop7, $pop9
 	tee_local	$push16=, $1=, $pop17
 	i32.store	__stack_pointer($pop10), $pop16
 	block   	
@@ -53,9 +53,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -63,10 +63,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push17=, $pop11, $pop12
+	i32.sub 	$push17=, $pop10, $pop12
 	tee_local	$push16=, $1=, $pop17
 	i32.store	__stack_pointer($pop13), $pop16
 	block   	
@@ -102,7 +102,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -110,7 +110,7 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	printf, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/941015-1.c.s b/test/torture-s/941015-1.c.s
index 20f3e427b..7f9178f52 100644
--- a/test/torture-s/941015-1.c.s
+++ b/test/torture-s/941015-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941015-1.c"
+	.file	"941015-1.c"
 	.section	.text.foo1,"ax",@progbits
-	.hidden	foo1
+	.hidden	foo1                    # -- Begin function foo1
 	.globl	foo1
 	.type	foo1,@function
 foo1:                                   # @foo1
@@ -17,9 +17,9 @@ foo1:                                   # @foo1
 	.endfunc
 .Lfunc_end0:
 	.size	foo1, .Lfunc_end0-foo1
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.hidden	foo2
+	.hidden	foo2                    # -- Begin function foo2
 	.globl	foo2
 	.type	foo2,@function
 foo2:                                   # @foo2
@@ -35,9 +35,9 @@ foo2:                                   # @foo2
 	.endfunc
 .Lfunc_end1:
 	.size	foo2, .Lfunc_end1-foo2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941021-1.c.s b/test/torture-s/941021-1.c.s
index d3b795c7f..da5732c4e 100644
--- a/test/torture-s/941021-1.c.s
+++ b/test/torture-s/941021-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941021-1.c"
+	.file	"941021-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	glob_dbl                # @glob_dbl
 	.type	glob_dbl,@object
 	.section	.bss.glob_dbl,"aw",@nobits
@@ -44,5 +44,5 @@ glob_dbl:
 	.size	glob_dbl, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941025-1.c.s b/test/torture-s/941025-1.c.s
index 760136848..5c2752cb5 100644
--- a/test/torture-s/941025-1.c.s
+++ b/test/torture-s/941025-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941025-1.c"
+	.file	"941025-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941031-1.c.s b/test/torture-s/941031-1.c.s
index 72a28716d..7027cb7c9 100644
--- a/test/torture-s/941031-1.c.s
+++ b/test/torture-s/941031-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941031-1.c"
+	.file	"941031-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -18,9 +18,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941101-1.c.s b/test/torture-s/941101-1.c.s
index b8b58c0d0..3051386a7 100644
--- a/test/torture-s/941101-1.c.s
+++ b/test/torture-s/941101-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941101-1.c"
+	.file	"941101-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941110-1.c.s b/test/torture-s/941110-1.c.s
index f715d7f11..244a115e3 100644
--- a/test/torture-s/941110-1.c.s
+++ b/test/torture-s/941110-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941110-1.c"
+	.file	"941110-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941202-1.c.s b/test/torture-s/941202-1.c.s
index 6e5377787..3624b14de 100644
--- a/test/torture-s/941202-1.c.s
+++ b/test/torture-s/941202-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/941202-1.c"
+	.file	"941202-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -21,9 +21,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,8 +35,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950221-1.c.s b/test/torture-s/950221-1.c.s
index fac7f8512..78ee48817 100644
--- a/test/torture-s/950221-1.c.s
+++ b/test/torture-s/950221-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950221-1.c"
+	.file	"950221-1.c"
 	.section	.text.g1,"ax",@progbits
-	.hidden	g1
+	.hidden	g1                      # -- Begin function g1
 	.globl	g1
 	.type	g1,@function
 g1:                                     # @g1
@@ -14,9 +14,9 @@ g1:                                     # @g1
 	.endfunc
 .Lfunc_end0:
 	.size	g1, .Lfunc_end0-g1
-
+                                        # -- End function
 	.section	.text.g2,"ax",@progbits
-	.hidden	g2
+	.hidden	g2                      # -- Begin function g2
 	.globl	g2
 	.type	g2,@function
 g2:                                     # @g2
@@ -38,9 +38,9 @@ g2:                                     # @g2
 	.endfunc
 .Lfunc_end1:
 	.size	g2, .Lfunc_end1-g2
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -67,9 +67,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end2:
 	.size	f, .Lfunc_end2-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -88,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	basepf                  # @basepf
 	.type	basepf,@object
 	.section	.bss.basepf,"aw",@nobits
@@ -126,6 +126,6 @@ filler:
 	.size	filler, 522240
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950322-1.c.s b/test/torture-s/950322-1.c.s
index dd859af46..b06442ef2 100644
--- a/test/torture-s/950322-1.c.s
+++ b/test/torture-s/950322-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950322-1.c"
+	.file	"950322-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -25,9 +25,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950426-1.c.s b/test/torture-s/950426-1.c.s
index 3d3dae3cf..d389e79bd 100644
--- a/test/torture-s/950426-1.c.s
+++ b/test/torture-s/950426-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950426-1.c"
+	.file	"950426-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,9 +25,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.func1,"ax",@progbits
-	.hidden	func1
+	.hidden	func1                   # -- Begin function func1
 	.globl	func1
 	.type	func1,@function
 func1:                                  # @func1
@@ -39,9 +39,9 @@ func1:                                  # @func1
 	.endfunc
 .Lfunc_end1:
 	.size	func1, .Lfunc_end1-func1
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -54,7 +54,7 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.hidden	s1                      # @s1
 	.type	s1,@object
 	.section	.bss.s1,"aw",@nobits
@@ -89,5 +89,5 @@ i:
 	.size	.L.str.1, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950426-2.c.s b/test/torture-s/950426-2.c.s
index a49f7bb58..03975e7ff 100644
--- a/test/torture-s/950426-2.c.s
+++ b/test/torture-s/950426-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950426-2.c"
+	.file	"950426-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950503-1.c.s b/test/torture-s/950503-1.c.s
index 9b3970cee..5fac3c0a5 100644
--- a/test/torture-s/950503-1.c.s
+++ b/test/torture-s/950503-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950503-1.c"
+	.file	"950503-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950511-1.c.s b/test/torture-s/950511-1.c.s
index 7f4b3d3e6..beea4980b 100644
--- a/test/torture-s/950511-1.c.s
+++ b/test/torture-s/950511-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950511-1.c"
+	.file	"950511-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950512-1.c.s b/test/torture-s/950512-1.c.s
index a50a1a1a7..88399d3dc 100644
--- a/test/torture-s/950512-1.c.s
+++ b/test/torture-s/950512-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950512-1.c"
+	.file	"950512-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -15,9 +15,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -31,9 +31,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950605-1.c.s b/test/torture-s/950605-1.c.s
index 50a4ee1ea..cd4ed79a1 100644
--- a/test/torture-s/950605-1.c.s
+++ b/test/torture-s/950605-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950605-1.c"
+	.file	"950605-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -23,9 +23,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,8 +37,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950607-1.c.s b/test/torture-s/950607-1.c.s
index 107014ea8..0ceebe9bd 100644
--- a/test/torture-s/950607-1.c.s
+++ b/test/torture-s/950607-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950607-1.c"
+	.file	"950607-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950607-2.c.s b/test/torture-s/950607-2.c.s
index aabee1c51..178e1eb2a 100644
--- a/test/torture-s/950607-2.c.s
+++ b/test/torture-s/950607-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950607-2.c"
+	.file	"950607-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,9 +9,8 @@ f:                                      # @f
 	.result 	i32
 	.local  	i32, i64
 # BB#0:                                 # %entry
-	i32.const	$push20=, 0
-	i32.const	$push17=, 1
-	i32.const	$push16=, 2
+	i32.const	$push21=, 0
+	i32.const	$push19=, 2
 	i32.load	$push10=, 4($2)
 	i32.load	$push28=, 4($0)
 	tee_local	$push27=, $3=, $pop28
@@ -32,19 +31,20 @@ f:                                      # @f
 	i64.mul 	$push6=, $pop5, $pop2
 	i64.sub 	$push24=, $pop13, $pop6
 	tee_local	$push23=, $4=, $pop24
+	i64.const	$push16=, 63
+	i64.shr_u	$push17=, $pop23, $pop16
+	i32.wrap/i64	$push18=, $pop17
+	i32.sub 	$push20=, $pop19, $pop18
 	i64.const	$push14=, 0
-	i64.lt_s	$push15=, $pop23, $pop14
-	i32.select	$push18=, $pop17, $pop16, $pop15
-	i64.const	$push22=, 0
-	i64.gt_s	$push19=, $4, $pop22
-	i32.select	$push21=, $pop20, $pop18, $pop19
-                                        # fallthrough-return: $pop21
+	i64.gt_s	$push15=, $4, $pop14
+	i32.select	$push22=, $pop21, $pop20, $pop15
+                                        # fallthrough-return: $pop22
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950612-1.c.s b/test/torture-s/950612-1.c.s
index 628f15bd4..a12e366cc 100644
--- a/test/torture-s/950612-1.c.s
+++ b/test/torture-s/950612-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950612-1.c"
+	.file	"950612-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -18,9 +18,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -37,9 +37,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -56,9 +56,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -75,21 +75,21 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond.10
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950621-1.c.s b/test/torture-s/950621-1.c.s
index 2550ea62b..905af4a60 100644
--- a/test/torture-s/950621-1.c.s
+++ b/test/torture-s/950621-1.c.s
@@ -1,49 +1,50 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950621-1.c"
+	.file	"950621-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 0
 	block   	
-	i32.eqz 	$push5=, $0
-	br_if   	0, $pop5        # 0: down to label0
+	block   	
+	i32.eqz 	$push7=, $0
+	br_if   	0, $pop7        # 0: down to label1
 # BB#1:                                 # %land.lhs.true
 	i32.load	$push0=, 0($0)
-	i32.const	$push3=, -1
-	i32.ne  	$push1=, $pop0, $pop3
-	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %land.rhs
-	i32.load	$push2=, 4($0)
 	i32.const	$push4=, -1
-	i32.eq  	$1=, $pop2, $pop4
-.LBB0_3:                                # %land.end
+	i32.eq  	$push1=, $pop0, $pop4
+	br_if   	1, $pop1        # 1: down to label0
+.LBB0_2:                                # %land.end
+	end_block                       # label1:
+	i32.const	$push5=, 0
+	return  	$pop5
+.LBB0_3:                                # %land.rhs
 	end_block                       # label0:
-	copy_local	$push6=, $1
-                                        # fallthrough-return: $pop6
+	i32.load	$push2=, 4($0)
+	i32.const	$push6=, -1
+	i32.eq  	$push3=, $pop2, $pop6
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %f.exit
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950628-1.c.s b/test/torture-s/950628-1.c.s
index 8293c044f..08ac3dacd 100644
--- a/test/torture-s/950628-1.c.s
+++ b/test/torture-s/950628-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950628-1.c"
+	.file	"950628-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -17,9 +17,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,9 +35,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950704-1.c.s b/test/torture-s/950704-1.c.s
index a74795ff8..d0f73dffc 100644
--- a/test/torture-s/950704-1.c.s
+++ b/test/torture-s/950704-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950704-1.c"
+	.file	"950704-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -50,9 +50,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -67,7 +67,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	errflag                 # @errflag
 	.type	errflag,@object
 	.section	.bss.errflag,"aw",@nobits
@@ -78,5 +78,5 @@ errflag:
 	.size	errflag, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950706-1.c.s b/test/torture-s/950706-1.c.s
index 6e99c90ca..73dc02270 100644
--- a/test/torture-s/950706-1.c.s
+++ b/test/torture-s/950706-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950706-1.c"
+	.file	"950706-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950710-1.c.s b/test/torture-s/950710-1.c.s
index da1113d88..adeafcee1 100644
--- a/test/torture-s/950710-1.c.s
+++ b/test/torture-s/950710-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950710-1.c"
+	.file	"950710-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -11,48 +11,62 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
+	call    	f@FUNCTION
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
+	unreachable
+	.endfunc
+.Lfunc_end1:
+	.size	main, .Lfunc_end1-main
+                                        # -- End function
+	.section	.text.f,"ax",@progbits
+	.type	f,@function             # -- Begin function f
+f:                                      # @f
+	.local  	i32, i32
+# BB#0:                                 # %entry
+	i32.const	$push8=, 0
 	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 32
-	i32.sub 	$push17=, $pop7, $pop8
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop9), $pop16
+	i32.load	$push5=, __stack_pointer($pop6)
+	i32.const	$push7=, 32
+	i32.sub 	$push19=, $pop5, $pop7
+	tee_local	$push18=, $1=, $pop19
+	i32.store	__stack_pointer($pop8), $pop18
 	block   	
-	i32.const	$push10=, 16
-	i32.add 	$push11=, $0, $pop10
-	i32.sub 	$push15=, $0, $pop11
-	tee_local	$push14=, $0=, $pop15
+	i32.const	$push12=, 16
+	i32.add 	$push13=, $1, $pop12
+	i32.sub 	$push17=, $1, $pop13
+	tee_local	$push16=, $0=, $pop17
 	i32.const	$push0=, 31
-	i32.shr_s	$push13=, $0, $pop0
-	tee_local	$push12=, $0=, $pop13
-	i32.add 	$push1=, $pop14, $pop12
+	i32.shr_s	$push15=, $0, $pop0
+	tee_local	$push14=, $0=, $pop15
+	i32.add 	$push1=, $pop16, $pop14
 	i32.xor 	$push2=, $pop1, $0
 	i32.const	$push3=, 11
-	i32.gt_u	$push4=, $pop2, $pop3
+	i32.le_u	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.then.i
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_2:                                # %f.exit
+# BB#1:                                 # %if.end
+	i32.const	$push11=, 0
+	i32.const	$push9=, 32
+	i32.add 	$push10=, $1, $pop9
+	i32.store	__stack_pointer($pop11), $pop10
+	return
+.LBB2_2:                                # %if.then
 	end_block                       # label0:
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
-.Lfunc_end1:
-	.size	main, .Lfunc_end1-main
-
+.Lfunc_end2:
+	.size	f, .Lfunc_end2-f
+                                        # -- End function
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/950714-1.c.s b/test/torture-s/950714-1.c.s
index b12e215cd..338d88e2a 100644
--- a/test/torture-s/950714-1.c.s
+++ b/test/torture-s/950714-1.c.s
@@ -1,89 +1,123 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950714-1.c"
+	.file	"950714-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$9=, 0
-	i32.const	$push21=, 0
-	i32.load	$8=, array+32($pop21)
-	i32.const	$push20=, 0
-	i32.load	$7=, array+28($pop20)
-	i32.const	$push19=, 0
-	i32.load	$6=, array+24($pop19)
-	i32.const	$push18=, 0
-	i32.load	$5=, array+20($pop18)
-	i32.const	$push17=, 0
-	i32.load	$4=, array+16($pop17)
-	i32.const	$push16=, 0
-	i32.load	$3=, array+12($pop16)
-	i32.const	$push15=, 0
-	i32.load	$2=, array+8($pop15)
-	i32.const	$push14=, 0
-	i32.load	$1=, array+4($pop14)
-	i32.const	$push13=, 0
-	i32.load	$0=, array($pop13)
-.LBB0_1:                                # %for.cond1.preheader
+	i32.const	$push0=, 0
+	i32.const	$push46=, 0
+	i32.load	$push1=, array($pop46)
+	i32.sub 	$8=, $pop0, $pop1
+	i32.const	$push45=, 0
+	i32.const	$push44=, 0
+	i32.load	$push2=, array+4($pop44)
+	i32.sub 	$7=, $pop45, $pop2
+	i32.const	$push43=, 0
+	i32.const	$push42=, 0
+	i32.load	$push3=, array+8($pop42)
+	i32.sub 	$6=, $pop43, $pop3
+	i32.const	$push41=, 0
+	i32.const	$push40=, 0
+	i32.load	$push4=, array+12($pop40)
+	i32.sub 	$5=, $pop41, $pop4
+	i32.const	$push39=, 0
+	i32.const	$push38=, 0
+	i32.load	$push5=, array+16($pop38)
+	i32.sub 	$4=, $pop39, $pop5
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push6=, array+20($pop36)
+	i32.sub 	$3=, $pop37, $pop6
+	i32.const	$push35=, 0
+	i32.const	$push34=, 0
+	i32.load	$push7=, array+24($pop34)
+	i32.sub 	$2=, $pop35, $pop7
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push8=, array+28($pop32)
+	i32.sub 	$1=, $pop33, $pop8
+	i32.const	$push31=, 0
+	i32.const	$push30=, 0
+	i32.load	$push9=, array+32($pop30)
+	i32.sub 	$0=, $pop31, $pop9
+	i32.const	$9=, -1
+.LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	block   	
 	loop    	                # label2:
-	i32.eq  	$push0=, $0, $9
-	br_if   	1, $pop0        # 1: down to label1
-# BB#2:                                 # %for.cond1.preheader
+	i32.add 	$push18=, $8, $9
+	i32.const	$push47=, -1
+	i32.eq  	$push19=, $pop18, $pop47
+	br_if   	1, $pop19       # 1: down to label1
+# BB#2:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push1=, $1, $9
-	br_if   	1, $pop1        # 1: down to label1
-# BB#3:                                 # %for.cond1.preheader
+	i32.add 	$push10=, $7, $9
+	i32.const	$push48=, -1
+	i32.eq  	$push20=, $pop10, $pop48
+	br_if   	1, $pop20       # 1: down to label1
+# BB#3:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push2=, $2, $9
-	br_if   	1, $pop2        # 1: down to label1
-# BB#4:                                 # %for.cond1.preheader
+	i32.add 	$push11=, $6, $9
+	i32.const	$push49=, -1
+	i32.eq  	$push21=, $pop11, $pop49
+	br_if   	1, $pop21       # 1: down to label1
+# BB#4:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push3=, $3, $9
-	br_if   	1, $pop3        # 1: down to label1
-# BB#5:                                 # %for.cond1.preheader
+	i32.add 	$push12=, $5, $9
+	i32.const	$push50=, -1
+	i32.eq  	$push22=, $pop12, $pop50
+	br_if   	1, $pop22       # 1: down to label1
+# BB#5:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push4=, $4, $9
-	br_if   	1, $pop4        # 1: down to label1
-# BB#6:                                 # %for.cond1.preheader
+	i32.add 	$push13=, $4, $9
+	i32.const	$push51=, -1
+	i32.eq  	$push23=, $pop13, $pop51
+	br_if   	1, $pop23       # 1: down to label1
+# BB#6:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push5=, $5, $9
-	br_if   	1, $pop5        # 1: down to label1
-# BB#7:                                 # %for.cond1.preheader
+	i32.add 	$push14=, $3, $9
+	i32.const	$push52=, -1
+	i32.eq  	$push24=, $pop14, $pop52
+	br_if   	1, $pop24       # 1: down to label1
+# BB#7:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push6=, $6, $9
-	br_if   	1, $pop6        # 1: down to label1
-# BB#8:                                 # %for.cond1.preheader
+	i32.add 	$push15=, $2, $9
+	i32.const	$push53=, -1
+	i32.eq  	$push25=, $pop15, $pop53
+	br_if   	1, $pop25       # 1: down to label1
+# BB#8:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push7=, $7, $9
-	br_if   	1, $pop7        # 1: down to label1
-# BB#9:                                 # %for.cond1.preheader
+	i32.add 	$push16=, $1, $9
+	i32.const	$push54=, -1
+	i32.eq  	$push26=, $pop16, $pop54
+	br_if   	1, $pop26       # 1: down to label1
+# BB#9:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.eq  	$push8=, $8, $9
-	br_if   	1, $pop8        # 1: down to label1
+	i32.add 	$push17=, $0, $9
+	i32.const	$push55=, -1
+	i32.eq  	$push27=, $pop17, $pop55
+	br_if   	1, $pop27       # 1: down to label1
 # BB#10:                                # %for.cond1.8
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push25=, 1
-	i32.add 	$push24=, $9, $pop25
-	tee_local	$push23=, $9=, $pop24
-	i32.const	$push22=, 10
-	i32.lt_s	$push9=, $pop23, $pop22
-	br_if   	0, $pop9        # 0: up to label2
+	i32.const	$push59=, 1
+	i32.add 	$push58=, $9, $pop59
+	tee_local	$push57=, $9=, $pop58
+	i32.const	$push56=, 9
+	i32.lt_u	$push28=, $pop57, $pop56
+	br_if   	0, $pop28       # 0: up to label2
 	br      	2               # 2: down to label0
 .LBB0_11:                               # %label
 	end_loop
 	end_block                       # label1:
-	i32.const	$push10=, 1
-	i32.ne  	$push11=, $9, $pop10
-	br_if   	0, $pop11       # 0: down to label0
+	br_if   	0, $9           # 0: down to label0
 # BB#12:                                # %if.end9
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+	i32.const	$push29=, 0
+	call    	exit@FUNCTION, $pop29
 	unreachable
 .LBB0_13:                               # %if.then8
 	end_block                       # label0:
@@ -92,7 +126,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	array                   # @array
 	.type	array,@object
 	.section	.data.array,"aw",@progbits
@@ -112,6 +146,6 @@ array:
 	.size	array, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950809-1.c.s b/test/torture-s/950809-1.c.s
index d3cde5a84..d2f255bda 100644
--- a/test/torture-s/950809-1.c.s
+++ b/test/torture-s/950809-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950809-1.c"
+	.file	"950809-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,19 +20,19 @@ f:                                      # @f
 	i32.load	$push1=, 0($4)
 	i32.store	8($4), $pop1
 	i32.store	0($4), $2
-	i32.load	$2=, 4($4)
+	i32.store	0($0), $4
+	i32.load	$4=, 4($4)
 	i32.store	12($0), $5
 	i32.store	0($1), $3
-	i32.store	4($0), $2
-	i32.store	0($0), $4
+	i32.store	4($0), $4
 	copy_local	$push6=, $0
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.sc,@object         # @main.sc
 	.section	.data.main.sc,"aw",@progbits
 	.p2align	2
@@ -73,6 +73,6 @@ main.sc:
 	.size	main.sc, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950906-1.c.s b/test/torture-s/950906-1.c.s
index 66c061294..00c4b4812 100644
--- a/test/torture-s/950906-1.c.s
+++ b/test/torture-s/950906-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950906-1.c"
+	.file	"950906-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -14,9 +14,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950915-1.c.s b/test/torture-s/950915-1.c.s
index a3c4c04d8..422e1de73 100644
--- a/test/torture-s/950915-1.c.s
+++ b/test/torture-s/950915-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950915-1.c"
+	.file	"950915-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -70,6 +70,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950929-1.c.s b/test/torture-s/950929-1.c.s
index 4bc8c3def..5623d4722 100644
--- a/test/torture-s/950929-1.c.s
+++ b/test/torture-s/950929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/950929-1.c"
+	.file	"950929-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951003-1.c.s b/test/torture-s/951003-1.c.s
index 9885720ca..5548cb60f 100644
--- a/test/torture-s/951003-1.c.s
+++ b/test/torture-s/951003-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/951003-1.c"
+	.file	"951003-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -26,9 +26,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951115-1.c.s b/test/torture-s/951115-1.c.s
index c5fde084d..88a9691a8 100644
--- a/test/torture-s/951115-1.c.s
+++ b/test/torture-s/951115-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/951115-1.c"
+	.file	"951115-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -16,9 +16,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -33,9 +33,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	var                     # @var
 	.type	var,@object
 	.section	.bss.var,"aw",@nobits
@@ -61,5 +61,5 @@ var:
 	.size	var, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951204-1.c.s b/test/torture-s/951204-1.c.s
index 7ecfa9b35..9e3e0e677 100644
--- a/test/torture-s/951204-1.c.s
+++ b/test/torture-s/951204-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/951204-1.c"
+	.file	"951204-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960116-1.c.s b/test/torture-s/960116-1.c.s
index 53927013b..64e6f859e 100644
--- a/test/torture-s/960116-1.c.s
+++ b/test/torture-s/960116-1.c.s
@@ -1,36 +1,34 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960116-1.c"
+	.file	"960116-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 1
 	block   	
-	block   	
-	i32.const	$push2=, 1
-	i32.and 	$push0=, $0, $pop2
-	br_if   	0, $pop0        # 0: down to label1
+	i32.const	$push3=, 1
+	i32.and 	$push0=, $0, $pop3
+	br_if   	0, $pop0        # 0: down to label0
 # BB#1:                                 # %land.lhs.true
 	i32.load	$push1=, 0($0)
-	br_if   	1, $pop1        # 1: down to label0
-.LBB0_2:                                # %if.end
-	end_block                       # label1:
-	i32.const	$1=, 0
-.LBB0_3:                                # %return
+	i32.eqz 	$push5=, $pop1
+	br_if   	0, $pop5        # 0: down to label0
+# BB#2:                                 # %return
+	i32.const	$push4=, 1
+	return  	$pop4
+.LBB0_3:                                # %if.end
 	end_block                       # label0:
-	copy_local	$push3=, $1
-                                        # fallthrough-return: $pop3
+	i32.const	$push2=, 0
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960117-1.c.s b/test/torture-s/960117-1.c.s
index 2c06c2418..b6c09114b 100644
--- a/test/torture-s/960117-1.c.s
+++ b/test/torture-s/960117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960117-1.c"
+	.file	"960117-1.c"
 	.section	.text.get_id,"ax",@progbits
-	.hidden	get_id
+	.hidden	get_id                  # -- Begin function get_id
 	.globl	get_id
 	.type	get_id,@function
 get_id:                                 # @get_id
@@ -16,9 +16,9 @@ get_id:                                 # @get_id
 	.endfunc
 .Lfunc_end0:
 	.size	get_id, .Lfunc_end0-get_id
-
+                                        # -- End function
 	.section	.text.get_tok,"ax",@progbits
-	.hidden	get_tok
+	.hidden	get_tok                 # -- Begin function get_tok
 	.globl	get_tok
 	.type	get_tok,@function
 get_tok:                                # @get_tok
@@ -38,22 +38,30 @@ get_tok:                                # @get_tok
 	.endfunc
 .Lfunc_end1:
 	.size	get_tok, .Lfunc_end1-get_tok
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.call	$drop=, get_tok@FUNCTION
-	i32.const	$push0=, 0
-	call    	exit@FUNCTION, $pop0
+	i32.const	$push1=, 0
+	i32.const	$push0=, id_space
+	i32.store	curval+2($pop1):p2align=1, $pop0
+	i32.const	$push6=, 0
+	i32.const	$push2=, 99
+	i32.store8	id_space($pop6), $pop2
+	i32.const	$push5=, 0
+	i32.const	$push4=, 0
+	i32.store16	curval($pop5), $pop4
+	i32.const	$push3=, 0
+	call    	exit@FUNCTION, $pop3
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	curval                  # @curval
 	.type	curval,@object
 	.section	.bss.curval,"aw",@nobits
@@ -71,5 +79,5 @@ id_space:
 	.size	id_space, 66
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960209-1.c.s b/test/torture-s/960209-1.c.s
index 59baf41ff..5c661cfe5 100644
--- a/test/torture-s/960209-1.c.s
+++ b/test/torture-s/960209-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960209-1.c"
+	.file	"960209-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,24 +14,26 @@ f:                                      # @f
 	block   	
 	i32.const	$push6=, 0
 	i32.load	$push1=, yabba($pop6)
-	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end24
+	i32.eqz 	$push9=, $pop1
+	br_if   	0, $pop9        # 0: down to label0
+# BB#1:                                 # %cleanup
+	return  	$1
+.LBB0_2:                                # %if.end24
+	end_block                       # label0:
 	i32.const	$push8=, 0
 	i32.const	$push2=, 255
 	i32.and 	$push3=, $0, $pop2
 	i32.const	$push4=, an_array
 	i32.add 	$push5=, $pop3, $pop4
 	i32.store	a_ptr($pop8), $pop5
-.LBB0_2:                                # %cleanup
-	end_block                       # label0:
-	copy_local	$push9=, $1
-                                        # fallthrough-return: $pop9
+	copy_local	$push10=, $1
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,7 +55,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	yabba                   # @yabba
 	.type	yabba,@object
 	.section	.data.yabba,"aw",@progbits
@@ -81,5 +83,5 @@ a_ptr:
 	.size	a_ptr, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960215-1.c.s b/test/torture-s/960215-1.c.s
index 3f582f6a7..dbb8b1680 100644
--- a/test/torture-s/960215-1.c.s
+++ b/test/torture-s/960215-1.c.s
@@ -1,28 +1,28 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960215-1.c"
+	.file	"960215-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32
+	.local  	i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push54=, 0
-	i32.const	$push51=, 0
-	i32.load	$push52=, __stack_pointer($pop51)
+	i32.const	$push52=, 0
+	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 320
-	i32.sub 	$push218=, $pop52, $pop53
-	tee_local	$push217=, $10=, $pop218
+	i32.sub 	$push218=, $pop51, $pop53
+	tee_local	$push217=, $12=, $pop218
 	i32.store	__stack_pointer($pop54), $pop217
 	i32.const	$push55=, 304
-	i32.add 	$push56=, $10, $pop55
+	i32.add 	$push56=, $12, $pop55
 	i32.const	$push216=, 0
 	i64.load	$push215=, C($pop216)
-	tee_local	$push214=, $5=, $pop215
+	tee_local	$push214=, $3=, $pop215
 	i32.const	$push213=, 0
 	i64.load	$push212=, C+8($pop213)
-	tee_local	$push211=, $4=, $pop212
+	tee_local	$push211=, $2=, $pop212
 	i32.const	$push210=, 0
 	i64.load	$push209=, U($pop210)
 	tee_local	$push208=, $1=, $pop209
@@ -31,234 +31,234 @@ main:                                   # @main
 	tee_local	$push205=, $0=, $pop206
 	call    	__addtf3@FUNCTION, $pop56, $pop214, $pop211, $pop208, $pop205
 	i32.const	$push57=, 240
-	i32.add 	$push58=, $10, $pop57
-	call    	__subtf3@FUNCTION, $pop58, $5, $4, $1, $0
+	i32.add 	$push58=, $12, $pop57
+	call    	__subtf3@FUNCTION, $pop58, $3, $2, $1, $0
 	i32.const	$push61=, 288
-	i32.add 	$push62=, $10, $pop61
-	i64.load	$push204=, 304($10)
-	tee_local	$push203=, $7=, $pop204
+	i32.add 	$push62=, $12, $pop61
+	i64.load	$push204=, 304($12)
+	tee_local	$push203=, $11=, $pop204
 	i32.const	$push59=, 304
-	i32.add 	$push60=, $10, $pop59
+	i32.add 	$push60=, $12, $pop59
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $pop60, $pop0
 	i64.load	$push202=, 0($pop1)
-	tee_local	$push201=, $6=, $pop202
+	tee_local	$push201=, $10=, $pop202
 	call    	__addtf3@FUNCTION, $pop62, $1, $0, $pop203, $pop201
-	i32.const	$push65=, 224
-	i32.add 	$push66=, $10, $pop65
-	i64.load	$push200=, 240($10)
-	tee_local	$push199=, $9=, $pop200
-	i32.const	$push63=, 240
-	i32.add 	$push64=, $10, $pop63
-	i32.const	$push198=, 8
-	i32.add 	$push2=, $pop64, $pop198
-	i64.load	$push197=, 0($pop2)
-	tee_local	$push196=, $8=, $pop197
-	call    	__subtf3@FUNCTION, $pop66, $pop199, $pop196, $1, $0
-	i32.const	$push69=, 272
-	i32.add 	$push70=, $10, $pop69
-	i64.load	$push195=, 288($10)
-	tee_local	$push194=, $3=, $pop195
-	i32.const	$push67=, 288
-	i32.add 	$push68=, $10, $pop67
-	i32.const	$push193=, 8
-	i32.add 	$push3=, $pop68, $pop193
-	i64.load	$push192=, 0($pop3)
-	tee_local	$push191=, $2=, $pop192
-	call    	__addtf3@FUNCTION, $pop70, $1, $0, $pop194, $pop191
-	i32.const	$push71=, 128
-	i32.add 	$push72=, $10, $pop71
-	i32.const	$push190=, 0
-	i64.load	$push189=, Y2($pop190)
-	tee_local	$push188=, $5=, $pop189
-	i32.const	$push187=, 0
-	i64.load	$push186=, Y2+8($pop187)
-	tee_local	$push185=, $4=, $pop186
+	i32.const	$push63=, 128
+	i32.add 	$push64=, $12, $pop63
+	i32.const	$push200=, 0
+	i64.load	$push199=, Y2($pop200)
+	tee_local	$push198=, $3=, $pop199
+	i32.const	$push197=, 0
+	i64.load	$push196=, Y2+8($pop197)
+	tee_local	$push195=, $2=, $pop196
+	call    	__addtf3@FUNCTION, $pop64, $1, $0, $pop198, $pop195
+	i32.const	$push67=, 224
+	i32.add 	$push68=, $12, $pop67
+	i64.load	$push194=, 240($12)
+	tee_local	$push193=, $5=, $pop194
+	i32.const	$push65=, 240
+	i32.add 	$push66=, $12, $pop65
+	i32.const	$push192=, 8
+	i32.add 	$push2=, $pop66, $pop192
+	i64.load	$push191=, 0($pop2)
+	tee_local	$push190=, $4=, $pop191
+	call    	__subtf3@FUNCTION, $pop68, $pop193, $pop190, $1, $0
+	i32.const	$push71=, 272
+	i32.add 	$push72=, $12, $pop71
+	i64.load	$push189=, 288($12)
+	tee_local	$push188=, $7=, $pop189
+	i32.const	$push69=, 288
+	i32.add 	$push70=, $12, $pop69
+	i32.const	$push187=, 8
+	i32.add 	$push3=, $pop70, $pop187
+	i64.load	$push186=, 0($pop3)
+	tee_local	$push185=, $6=, $pop186
 	call    	__addtf3@FUNCTION, $pop72, $1, $0, $pop188, $pop185
-	i32.const	$push73=, 192
-	i32.add 	$push74=, $10, $pop73
-	call    	__multf3@FUNCTION, $pop74, $7, $6, $5, $4
-	i32.const	$push75=, 112
-	i32.add 	$push76=, $10, $pop75
+	i32.const	$push73=, 16
+	i32.add 	$push74=, $12, $pop73
 	i32.const	$push184=, 0
 	i64.load	$push183=, Y1($pop184)
-	tee_local	$push182=, $7=, $pop183
+	tee_local	$push182=, $9=, $pop183
 	i32.const	$push181=, 0
 	i64.load	$push180=, Y1+8($pop181)
-	tee_local	$push179=, $6=, $pop180
-	call    	__multf3@FUNCTION, $pop76, $9, $8, $pop182, $pop179
-	i32.const	$push79=, 80
-	i32.add 	$push80=, $10, $pop79
-	i64.load	$push178=, 224($10)
-	tee_local	$push177=, $9=, $pop178
-	i32.const	$push77=, 224
-	i32.add 	$push78=, $10, $pop77
-	i32.const	$push176=, 8
-	i32.add 	$push4=, $pop78, $pop176
-	i64.load	$push175=, 0($pop4)
-	tee_local	$push174=, $8=, $pop175
-	call    	__multf3@FUNCTION, $pop80, $7, $6, $pop177, $pop174
-	i32.const	$push81=, 208
-	i32.add 	$push82=, $10, $pop81
-	call    	__subtf3@FUNCTION, $pop82, $1, $0, $9, $8
-	i32.const	$push83=, 160
-	i32.add 	$push84=, $10, $pop83
-	call    	__multf3@FUNCTION, $pop84, $5, $4, $3, $2
-	i32.const	$push87=, 256
-	i32.add 	$push88=, $10, $pop87
-	i64.load	$push173=, 272($10)
-	tee_local	$push172=, $3=, $pop173
-	i32.const	$push85=, 272
-	i32.add 	$push86=, $10, $pop85
-	i32.const	$push171=, 8
-	i32.add 	$push5=, $pop86, $pop171
-	i64.load	$push170=, 0($pop5)
-	tee_local	$push169=, $2=, $pop170
-	call    	__addtf3@FUNCTION, $pop88, $1, $0, $pop172, $pop169
-	i32.const	$push91=, 48
-	i32.add 	$push92=, $10, $pop91
-	i64.load	$push8=, 128($10)
-	i32.const	$push89=, 128
-	i32.add 	$push90=, $10, $pop89
-	i32.const	$push168=, 8
-	i32.add 	$push6=, $pop90, $pop168
-	i64.load	$push7=, 0($pop6)
-	call    	__multf3@FUNCTION, $pop92, $pop8, $pop7, $7, $6
-	i32.const	$push93=, 16
-	i32.add 	$push94=, $10, $pop93
-	call    	__multf3@FUNCTION, $pop94, $5, $4, $7, $6
-	i32.const	$push97=, 176
-	i32.add 	$push98=, $10, $pop97
-	i64.load	$push11=, 192($10)
-	i32.const	$push95=, 192
-	i32.add 	$push96=, $10, $pop95
+	tee_local	$push179=, $8=, $pop180
+	call    	__multf3@FUNCTION, $pop74, $3, $2, $pop182, $pop179
+	i32.const	$push75=, 112
+	i32.add 	$push76=, $12, $pop75
+	call    	__multf3@FUNCTION, $pop76, $5, $4, $9, $8
+	i32.const	$push79=, 48
+	i32.add 	$push80=, $12, $pop79
+	i64.load	$push6=, 128($12)
+	i32.const	$push77=, 128
+	i32.add 	$push78=, $12, $pop77
+	i32.const	$push178=, 8
+	i32.add 	$push4=, $pop78, $pop178
+	i64.load	$push5=, 0($pop4)
+	call    	__multf3@FUNCTION, $pop80, $pop6, $pop5, $9, $8
+	i32.const	$push81=, 192
+	i32.add 	$push82=, $12, $pop81
+	call    	__multf3@FUNCTION, $pop82, $11, $10, $3, $2
+	i32.const	$push85=, 80
+	i32.add 	$push86=, $12, $pop85
+	i64.load	$push177=, 224($12)
+	tee_local	$push176=, $11=, $pop177
+	i32.const	$push83=, 224
+	i32.add 	$push84=, $12, $pop83
+	i32.const	$push175=, 8
+	i32.add 	$push7=, $pop84, $pop175
+	i64.load	$push174=, 0($pop7)
+	tee_local	$push173=, $10=, $pop174
+	call    	__multf3@FUNCTION, $pop86, $pop176, $pop173, $9, $8
+	i32.const	$push87=, 208
+	i32.add 	$push88=, $12, $pop87
+	call    	__subtf3@FUNCTION, $pop88, $1, $0, $11, $10
+	i32.const	$push89=, 160
+	i32.add 	$push90=, $12, $pop89
+	call    	__multf3@FUNCTION, $pop90, $3, $2, $7, $6
+	i32.const	$push93=, 256
+	i32.add 	$push94=, $12, $pop93
+	i64.load	$push172=, 272($12)
+	tee_local	$push171=, $9=, $pop172
+	i32.const	$push91=, 272
+	i32.add 	$push92=, $12, $pop91
+	i32.const	$push170=, 8
+	i32.add 	$push8=, $pop92, $pop170
+	i64.load	$push169=, 0($pop8)
+	tee_local	$push168=, $8=, $pop169
+	call    	__addtf3@FUNCTION, $pop94, $1, $0, $pop171, $pop168
+	i64.load	$push13=, 16($12)
+	i32.const	$push95=, 16
+	i32.add 	$push96=, $12, $pop95
 	i32.const	$push167=, 8
 	i32.add 	$push9=, $pop96, $pop167
 	i64.load	$push10=, 0($pop9)
-	call    	__subtf3@FUNCTION, $pop98, $pop11, $pop10, $3, $2
-	i32.const	$push101=, 96
-	i32.add 	$push102=, $10, $pop101
-	i64.load	$push14=, 112($10)
-	i32.const	$push99=, 112
-	i32.add 	$push100=, $10, $pop99
+	i64.const	$push12=, 0
+	i64.const	$push11=, -4612248968380809216
+	call    	__addtf3@FUNCTION, $12, $pop13, $pop10, $pop12, $pop11
+	i32.const	$push99=, 96
+	i32.add 	$push100=, $12, $pop99
+	i64.load	$push16=, 112($12)
+	i32.const	$push97=, 112
+	i32.add 	$push98=, $12, $pop97
 	i32.const	$push166=, 8
-	i32.add 	$push12=, $pop100, $pop166
-	i64.load	$push13=, 0($pop12)
-	call    	__subtf3@FUNCTION, $pop102, $pop14, $pop13, $9, $8
-	i32.const	$push107=, 64
-	i32.add 	$push108=, $10, $pop107
-	i64.load	$push20=, 208($10)
-	i32.const	$push105=, 208
-	i32.add 	$push106=, $10, $pop105
+	i32.add 	$push14=, $pop98, $pop166
+	i64.load	$push15=, 0($pop14)
+	call    	__subtf3@FUNCTION, $pop100, $pop16, $pop15, $11, $10
+	i32.const	$push103=, 32
+	i32.add 	$push104=, $12, $pop103
+	i64.load	$push19=, 48($12)
+	i32.const	$push101=, 48
+	i32.add 	$push102=, $12, $pop101
 	i32.const	$push165=, 8
-	i32.add 	$push17=, $pop106, $pop165
+	i32.add 	$push17=, $pop102, $pop165
 	i64.load	$push18=, 0($pop17)
-	i64.load	$push19=, 80($10)
-	i32.const	$push103=, 80
-	i32.add 	$push104=, $10, $pop103
+	call    	__subtf3@FUNCTION, $pop104, $pop19, $pop18, $3, $2
+	i32.const	$push107=, 176
+	i32.add 	$push108=, $12, $pop107
+	i64.load	$push22=, 192($12)
+	i32.const	$push105=, 192
+	i32.add 	$push106=, $12, $pop105
 	i32.const	$push164=, 8
-	i32.add 	$push15=, $pop104, $pop164
-	i64.load	$push16=, 0($pop15)
-	call    	__addtf3@FUNCTION, $pop108, $pop20, $pop18, $pop19, $pop16
-	i32.const	$push113=, 144
-	i32.add 	$push114=, $10, $pop113
-	i64.load	$push163=, 160($10)
-	tee_local	$push162=, $1=, $pop163
-	i32.const	$push109=, 160
-	i32.add 	$push110=, $10, $pop109
-	i32.const	$push161=, 8
-	i32.add 	$push21=, $pop110, $pop161
-	i64.load	$push160=, 0($pop21)
-	tee_local	$push159=, $0=, $pop160
-	i64.load	$push24=, 256($10)
-	i32.const	$push111=, 256
-	i32.add 	$push112=, $10, $pop111
-	i32.const	$push158=, 8
-	i32.add 	$push22=, $pop112, $pop158
-	i64.load	$push23=, 0($pop22)
-	call    	__subtf3@FUNCTION, $pop114, $pop162, $pop159, $pop24, $pop23
-	i32.const	$push117=, 32
-	i32.add 	$push118=, $10, $pop117
-	i64.load	$push27=, 48($10)
-	i32.const	$push115=, 48
-	i32.add 	$push116=, $10, $pop115
-	i32.const	$push157=, 8
-	i32.add 	$push25=, $pop116, $pop157
+	i32.add 	$push20=, $pop106, $pop164
+	i64.load	$push21=, 0($pop20)
+	call    	__subtf3@FUNCTION, $pop108, $pop22, $pop21, $9, $8
+	i32.const	$push113=, 64
+	i32.add 	$push114=, $12, $pop113
+	i64.load	$push28=, 208($12)
+	i32.const	$push111=, 208
+	i32.add 	$push112=, $12, $pop111
+	i32.const	$push163=, 8
+	i32.add 	$push25=, $pop112, $pop163
 	i64.load	$push26=, 0($pop25)
-	call    	__subtf3@FUNCTION, $pop118, $pop27, $pop26, $5, $4
-	i64.load	$push32=, 16($10)
-	i32.const	$push119=, 16
-	i32.add 	$push120=, $10, $pop119
+	i64.load	$push27=, 80($12)
+	i32.const	$push109=, 80
+	i32.add 	$push110=, $12, $pop109
+	i32.const	$push162=, 8
+	i32.add 	$push23=, $pop110, $pop162
+	i64.load	$push24=, 0($pop23)
+	call    	__addtf3@FUNCTION, $pop114, $pop28, $pop26, $pop27, $pop24
+	i32.const	$push119=, 144
+	i32.add 	$push120=, $12, $pop119
+	i64.load	$push161=, 160($12)
+	tee_local	$push160=, $1=, $pop161
+	i32.const	$push115=, 160
+	i32.add 	$push116=, $12, $pop115
+	i32.const	$push159=, 8
+	i32.add 	$push29=, $pop116, $pop159
+	i64.load	$push158=, 0($pop29)
+	tee_local	$push157=, $0=, $pop158
+	i64.load	$push32=, 256($12)
+	i32.const	$push117=, 256
+	i32.add 	$push118=, $12, $pop117
 	i32.const	$push156=, 8
-	i32.add 	$push28=, $pop120, $pop156
-	i64.load	$push29=, 0($pop28)
-	i64.const	$push31=, 0
-	i64.const	$push30=, -4612248968380809216
-	call    	__addtf3@FUNCTION, $10, $pop32, $pop29, $pop31, $pop30
+	i32.add 	$push30=, $pop118, $pop156
+	i64.load	$push31=, 0($pop30)
+	call    	__subtf3@FUNCTION, $pop120, $pop160, $pop157, $pop32, $pop31
 	i32.const	$push155=, 0
-	i64.store	S+8($pop155), $0
-	i32.const	$push154=, 0
-	i64.store	S($pop154), $1
-	i32.const	$push153=, 0
-	i32.const	$push121=, 176
-	i32.add 	$push122=, $10, $pop121
-	i32.const	$push152=, 8
-	i32.add 	$push33=, $pop122, $pop152
+	i32.const	$push154=, 8
+	i32.add 	$push33=, $12, $pop154
 	i64.load	$push34=, 0($pop33)
-	i64.store	X+8($pop153), $pop34
+	i64.store	Y1+8($pop155), $pop34
+	i32.const	$push153=, 0
+	i64.load	$push35=, 0($12)
+	i64.store	Y1($pop153), $pop35
+	i32.const	$push152=, 0
+	i64.store	S+8($pop152), $0
 	i32.const	$push151=, 0
-	i64.load	$push35=, 176($10)
-	i64.store	X($pop151), $pop35
+	i64.store	S($pop151), $1
 	i32.const	$push150=, 0
-	i32.const	$push123=, 96
-	i32.add 	$push124=, $10, $pop123
+	i32.const	$push121=, 96
+	i32.add 	$push122=, $12, $pop121
 	i32.const	$push149=, 8
-	i32.add 	$push36=, $pop124, $pop149
+	i32.add 	$push36=, $pop122, $pop149
 	i64.load	$push37=, 0($pop36)
 	i64.store	T+8($pop150), $pop37
 	i32.const	$push148=, 0
-	i64.load	$push38=, 96($10)
+	i64.load	$push38=, 96($12)
 	i64.store	T($pop148), $pop38
 	i32.const	$push147=, 0
-	i32.const	$push125=, 64
-	i32.add 	$push126=, $10, $pop125
+	i32.const	$push123=, 32
+	i32.add 	$push124=, $12, $pop123
 	i32.const	$push146=, 8
-	i32.add 	$push39=, $pop126, $pop146
+	i32.add 	$push39=, $pop124, $pop146
 	i64.load	$push40=, 0($pop39)
-	i64.store	Y+8($pop147), $pop40
+	i64.store	R+8($pop147), $pop40
 	i32.const	$push145=, 0
-	i64.load	$push41=, 64($10)
-	i64.store	Y($pop145), $pop41
+	i64.load	$push41=, 32($12)
+	i64.store	R($pop145), $pop41
 	i32.const	$push144=, 0
-	i32.const	$push127=, 144
-	i32.add 	$push128=, $10, $pop127
+	i32.const	$push125=, 176
+	i32.add 	$push126=, $12, $pop125
 	i32.const	$push143=, 8
-	i32.add 	$push42=, $pop128, $pop143
-	i64.load	$push142=, 0($pop42)
-	tee_local	$push141=, $1=, $pop142
-	i64.store	Z+8($pop144), $pop141
-	i32.const	$push140=, 0
-	i64.load	$push139=, 144($10)
-	tee_local	$push138=, $0=, $pop139
-	i64.store	Z($pop140), $pop138
-	i32.const	$push137=, 0
-	i32.const	$push129=, 32
-	i32.add 	$push130=, $10, $pop129
-	i32.const	$push136=, 8
-	i32.add 	$push43=, $pop130, $pop136
-	i64.load	$push44=, 0($pop43)
-	i64.store	R+8($pop137), $pop44
-	i32.const	$push135=, 0
-	i64.load	$push45=, 32($10)
-	i64.store	R($pop135), $pop45
+	i32.add 	$push42=, $pop126, $pop143
+	i64.load	$push43=, 0($pop42)
+	i64.store	X+8($pop144), $pop43
+	i32.const	$push142=, 0
+	i64.load	$push44=, 176($12)
+	i64.store	X($pop142), $pop44
+	i32.const	$push141=, 0
+	i32.const	$push127=, 64
+	i32.add 	$push128=, $12, $pop127
+	i32.const	$push140=, 8
+	i32.add 	$push45=, $pop128, $pop140
+	i64.load	$push46=, 0($pop45)
+	i64.store	Y+8($pop141), $pop46
+	i32.const	$push139=, 0
+	i64.load	$push47=, 64($12)
+	i64.store	Y($pop139), $pop47
+	i32.const	$push138=, 0
+	i32.const	$push129=, 144
+	i32.add 	$push130=, $12, $pop129
+	i32.const	$push137=, 8
+	i32.add 	$push48=, $pop130, $pop137
+	i64.load	$push136=, 0($pop48)
+	tee_local	$push135=, $1=, $pop136
+	i64.store	Z+8($pop138), $pop135
 	i32.const	$push134=, 0
-	i32.const	$push133=, 8
-	i32.add 	$push46=, $10, $pop133
-	i64.load	$push47=, 0($pop46)
-	i64.store	Y1+8($pop134), $pop47
-	i32.const	$push132=, 0
-	i64.load	$push48=, 0($10)
-	i64.store	Y1($pop132), $pop48
+	i64.load	$push133=, 144($12)
+	tee_local	$push132=, $0=, $pop133
+	i64.store	Z($pop134), $pop132
 	block   	
 	i64.const	$push131=, 0
 	i64.const	$push49=, 4612108230892453888
@@ -276,7 +276,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	C                       # @C
 	.type	C,@object
 	.section	.data.C,"aw",@progbits
@@ -378,6 +378,6 @@ S:
 	.size	S, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960218-1.c.s b/test/torture-s/960218-1.c.s
index 1e79385ed..6a6d8a06a 100644
--- a/test/torture-s/960218-1.c.s
+++ b/test/torture-s/960218-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960218-1.c"
+	.file	"960218-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -15,9 +15,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -40,9 +40,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,7 +57,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	glob                    # @glob
 	.type	glob,@object
 	.section	.bss.glob,"aw",@nobits
@@ -68,5 +68,5 @@ glob:
 	.size	glob, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960219-1.c.s b/test/torture-s/960219-1.c.s
index 61dd824aa..ee8754ae1 100644
--- a/test/torture-s/960219-1.c.s
+++ b/test/torture-s/960219-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960219-1.c"
+	.file	"960219-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,8 +33,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960301-1.c.s b/test/torture-s/960301-1.c.s
index 2e13a7033..d2c406f05 100644
--- a/test/torture-s/960301-1.c.s
+++ b/test/torture-s/960301-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960301-1.c"
+	.file	"960301-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -30,9 +30,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -78,5 +78,5 @@ oldfoo:
 	.size	oldfoo, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960302-1.c.s b/test/torture-s/960302-1.c.s
index 85c0ba345..714fdf51f 100644
--- a/test/torture-s/960302-1.c.s
+++ b/test/torture-s/960302-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960302-1.c"
+	.file	"960302-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -62,6 +62,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960311-1.c.s b/test/torture-s/960311-1.c.s
index 9e8d1c746..942f41489 100644
--- a/test/torture-s/960311-1.c.s
+++ b/test/torture-s/960311-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960311-1.c"
+	.file	"960311-1.c"
 	.section	.text.a1,"ax",@progbits
-	.hidden	a1
+	.hidden	a1                      # -- Begin function a1
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
@@ -16,9 +16,9 @@ a1:                                     # @a1
 	.endfunc
 .Lfunc_end0:
 	.size	a1, .Lfunc_end0-a1
-
+                                        # -- End function
 	.section	.text.b,"ax",@progbits
-	.hidden	b
+	.hidden	b                       # -- Begin function b
 	.globl	b
 	.type	b,@function
 b:                                      # @b
@@ -70,9 +70,9 @@ b:                                      # @b
 	.endfunc
 .Lfunc_end1:
 	.size	b, .Lfunc_end1-b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,7 +87,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -98,5 +98,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960311-2.c.s b/test/torture-s/960311-2.c.s
index 83fd752d7..60c57fea1 100644
--- a/test/torture-s/960311-2.c.s
+++ b/test/torture-s/960311-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960311-2.c"
+	.file	"960311-2.c"
 	.section	.text.a1,"ax",@progbits
-	.hidden	a1
+	.hidden	a1                      # -- Begin function a1
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
@@ -16,9 +16,9 @@ a1:                                     # @a1
 	.endfunc
 .Lfunc_end0:
 	.size	a1, .Lfunc_end0-a1
-
+                                        # -- End function
 	.section	.text.b,"ax",@progbits
-	.hidden	b
+	.hidden	b                       # -- Begin function b
 	.globl	b
 	.type	b,@function
 b:                                      # @b
@@ -70,9 +70,9 @@ b:                                      # @b
 	.endfunc
 .Lfunc_end1:
 	.size	b, .Lfunc_end1-b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,7 +87,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -98,5 +98,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960311-3.c.s b/test/torture-s/960311-3.c.s
index 7c8720b90..9af250f0d 100644
--- a/test/torture-s/960311-3.c.s
+++ b/test/torture-s/960311-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960311-3.c"
+	.file	"960311-3.c"
 	.section	.text.a1,"ax",@progbits
-	.hidden	a1
+	.hidden	a1                      # -- Begin function a1
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
@@ -16,9 +16,9 @@ a1:                                     # @a1
 	.endfunc
 .Lfunc_end0:
 	.size	a1, .Lfunc_end0-a1
-
+                                        # -- End function
 	.section	.text.b,"ax",@progbits
-	.hidden	b
+	.hidden	b                       # -- Begin function b
 	.globl	b
 	.type	b,@function
 b:                                      # @b
@@ -69,9 +69,9 @@ b:                                      # @b
 	.endfunc
 .Lfunc_end1:
 	.size	b, .Lfunc_end1-b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -86,7 +86,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -97,5 +97,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960312-1.c.s b/test/torture-s/960312-1.c.s
index b01bf133b..a4346b896 100644
--- a/test/torture-s/960312-1.c.s
+++ b/test/torture-s/960312-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960312-1.c"
+	.file	"960312-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -32,9 +32,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,7 +69,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.sc,@object         # @main.sc
 	.section	.data.main.sc,"aw",@progbits
 	.p2align	2
@@ -80,6 +80,6 @@ main.sc:
 	.size	main.sc, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960317-1.c.s b/test/torture-s/960317-1.c.s
index 7c348547e..489825282 100644
--- a/test/torture-s/960317-1.c.s
+++ b/test/torture-s/960317-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960317-1.c"
+	.file	"960317-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,13 +14,13 @@ f:                                      # @f
 	i32.shl 	$push6=, $pop7, $0
 	tee_local	$push5=, $0=, $pop6
 	i32.sub 	$push0=, $pop8, $pop5
-	i32.and 	$push1=, $1, $pop0
+	i32.and 	$push1=, $pop0, $1
 	i32.eqz 	$push12=, $pop1
 	br_if   	0, $pop12       # 0: down to label0
 # BB#1:                                 # %if.end
 	i32.const	$push10=, -1
 	i32.xor 	$push2=, $0, $pop10
-	i32.and 	$push3=, $1, $pop2
+	i32.and 	$push3=, $pop2, $1
 	i32.const	$push9=, 0
 	i32.ne  	$push4=, $pop3, $pop9
 	return  	$pop4
@@ -31,9 +31,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960321-1.c.s b/test/torture-s/960321-1.c.s
index 87c6a4d00..5456cbd07 100644
--- a/test/torture-s/960321-1.c.s
+++ b/test/torture-s/960321-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960321-1.c"
+	.file	"960321-1.c"
 	.section	.text.acc_a,"ax",@progbits
-	.hidden	acc_a
+	.hidden	acc_a                   # -- Begin function acc_a
 	.globl	acc_a
 	.type	acc_a,@function
 acc_a:                                  # @acc_a
@@ -15,9 +15,9 @@ acc_a:                                  # @acc_a
 	.endfunc
 .Lfunc_end0:
 	.size	acc_a, .Lfunc_end0-acc_a
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -50,6 +50,6 @@ a:
 	.size	a, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960326-1.c.s b/test/torture-s/960326-1.c.s
index 4d6296902..710539e26 100644
--- a/test/torture-s/960326-1.c.s
+++ b/test/torture-s/960326-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960326-1.c"
+	.file	"960326-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -41,6 +41,6 @@ s:
 	.size	s, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960327-1.c.s b/test/torture-s/960327-1.c.s
index 7a2c0b83d..e0d1f3578 100644
--- a/test/torture-s/960327-1.c.s
+++ b/test/torture-s/960327-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960327-1.c"
+	.file	"960327-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -12,66 +12,59 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
-	i32.const	$push18=, 16
-	i32.sub 	$push26=, $pop17, $pop18
-	tee_local	$push25=, $3=, $pop26
-	i32.store	__stack_pointer($pop19), $pop25
-	i32.const	$push2=, 12
-	i32.add 	$push3=, $3, $pop2
+	i32.const	$push14=, 0
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
+	i32.const	$push13=, 16
+	i32.sub 	$push20=, $pop11, $pop13
+	tee_local	$push19=, $3=, $pop20
+	i32.store	__stack_pointer($pop14), $pop19
 	i32.const	$push0=, 0
-	i32.load16_u	$push1=, .Lf.s+12($pop0):p2align=0
-	i32.store16	0($pop3), $pop1
-	i32.const	$push5=, 8
-	i32.add 	$push6=, $3, $pop5
-	i32.const	$push24=, 0
-	i32.load	$push4=, .Lf.s+8($pop24):p2align=0
-	i32.store	0($pop6), $pop4
-	i32.const	$push23=, 0
-	i64.load	$push7=, .Lf.s($pop23):p2align=0
-	i64.store	0($3):p2align=2, $pop7
-	i32.const	$push8=, 13
-	i32.add 	$2=, $3, $pop8
+	i64.load	$push1=, .Lf.s+6($pop0):p2align=0
+	i64.store	6($3):p2align=1, $pop1
+	i32.const	$push18=, 0
+	i64.load	$push2=, .Lf.s($pop18):p2align=0
+	i64.store	0($3), $pop2
+	i32.const	$push3=, 13
+	i32.add 	$2=, $3, $pop3
 .LBB1_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push31=, -2
-	i32.add 	$1=, $2, $pop31
-	i32.const	$push30=, -1
-	i32.add 	$push29=, $2, $pop30
-	tee_local	$push28=, $0=, $pop29
-	copy_local	$2=, $pop28
-	i32.load8_u	$push9=, 0($1)
-	i32.const	$push27=, 48
-	i32.eq  	$push10=, $pop9, $pop27
-	br_if   	0, $pop10       # 0: up to label0
+	i32.const	$push25=, -2
+	i32.add 	$1=, $2, $pop25
+	i32.const	$push24=, -1
+	i32.add 	$push23=, $2, $pop24
+	tee_local	$push22=, $0=, $pop23
+	copy_local	$2=, $pop22
+	i32.load8_u	$push4=, 0($1)
+	i32.const	$push21=, 48
+	i32.eq  	$push5=, $pop4, $pop21
+	br_if   	0, $pop5        # 0: up to label0
 # BB#2:                                 # %while.end
 	end_loop
-	i32.const	$push11=, 88
-	i32.store16	0($0):p2align=0, $pop11
+	i32.const	$push6=, 88
+	i32.store16	0($0):p2align=0, $pop6
 	block   	
-	i32.const	$push12=, 12
-	i32.add 	$push13=, $3, $pop12
-	i32.load8_u	$push14=, 0($pop13)
-	i32.const	$push32=, 88
-	i32.ne  	$push15=, $pop14, $pop32
-	br_if   	0, $pop15       # 0: down to label1
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $3, $pop7
+	i32.load8_u	$push9=, 0($pop8)
+	i32.const	$push26=, 88
+	i32.ne  	$push10=, $pop9, $pop26
+	br_if   	0, $pop10       # 0: down to label1
 # BB#3:                                 # %if.end
-	i32.const	$push22=, 0
-	i32.const	$push20=, 16
-	i32.add 	$push21=, $3, $pop20
-	i32.store	__stack_pointer($pop22), $pop21
+	i32.const	$push17=, 0
+	i32.const	$push15=, 16
+	i32.add 	$push16=, $3, $pop15
+	i32.store	__stack_pointer($pop17), $pop16
 	return  	$2
 .LBB1_4:                                # %if.then
 	end_block                       # label1:
@@ -80,9 +73,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -95,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lf.s,@object           # @f.s
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .Lf.s:
@@ -103,6 +96,6 @@ main:                                   # @main
 	.size	.Lf.s, 14
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960402-1.c.s b/test/torture-s/960402-1.c.s
index 2a038c707..8e527a4d0 100644
--- a/test/torture-s/960402-1.c.s
+++ b/test/torture-s/960402-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960402-1.c"
+	.file	"960402-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960405-1.c.s b/test/torture-s/960405-1.c.s
index b30ef2811..649fb53a1 100644
--- a/test/torture-s/960405-1.c.s
+++ b/test/torture-s/960405-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960405-1.c"
+	.file	"960405-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -52,6 +52,6 @@ y:
 	.size	y, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960416-1.c.s b/test/torture-s/960416-1.c.s
index c8fb1b261..6e857b745 100644
--- a/test/torture-s/960416-1.c.s
+++ b/test/torture-s/960416-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960416-1.c"
+	.file	"960416-1.c"
 	.section	.text.f_le,"ax",@progbits
-	.hidden	f_le
+	.hidden	f_le                    # -- Begin function f_le
 	.globl	f_le
 	.type	f_le,@function
 f_le:                                   # @f_le
@@ -61,9 +61,9 @@ f_le:                                   # @f_le
 	.endfunc
 .Lfunc_end0:
 	.size	f_le, .Lfunc_end0-f_le
-
+                                        # -- End function
 	.section	.text.f_be,"ax",@progbits
-	.hidden	f_be
+	.hidden	f_be                    # -- Begin function f_be
 	.globl	f_be
 	.type	f_be,@function
 f_be:                                   # @f_be
@@ -133,9 +133,9 @@ f_be:                                   # @f_be
 	.endfunc
 .Lfunc_end1:
 	.size	f_be, .Lfunc_end1-f_be
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -147,7 +147,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960419-1.c.s b/test/torture-s/960419-1.c.s
index 8d498413f..e2deb25a7 100644
--- a/test/torture-s/960419-1.c.s
+++ b/test/torture-s/960419-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960419-1.c"
+	.file	"960419-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -19,9 +19,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,8 +33,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960419-2.c.s b/test/torture-s/960419-2.c.s
index c1bf31e40..f9d0de535 100644
--- a/test/torture-s/960419-2.c.s
+++ b/test/torture-s/960419-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960419-2.c"
+	.file	"960419-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960512-1.c.s b/test/torture-s/960512-1.c.s
index df706b92b..f3bc07325 100644
--- a/test/torture-s/960512-1.c.s
+++ b/test/torture-s/960512-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960512-1.c"
+	.file	"960512-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960513-1.c.s b/test/torture-s/960513-1.c.s
index 3c6afc990..a0cc264d1 100644
--- a/test/torture-s/960513-1.c.s
+++ b/test/torture-s/960513-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960513-1.c"
+	.file	"960513-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,10 +9,10 @@ f:                                      # @f
 	.local  	i64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
+	i32.const	$push35=, 0
+	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 192
-	i32.sub 	$push121=, $pop35, $pop36
+	i32.sub 	$push121=, $pop34, $pop36
 	tee_local	$push120=, $6=, $pop121
 	i32.store	__stack_pointer($pop37), $pop120
 	i32.const	$push41=, 176
@@ -150,9 +150,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -164,7 +164,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960521-1.c.s b/test/torture-s/960521-1.c.s
index bb82006a2..bc68eb416 100644
--- a/test/torture-s/960521-1.c.s
+++ b/test/torture-s/960521-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960521-1.c"
+	.file	"960521-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -32,7 +32,7 @@ foo:                                    # @foo
 	i32.load	$push2=, n($pop10)
 	i32.lt_s	$push3=, $pop11, $pop2
 	br_if   	0, $pop3        # 0: up to label1
-.LBB0_3:                                # %for.cond1.preheader
+.LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
 	i32.const	$push16=, 0
@@ -45,68 +45,46 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %for.body.lr.ph.i
-	i32.const	$4=, 0
-	i32.const	$push18=, 0
+	.local  	i32, i32
+# BB#0:                                 # %if.end
+	i32.const	$push1=, 0
 	i32.const	$push0=, 130560
-	i32.store	n($pop18), $pop0
-	i32.const	$push17=, 0
-	i32.const	$push1=, 522240
-	i32.call	$push16=, malloc@FUNCTION, $pop1
-	tee_local	$push15=, $3=, $pop16
-	i32.store	a($pop17), $pop15
-	i32.const	$push14=, 522240
-	i32.call	$push13=, malloc@FUNCTION, $pop14
-	tee_local	$push12=, $0=, $pop13
+	i32.store	n($pop1), $pop0
+	i32.const	$push18=, 0
+	i32.const	$push2=, 522240
+	i32.call	$push17=, malloc@FUNCTION, $pop2
+	tee_local	$push16=, $0=, $pop17
+	i32.store	a($pop18), $pop16
+	i32.const	$push15=, 522240
+	i32.call	$push14=, malloc@FUNCTION, $pop15
+	tee_local	$push13=, $1=, $pop14
+	i32.const	$push12=, 0
+	i32.store	0($pop13), $pop12
 	i32.const	$push11=, 0
-	i32.store	0($pop12), $pop11
-	i32.const	$push10=, 0
-	i32.const	$push9=, 4
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $1=, $pop8
-	i32.store	b($pop10), $pop7
-	i32.const	$push6=, 0
-	i32.load	$2=, n($pop6)
-.LBB1_1:                                # %for.body.i
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label2:
-	i32.const	$push23=, -1
-	i32.store	0($3), $pop23
-	i32.const	$push22=, 4
-	i32.add 	$3=, $3, $pop22
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $4, $pop21
-	tee_local	$push19=, $4=, $pop20
-	i32.lt_s	$push2=, $pop19, $2
-	br_if   	0, $pop2        # 0: up to label2
-# BB#2:                                 # %foo.exit
-	end_loop
-	i32.load	$3=, 0($0)
+	i32.const	$push3=, 4
+	i32.add 	$push10=, $1, $pop3
+	tee_local	$push9=, $1=, $pop10
+	i32.store	b($pop11), $pop9
 	i32.const	$push4=, 255
-	i32.const	$push3=, 522236
-	i32.call	$drop=, memset@FUNCTION, $1, $pop4, $pop3
-	block   	
-	br_if   	0, $3           # 0: down to label3
-# BB#3:                                 # %if.end
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
-	unreachable
-.LBB1_4:                                # %if.then
-	end_block                       # label3:
-	call    	abort@FUNCTION
+	i32.const	$push8=, 522240
+	i32.call	$drop=, memset@FUNCTION, $0, $pop4, $pop8
+	i32.const	$push7=, 255
+	i32.const	$push5=, 522236
+	i32.call	$drop=, memset@FUNCTION, $1, $pop7, $pop5
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.bss.n,"aw",@nobits
@@ -135,7 +113,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
-	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/960608-1.c.s b/test/torture-s/960608-1.c.s
index bf082aa8f..32b445c9d 100644
--- a/test/torture-s/960608-1.c.s
+++ b/test/torture-s/960608-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960608-1.c"
+	.file	"960608-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960801-1.c.s b/test/torture-s/960801-1.c.s
index 33089a518..fce54152a 100644
--- a/test/torture-s/960801-1.c.s
+++ b/test/torture-s/960801-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960801-1.c"
+	.file	"960801-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -25,9 +25,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960802-1.c.s b/test/torture-s/960802-1.c.s
index b13b23eb6..e1b5d4bba 100644
--- a/test/torture-s/960802-1.c.s
+++ b/test/torture-s/960802-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960802-1.c"
+	.file	"960802-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -12,9 +12,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -25,9 +25,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -39,9 +39,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -53,9 +53,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,7 +70,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	val                     # @val
 	.type	val,@object
 	.section	.data.val,"aw",@progbits
@@ -81,5 +81,5 @@ val:
 	.size	val, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960830-1.c.s b/test/torture-s/960830-1.c.s
index 58c28acef..caf851b96 100644
--- a/test/torture-s/960830-1.c.s
+++ b/test/torture-s/960830-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960830-1.c"
+	.file	"960830-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960909-1.c.s b/test/torture-s/960909-1.c.s
index a2fee68fb..681ec661f 100644
--- a/test/torture-s/960909-1.c.s
+++ b/test/torture-s/960909-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/960909-1.c"
+	.file	"960909-1.c"
 	.section	.text.ffs,"ax",@progbits
-	.hidden	ffs
+	.hidden	ffs                     # -- Begin function ffs
 	.globl	ffs
 	.type	ffs,@function
 ffs:                                    # @ffs
@@ -12,7 +12,7 @@ ffs:                                    # @ffs
 	block   	
 	i32.eqz 	$push8=, $0
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %for.cond.preheader
+# BB#1:                                 # %if.end
 	i32.const	$2=, 1
 	block   	
 	i32.const	$push3=, 1
@@ -43,9 +43,9 @@ ffs:                                    # @ffs
 	.endfunc
 .Lfunc_end0:
 	.size	ffs, .Lfunc_end0-ffs
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -64,9 +64,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -78,8 +78,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/961004-1.c.s b/test/torture-s/961004-1.c.s
index 6c6532a50..84e5bf676 100644
--- a/test/torture-s/961004-1.c.s
+++ b/test/torture-s/961004-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961004-1.c"
+	.file	"961004-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	k                       # @k
 	.type	k,@object
 	.section	.bss.k,"aw",@nobits
@@ -34,5 +34,5 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961017-1.c.s b/test/torture-s/961017-1.c.s
index d838f112f..28b77508c 100644
--- a/test/torture-s/961017-1.c.s
+++ b/test/torture-s/961017-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961017-1.c"
+	.file	"961017-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961017-2.c.s b/test/torture-s/961017-2.c.s
index e738d79ba..15698081c 100644
--- a/test/torture-s/961017-2.c.s
+++ b/test/torture-s/961017-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961017-2.c"
+	.file	"961017-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961026-1.c.s b/test/torture-s/961026-1.c.s
index 4e71ce5b7..ff80c9632 100644
--- a/test/torture-s/961026-1.c.s
+++ b/test/torture-s/961026-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961026-1.c"
+	.file	"961026-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -14,9 +14,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961112-1.c.s b/test/torture-s/961112-1.c.s
index f0d4581b8..6ce868da3 100644
--- a/test/torture-s/961112-1.c.s
+++ b/test/torture-s/961112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961112-1.c"
+	.file	"961112-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,21 +13,21 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961122-1.c.s b/test/torture-s/961122-1.c.s
index c0baab0b0..98dd5a421 100644
--- a/test/torture-s/961122-1.c.s
+++ b/test/torture-s/961122-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961122-1.c"
+	.file	"961122-1.c"
 	.section	.text.addhi,"ax",@progbits
-	.hidden	addhi
+	.hidden	addhi                   # -- Begin function addhi
 	.globl	addhi
 	.type	addhi,@function
 addhi:                                  # @addhi
@@ -21,9 +21,9 @@ addhi:                                  # @addhi
 	.endfunc
 .Lfunc_end0:
 	.size	addhi, .Lfunc_end0-addhi
-
+                                        # -- End function
 	.section	.text.subhi,"ax",@progbits
-	.hidden	subhi
+	.hidden	subhi                   # -- Begin function subhi
 	.globl	subhi
 	.type	subhi,@function
 subhi:                                  # @subhi
@@ -43,9 +43,9 @@ subhi:                                  # @subhi
 	.endfunc
 .Lfunc_end1:
 	.size	subhi, .Lfunc_end1-subhi
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	acc                     # @acc
 	.type	acc,@object
 	.section	.bss.acc,"aw",@nobits
@@ -71,5 +71,5 @@ acc:
 	.size	acc, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961122-2.c.s b/test/torture-s/961122-2.c.s
index ddd5a9897..e4b0a823f 100644
--- a/test/torture-s/961122-2.c.s
+++ b/test/torture-s/961122-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961122-2.c"
+	.file	"961122-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961125-1.c.s b/test/torture-s/961125-1.c.s
index 65cc03920..2b851cf8f 100644
--- a/test/torture-s/961125-1.c.s
+++ b/test/torture-s/961125-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961125-1.c"
+	.file	"961125-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -17,7 +17,7 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.eqz 	$push20=, $1
 	br_if   	1, $pop20       # 1: down to label0
-# BB#2:                                 # %while.cond2.preheader.i
+# BB#2:                                 # %while.body.i
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
 	i32.const	$push12=, .L.str+3
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -83,6 +83,6 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/961206-1.c.s b/test/torture-s/961206-1.c.s
index 317bc6c8e..b8add2978 100644
--- a/test/torture-s/961206-1.c.s
+++ b/test/torture-s/961206-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961206-1.c"
+	.file	"961206-1.c"
 	.section	.text.sub1,"ax",@progbits
-	.hidden	sub1
+	.hidden	sub1                    # -- Begin function sub1
 	.globl	sub1
 	.type	sub1,@function
 sub1:                                   # @sub1
@@ -14,9 +14,9 @@ sub1:                                   # @sub1
 	.endfunc
 .Lfunc_end0:
 	.size	sub1, .Lfunc_end0-sub1
-
+                                        # -- End function
 	.section	.text.sub2,"ax",@progbits
-	.hidden	sub2
+	.hidden	sub2                    # -- Begin function sub2
 	.globl	sub2
 	.type	sub2,@function
 sub2:                                   # @sub2
@@ -29,9 +29,9 @@ sub2:                                   # @sub2
 	.endfunc
 .Lfunc_end1:
 	.size	sub2, .Lfunc_end1-sub2
-
+                                        # -- End function
 	.section	.text.sub3,"ax",@progbits
-	.hidden	sub3
+	.hidden	sub3                    # -- Begin function sub3
 	.globl	sub3
 	.type	sub3,@function
 sub3:                                   # @sub3
@@ -44,9 +44,9 @@ sub3:                                   # @sub3
 	.endfunc
 .Lfunc_end2:
 	.size	sub3, .Lfunc_end2-sub3
-
+                                        # -- End function
 	.section	.text.sub4,"ax",@progbits
-	.hidden	sub4
+	.hidden	sub4                    # -- Begin function sub4
 	.globl	sub4
 	.type	sub4,@function
 sub4:                                   # @sub4
@@ -59,9 +59,9 @@ sub4:                                   # @sub4
 	.endfunc
 .Lfunc_end3:
 	.size	sub4, .Lfunc_end3-sub4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961213-1.c.s b/test/torture-s/961213-1.c.s
index c39e39723..a89be0f96 100644
--- a/test/torture-s/961213-1.c.s
+++ b/test/torture-s/961213-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961213-1.c"
+	.file	"961213-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -22,9 +22,9 @@ g:                                      # @g
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.load32_u	$push4=, 0($2)
 	i64.mul 	$push3=, $5, $4
-	i64.add 	$5=, $pop4, $pop3
+	i64.load32_u	$push4=, 0($2)
+	i64.add 	$5=, $pop3, $pop4
 	i32.const	$push9=, 4
 	i32.add 	$push0=, $2, $pop9
 	copy_local	$2=, $pop0
@@ -42,9 +42,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961223-1.c.s b/test/torture-s/961223-1.c.s
index a5a56fd70..fd2d88245 100644
--- a/test/torture-s/961223-1.c.s
+++ b/test/torture-s/961223-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/961223-1.c"
+	.file	"961223-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -14,9 +14,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970214-1.c.s b/test/torture-s/970214-1.c.s
index 410bb74cb..793a90c59 100644
--- a/test/torture-s/970214-1.c.s
+++ b/test/torture-s/970214-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/970214-1.c"
+	.file	"970214-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970214-2.c.s b/test/torture-s/970214-2.c.s
index 3a02a84e7..ec7c80814 100644
--- a/test/torture-s/970214-2.c.s
+++ b/test/torture-s/970214-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/970214-2.c"
+	.file	"970214-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970217-1.c.s b/test/torture-s/970217-1.c.s
index 132041bf2..bf1571a86 100644
--- a/test/torture-s/970217-1.c.s
+++ b/test/torture-s/970217-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/970217-1.c"
+	.file	"970217-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -14,9 +14,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970923-1.c.s b/test/torture-s/970923-1.c.s
index 134c4e710..00a4faf79 100644
--- a/test/torture-s/970923-1.c.s
+++ b/test/torture-s/970923-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/970923-1.c"
+	.file	"970923-1.c"
 	.section	.text.ts,"ax",@progbits
-	.hidden	ts
+	.hidden	ts                      # -- Begin function ts
 	.globl	ts
 	.type	ts,@function
 ts:                                     # @ts
@@ -13,9 +13,9 @@ ts:                                     # @ts
 	.endfunc
 .Lfunc_end0:
 	.size	ts, .Lfunc_end0-ts
-
+                                        # -- End function
 	.section	.text.tu,"ax",@progbits
-	.hidden	tu
+	.hidden	tu                      # -- Begin function tu
 	.globl	tu
 	.type	tu,@function
 tu:                                     # @tu
@@ -27,9 +27,9 @@ tu:                                     # @tu
 	.endfunc
 .Lfunc_end1:
 	.size	tu, .Lfunc_end1-tu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980205.c.s b/test/torture-s/980205.c.s
index e1c560758..24e866432 100644
--- a/test/torture-s/980205.c.s
+++ b/test/torture-s/980205.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980205.c"
+	.file	"980205.c"
 	.section	.text.fdouble,"ax",@progbits
-	.hidden	fdouble
+	.hidden	fdouble                 # -- Begin function fdouble
 	.globl	fdouble
 	.type	fdouble,@function
 fdouble:                                # @fdouble
@@ -9,13 +9,12 @@ fdouble:                                # @fdouble
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop11, $pop12
+	i32.sub 	$push20=, $pop10, $pop12
 	tee_local	$push19=, $2=, $pop20
 	i32.store	__stack_pointer($pop13), $pop19
-	i32.store	12($2), $1
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
@@ -46,9 +45,9 @@ fdouble:                                # @fdouble
 	.endfunc
 .Lfunc_end0:
 	.size	fdouble, .Lfunc_end0-fdouble
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,10 +55,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i64.const	$push0=, 4611686018427387904
@@ -72,8 +71,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980223.c.s b/test/torture-s/980223.c.s
index a65473dc1..ab80035af 100644
--- a/test/torture-s/980223.c.s
+++ b/test/torture-s/980223.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980223.c"
+	.file	"980223.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -12,119 +12,83 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-	.local  	i64, i32
+	.local  	i64
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
-	i32.const	$push7=, 16
-	i32.sub 	$push18=, $pop6, $pop7
-	tee_local	$push17=, $4=, $pop18
-	i32.store	__stack_pointer($pop8), $pop17
-	block   	
 	block   	
-	block   	
-	i32.load	$push16=, 0($1)
-	tee_local	$push15=, $1=, $pop16
-	i32.load8_u	$push0=, 4($pop15)
-	i32.const	$push14=, 64
-	i32.and 	$push1=, $pop0, $pop14
-	br_if   	0, $pop1        # 0: down to label2
+	i32.load	$push7=, 0($1)
+	tee_local	$push6=, $1=, $pop7
+	i32.load8_u	$push0=, 4($pop6)
+	i32.const	$push5=, 64
+	i32.and 	$push1=, $pop0, $pop5
+	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %entry.if.end7_crit_edge
-	i64.load	$3=, 0($2):p2align=2
-	br      	1               # 1: down to label1
+	i64.load	$push4=, 0($2):p2align=2
+	i64.store	0($0):p2align=2, $pop4
+	return
 .LBB1_2:                                # %if.then
-	end_block                       # label2:
-	i32.load	$push23=, 0($1)
-	tee_local	$push22=, $1=, $pop23
-	i64.load	$push21=, 8($pop22):p2align=2
-	tee_local	$push20=, $3=, $pop21
-	i64.store	0($2):p2align=2, $pop20
+	end_block                       # label0:
+	i32.load	$push12=, 0($1)
+	tee_local	$push11=, $1=, $pop12
+	i64.load	$push10=, 8($pop11):p2align=2
+	tee_local	$push9=, $3=, $pop10
+	i64.store	0($2):p2align=2, $pop9
+	block   	
 	i32.load8_u	$push2=, 4($1)
-	i32.const	$push19=, 64
-	i32.and 	$push3=, $pop2, $pop19
-	br_if   	1, $pop3        # 1: down to label0
-.LBB1_3:                                # %if.end7
-	end_block                       # label1:
+	i32.const	$push8=, 64
+	i32.and 	$push3=, $pop2, $pop8
+	br_if   	0, $pop3        # 0: down to label1
+# BB#3:                                 # %if.end7
 	i64.store	0($0):p2align=2, $3
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $4, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
 	return
 .LBB1_4:                                # %if.then6
-	end_block                       # label0:
-	i64.load	$push4=, 0($2):p2align=2
-	i64.store	8($4):p2align=2, $pop4
-	i32.const	$push12=, 8
-	i32.add 	$push13=, $4, $pop12
-	call    	bar@FUNCTION, $2, $pop13
+	end_block                       # label1:
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push18=, $pop8, $pop9
-	tee_local	$push17=, $1=, $pop18
-	i32.store	__stack_pointer($pop10), $pop17
-	i32.const	$push16=, 0
-	i64.load	$push0=, .Lmain.y($pop16)
-	i64.store	8($1), $pop0
 	block   	
 	block   	
-	i32.const	$push15=, 0
-	i32.load8_u	$push1=, cons2+4($pop15)
-	i32.const	$push14=, 64
-	i32.and 	$push2=, $pop1, $pop14
-	i32.eqz 	$push24=, $pop2
-	br_if   	0, $pop24       # 0: down to label4
+	i32.const	$push6=, 0
+	i32.load8_u	$push0=, cons2+4($pop6)
+	i32.const	$push5=, 64
+	i32.and 	$push1=, $pop0, $pop5
+	i32.eqz 	$push10=, $pop1
+	br_if   	0, $pop10       # 0: down to label3
 # BB#1:                                 # %if.then.i
-	i32.const	$push22=, 0
-	i32.load	$push21=, cons2($pop22)
-	tee_local	$push20=, $0=, $pop21
-	i64.load	$push3=, 8($pop20):p2align=2
-	i64.store	8($1), $pop3
-	i32.load8_u	$push4=, 4($0)
-	i32.const	$push19=, 64
-	i32.and 	$push5=, $pop4, $pop19
-	br_if   	1, $pop5        # 1: down to label3
+	i32.const	$push8=, 0
+	i32.load	$push2=, cons2($pop8)
+	i32.load8_u	$push3=, 4($pop2)
+	i32.const	$push7=, 64
+	i32.and 	$push4=, $pop3, $pop7
+	br_if   	1, $pop4        # 1: down to label2
 .LBB2_2:                                # %foo.exit
-	end_block                       # label4:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $1, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
-	i32.const	$push23=, 0
-	return  	$pop23
-.LBB2_3:                                # %if.then6.i
 	end_block                       # label3:
-	i64.load	$push6=, 8($1)
-	i64.store	0($1):p2align=2, $pop6
-	call    	bar@FUNCTION, $1, $1
+	i32.const	$push9=, 0
+	return  	$pop9
+.LBB2_3:                                # %if.then6.i
+	end_block                       # label2:
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	nil                     # @nil
 	.type	nil,@object
 	.section	.bss.nil,"aw",@nobits
@@ -158,14 +122,6 @@ cons2:
 	.int32	0                       # 0x0
 	.size	cons2, 16
 
-	.type	.Lmain.y,@object        # @main.y
-	.section	.rodata..Lmain.y,"a",@progbits
-	.p2align	3
-.Lmain.y:
-	.int32	nil
-	.int32	0                       # 0x0
-	.size	.Lmain.y, 8
-
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/980424-1.c.s b/test/torture-s/980424-1.c.s
index 931ab61c0..350128111 100644
--- a/test/torture-s/980424-1.c.s
+++ b/test/torture-s/980424-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980424-1.c"
+	.file	"980424-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -49,9 +49,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,7 +70,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -90,6 +90,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980505-1.c.s b/test/torture-s/980505-1.c.s
index 53b94d420..d3276c410 100644
--- a/test/torture-s/980505-1.c.s
+++ b/test/torture-s/980505-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980505-1.c"
+	.file	"980505-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980505-2.c.s b/test/torture-s/980505-2.c.s
index 456ff431a..bd792f507 100644
--- a/test/torture-s/980505-2.c.s
+++ b/test/torture-s/980505-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980505-2.c"
+	.file	"980505-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-1.c.s b/test/torture-s/980506-1.c.s
index 2d8fcad02..1fe3b1617 100644
--- a/test/torture-s/980506-1.c.s
+++ b/test/torture-s/980506-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980506-1.c"
+	.file	"980506-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-2.c.s b/test/torture-s/980506-2.c.s
index f51ede4e9..f844bc332 100644
--- a/test/torture-s/980506-2.c.s
+++ b/test/torture-s/980506-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980506-2.c"
+	.file	"980506-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-3.c.s b/test/torture-s/980506-3.c.s
index 30b064615..7778c98c3 100644
--- a/test/torture-s/980506-3.c.s
+++ b/test/torture-s/980506-3.c.s
@@ -1,13 +1,13 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980506-3.c"
+	.file	"980506-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.else
+# BB#0:                                 # %entry
 	i32.const	$push2=, lookup_table
 	i32.const	$push1=, 4
 	i32.const	$push0=, 257
@@ -18,7 +18,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	lookup_table            # @lookup_table
 	.type	lookup_table,@object
 	.section	.bss.lookup_table,"aw",@nobits
@@ -29,5 +29,5 @@ lookup_table:
 	.size	lookup_table, 257
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980526-2.c.s b/test/torture-s/980526-2.c.s
index be4d116b6..d8bdad3b2 100644
--- a/test/torture-s/980526-2.c.s
+++ b/test/torture-s/980526-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980526-2.c"
+	.file	"980526-2.c"
 	.section	.text.do_mknod,"ax",@progbits
-	.hidden	do_mknod
+	.hidden	do_mknod                # -- Begin function do_mknod
 	.globl	do_mknod
 	.type	do_mknod,@function
 do_mknod:                               # @do_mknod
@@ -22,9 +22,9 @@ do_mknod:                               # @do_mknod
 	.endfunc
 .Lfunc_end0:
 	.size	do_mknod, .Lfunc_end0-do_mknod
-
+                                        # -- End function
 	.section	.text.getname,"ax",@progbits
-	.hidden	getname
+	.hidden	getname                 # -- Begin function getname
 	.globl	getname
 	.type	getname,@function
 getname:                                # @getname
@@ -79,9 +79,9 @@ getname:                                # @getname
 	.endfunc
 .Lfunc_end1:
 	.size	getname, .Lfunc_end1-getname
-
+                                        # -- End function
 	.section	.text.sys_mknod,"ax",@progbits
-	.hidden	sys_mknod
+	.hidden	sys_mknod               # -- Begin function sys_mknod
 	.globl	sys_mknod
 	.type	sys_mknod,@function
 sys_mknod:                              # @sys_mknod
@@ -100,9 +100,9 @@ sys_mknod:                              # @sys_mknod
 	.endfunc
 .Lfunc_end2:
 	.size	sys_mknod, .Lfunc_end2-sys_mknod
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -116,7 +116,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -124,6 +124,6 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/980526-3.c.s b/test/torture-s/980526-3.c.s
index 37303a099..edb1eae09 100644
--- a/test/torture-s/980526-3.c.s
+++ b/test/torture-s/980526-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980526-3.c"
+	.file	"980526-3.c"
 	.section	.text.compare,"ax",@progbits
-	.hidden	compare
+	.hidden	compare                 # -- Begin function compare
 	.globl	compare
 	.type	compare,@function
 compare:                                # @compare
@@ -13,9 +13,9 @@ compare:                                # @compare
 	.endfunc
 .Lfunc_end0:
 	.size	compare, .Lfunc_end0-compare
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980602-1.c.s b/test/torture-s/980602-1.c.s
index 2fe93d3ec..a9f2a9954 100644
--- a/test/torture-s/980602-1.c.s
+++ b/test/torture-s/980602-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980602-1.c"
+	.file	"980602-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980602-2.c.s b/test/torture-s/980602-2.c.s
index 43799229a..bfa42bf84 100644
--- a/test/torture-s/980602-2.c.s
+++ b/test/torture-s/980602-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980602-2.c"
+	.file	"980602-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -46,6 +46,6 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/980604-1.c.s b/test/torture-s/980604-1.c.s
index 8383b99c1..bbdf69dff 100644
--- a/test/torture-s/980604-1.c.s
+++ b/test/torture-s/980604-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980604-1.c"
+	.file	"980604-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -67,6 +67,6 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980605-1.c.s b/test/torture-s/980605-1.c.s
index f0abfd448..fda0dd631 100644
--- a/test/torture-s/980605-1.c.s
+++ b/test/torture-s/980605-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980605-1.c"
+	.file	"980605-1.c"
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -26,9 +26,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end0:
 	.size	f2, .Lfunc_end0-f2
-
+                                        # -- End function
 	.section	.text.getval,"ax",@progbits
-	.hidden	getval
+	.hidden	getval                  # -- Begin function getval
 	.globl	getval
 	.type	getval,@function
 getval:                                 # @getval
@@ -47,19 +47,19 @@ getval:                                 # @getval
 	.endfunc
 .Lfunc_end1:
 	.size	getval, .Lfunc_end1-getval
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 16
-	i32.sub 	$push23=, $pop10, $pop11
+	i32.sub 	$push23=, $pop9, $pop11
 	tee_local	$push22=, $1=, $pop23
 	i32.store	__stack_pointer($pop12), $pop22
 	i32.const	$push0=, 0
@@ -95,9 +95,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end2:
 	.size	f, .Lfunc_end2-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -110,7 +110,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -135,7 +135,7 @@ buf:
 	.size	.L.str, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980608-1.c.s b/test/torture-s/980608-1.c.s
index 1f7c82485..79b4ffbcf 100644
--- a/test/torture-s/980608-1.c.s
+++ b/test/torture-s/980608-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980608-1.c"
+	.file	"980608-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -11,9 +11,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.debug,"ax",@progbits
-	.hidden	debug
+	.hidden	debug                   # -- Begin function debug
 	.globl	debug
 	.type	debug,@function
 debug:                                  # @debug
@@ -21,13 +21,12 @@ debug:                                  # @debug
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push28=, 0
-	i32.const	$push25=, 0
-	i32.load	$push26=, __stack_pointer($pop25)
+	i32.const	$push26=, 0
+	i32.load	$push25=, __stack_pointer($pop26)
 	i32.const	$push27=, 16
-	i32.sub 	$push35=, $pop26, $pop27
+	i32.sub 	$push35=, $pop25, $pop27
 	tee_local	$push34=, $4=, $pop35
 	i32.store	__stack_pointer($pop28), $pop34
-	i32.store	12($4), $1
 	i32.const	$push0=, 4
 	i32.add 	$push33=, $1, $pop0
 	tee_local	$push32=, $2=, $pop33
@@ -87,16 +86,16 @@ debug:                                  # @debug
 	i32.add 	$push30=, $4, $pop29
 	i32.store	__stack_pointer($pop31), $pop30
 	return
-.LBB1_7:                                # %if.then25
+.LBB1_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	debug, .Lfunc_end1-debug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -104,10 +103,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push11=, $pop7, $pop8
+	i32.sub 	$push11=, $pop6, $pop8
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop9), $pop10
 	i32.const	$push0=, 16
@@ -125,8 +124,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980612-1.c.s b/test/torture-s/980612-1.c.s
index 27020257f..c1f0f8100 100644
--- a/test/torture-s/980612-1.c.s
+++ b/test/torture-s/980612-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980612-1.c"
+	.file	"980612-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -12,9 +12,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.h,"ax",@progbits
-	.hidden	h
+	.hidden	h                       # -- Begin function h
 	.globl	h
 	.type	h,@function
 h:                                      # @h
@@ -25,9 +25,9 @@ h:                                      # @h
 	.endfunc
 .Lfunc_end1:
 	.size	h, .Lfunc_end1-h
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -55,7 +55,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	f                       # @f
 	.type	f,@object
 	.section	.data.f,"aw",@progbits
@@ -66,6 +66,6 @@ f:
 	.size	f, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980617-1.c.s b/test/torture-s/980617-1.c.s
index 0c71a612b..fac3b470e 100644
--- a/test/torture-s/980617-1.c.s
+++ b/test/torture-s/980617-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980617-1.c"
+	.file	"980617-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -23,9 +23,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,10 +33,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push9=, $pop3, $pop4
+	i32.sub 	$push9=, $pop2, $pop4
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop5), $pop8
 	i32.const	$push0=, 196625
@@ -50,8 +50,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980618-1.c.s b/test/torture-s/980618-1.c.s
index af77c3960..5cda6d5e0 100644
--- a/test/torture-s/980618-1.c.s
+++ b/test/torture-s/980618-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980618-1.c"
+	.file	"980618-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,9 +13,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.func,"ax",@progbits
-	.hidden	func
+	.hidden	func                    # -- Begin function func
 	.globl	func
 	.type	func,@function
 func:                                   # @func
@@ -33,8 +33,8 @@ func:                                   # @func
 	.endfunc
 .Lfunc_end1:
 	.size	func, .Lfunc_end1-func
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/980701-1.c.s b/test/torture-s/980701-1.c.s
index 3c5c736f6..e37d0443f 100644
--- a/test/torture-s/980701-1.c.s
+++ b/test/torture-s/980701-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980701-1.c"
+	.file	"980701-1.c"
 	.section	.text.ns_name_skip,"ax",@progbits
-	.hidden	ns_name_skip
+	.hidden	ns_name_skip            # -- Begin function ns_name_skip
 	.globl	ns_name_skip
 	.type	ns_name_skip,@function
 ns_name_skip:                           # @ns_name_skip
@@ -15,9 +15,9 @@ ns_name_skip:                           # @ns_name_skip
 	.endfunc
 .Lfunc_end0:
 	.size	ns_name_skip, .Lfunc_end0-ns_name_skip
-
+                                        # -- End function
 	.section	.text.dn_skipname,"ax",@progbits
-	.hidden	dn_skipname
+	.hidden	dn_skipname             # -- Begin function dn_skipname
 	.globl	dn_skipname
 	.type	dn_skipname,@function
 dn_skipname:                            # @dn_skipname
@@ -30,9 +30,9 @@ dn_skipname:                            # @dn_skipname
 	.endfunc
 .Lfunc_end1:
 	.size	dn_skipname, .Lfunc_end1-dn_skipname
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -62,6 +62,6 @@ a:
 	.size	a, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980707-1.c.s b/test/torture-s/980707-1.c.s
index 9d74c288b..660eea0b9 100644
--- a/test/torture-s/980707-1.c.s
+++ b/test/torture-s/980707-1.c.s
@@ -1,209 +1,212 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980707-1.c"
+	.file	"980707-1.c"
 	.section	.text.buildargv,"ax",@progbits
-	.hidden	buildargv
+	.hidden	buildargv               # -- Begin function buildargv
 	.globl	buildargv
 	.type	buildargv,@function
 buildargv:                              # @buildargv
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 0
+	i32.const	$3=, 0
 .LBB0_1:                                # %while.cond1
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_5 Depth 2
 	loop    	                # label0:
 	block   	
-	i32.load8_u	$push12=, 0($0)
-	tee_local	$push11=, $1=, $pop12
-	i32.const	$push10=, 32
-	i32.ne  	$push0=, $pop11, $pop10
-	br_if   	0, $pop0        # 0: down to label1
+	i32.load8_u	$push16=, 0($0)
+	tee_local	$push15=, $2=, $pop16
+	i32.const	$push14=, 32
+	i32.ne  	$push1=, $pop15, $pop14
+	br_if   	0, $pop1        # 0: down to label1
 # BB#2:                                 # %while.body3
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push9=, 1
-	i32.add 	$0=, $0, $pop9
+	i32.const	$push13=, 1
+	i32.add 	$0=, $0, $pop13
 	br      	1               # 1: up to label0
 .LBB0_3:                                # %while.cond1
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
 	block   	
-	i32.eqz 	$push27=, $1
-	br_if   	0, $pop27       # 0: down to label2
+	i32.eqz 	$push30=, $2
+	br_if   	0, $pop30       # 0: down to label2
 # BB#4:                                 # %if.end
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push17=, 2
-	i32.shl 	$push1=, $2, $pop17
-	i32.const	$push16=, buildargv.arglist
-	i32.add 	$push2=, $pop1, $pop16
-	i32.store	0($pop2), $0
-	i32.const	$push15=, 1
-	i32.add 	$2=, $2, $pop15
-	i32.load8_u	$push14=, 0($0)
-	tee_local	$push13=, $1=, $pop14
-	i32.eqz 	$push28=, $pop13
-	br_if   	0, $pop28       # 0: down to label2
+	i32.const	$push18=, 2
+	i32.shl 	$push2=, $3, $pop18
+	i32.const	$push17=, buildargv.arglist
+	i32.add 	$push3=, $pop2, $pop17
+	i32.store	0($pop3), $0
 .LBB0_5:                                # %while.cond7
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	block   	
-	loop    	                # label4:
-	i32.const	$push23=, 32
-	i32.eq  	$push3=, $1, $pop23
-	br_if   	1, $pop3        # 1: down to label3
-# BB#6:                                 # %while.body14
-                                        #   in Loop: Header=BB0_5 Depth=2
-	i32.const	$push22=, 1
-	i32.add 	$push21=, $0, $pop22
-	tee_local	$push20=, $0=, $pop21
-	i32.load8_u	$push19=, 0($pop20)
-	tee_local	$push18=, $1=, $pop19
-	i32.eqz 	$push29=, $pop18
-	br_if   	2, $pop29       # 2: down to label2
-	br      	0               # 0: up to label4
-.LBB0_7:                                # %if.end21
+	loop    	                # label3:
+	i32.load8_u	$2=, 0($0)
+	i32.const	$push24=, 1
+	i32.add 	$push23=, $0, $pop24
+	tee_local	$push22=, $1=, $pop23
+	copy_local	$0=, $pop22
+	i32.const	$push21=, 32
+	i32.or  	$push4=, $2, $pop21
+	i32.const	$push20=, 255
+	i32.and 	$push5=, $pop4, $pop20
+	i32.const	$push19=, 32
+	i32.ne  	$push6=, $pop5, $pop19
+	br_if   	0, $pop6        # 0: up to label3
+# BB#6:                                 # %while.end16
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	end_block                       # label3:
-	i32.const	$push25=, 0
-	i32.store8	0($0), $pop25
-	i32.const	$push24=, 1
-	i32.add 	$0=, $0, $pop24
+	i32.const	$push26=, 1
+	i32.add 	$3=, $3, $pop26
+	i32.const	$push25=, 255
+	i32.and 	$push7=, $2, $pop25
+	i32.eqz 	$push31=, $pop7
+	br_if   	0, $pop31       # 0: down to label2
+# BB#7:                                 # %if.end21
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push28=, -1
+	i32.add 	$push0=, $1, $pop28
+	i32.const	$push27=, 0
+	i32.store8	0($pop0), $pop27
+	copy_local	$0=, $1
 	br      	1               # 1: up to label0
 .LBB0_8:                                # %while.end23
 	end_block                       # label2:
 	end_loop
-	i32.const	$push4=, 2
-	i32.shl 	$push5=, $2, $pop4
-	i32.const	$push6=, buildargv.arglist
-	i32.add 	$push7=, $pop5, $pop6
-	i32.const	$push8=, 0
-	i32.store	0($pop7), $pop8
-	i32.const	$push26=, buildargv.arglist
-                                        # fallthrough-return: $pop26
+	i32.const	$push8=, 2
+	i32.shl 	$push9=, $3, $pop8
+	i32.const	$push10=, buildargv.arglist
+	i32.add 	$push11=, $pop9, $pop10
+	i32.const	$push12=, 0
+	i32.store	0($pop11), $pop12
+	i32.const	$push29=, buildargv.arglist
+                                        # fallthrough-return: $pop29
 	.endfunc
 .Lfunc_end0:
 	.size	buildargv, .Lfunc_end0-buildargv
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
-	i32.const	$push19=, 256
-	i32.sub 	$push24=, $pop18, $pop19
-	tee_local	$push23=, $0=, $pop24
-	i32.store	__stack_pointer($pop20), $pop23
+	i32.const	$push24=, 0
 	i32.const	$push22=, 0
-	i32.load8_u	$push0=, .L.str+4($pop22)
-	i32.store8	4($0), $pop0
-	i32.const	$push21=, 0
-	i32.load	$push1=, .L.str($pop21):p2align=0
-	i32.store	0($0), $pop1
-	copy_local	$0=, $0
+	i32.load	$push21=, __stack_pointer($pop22)
+	i32.const	$push23=, 256
+	i32.sub 	$push28=, $pop21, $pop23
+	tee_local	$push27=, $3=, $pop28
+	i32.store	__stack_pointer($pop24), $pop27
+	i32.const	$push26=, 0
+	i32.load8_u	$push1=, .L.str+4($pop26)
+	i32.store8	4($3), $pop1
+	i32.const	$push25=, 0
+	i32.load	$push2=, .L.str($pop25):p2align=0
+	i32.store	0($3), $pop2
+	copy_local	$3=, $3
 	i32.const	$2=, 0
 .LBB1_1:                                # %while.cond1.i
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB1_5 Depth 2
+                                        #     Child Loop BB1_4 Depth 2
+	block   	
 	loop    	                # label5:
 	block   	
-	i32.load8_u	$push28=, 0($0)
-	tee_local	$push27=, $1=, $pop28
-	i32.const	$push26=, 32
-	i32.ne  	$push2=, $pop27, $pop26
-	br_if   	0, $pop2        # 0: down to label6
-# BB#2:                                 # %while.body3.i
+	i32.load8_u	$push33=, 0($3)
+	tee_local	$push32=, $0=, $pop33
+	i32.const	$push31=, 32
+	i32.eq  	$push3=, $pop32, $pop31
+	br_if   	0, $pop3        # 0: down to label6
+# BB#2:                                 # %while.cond1.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push25=, 1
-	i32.add 	$0=, $0, $pop25
-	br      	1               # 1: up to label5
-.LBB1_3:                                # %while.cond1.i
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label6:
-	block   	
-	i32.eqz 	$push43=, $1
-	br_if   	0, $pop43       # 0: down to label7
-# BB#4:                                 # %if.end.i
+	i32.eqz 	$push50=, $0
+	br_if   	2, $pop50       # 2: down to label4
+# BB#3:                                 # %if.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push31=, 2
-	i32.shl 	$push3=, $2, $pop31
-	i32.const	$push30=, buildargv.arglist
-	i32.add 	$push4=, $pop3, $pop30
-	i32.store	0($pop4), $0
-	i32.const	$push29=, 1
-	i32.add 	$2=, $2, $pop29
-.LBB1_5:                                # %while.cond7.i
+	i32.const	$push35=, 2
+	i32.shl 	$push4=, $2, $pop35
+	i32.const	$push34=, buildargv.arglist
+	i32.add 	$push5=, $pop4, $pop34
+	i32.store	0($pop5), $3
+.LBB1_4:                                # %while.cond7.i
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	block   	
-	loop    	                # label9:
-	i32.load8_u	$push35=, 0($0)
-	tee_local	$push34=, $1=, $pop35
-	i32.const	$push33=, 32
-	i32.eq  	$push5=, $pop34, $pop33
-	br_if   	1, $pop5        # 1: down to label8
-# BB#6:                                 # %while.cond7.i
-                                        #   in Loop: Header=BB1_5 Depth=2
-	i32.eqz 	$push44=, $1
-	br_if   	2, $pop44       # 2: down to label7
-# BB#7:                                 # %while.body14.i
-                                        #   in Loop: Header=BB1_5 Depth=2
-	i32.const	$push32=, 1
-	i32.add 	$0=, $0, $pop32
-	br      	0               # 0: up to label9
-.LBB1_8:                                # %if.end21.i
+	loop    	                # label7:
+	i32.load8_u	$0=, 0($3)
+	i32.const	$push41=, 1
+	i32.add 	$push40=, $3, $pop41
+	tee_local	$push39=, $1=, $pop40
+	copy_local	$3=, $pop39
+	i32.const	$push38=, 32
+	i32.or  	$push6=, $0, $pop38
+	i32.const	$push37=, 255
+	i32.and 	$push7=, $pop6, $pop37
+	i32.const	$push36=, 32
+	i32.ne  	$push8=, $pop7, $pop36
+	br_if   	0, $pop8        # 0: up to label7
+# BB#5:                                 # %while.end16.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	end_block                       # label8:
-	i32.const	$push37=, 0
-	i32.store8	0($0), $pop37
-	i32.const	$push36=, 1
-	i32.add 	$0=, $0, $pop36
+	i32.const	$push43=, 1
+	i32.add 	$2=, $2, $pop43
+	i32.const	$push42=, 255
+	i32.and 	$push9=, $0, $pop42
+	i32.eqz 	$push51=, $pop9
+	br_if   	2, $pop51       # 2: down to label4
+# BB#6:                                 # %if.end21.i
+                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push30=, -1
+	i32.add 	$push0=, $1, $pop30
+	i32.const	$push29=, 0
+	i32.store8	0($pop0), $pop29
+	copy_local	$3=, $1
 	br      	1               # 1: up to label5
-.LBB1_9:                                # %buildargv.exit
-	end_block                       # label7:
+.LBB1_7:                                # %while.body3.i
+                                        #   in Loop: Header=BB1_1 Depth=1
+	end_block                       # label6:
+	i32.const	$push44=, 1
+	i32.add 	$3=, $3, $pop44
+	br      	0               # 0: up to label5
+.LBB1_8:                                # %buildargv.exit
 	end_loop
-	i32.const	$push6=, 2
-	i32.shl 	$push7=, $2, $pop6
-	i32.const	$push8=, buildargv.arglist
-	i32.add 	$push9=, $pop7, $pop8
-	i32.const	$push39=, 0
-	i32.store	0($pop9), $pop39
+	end_block                       # label4:
+	i32.const	$push10=, 2
+	i32.shl 	$push11=, $2, $pop10
+	i32.const	$push12=, buildargv.arglist
+	i32.add 	$push13=, $pop11, $pop12
+	i32.const	$push46=, 0
+	i32.store	0($pop13), $pop46
 	block   	
-	i32.const	$push38=, 0
-	i32.load	$push10=, buildargv.arglist($pop38)
-	i32.const	$push11=, .L.str.1
-	i32.call	$push12=, strcmp@FUNCTION, $pop10, $pop11
-	br_if   	0, $pop12       # 0: down to label10
-# BB#10:                                # %if.end
-	i32.const	$push40=, 0
-	i32.load	$push13=, buildargv.arglist+4($pop40)
-	i32.const	$push14=, .L.str.2
-	i32.call	$push15=, strcmp@FUNCTION, $pop13, $pop14
-	br_if   	0, $pop15       # 0: down to label10
-# BB#11:                                # %if.end8
-	i32.const	$push41=, 0
-	i32.load	$push16=, buildargv.arglist+8($pop41)
-	br_if   	0, $pop16       # 0: down to label10
-# BB#12:                                # %if.end11
-	i32.const	$push42=, 0
-	call    	exit@FUNCTION, $pop42
+	i32.const	$push45=, 0
+	i32.load	$push14=, buildargv.arglist($pop45)
+	i32.const	$push15=, .L.str.1
+	i32.call	$push16=, strcmp@FUNCTION, $pop14, $pop15
+	br_if   	0, $pop16       # 0: down to label8
+# BB#9:                                 # %if.end
+	i32.const	$push47=, 0
+	i32.load	$push17=, buildargv.arglist+4($pop47)
+	i32.const	$push18=, .L.str.2
+	i32.call	$push19=, strcmp@FUNCTION, $pop17, $pop18
+	br_if   	0, $pop19       # 0: down to label8
+# BB#10:                                # %if.end8
+	i32.const	$push48=, 0
+	i32.load	$push20=, buildargv.arglist+8($pop48)
+	br_if   	0, $pop20       # 0: down to label8
+# BB#11:                                # %if.end11
+	i32.const	$push49=, 0
+	call    	exit@FUNCTION, $pop49
 	unreachable
-.LBB1_13:                               # %if.then10
-	end_block                       # label10:
+.LBB1_12:                               # %if.then
+	end_block                       # label8:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	buildargv.arglist,@object # @buildargv.arglist
 	.section	.bss.buildargv.arglist,"aw",@nobits
 	.p2align	4
@@ -228,7 +231,7 @@ buildargv.arglist:
 	.size	.L.str.2, 2
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980709-1.c.s b/test/torture-s/980709-1.c.s
index 398540e09..7432b13f9 100644
--- a/test/torture-s/980709-1.c.s
+++ b/test/torture-s/980709-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980709-1.c"
+	.file	"980709-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	f64, f64, i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop13, $pop14
+	i32.sub 	$push22=, $pop12, $pop14
 	tee_local	$push21=, $2=, $pop22
 	i32.store	__stack_pointer($pop15), $pop21
 	i64.const	$push0=, 4629700416936869888
@@ -50,8 +50,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/980716-1.c.s b/test/torture-s/980716-1.c.s
index 6ff0b24ae..6011c0b07 100644
--- a/test/torture-s/980716-1.c.s
+++ b/test/torture-s/980716-1.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980716-1.c"
+	.file	"980716-1.c"
 	.section	.text.stub,"ax",@progbits
-	.hidden	stub
+	.hidden	stub                    # -- Begin function stub
 	.globl	stub
 	.type	stub,@function
 stub:                                   # @stub
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push4=, $pop1, $pop2
+	i32.sub 	$push4=, $pop0, $pop2
 	tee_local	$push3=, $5=, $pop4
 	i32.store	12($pop3), $1
 	copy_local	$4=, $1
@@ -44,9 +44,9 @@ stub:                                   # @stub
 	.endfunc
 .Lfunc_end0:
 	.size	stub, .Lfunc_end0-stub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,10 +54,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop5, $pop6
+	i32.sub 	$push10=, $pop4, $pop6
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop7), $pop9
 	i32.const	$push0=, 0
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -93,5 +93,5 @@ main:                                   # @main
 	.size	.L.str.2, 3
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980929-1.c.s b/test/torture-s/980929-1.c.s
index b8bb16b44..0b5d38110 100644
--- a/test/torture-s/980929-1.c.s
+++ b/test/torture-s/980929-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/980929-1.c"
+	.file	"980929-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,8 +34,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/981001-1.c.s b/test/torture-s/981001-1.c.s
index f671be0ec..c8ecb9685 100644
--- a/test/torture-s/981001-1.c.s
+++ b/test/torture-s/981001-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/981001-1.c"
+	.file	"981001-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -48,9 +48,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,7 +87,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	flg                     # @flg
 	.type	flg,@object
 	.section	.bss.flg,"aw",@nobits
@@ -98,6 +98,6 @@ flg:
 	.size	flg, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/981019-1.c.s b/test/torture-s/981019-1.c.s
index a615ffeb2..77461bb0a 100644
--- a/test/torture-s/981019-1.c.s
+++ b/test/torture-s/981019-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/981019-1.c"
+	.file	"981019-1.c"
 	.section	.text.ff,"ax",@progbits
-	.hidden	ff
+	.hidden	ff                      # -- Begin function ff
 	.globl	ff
 	.type	ff,@function
 ff:                                     # @ff
@@ -10,48 +10,50 @@ ff:                                     # @ff
 # BB#0:                                 # %entry
 	block   	
 	block   	
-	i32.eqz 	$push3=, $0
-	br_if   	0, $pop3        # 0: down to label1
+	block   	
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label2
 # BB#1:                                 # %entry
-	br_if   	1, $2           # 1: down to label0
-.LBB0_2:                                # %while.cond.preheader
-	end_block                       # label1:
+	br_if   	1, $2           # 1: down to label1
+.LBB0_2:                                # %if.end3
+	end_block                       # label2:
 	i32.const	$push0=, 0
-	i32.load	$0=, f3.x($pop0)
-.LBB0_3:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.const	$push8=, 0
+	i32.load	$push7=, f3.x($pop8)
+	tee_local	$push6=, $0=, $pop7
+	i32.eqz 	$push5=, $pop6
+	tee_local	$push4=, $3=, $pop5
+	i32.store	f3.x($pop0), $pop4
 	block   	
-	loop    	                # label3:
-	i32.eqz 	$3=, $0
-	br_if   	1, $0           # 1: down to label2
-# BB#4:                                 # %while.body
-                                        #   in Loop: Header=BB0_3 Depth=1
-	copy_local	$0=, $3
-	i32.eqz 	$push4=, $2
-	br_if   	0, $pop4        # 0: up to label3
-# BB#5:                                 # %land.lhs.true
-	end_loop
-	i32.const	$push2=, 0
-	i32.store	f3.x($pop2), $3
-	i32.call	$drop=, f2@FUNCTION
-	unreachable
-.LBB0_6:                                # %while.end
-	end_block                       # label2:
-	i32.const	$push1=, 0
-	i32.store	f3.x($pop1), $3
-	br_if   	0, $2           # 0: down to label0
-# BB#7:                                 # %if.end16
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label3
+# BB#3:                                 # %while.end
+	br_if   	1, $2           # 1: down to label1
+# BB#4:                                 # %if.end16
 	return
-.LBB0_8:                                # %if.then15
-	end_block                       # label0:
+.LBB0_5:                                # %while.body.lr.ph
+	end_block                       # label3:
+	br_if   	1, $2           # 1: down to label0
+# BB#6:                                 # %while.end.thread
+	i32.const	$push3=, 0
+	i32.const	$push1=, 1
+	i32.xor 	$push2=, $3, $pop1
+	i32.store	f3.x($pop3), $pop2
+	return
+.LBB0_7:                                # %if.then2
+	end_block                       # label1:
 	call    	f1@FUNCTION
 	unreachable
+.LBB0_8:                                # %land.lhs.true.split
+	end_block                       # label0:
+	i32.call	$drop=, f2@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	ff, .Lfunc_end0-ff
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -61,9 +63,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -81,9 +83,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -94,35 +96,23 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load	$1=, f3.x($pop0)
-.LBB4_1:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label4:
-	copy_local	$push3=, $1
-	tee_local	$push2=, $0=, $pop3
-	i32.eqz 	$1=, $pop2
-	i32.eqz 	$push5=, $0
-	br_if   	0, $pop5        # 0: up to label4
-# BB#2:                                 # %ff.exit
-	end_loop
+	i32.const	$push2=, 0
+	i32.store	f3.x($pop0), $pop2
 	i32.const	$push1=, 0
-	i32.store	f3.x($pop1), $1
-	i32.const	$push4=, 0
-                                        # fallthrough-return: $pop4
+                                        # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.type	f3.x,@object            # @f3.x
 	.section	.bss.f3.x,"aw",@nobits
 	.p2align	2
@@ -131,5 +121,5 @@ f3.x:
 	.size	f3.x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/981130-1.c.s b/test/torture-s/981130-1.c.s
index 5e1f0178e..84f91d180 100644
--- a/test/torture-s/981130-1.c.s
+++ b/test/torture-s/981130-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/981130-1.c"
+	.file	"981130-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -21,9 +21,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s2                      # @s2
 	.type	s2,@object
 	.section	.data.s2,"aw",@progbits
@@ -63,6 +63,6 @@ s1:
 	.size	s1, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/981206-1.c.s b/test/torture-s/981206-1.c.s
index a4ad5b30d..f93f9d160 100644
--- a/test/torture-s/981206-1.c.s
+++ b/test/torture-s/981206-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/981206-1.c"
+	.file	"981206-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	x,@object               # @x
 	.section	.bss.x,"aw",@nobits
 	.p2align	1
@@ -52,5 +52,5 @@ y:
 	.size	y, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990106-1.c.s b/test/torture-s/990106-1.c.s
index 7173f4230..0446c0738 100644
--- a/test/torture-s/990106-1.c.s
+++ b/test/torture-s/990106-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990106-1.c"
+	.file	"990106-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990106-2.c.s b/test/torture-s/990106-2.c.s
index 23ff7244c..2a58150a8 100644
--- a/test/torture-s/990106-2.c.s
+++ b/test/torture-s/990106-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990106-2.c"
+	.file	"990106-2.c"
 	.section	.text.calc_mp,"ax",@progbits
-	.hidden	calc_mp
+	.hidden	calc_mp                 # -- Begin function calc_mp
 	.globl	calc_mp
 	.type	calc_mp,@function
 calc_mp:                                # @calc_mp
@@ -22,9 +22,9 @@ calc_mp:                                # @calc_mp
 	.endfunc
 .Lfunc_end0:
 	.size	calc_mp, .Lfunc_end0-calc_mp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990117-1.c.s b/test/torture-s/990117-1.c.s
index 83e8f913b..d3c490bd1 100644
--- a/test/torture-s/990117-1.c.s
+++ b/test/torture-s/990117-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990117-1.c"
+	.file	"990117-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,19 +19,19 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/990127-1.c.s b/test/torture-s/990127-1.c.s
index 40ecd7cea..4da9346ad 100644
--- a/test/torture-s/990127-1.c.s
+++ b/test/torture-s/990127-1.c.s
@@ -1,303 +1,111 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990127-1.c"
+	.file	"990127-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %while.end
-	i32.const	$push30=, 0
-	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
-	i32.const	$push29=, 16
-	i32.sub 	$push65=, $pop28, $pop29
-	tee_local	$push64=, $3=, $pop65
-	i32.store	__stack_pointer($pop30), $pop64
-	i32.const	$0=, 10
-	i32.const	$push63=, 10
-	i32.store	12($3), $pop63
+	.local  	i32, i32, i32, i32, i32
+# BB#0:                                 # %entry
+	i32.const	$push15=, 0
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
+	i32.const	$push14=, 16
+	i32.sub 	$push28=, $pop12, $pop14
+	tee_local	$push27=, $4=, $pop28
+	i32.store	__stack_pointer($pop15), $pop27
 	i32.const	$push0=, 20
-	i32.store	8($3), $pop0
-	i32.const	$push1=, 2
-	i32.store	8($3), $pop1
-	i32.const	$push2=, 9
-	i32.store	12($3), $pop2
-	i32.const	$2=, 21
-.LBB0_1:                                # %while.body.1
-                                        # =>This Inner Loop Header: Depth=1
+	i32.store	8($4), $pop0
+	i32.const	$push26=, 10
+	i32.store	12($4), $pop26
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $4, $pop16
+	copy_local	$2=, $pop17
+	i32.const	$0=, 0
+	i32.const	$3=, 0
+.LBB0_1:                                # %for.body
+                                        # =>This Loop Header: Depth=1
+                                        #     Child Loop BB0_3 Depth 2
+	loop    	                # label0:
+	i32.const	$push20=, 8
+	i32.add 	$push21=, $4, $pop20
+	i32.const	$push22=, 12
+	i32.add 	$push23=, $4, $pop22
+	i32.const	$push18=, 12
+	i32.add 	$push19=, $4, $pop18
+	i32.eq  	$push1=, $2, $pop19
+	i32.select	$push33=, $pop21, $pop23, $pop1
+	tee_local	$push32=, $2=, $pop33
+	i32.load	$push31=, 0($2)
+	tee_local	$push30=, $2=, $pop31
+	i32.const	$push29=, -1
+	i32.add 	$push2=, $pop30, $pop29
+	i32.store	0($pop32), $pop2
 	block   	
-	loop    	                # label1:
-	copy_local	$1=, $2
-	i32.const	$push66=, 4
-	i32.lt_s	$push3=, $0, $pop66
-	br_if   	1, $pop3        # 1: down to label0
-# BB#2:                                 # %while.body.1.while.cond.1_crit_edge
+	i32.eqz 	$push45=, $2
+	br_if   	0, $pop45       # 0: down to label1
+# BB#2:                                 # %while.body.preheader
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push34=, 1
+	i32.add 	$1=, $3, $pop34
+.LBB0_3:                                # %while.body
+                                        #   Parent Loop BB0_1 Depth=1
+                                        # =>  This Inner Loop Header: Depth=2
+	loop    	                # label2:
+	copy_local	$3=, $1
+	i32.const	$push35=, 3
+	i32.le_s	$push3=, $2, $pop35
+	br_if   	1, $pop3        # 1: down to label1
+# BB#4:                                 # %while.cond
+                                        #   in Loop: Header=BB0_3 Depth=2
+	i32.load	$push39=, 8($4)
+	tee_local	$push38=, $2=, $pop39
+	i32.const	$push37=, -1
+	i32.add 	$push4=, $pop38, $pop37
+	i32.store	8($4), $pop4
+	i32.const	$push36=, 1
+	i32.add 	$1=, $3, $pop36
+	br_if   	0, $2           # 0: up to label2
+.LBB0_5:                                # %while.end
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.load	$push70=, 8($3)
-	tee_local	$push69=, $0=, $pop70
-	i32.const	$push68=, -1
-	i32.add 	$push4=, $pop69, $pop68
-	i32.store	8($3), $pop4
-	i32.const	$push67=, 1
-	i32.add 	$2=, $1, $pop67
-	br_if   	0, $0           # 0: up to label1
-.LBB0_3:                                # %while.end.1
-	end_loop
-	end_block                       # label0:
-	i32.const	$push31=, 12
-	i32.add 	$push32=, $3, $pop31
-	copy_local	$0=, $pop32
-.LBB0_4:                                # %while.cond.2
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label3:
-	i32.load	$push73=, 0($0)
-	tee_local	$push72=, $2=, $pop73
-	i32.const	$push71=, -1
-	i32.add 	$push5=, $pop72, $pop71
-	i32.store	0($0), $pop5
-	i32.eqz 	$push118=, $2
-	br_if   	1, $pop118      # 1: down to label2
-# BB#5:                                 # %while.body.2
-                                        #   in Loop: Header=BB0_4 Depth=1
-	i32.const	$push75=, 1
-	i32.add 	$1=, $1, $pop75
-	i32.const	$push61=, 8
-	i32.add 	$push62=, $3, $pop61
-	copy_local	$0=, $pop62
-	i32.const	$push74=, 3
-	i32.gt_s	$push6=, $2, $pop74
-	br_if   	0, $pop6        # 0: up to label3
-.LBB0_6:                                # %while.end.2
-	end_loop
-	end_block                       # label2:
-	i32.const	$push76=, 1
-	i32.add 	$2=, $1, $pop76
-	i32.const	$push33=, 12
-	i32.add 	$push34=, $3, $pop33
-	copy_local	$1=, $pop34
-.LBB0_7:                                # %while.cond.3
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label5:
-	i32.load	$push79=, 0($1)
-	tee_local	$push78=, $0=, $pop79
-	i32.const	$push77=, -1
-	i32.add 	$push7=, $pop78, $pop77
-	i32.store	0($1), $pop7
-	i32.eqz 	$push119=, $0
-	br_if   	1, $pop119      # 1: down to label4
-# BB#8:                                 # %while.body.3
-                                        #   in Loop: Header=BB0_7 Depth=1
-	i32.const	$push81=, 1
-	i32.add 	$2=, $2, $pop81
-	i32.const	$push59=, 8
-	i32.add 	$push60=, $3, $pop59
-	copy_local	$1=, $pop60
-	i32.const	$push80=, 3
-	i32.gt_s	$push8=, $0, $pop80
-	br_if   	0, $pop8        # 0: up to label5
-.LBB0_9:                                # %while.end.3
-	end_loop
-	end_block                       # label4:
-	i32.const	$push82=, 1
-	i32.add 	$2=, $2, $pop82
-	i32.const	$push35=, 12
-	i32.add 	$push36=, $3, $pop35
-	copy_local	$1=, $pop36
-.LBB0_10:                               # %while.cond.4
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label7:
-	i32.load	$push85=, 0($1)
-	tee_local	$push84=, $0=, $pop85
-	i32.const	$push83=, -1
-	i32.add 	$push9=, $pop84, $pop83
-	i32.store	0($1), $pop9
-	i32.eqz 	$push120=, $0
-	br_if   	1, $pop120      # 1: down to label6
-# BB#11:                                # %while.body.4
-                                        #   in Loop: Header=BB0_10 Depth=1
-	i32.const	$push87=, 1
-	i32.add 	$2=, $2, $pop87
-	i32.const	$push57=, 8
-	i32.add 	$push58=, $3, $pop57
-	copy_local	$1=, $pop58
-	i32.const	$push86=, 3
-	i32.gt_s	$push10=, $0, $pop86
-	br_if   	0, $pop10       # 0: up to label7
-.LBB0_12:                               # %while.end.4
-	end_loop
-	end_block                       # label6:
-	i32.const	$push88=, 1
-	i32.add 	$2=, $2, $pop88
-	i32.const	$push37=, 12
-	i32.add 	$push38=, $3, $pop37
-	copy_local	$1=, $pop38
-.LBB0_13:                               # %while.cond.5
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label9:
-	i32.load	$push91=, 0($1)
-	tee_local	$push90=, $0=, $pop91
-	i32.const	$push89=, -1
-	i32.add 	$push11=, $pop90, $pop89
-	i32.store	0($1), $pop11
-	i32.eqz 	$push121=, $0
-	br_if   	1, $pop121      # 1: down to label8
-# BB#14:                                # %while.body.5
-                                        #   in Loop: Header=BB0_13 Depth=1
-	i32.const	$push93=, 1
-	i32.add 	$2=, $2, $pop93
-	i32.const	$push55=, 8
-	i32.add 	$push56=, $3, $pop55
-	copy_local	$1=, $pop56
-	i32.const	$push92=, 3
-	i32.gt_s	$push12=, $0, $pop92
-	br_if   	0, $pop12       # 0: up to label9
-.LBB0_15:                               # %while.end.5
-	end_loop
-	end_block                       # label8:
-	i32.const	$push94=, 1
-	i32.add 	$2=, $2, $pop94
-	i32.const	$push39=, 12
-	i32.add 	$push40=, $3, $pop39
-	copy_local	$1=, $pop40
-.LBB0_16:                               # %while.cond.6
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label11:
-	i32.load	$push97=, 0($1)
-	tee_local	$push96=, $0=, $pop97
-	i32.const	$push95=, -1
-	i32.add 	$push13=, $pop96, $pop95
-	i32.store	0($1), $pop13
-	i32.eqz 	$push122=, $0
-	br_if   	1, $pop122      # 1: down to label10
-# BB#17:                                # %while.body.6
-                                        #   in Loop: Header=BB0_16 Depth=1
-	i32.const	$push99=, 1
-	i32.add 	$2=, $2, $pop99
-	i32.const	$push53=, 8
-	i32.add 	$push54=, $3, $pop53
-	copy_local	$1=, $pop54
-	i32.const	$push98=, 3
-	i32.gt_s	$push14=, $0, $pop98
-	br_if   	0, $pop14       # 0: up to label11
-.LBB0_18:                               # %while.end.6
-	end_loop
-	end_block                       # label10:
-	i32.const	$push100=, 1
-	i32.add 	$2=, $2, $pop100
-	i32.const	$push41=, 12
-	i32.add 	$push42=, $3, $pop41
-	copy_local	$1=, $pop42
-.LBB0_19:                               # %while.cond.7
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label13:
-	i32.load	$push103=, 0($1)
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, -1
-	i32.add 	$push15=, $pop102, $pop101
-	i32.store	0($1), $pop15
-	i32.eqz 	$push123=, $0
-	br_if   	1, $pop123      # 1: down to label12
-# BB#20:                                # %while.body.7
-                                        #   in Loop: Header=BB0_19 Depth=1
-	i32.const	$push105=, 1
-	i32.add 	$2=, $2, $pop105
-	i32.const	$push51=, 8
-	i32.add 	$push52=, $3, $pop51
-	copy_local	$1=, $pop52
-	i32.const	$push104=, 3
-	i32.gt_s	$push16=, $0, $pop104
-	br_if   	0, $pop16       # 0: up to label13
-.LBB0_21:                               # %while.end.7
-	end_loop
-	end_block                       # label12:
-	i32.const	$push106=, 1
-	i32.add 	$2=, $2, $pop106
-	i32.const	$push43=, 12
-	i32.add 	$push44=, $3, $pop43
-	copy_local	$1=, $pop44
-.LBB0_22:                               # %while.cond.8
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label15:
-	i32.load	$push109=, 0($1)
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, -1
-	i32.add 	$push17=, $pop108, $pop107
-	i32.store	0($1), $pop17
-	i32.eqz 	$push124=, $0
-	br_if   	1, $pop124      # 1: down to label14
-# BB#23:                                # %while.body.8
-                                        #   in Loop: Header=BB0_22 Depth=1
-	i32.const	$push111=, 1
-	i32.add 	$2=, $2, $pop111
-	i32.const	$push49=, 8
-	i32.add 	$push50=, $3, $pop49
-	copy_local	$1=, $pop50
-	i32.const	$push110=, 3
-	i32.gt_s	$push18=, $0, $pop110
-	br_if   	0, $pop18       # 0: up to label15
-.LBB0_24:                               # %while.end.8
 	end_loop
-	end_block                       # label14:
-	i32.const	$push112=, 1
-	i32.add 	$2=, $2, $pop112
-	i32.const	$push45=, 12
-	i32.add 	$push46=, $3, $pop45
-	copy_local	$1=, $pop46
-.LBB0_25:                               # %while.cond.9
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label17:
-	i32.load	$push115=, 0($1)
-	tee_local	$push114=, $0=, $pop115
-	i32.const	$push113=, -1
-	i32.add 	$push19=, $pop114, $pop113
-	i32.store	0($1), $pop19
-	i32.eqz 	$push125=, $0
-	br_if   	1, $pop125      # 1: down to label16
-# BB#26:                                # %while.body.9
-                                        #   in Loop: Header=BB0_25 Depth=1
-	i32.const	$push117=, 1
-	i32.add 	$2=, $2, $pop117
-	i32.const	$push47=, 8
-	i32.add 	$push48=, $3, $pop47
-	copy_local	$1=, $pop48
-	i32.const	$push116=, 3
-	i32.gt_s	$push20=, $0, $pop116
-	br_if   	0, $pop20       # 0: up to label17
-.LBB0_27:                               # %while.end.9
+	end_block                       # label1:
+	i32.const	$push44=, 1
+	i32.add 	$3=, $3, $pop44
+	i32.const	$push24=, 8
+	i32.add 	$push25=, $4, $pop24
+	copy_local	$2=, $pop25
+	i32.const	$push43=, 1
+	i32.add 	$push42=, $0, $pop43
+	tee_local	$push41=, $0=, $pop42
+	i32.const	$push40=, 10
+	i32.ne  	$push5=, $pop41, $pop40
+	br_if   	0, $pop5        # 0: up to label0
+# BB#6:                                 # %for.end
 	end_loop
-	end_block                       # label16:
 	block   	
-	i32.load	$push22=, 8($3)
-	i32.const	$push21=, -5
-	i32.ne  	$push23=, $pop22, $pop21
-	br_if   	0, $pop23       # 0: down to label18
-# BB#28:                                # %while.end.9
-	i32.const	$push24=, 42
-	i32.ne  	$push25=, $2, $pop24
-	br_if   	0, $pop25       # 0: down to label18
-# BB#29:                                # %if.end13
-	i32.const	$push26=, 0
-	call    	exit@FUNCTION, $pop26
+	i32.load	$push7=, 8($4)
+	i32.const	$push6=, -5
+	i32.ne  	$push8=, $pop7, $pop6
+	br_if   	0, $pop8        # 0: down to label3
+# BB#7:                                 # %for.end
+	i32.const	$push9=, 43
+	i32.ne  	$push10=, $3, $pop9
+	br_if   	0, $pop10       # 0: down to label3
+# BB#8:                                 # %if.end13
+	i32.const	$push11=, 0
+	call    	exit@FUNCTION, $pop11
 	unreachable
-.LBB0_30:                               # %if.then12
-	end_block                       # label18:
+.LBB0_9:                                # %if.then12
+	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990127-2.c.s b/test/torture-s/990127-2.c.s
index 8c23ec5a3..ec18e1359 100644
--- a/test/torture-s/990127-2.c.s
+++ b/test/torture-s/990127-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990127-2.c"
+	.file	"990127-2.c"
 	.section	.text.fpEq,"ax",@progbits
-	.hidden	fpEq
+	.hidden	fpEq                    # -- Begin function fpEq
 	.globl	fpEq
 	.type	fpEq,@function
 fpEq:                                   # @fpEq
@@ -19,9 +19,9 @@ fpEq:                                   # @fpEq
 	.endfunc
 .Lfunc_end0:
 	.size	fpEq, .Lfunc_end0-fpEq
-
+                                        # -- End function
 	.section	.text.fpTest,"ax",@progbits
-	.hidden	fpTest
+	.hidden	fpTest                  # -- Begin function fpTest
 	.globl	fpTest
 	.type	fpTest,@function
 fpTest:                                 # @fpTest
@@ -43,25 +43,22 @@ fpTest:                                 # @fpTest
 	.endfunc
 .Lfunc_end1:
 	.size	fpTest, .Lfunc_end1-fpTest
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	f64.const	$push1=, 0x1.1d9999999999ap5
-	f64.const	$push0=, 0x1.68p5
-	call    	fpTest@FUNCTION, $pop1, $pop0
-	i32.const	$push2=, 0
-	call    	exit@FUNCTION, $pop2
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990128-1.c.s b/test/torture-s/990128-1.c.s
index 213434172..7a0060af9 100644
--- a/test/torture-s/990128-1.c.s
+++ b/test/torture-s/990128-1.c.s
@@ -1,13 +1,13 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990128-1.c"
+	.file	"990128-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %for.inc.i.preheader.i.preheader
+# BB#0:                                 # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, sss
 	i32.store	ss($pop1), $pop0
@@ -47,7 +47,7 @@ main:                                   # @main
 	i32.store	sss+36($pop16), $pop15
 	i32.const	$push14=, 0
 	i32.load	$2=, count($pop14)
-.LBB0_1:                                # %for.inc.i.preheader.i
+.LBB0_1:                                # %for.inc.lr.ph.i.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
 	loop    	                # label0:
@@ -90,9 +90,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -104,8 +104,8 @@ sub:                                    # @sub
 	block   	
 	i32.eqz 	$push12=, $0
 	br_if   	0, $pop12       # 0: down to label3
-# BB#1:                                 # %for.inc.i.preheader.preheader
-.LBB1_2:                                # %for.inc.i.preheader
+# BB#1:
+.LBB1_2:                                # %for.inc.lr.ph.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_3 Depth 2
 	loop    	                # label4:
@@ -143,9 +143,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end1:
 	.size	sub, .Lfunc_end1-sub
-
+                                        # -- End function
 	.section	.text.look,"ax",@progbits
-	.hidden	look
+	.hidden	look                    # -- Begin function look
 	.globl	look
 	.type	look,@function
 look:                                   # @look
@@ -177,7 +177,7 @@ look:                                   # @look
 	.endfunc
 .Lfunc_end2:
 	.size	look, .Lfunc_end2-look
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -215,6 +215,6 @@ sss:
 	.size	sss, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990130-1.c.s b/test/torture-s/990130-1.c.s
index b63d3feec..0390eaa92 100644
--- a/test/torture-s/990130-1.c.s
+++ b/test/torture-s/990130-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990130-1.c"
+	.file	"990130-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	count                   # @count
 	.type	count,@object
 	.section	.bss.count,"aw",@nobits
@@ -54,6 +54,6 @@ dummy:
 	.size	dummy, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990211-1.c.s b/test/torture-s/990211-1.c.s
index 5fd828715..fc6374b13 100644
--- a/test/torture-s/990211-1.c.s
+++ b/test/torture-s/990211-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990211-1.c"
+	.file	"990211-1.c"
 	.section	.text.func,"ax",@progbits
-	.hidden	func
+	.hidden	func                    # -- Begin function func
 	.globl	func
 	.type	func,@function
 func:                                   # @func
@@ -11,9 +11,9 @@ func:                                   # @func
 	.endfunc
 .Lfunc_end0:
 	.size	func, .Lfunc_end0-func
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,6 +24,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/990222-1.c.s b/test/torture-s/990222-1.c.s
index 0d9191154..3c9f26344 100644
--- a/test/torture-s/990222-1.c.s
+++ b/test/torture-s/990222-1.c.s
@@ -1,81 +1,76 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990222-1.c"
+	.file	"990222-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push26=, 0
-	i32.load8_u	$push0=, line+2($pop26)
-	i32.const	$push25=, 1
-	i32.add 	$push24=, $pop0, $pop25
-	tee_local	$push23=, $1=, $pop24
-	i32.store8	line+2($pop27), $pop23
-	block   	
-	i32.const	$push22=, 24
-	i32.shl 	$push1=, $1, $pop22
-	i32.const	$push21=, 24
-	i32.shr_s	$push20=, $pop1, $pop21
+	i32.const	$push23=, 0
+	i32.const	$push22=, 0
+	i32.load8_u	$push0=, line+2($pop22)
+	i32.const	$push21=, 1
+	i32.add 	$push20=, $pop0, $pop21
 	tee_local	$push19=, $1=, $pop20
-	i32.const	$push2=, 58
-	i32.lt_s	$push3=, $pop19, $pop2
+	i32.store8	line+2($pop23), $pop19
+	block   	
+	i32.const	$push18=, 24
+	i32.shl 	$push1=, $1, $pop18
+	i32.const	$push2=, 956301313
+	i32.lt_s	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %while.body.preheader
 	i32.const	$1=, line+1
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push36=, 1
-	i32.add 	$push4=, $1, $pop36
-	i32.const	$push35=, 48
-	i32.store8	0($pop4), $pop35
+	i32.const	$push31=, 1
+	i32.add 	$push4=, $1, $pop31
+	i32.const	$push30=, 48
+	i32.store8	0($pop4), $pop30
 	i32.load8_u	$push5=, 0($1)
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $pop5, $pop34
-	tee_local	$push32=, $0=, $pop33
-	i32.store8	0($1), $pop32
-	i32.const	$push31=, -1
-	i32.add 	$1=, $1, $pop31
-	i32.const	$push30=, 24
-	i32.shl 	$push6=, $0, $pop30
-	i32.const	$push29=, 24
-	i32.shr_s	$push7=, $pop6, $pop29
-	i32.const	$push28=, 57
-	i32.gt_s	$push8=, $pop7, $pop28
-	br_if   	0, $pop8        # 0: up to label1
+	i32.const	$push29=, 1
+	i32.add 	$push28=, $pop5, $pop29
+	tee_local	$push27=, $0=, $pop28
+	i32.store8	0($1), $pop27
+	i32.const	$push26=, -1
+	i32.add 	$1=, $1, $pop26
+	i32.const	$push25=, 24
+	i32.shl 	$push6=, $0, $pop25
+	i32.const	$push24=, 956301312
+	i32.gt_s	$push7=, $pop6, $pop24
+	br_if   	0, $pop7        # 0: up to label1
 # BB#3:                                 # %while.end.loopexit
 	end_loop
-	i32.const	$push9=, 0
-	i32.load8_u	$1=, line+2($pop9)
+	i32.const	$push8=, 0
+	i32.load8_u	$1=, line+2($pop8)
 .LBB0_4:                                # %while.end
 	end_block                       # label0:
 	block   	
-	i32.const	$push37=, 0
-	i32.load8_u	$push11=, line($pop37)
-	i32.const	$push12=, 50
-	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	0, $pop13       # 0: down to label2
+	i32.const	$push32=, 0
+	i32.load8_u	$push10=, line($pop32)
+	i32.const	$push11=, 50
+	i32.ne  	$push12=, $pop10, $pop11
+	br_if   	0, $pop12       # 0: down to label2
 # BB#5:                                 # %while.end
-	i32.const	$push40=, 0
-	i32.load8_u	$push10=, line+1($pop40)
-	i32.const	$push39=, 255
-	i32.and 	$push14=, $pop10, $pop39
-	i32.const	$push38=, 48
-	i32.ne  	$push15=, $pop14, $pop38
-	br_if   	0, $pop15       # 0: down to label2
+	i32.const	$push35=, 0
+	i32.load8_u	$push9=, line+1($pop35)
+	i32.const	$push34=, 255
+	i32.and 	$push13=, $pop9, $pop34
+	i32.const	$push33=, 48
+	i32.ne  	$push14=, $pop13, $pop33
+	br_if   	0, $pop14       # 0: down to label2
 # BB#6:                                 # %while.end
-	i32.const	$push42=, 255
-	i32.and 	$push16=, $1, $pop42
-	i32.const	$push41=, 48
-	i32.ne  	$push17=, $pop16, $pop41
-	br_if   	0, $pop17       # 0: down to label2
+	i32.const	$push37=, 255
+	i32.and 	$push15=, $1, $pop37
+	i32.const	$push36=, 48
+	i32.ne  	$push16=, $pop15, $pop36
+	br_if   	0, $pop16       # 0: down to label2
 # BB#7:                                 # %if.end
-	i32.const	$push18=, 0
-	return  	$pop18
+	i32.const	$push17=, 0
+	return  	$pop17
 .LBB0_8:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -83,7 +78,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	line                    # @line
 	.type	line,@object
 	.section	.data.line,"aw",@progbits
@@ -93,5 +88,5 @@ line:
 	.size	line, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/990324-1.c.s b/test/torture-s/990324-1.c.s
index 7d22b987c..ccc654d74 100644
--- a/test/torture-s/990324-1.c.s
+++ b/test/torture-s/990324-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990324-1.c"
+	.file	"990324-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -24,9 +24,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,8 +38,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990326-1.c.s b/test/torture-s/990326-1.c.s
index 52a5478f8..52f63c279 100644
--- a/test/torture-s/990326-1.c.s
+++ b/test/torture-s/990326-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990326-1.c"
+	.file	"990326-1.c"
 	.section	.text.a1,"ax",@progbits
-	.hidden	a1
+	.hidden	a1                      # -- Begin function a1
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
@@ -12,9 +12,9 @@ a1:                                     # @a1
 	.endfunc
 .Lfunc_end0:
 	.size	a1, .Lfunc_end0-a1
-
+                                        # -- End function
 	.section	.text.a2,"ax",@progbits
-	.hidden	a2
+	.hidden	a2                      # -- Begin function a2
 	.globl	a2
 	.type	a2,@function
 a2:                                     # @a2
@@ -25,9 +25,9 @@ a2:                                     # @a2
 	.endfunc
 .Lfunc_end1:
 	.size	a2, .Lfunc_end1-a2
-
+                                        # -- End function
 	.section	.text.a3,"ax",@progbits
-	.hidden	a3
+	.hidden	a3                      # -- Begin function a3
 	.globl	a3
 	.type	a3,@function
 a3:                                     # @a3
@@ -38,9 +38,9 @@ a3:                                     # @a3
 	.endfunc
 .Lfunc_end2:
 	.size	a3, .Lfunc_end2-a3
-
+                                        # -- End function
 	.section	.text.b1,"ax",@progbits
-	.hidden	b1
+	.hidden	b1                      # -- Begin function b1
 	.globl	b1
 	.type	b1,@function
 b1:                                     # @b1
@@ -51,9 +51,9 @@ b1:                                     # @b1
 	.endfunc
 .Lfunc_end3:
 	.size	b1, .Lfunc_end3-b1
-
+                                        # -- End function
 	.section	.text.b2,"ax",@progbits
-	.hidden	b2
+	.hidden	b2                      # -- Begin function b2
 	.globl	b2
 	.type	b2,@function
 b2:                                     # @b2
@@ -64,9 +64,9 @@ b2:                                     # @b2
 	.endfunc
 .Lfunc_end4:
 	.size	b2, .Lfunc_end4-b2
-
+                                        # -- End function
 	.section	.text.b3,"ax",@progbits
-	.hidden	b3
+	.hidden	b3                      # -- Begin function b3
 	.globl	b3
 	.type	b3,@function
 b3:                                     # @b3
@@ -77,9 +77,9 @@ b3:                                     # @b3
 	.endfunc
 .Lfunc_end5:
 	.size	b3, .Lfunc_end5-b3
-
+                                        # -- End function
 	.section	.text.c1,"ax",@progbits
-	.hidden	c1
+	.hidden	c1                      # -- Begin function c1
 	.globl	c1
 	.type	c1,@function
 c1:                                     # @c1
@@ -90,9 +90,9 @@ c1:                                     # @c1
 	.endfunc
 .Lfunc_end6:
 	.size	c1, .Lfunc_end6-c1
-
+                                        # -- End function
 	.section	.text.c2,"ax",@progbits
-	.hidden	c2
+	.hidden	c2                      # -- Begin function c2
 	.globl	c2
 	.type	c2,@function
 c2:                                     # @c2
@@ -103,9 +103,9 @@ c2:                                     # @c2
 	.endfunc
 .Lfunc_end7:
 	.size	c2, .Lfunc_end7-c2
-
+                                        # -- End function
 	.section	.text.c3,"ax",@progbits
-	.hidden	c3
+	.hidden	c3                      # -- Begin function c3
 	.globl	c3
 	.type	c3,@function
 c3:                                     # @c3
@@ -116,9 +116,9 @@ c3:                                     # @c3
 	.endfunc
 .Lfunc_end8:
 	.size	c3, .Lfunc_end8-c3
-
+                                        # -- End function
 	.section	.text.d1,"ax",@progbits
-	.hidden	d1
+	.hidden	d1                      # -- Begin function d1
 	.globl	d1
 	.type	d1,@function
 d1:                                     # @d1
@@ -129,9 +129,9 @@ d1:                                     # @d1
 	.endfunc
 .Lfunc_end9:
 	.size	d1, .Lfunc_end9-d1
-
+                                        # -- End function
 	.section	.text.d2,"ax",@progbits
-	.hidden	d2
+	.hidden	d2                      # -- Begin function d2
 	.globl	d2
 	.type	d2,@function
 d2:                                     # @d2
@@ -142,9 +142,9 @@ d2:                                     # @d2
 	.endfunc
 .Lfunc_end10:
 	.size	d2, .Lfunc_end10-d2
-
+                                        # -- End function
 	.section	.text.d3,"ax",@progbits
-	.hidden	d3
+	.hidden	d3                      # -- Begin function d3
 	.globl	d3
 	.type	d3,@function
 d3:                                     # @d3
@@ -155,9 +155,9 @@ d3:                                     # @d3
 	.endfunc
 .Lfunc_end11:
 	.size	d3, .Lfunc_end11-d3
-
+                                        # -- End function
 	.section	.text.e1,"ax",@progbits
-	.hidden	e1
+	.hidden	e1                      # -- Begin function e1
 	.globl	e1
 	.type	e1,@function
 e1:                                     # @e1
@@ -168,9 +168,9 @@ e1:                                     # @e1
 	.endfunc
 .Lfunc_end12:
 	.size	e1, .Lfunc_end12-e1
-
+                                        # -- End function
 	.section	.text.e2,"ax",@progbits
-	.hidden	e2
+	.hidden	e2                      # -- Begin function e2
 	.globl	e2
 	.type	e2,@function
 e2:                                     # @e2
@@ -181,9 +181,9 @@ e2:                                     # @e2
 	.endfunc
 .Lfunc_end13:
 	.size	e2, .Lfunc_end13-e2
-
+                                        # -- End function
 	.section	.text.e3,"ax",@progbits
-	.hidden	e3
+	.hidden	e3                      # -- Begin function e3
 	.globl	e3
 	.type	e3,@function
 e3:                                     # @e3
@@ -194,9 +194,9 @@ e3:                                     # @e3
 	.endfunc
 .Lfunc_end14:
 	.size	e3, .Lfunc_end14-e3
-
+                                        # -- End function
 	.section	.text.e4,"ax",@progbits
-	.hidden	e4
+	.hidden	e4                      # -- Begin function e4
 	.globl	e4
 	.type	e4,@function
 e4:                                     # @e4
@@ -207,9 +207,9 @@ e4:                                     # @e4
 	.endfunc
 .Lfunc_end15:
 	.size	e4, .Lfunc_end15-e4
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -220,9 +220,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end16:
 	.size	f1, .Lfunc_end16-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -233,9 +233,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end17:
 	.size	f2, .Lfunc_end17-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -246,9 +246,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end18:
 	.size	f3, .Lfunc_end18-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -259,9 +259,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end19:
 	.size	f4, .Lfunc_end19-f4
-
+                                        # -- End function
 	.section	.text.g1,"ax",@progbits
-	.hidden	g1
+	.hidden	g1                      # -- Begin function g1
 	.globl	g1
 	.type	g1,@function
 g1:                                     # @g1
@@ -272,9 +272,9 @@ g1:                                     # @g1
 	.endfunc
 .Lfunc_end20:
 	.size	g1, .Lfunc_end20-g1
-
+                                        # -- End function
 	.section	.text.g2,"ax",@progbits
-	.hidden	g2
+	.hidden	g2                      # -- Begin function g2
 	.globl	g2
 	.type	g2,@function
 g2:                                     # @g2
@@ -285,9 +285,9 @@ g2:                                     # @g2
 	.endfunc
 .Lfunc_end21:
 	.size	g2, .Lfunc_end21-g2
-
+                                        # -- End function
 	.section	.text.g3,"ax",@progbits
-	.hidden	g3
+	.hidden	g3                      # -- Begin function g3
 	.globl	g3
 	.type	g3,@function
 g3:                                     # @g3
@@ -298,9 +298,9 @@ g3:                                     # @g3
 	.endfunc
 .Lfunc_end22:
 	.size	g3, .Lfunc_end22-g3
-
+                                        # -- End function
 	.section	.text.g4,"ax",@progbits
-	.hidden	g4
+	.hidden	g4                      # -- Begin function g4
 	.globl	g4
 	.type	g4,@function
 g4:                                     # @g4
@@ -311,9 +311,9 @@ g4:                                     # @g4
 	.endfunc
 .Lfunc_end23:
 	.size	g4, .Lfunc_end23-g4
-
+                                        # -- End function
 	.section	.text.g5,"ax",@progbits
-	.hidden	g5
+	.hidden	g5                      # -- Begin function g5
 	.globl	g5
 	.type	g5,@function
 g5:                                     # @g5
@@ -324,9 +324,9 @@ g5:                                     # @g5
 	.endfunc
 .Lfunc_end24:
 	.size	g5, .Lfunc_end24-g5
-
+                                        # -- End function
 	.section	.text.g6,"ax",@progbits
-	.hidden	g6
+	.hidden	g6                      # -- Begin function g6
 	.globl	g6
 	.type	g6,@function
 g6:                                     # @g6
@@ -337,9 +337,9 @@ g6:                                     # @g6
 	.endfunc
 .Lfunc_end25:
 	.size	g6, .Lfunc_end25-g6
-
+                                        # -- End function
 	.section	.text.g7,"ax",@progbits
-	.hidden	g7
+	.hidden	g7                      # -- Begin function g7
 	.globl	g7
 	.type	g7,@function
 g7:                                     # @g7
@@ -350,9 +350,9 @@ g7:                                     # @g7
 	.endfunc
 .Lfunc_end26:
 	.size	g7, .Lfunc_end26-g7
-
+                                        # -- End function
 	.section	.text.h1,"ax",@progbits
-	.hidden	h1
+	.hidden	h1                      # -- Begin function h1
 	.globl	h1
 	.type	h1,@function
 h1:                                     # @h1
@@ -363,9 +363,9 @@ h1:                                     # @h1
 	.endfunc
 .Lfunc_end27:
 	.size	h1, .Lfunc_end27-h1
-
+                                        # -- End function
 	.section	.text.h2,"ax",@progbits
-	.hidden	h2
+	.hidden	h2                      # -- Begin function h2
 	.globl	h2
 	.type	h2,@function
 h2:                                     # @h2
@@ -376,9 +376,9 @@ h2:                                     # @h2
 	.endfunc
 .Lfunc_end28:
 	.size	h2, .Lfunc_end28-h2
-
+                                        # -- End function
 	.section	.text.h3,"ax",@progbits
-	.hidden	h3
+	.hidden	h3                      # -- Begin function h3
 	.globl	h3
 	.type	h3,@function
 h3:                                     # @h3
@@ -389,9 +389,9 @@ h3:                                     # @h3
 	.endfunc
 .Lfunc_end29:
 	.size	h3, .Lfunc_end29-h3
-
+                                        # -- End function
 	.section	.text.h4,"ax",@progbits
-	.hidden	h4
+	.hidden	h4                      # -- Begin function h4
 	.globl	h4
 	.type	h4,@function
 h4:                                     # @h4
@@ -402,9 +402,9 @@ h4:                                     # @h4
 	.endfunc
 .Lfunc_end30:
 	.size	h4, .Lfunc_end30-h4
-
+                                        # -- End function
 	.section	.text.h5,"ax",@progbits
-	.hidden	h5
+	.hidden	h5                      # -- Begin function h5
 	.globl	h5
 	.type	h5,@function
 h5:                                     # @h5
@@ -415,9 +415,9 @@ h5:                                     # @h5
 	.endfunc
 .Lfunc_end31:
 	.size	h5, .Lfunc_end31-h5
-
+                                        # -- End function
 	.section	.text.h6,"ax",@progbits
-	.hidden	h6
+	.hidden	h6                      # -- Begin function h6
 	.globl	h6
 	.type	h6,@function
 h6:                                     # @h6
@@ -428,9 +428,9 @@ h6:                                     # @h6
 	.endfunc
 .Lfunc_end32:
 	.size	h6, .Lfunc_end32-h6
-
+                                        # -- End function
 	.section	.text.h7,"ax",@progbits
-	.hidden	h7
+	.hidden	h7                      # -- Begin function h7
 	.globl	h7
 	.type	h7,@function
 h7:                                     # @h7
@@ -441,9 +441,9 @@ h7:                                     # @h7
 	.endfunc
 .Lfunc_end33:
 	.size	h7, .Lfunc_end33-h7
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -455,7 +455,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end34:
 	.size	main, .Lfunc_end34-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990404-1.c.s b/test/torture-s/990404-1.c.s
index b56d9698e..885b682fe 100644
--- a/test/torture-s/990404-1.c.s
+++ b/test/torture-s/990404-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990404-1.c"
+	.file	"990404-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,42 +47,42 @@ main:                                   # @main
 	i32.const	$push53=, 0
 	i32.const	$push52=, 0
 	i32.gt_s	$push51=, $0, $pop52
-	tee_local	$push50=, $1=, $pop51
+	tee_local	$push50=, $0=, $pop51
 	i32.select	$push49=, $pop54, $pop53, $pop50
-	tee_local	$push48=, $0=, $pop49
-	i32.gt_s	$push47=, $2, $0
-	tee_local	$push46=, $0=, $pop47
+	tee_local	$push48=, $1=, $pop49
+	i32.gt_s	$push47=, $2, $1
+	tee_local	$push46=, $2=, $pop47
 	i32.select	$push45=, $pop57, $pop48, $pop46
-	tee_local	$push44=, $2=, $pop45
-	i32.gt_s	$push43=, $3, $2
-	tee_local	$push42=, $2=, $pop43
+	tee_local	$push44=, $1=, $pop45
+	i32.gt_s	$push43=, $3, $1
+	tee_local	$push42=, $3=, $pop43
 	i32.select	$push41=, $pop60, $pop44, $pop42
-	tee_local	$push40=, $3=, $pop41
-	i32.gt_s	$push39=, $4, $3
-	tee_local	$push38=, $3=, $pop39
+	tee_local	$push40=, $1=, $pop41
+	i32.gt_s	$push39=, $4, $1
+	tee_local	$push38=, $4=, $pop39
 	i32.select	$push37=, $pop63, $pop40, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.gt_s	$push35=, $5, $4
-	tee_local	$push34=, $4=, $pop35
+	tee_local	$push36=, $1=, $pop37
+	i32.gt_s	$push35=, $5, $1
+	tee_local	$push34=, $5=, $pop35
 	i32.select	$push33=, $pop66, $pop36, $pop34
-	tee_local	$push32=, $5=, $pop33
-	i32.gt_s	$push31=, $6, $5
-	tee_local	$push30=, $5=, $pop31
+	tee_local	$push32=, $1=, $pop33
+	i32.gt_s	$push31=, $6, $1
+	tee_local	$push30=, $6=, $pop31
 	i32.select	$push29=, $pop69, $pop32, $pop30
-	tee_local	$push28=, $6=, $pop29
-	i32.gt_s	$push27=, $7, $6
-	tee_local	$push26=, $6=, $pop27
+	tee_local	$push28=, $1=, $pop29
+	i32.gt_s	$push27=, $7, $1
+	tee_local	$push26=, $7=, $pop27
 	i32.select	$push25=, $pop72, $pop28, $pop26
-	tee_local	$push24=, $7=, $pop25
-	i32.gt_s	$push23=, $8, $7
-	tee_local	$push22=, $7=, $pop23
+	tee_local	$push24=, $1=, $pop25
+	i32.gt_s	$push23=, $8, $1
+	tee_local	$push22=, $8=, $pop23
 	i32.select	$push21=, $pop75, $pop24, $pop22
-	tee_local	$push20=, $8=, $pop21
-	i32.gt_s	$push19=, $9, $8
-	tee_local	$push18=, $8=, $pop19
+	tee_local	$push20=, $1=, $pop21
+	i32.gt_s	$push19=, $9, $1
+	tee_local	$push18=, $9=, $pop19
 	i32.select	$push17=, $pop78, $pop20, $pop18
-	tee_local	$push16=, $9=, $pop17
-	i32.gt_s	$push15=, $10, $9
+	tee_local	$push16=, $1=, $pop17
+	i32.gt_s	$push15=, $10, $1
 	tee_local	$push14=, $10=, $pop15
 	i32.select	$push9=, $pop81, $pop16, $pop14
 	i32.eqz 	$push103=, $pop9
@@ -99,15 +99,15 @@ main:                                   # @main
 	i32.const	$push95=, 2
 	i32.const	$push94=, 1
 	i32.const	$push93=, 0
-	i32.select	$push0=, $pop93, $12, $1
-	i32.select	$push1=, $pop94, $pop0, $0
-	i32.select	$push2=, $pop95, $pop1, $2
-	i32.select	$push3=, $pop96, $pop2, $3
-	i32.select	$push4=, $pop97, $pop3, $4
-	i32.select	$push5=, $pop98, $pop4, $5
-	i32.select	$push6=, $pop99, $pop5, $6
-	i32.select	$push7=, $pop100, $pop6, $7
-	i32.select	$push8=, $pop101, $pop7, $8
+	i32.select	$push0=, $pop93, $12, $0
+	i32.select	$push1=, $pop94, $pop0, $2
+	i32.select	$push2=, $pop95, $pop1, $3
+	i32.select	$push3=, $pop96, $pop2, $4
+	i32.select	$push4=, $pop97, $pop3, $5
+	i32.select	$push5=, $pop98, $pop4, $6
+	i32.select	$push6=, $pop99, $pop5, $7
+	i32.select	$push7=, $pop100, $pop6, $8
+	i32.select	$push8=, $pop101, $pop7, $9
 	i32.select	$push92=, $pop102, $pop8, $10
 	tee_local	$push91=, $12=, $pop92
 	i32.const	$push90=, 2
@@ -120,7 +120,7 @@ main:                                   # @main
 	i32.add 	$push86=, $11, $pop87
 	tee_local	$push85=, $11=, $pop86
 	i32.const	$push84=, 10
-	i32.lt_s	$push12=, $pop85, $pop84
+	i32.lt_u	$push12=, $pop85, $pop84
 	br_if   	0, $pop12       # 0: up to label1
 # BB#3:                                 # %if.then11
 	end_loop
@@ -134,7 +134,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -154,6 +154,6 @@ x:
 	.size	x, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990513-1.c.s b/test/torture-s/990513-1.c.s
index 9b7e5cc53..2e2442d2a 100644
--- a/test/torture-s/990513-1.c.s
+++ b/test/torture-s/990513-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990513-1.c"
+	.file	"990513-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -36,9 +36,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,10 +46,10 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 1024
-	i32.sub 	$push16=, $pop8, $pop9
+	i32.sub 	$push16=, $pop7, $pop9
 	tee_local	$push15=, $1=, $pop16
 	i32.store	__stack_pointer($pop10), $pop15
 	i32.const	$2=, 1024
@@ -94,7 +94,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/990524-1.c.s b/test/torture-s/990524-1.c.s
index 0f2e19f82..df8850933 100644
--- a/test/torture-s/990524-1.c.s
+++ b/test/torture-s/990524-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990524-1.c"
+	.file	"990524-1.c"
 	.section	.text.loop,"ax",@progbits
-	.hidden	loop
+	.hidden	loop                    # -- Begin function loop
 	.globl	loop
 	.type	loop,@function
 loop:                                   # @loop
@@ -70,9 +70,9 @@ loop:                                   # @loop
 	.endfunc
 .Lfunc_end0:
 	.size	loop, .Lfunc_end0-loop
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -87,7 +87,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -105,6 +105,6 @@ b:
 	.size	b, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990525-1.c.s b/test/torture-s/990525-1.c.s
index e4696bd71..4d4d62a27 100644
--- a/test/torture-s/990525-1.c.s
+++ b/test/torture-s/990525-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990525-1.c"
+	.file	"990525-1.c"
 	.section	.text.die,"ax",@progbits
-	.hidden	die
+	.hidden	die                     # -- Begin function die
 	.globl	die
 	.type	die,@function
 die:                                    # @die
@@ -21,9 +21,9 @@ die:                                    # @die
 	.endfunc
 .Lfunc_end0:
 	.size	die, .Lfunc_end0-die
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,15 +31,15 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop3, $pop4
+	i32.sub 	$push10=, $pop2, $pop4
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop5), $pop9
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.s($pop0):p2align=2
-	i64.store	8($0):p2align=2, $pop1
+	i64.store	8($0), $pop1
 	i32.const	$push6=, 8
 	i32.add 	$push7=, $0, $pop6
 	call    	die@FUNCTION, $pop7
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.s,@object        # @main.s
 	.section	.rodata.cst8,"aM",@progbits,8
 	.p2align	2
@@ -59,6 +59,6 @@ main:                                   # @main
 	.size	.Lmain.s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990525-2.c.s b/test/torture-s/990525-2.c.s
index 200b3a0a6..cc7bbf23c 100644
--- a/test/torture-s/990525-2.c.s
+++ b/test/torture-s/990525-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990525-2.c"
+	.file	"990525-2.c"
 	.section	.text.func1,"ax",@progbits
-	.hidden	func1
+	.hidden	func1                   # -- Begin function func1
 	.globl	func1
 	.type	func1,@function
 func1:                                  # @func1
@@ -13,9 +13,9 @@ func1:                                  # @func1
 	.endfunc
 .Lfunc_end0:
 	.size	func1, .Lfunc_end0-func1
-
+                                        # -- End function
 	.section	.text.func2,"ax",@progbits
-	.hidden	func2
+	.hidden	func2                   # -- Begin function func2
 	.globl	func2
 	.type	func2,@function
 func2:                                  # @func2
@@ -29,9 +29,9 @@ func2:                                  # @func2
 	.endfunc
 .Lfunc_end1:
 	.size	func2, .Lfunc_end1-func2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990527-1.c.s b/test/torture-s/990527-1.c.s
index a1af3474c..f20056312 100644
--- a/test/torture-s/990527-1.c.s
+++ b/test/torture-s/990527-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990527-1.c"
+	.file	"990527-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -16,9 +16,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -35,9 +35,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -64,7 +64,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	sum                     # @sum
 	.type	sum,@object
 	.section	.bss.sum,"aw",@nobits
@@ -75,6 +75,6 @@ sum:
 	.size	sum, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990531-1.c.s b/test/torture-s/990531-1.c.s
index f383b913f..d2a6b7f7d 100644
--- a/test/torture-s/990531-1.c.s
+++ b/test/torture-s/990531-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990531-1.c"
+	.file	"990531-1.c"
 	.section	.text.bad,"ax",@progbits
-	.hidden	bad
+	.hidden	bad                     # -- Begin function bad
 	.globl	bad
 	.type	bad,@function
 bad:                                    # @bad
@@ -9,10 +9,10 @@ bad:                                    # @bad
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push9=, $pop4, $pop5
+	i32.sub 	$push9=, $pop3, $pop5
 	tee_local	$push8=, $2=, $pop9
 	i32.store	8($pop8), $1
 	i32.const	$push6=, 8
@@ -25,9 +25,9 @@ bad:                                    # @bad
 	.endfunc
 .Lfunc_end0:
 	.size	bad, .Lfunc_end0-bad
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990604-1.c.s b/test/torture-s/990604-1.c.s
index 62c2a2098..2e8548b3c 100644
--- a/test/torture-s/990604-1.c.s
+++ b/test/torture-s/990604-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990604-1.c"
+	.file	"990604-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,20 +9,22 @@ f:                                      # @f
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, b($pop2)
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %do.body.preheader
+	i32.eqz 	$push4=, $pop0
+	br_if   	0, $pop4        # 0: down to label0
+# BB#1:                                 # %if.end
+	return
+.LBB0_2:                                # %if.then
+	end_block                       # label0:
 	i32.const	$push3=, 0
 	i32.const	$push1=, 9
 	i32.store	b($pop3), $pop1
-.LBB0_2:                                # %if.end
-	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -65,5 +67,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/990628-1.c.s b/test/torture-s/990628-1.c.s
index 6206372d1..3a320aa16 100644
--- a/test/torture-s/990628-1.c.s
+++ b/test/torture-s/990628-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990628-1.c"
+	.file	"990628-1.c"
 	.section	.text.num_records,"ax",@progbits
-	.hidden	num_records
+	.hidden	num_records             # -- Begin function num_records
 	.globl	num_records
 	.type	num_records,@function
 num_records:                            # @num_records
@@ -12,9 +12,9 @@ num_records:                            # @num_records
 	.endfunc
 .Lfunc_end0:
 	.size	num_records, .Lfunc_end0-num_records
-
+                                        # -- End function
 	.section	.text.fetch,"ax",@progbits
-	.hidden	fetch
+	.hidden	fetch                   # -- Begin function fetch
 	.globl	fetch
 	.type	fetch,@function
 fetch:                                  # @fetch
@@ -42,9 +42,9 @@ fetch:                                  # @fetch
 	.endfunc
 .Lfunc_end1:
 	.size	fetch, .Lfunc_end1-fetch
-
+                                        # -- End function
 	.section	.text.load_data,"ax",@progbits
-	.hidden	load_data
+	.hidden	load_data               # -- Begin function load_data
 	.globl	load_data
 	.type	load_data,@function
 load_data:                              # @load_data
@@ -78,9 +78,13 @@ load_data:                              # @load_data
 	i32.select	$push5=, $pop4, $pop14, $pop11
 	i32.store	sqlca($pop15), $pop5
 	block   	
-	br_if   	0, $1           # 0: down to label0
-.LBB2_1:                                # %while.body
+	i32.eqz 	$push36=, $1
+	br_if   	0, $pop36       # 0: down to label0
+# BB#1:                                 # %while.end
+	return
+.LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
+	end_block                       # label0:
 	loop    	                # label1:
 	i32.const	$push34=, 404
 	i32.call	$drop=, memcpy@FUNCTION, $3, $0, $pop34
@@ -95,7 +99,7 @@ load_data:                              # @load_data
 	i32.const	$push27=, 1
 	i32.lt_s	$push6=, $pop28, $pop27
 	br_if   	0, $pop6        # 0: up to label1
-# BB#2:                                 # %while.cond.while.end_crit_edge
+# BB#3:                                 # %while.cond.while.end_crit_edge
 	end_loop
 	i32.const	$push8=, 0
 	i32.const	$push7=, 100
@@ -104,15 +108,13 @@ load_data:                              # @load_data
 	i32.const	$push9=, 1
 	i32.add 	$push10=, $2, $pop9
 	i32.store	fetch.fetch_count($pop35), $pop10
-.LBB2_3:                                # %while.end
-	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	load_data, .Lfunc_end2-load_data
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -120,32 +122,32 @@ main:                                   # @main
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push29=, 404
-	i32.call	$push28=, malloc@FUNCTION, $pop29
-	tee_local	$push27=, $2=, $pop28
-	i32.store	data_ptr($pop0), $pop27
+	i32.const	$push27=, 404
+	i32.call	$push26=, malloc@FUNCTION, $pop27
+	tee_local	$push25=, $1=, $pop26
+	i32.store	data_ptr($pop0), $pop25
 	i32.const	$push1=, 170
-	i32.const	$push26=, 404
-	i32.call	$0=, memset@FUNCTION, $2, $pop1, $pop26
-	i32.const	$push2=, data_tmp
-	i32.const	$push25=, 85
 	i32.const	$push24=, 404
-	i32.call	$1=, memset@FUNCTION, $pop2, $pop25, $pop24
-	i32.const	$push23=, 0
-	i32.const	$push22=, 0
-	i32.load	$push21=, fetch.fetch_count($pop22)
-	tee_local	$push20=, $2=, $pop21
-	i32.const	$push19=, 1
-	i32.add 	$push3=, $pop20, $pop19
-	i32.store	fetch.fetch_count($pop23), $pop3
-	i32.const	$push18=, 0
-	i32.const	$push4=, 100
-	i32.const	$push17=, 0
+	i32.call	$0=, memset@FUNCTION, $1, $pop1, $pop24
+	i32.const	$push2=, data_tmp
+	i32.const	$push23=, 85
+	i32.const	$push22=, 404
+	i32.call	$1=, memset@FUNCTION, $pop2, $pop23, $pop22
+	i32.const	$push21=, 0
+	i32.const	$push20=, 0
+	i32.load	$push19=, fetch.fetch_count($pop20)
+	tee_local	$push18=, $2=, $pop19
+	i32.const	$push17=, 1
+	i32.add 	$push3=, $pop18, $pop17
+	i32.store	fetch.fetch_count($pop21), $pop3
 	i32.const	$push16=, 0
-	i32.gt_s	$push15=, $2, $pop16
-	tee_local	$push14=, $3=, $pop15
-	i32.select	$push5=, $pop4, $pop17, $pop14
-	i32.store	sqlca($pop18), $pop5
+	i32.const	$push4=, 100
+	i32.const	$push15=, 0
+	i32.const	$push14=, 0
+	i32.gt_s	$push13=, $2, $pop14
+	tee_local	$push12=, $3=, $pop13
+	i32.select	$push5=, $pop4, $pop15, $pop12
+	i32.store	sqlca($pop16), $pop5
 	block   	
 	br_if   	0, $3           # 0: down to label2
 # BB#1:                                 # %while.body.lr.ph.i
@@ -153,46 +155,43 @@ main:                                   # @main
 .LBB3_2:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push37=, 404
-	i32.call	$drop=, memcpy@FUNCTION, $3, $1, $pop37
-	i32.const	$push36=, 85
 	i32.const	$push35=, 404
-	i32.call	$drop=, memset@FUNCTION, $1, $pop36, $pop35
-	i32.const	$push34=, 404
-	i32.add 	$3=, $3, $pop34
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $2, $pop33
-	tee_local	$push31=, $2=, $pop32
-	i32.const	$push30=, 1
-	i32.lt_s	$push6=, $pop31, $pop30
+	i32.call	$drop=, memcpy@FUNCTION, $3, $1, $pop35
+	i32.const	$push34=, 85
+	i32.const	$push33=, 404
+	i32.call	$drop=, memset@FUNCTION, $1, $pop34, $pop33
+	i32.const	$push32=, 404
+	i32.add 	$3=, $3, $pop32
+	i32.const	$push31=, 1
+	i32.add 	$push30=, $2, $pop31
+	tee_local	$push29=, $2=, $pop30
+	i32.const	$push28=, 1
+	i32.lt_s	$push6=, $pop29, $pop28
 	br_if   	0, $pop6        # 0: up to label3
-# BB#3:                                 # %while.cond.while.end_crit_edge.i
+# BB#3:                                 # %load_data.exit
 	end_loop
-	i32.const	$push8=, 0
+	i32.const	$push37=, 0
 	i32.const	$push7=, 100
-	i32.store	sqlca($pop8), $pop7
+	i32.store	sqlca($pop37), $pop7
+	i32.const	$push36=, 0
+	i32.const	$push8=, 2
+	i32.store	fetch.fetch_count($pop36), $pop8
+	i32.load	$push9=, 0($0)
+	i32.const	$push10=, 1431655765
+	i32.ne  	$push11=, $pop9, $pop10
+	br_if   	0, $pop11       # 0: down to label2
+# BB#4:                                 # %if.end
 	i32.const	$push38=, 0
-	i32.const	$push9=, 2
-	i32.store	fetch.fetch_count($pop38), $pop9
-.LBB3_4:                                # %load_data.exit
-	end_block                       # label2:
-	block   	
-	i32.load	$push10=, 0($0)
-	i32.const	$push11=, 1431655765
-	i32.ne  	$push12=, $pop10, $pop11
-	br_if   	0, $pop12       # 0: down to label4
-# BB#5:                                 # %if.end
-	i32.const	$push13=, 0
-	call    	exit@FUNCTION, $pop13
+	call    	exit@FUNCTION, $pop38
 	unreachable
-.LBB3_6:                                # %if.then
-	end_block                       # label4:
+.LBB3_5:                                # %if.then
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	fetch.fetch_count,@object # @fetch.fetch_count
 	.section	.bss.fetch.fetch_count,"aw",@nobits
 	.p2align	2
@@ -228,7 +227,7 @@ data_ptr:
 	.size	data_ptr, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990804-1.c.s b/test/torture-s/990804-1.c.s
index 190401cc8..4835a9af8 100644
--- a/test/torture-s/990804-1.c.s
+++ b/test/torture-s/990804-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990804-1.c"
+	.file	"990804-1.c"
 	.section	.text.gfbyte,"ax",@progbits
-	.hidden	gfbyte
+	.hidden	gfbyte                  # -- Begin function gfbyte
 	.globl	gfbyte
 	.type	gfbyte,@function
 gfbyte:                                 # @gfbyte
@@ -12,9 +12,9 @@ gfbyte:                                 # @gfbyte
 	.endfunc
 .Lfunc_end0:
 	.size	gfbyte, .Lfunc_end0-gfbyte
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990811-1.c.s b/test/torture-s/990811-1.c.s
index 274079ef4..76b6d633d 100644
--- a/test/torture-s/990811-1.c.s
+++ b/test/torture-s/990811-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990811-1.c"
+	.file	"990811-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,27 +10,27 @@ foo:                                    # @foo
 # BB#0:                                 # %entry
 	block   	
 	block   	
-	block   	
 	i32.const	$push0=, 2
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label2
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push2=, 1
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	1, $pop3        # 1: down to label1
+	br_if   	0, $pop3        # 0: down to label2
 # BB#2:                                 # %entry
 	br_if   	2, $0           # 2: down to label0
 # BB#3:                                 # %sw.bb
 	i32.load	$push6=, 0($1)
 	return  	$pop6
-.LBB0_4:                                # %sw.bb2
+.LBB0_4:                                # %sw.bb1
 	end_block                       # label2:
-	i32.load16_s	$push4=, 0($1)
-	return  	$pop4
-.LBB0_5:                                # %sw.bb1
-	end_block                       # label1:
 	i32.load8_s	$push5=, 0($1)
 	return  	$pop5
+.LBB0_5:                                # %sw.bb2
+	end_block                       # label1:
+	i32.load16_s	$push4=, 0($1)
+	return  	$pop4
 .LBB0_6:                                # %sw.epilog
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -38,9 +38,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,8 +52,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/990826-0.c.s b/test/torture-s/990826-0.c.s
index efc855dd4..0550c01cd 100644
--- a/test/torture-s/990826-0.c.s
+++ b/test/torture-s/990826-0.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990826-0.c"
+	.file	"990826-0.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/990827-1.c.s b/test/torture-s/990827-1.c.s
index 865d3b8c6..98faf3cab 100644
--- a/test/torture-s/990827-1.c.s
+++ b/test/torture-s/990827-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990827-1.c"
+	.file	"990827-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -21,9 +21,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990829-1.c.s b/test/torture-s/990829-1.c.s
index bfebdd355..adfa57347 100644
--- a/test/torture-s/990829-1.c.s
+++ b/test/torture-s/990829-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990829-1.c"
+	.file	"990829-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -17,21 +17,21 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990923-1.c.s b/test/torture-s/990923-1.c.s
index 435d8338d..6e0bcfbfe 100644
--- a/test/torture-s/990923-1.c.s
+++ b/test/torture-s/990923-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/990923-1.c"
+	.file	"990923-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991014-1.c.s b/test/torture-s/991014-1.c.s
index 604026939..ef29c6830 100644
--- a/test/torture-s/991014-1.c.s
+++ b/test/torture-s/991014-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991014-1.c"
+	.file	"991014-1.c"
 	.section	.text.union_size,"ax",@progbits
-	.hidden	union_size
+	.hidden	union_size              # -- Begin function union_size
 	.globl	union_size
 	.type	union_size,@function
 union_size:                             # @union_size
@@ -12,9 +12,9 @@ union_size:                             # @union_size
 	.endfunc
 .Lfunc_end0:
 	.size	union_size, .Lfunc_end0-union_size
-
+                                        # -- End function
 	.section	.text.struct_size,"ax",@progbits
-	.hidden	struct_size
+	.hidden	struct_size             # -- Begin function struct_size
 	.globl	struct_size
 	.type	struct_size,@function
 struct_size:                            # @struct_size
@@ -25,9 +25,9 @@ struct_size:                            # @struct_size
 	.endfunc
 .Lfunc_end1:
 	.size	struct_size, .Lfunc_end1-struct_size
-
+                                        # -- End function
 	.section	.text.struct_a_offset,"ax",@progbits
-	.hidden	struct_a_offset
+	.hidden	struct_a_offset         # -- Begin function struct_a_offset
 	.globl	struct_a_offset
 	.type	struct_a_offset,@function
 struct_a_offset:                        # @struct_a_offset
@@ -38,9 +38,9 @@ struct_a_offset:                        # @struct_a_offset
 	.endfunc
 .Lfunc_end2:
 	.size	struct_a_offset, .Lfunc_end2-struct_a_offset
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,6 +51,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/991016-1.c.s b/test/torture-s/991016-1.c.s
index b6f2d568c..3a9283b81 100644
--- a/test/torture-s/991016-1.c.s
+++ b/test/torture-s/991016-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991016-1.c"
+	.file	"991016-1.c"
 	.section	.text.doit,"ax",@progbits
-	.hidden	doit
+	.hidden	doit                    # -- Begin function doit
 	.globl	doit
 	.type	doit,@function
 doit:                                   # @doit
@@ -11,39 +11,38 @@ doit:                                   # @doit
 # BB#0:                                 # %entry
 	block   	
 	block   	
-	block   	
-	i32.eqz 	$push25=, $0
-	br_if   	0, $pop25       # 0: down to label2
+	i32.const	$push0=, 2
+	i32.eq  	$push1=, $0, $pop0
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push6=, 1
-	i32.eq  	$push0=, $0, $pop6
-	br_if   	1, $pop0        # 1: down to label1
+	i32.eq  	$push2=, $0, $pop6
+	br_if   	0, $pop2        # 0: down to label2
 # BB#2:                                 # %entry
-	i32.const	$push1=, 2
-	i32.ne  	$push2=, $0, $pop1
-	br_if   	2, $pop2        # 2: down to label0
-# BB#3:                                 # %do.body11.preheader
-	i64.load	$5=, 0($2)
-.LBB0_4:                                # %do.body11
+	br_if   	2, $0           # 2: down to label0
+# BB#3:                                 # %sw.bb
+	i32.load	$0=, 0($2)
+.LBB0_4:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	copy_local	$push12=, $5
-	tee_local	$push11=, $4=, $pop12
-	i64.const	$push10=, 1
-	i64.shl 	$5=, $pop11, $pop10
+	copy_local	$push12=, $0
+	tee_local	$push11=, $3=, $pop12
+	i32.const	$push10=, 1
+	i32.shl 	$0=, $pop11, $pop10
 	i32.const	$push9=, -1
 	i32.add 	$push8=, $1, $pop9
 	tee_local	$push7=, $1=, $pop8
 	br_if   	0, $pop7        # 0: up to label3
-# BB#5:                                 # %do.end16
+# BB#5:                                 # %do.end
 	end_loop
-	i64.store	0($2), $5
-	i64.eqz 	$push3=, $4
-	return  	$pop3
-.LBB0_6:                                # %do.body.preheader
+	i32.store	0($2), $0
+	i32.eqz 	$push5=, $3
+	return  	$pop5
+.LBB0_6:                                # %sw.bb1
 	end_block                       # label2:
 	i32.load	$0=, 0($2)
-.LBB0_7:                                # %do.body
+.LBB0_7:                                # %do.body2
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
 	copy_local	$push18=, $0
@@ -54,30 +53,30 @@ doit:                                   # @doit
 	i32.add 	$push14=, $1, $pop15
 	tee_local	$push13=, $1=, $pop14
 	br_if   	0, $pop13       # 0: up to label4
-# BB#8:                                 # %do.end
+# BB#8:                                 # %do.end7
 	end_loop
 	i32.store	0($2), $0
-	i32.eqz 	$push5=, $3
-	return  	$pop5
-.LBB0_9:                                # %do.body2.preheader
+	i32.eqz 	$push4=, $3
+	return  	$pop4
+.LBB0_9:                                # %sw.bb10
 	end_block                       # label1:
-	i32.load	$0=, 0($2)
-.LBB0_10:                               # %do.body2
+	i64.load	$5=, 0($2)
+.LBB0_10:                               # %do.body11
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	copy_local	$push24=, $0
-	tee_local	$push23=, $3=, $pop24
-	i32.const	$push22=, 1
-	i32.shl 	$0=, $pop23, $pop22
+	copy_local	$push24=, $5
+	tee_local	$push23=, $4=, $pop24
+	i64.const	$push22=, 1
+	i64.shl 	$5=, $pop23, $pop22
 	i32.const	$push21=, -1
 	i32.add 	$push20=, $1, $pop21
 	tee_local	$push19=, $1=, $pop20
 	br_if   	0, $pop19       # 0: up to label5
-# BB#11:                                # %do.end7
+# BB#11:                                # %do.end16
 	end_loop
-	i32.store	0($2), $0
-	i32.eqz 	$push4=, $3
-	return  	$pop4
+	i64.store	0($2), $5
+	i64.eqz 	$push3=, $4
+	return  	$pop3
 .LBB0_12:                               # %sw.default
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -85,9 +84,9 @@ doit:                                   # @doit
 	.endfunc
 .Lfunc_end0:
 	.size	doit, .Lfunc_end0-doit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -99,8 +98,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991019-1.c.s b/test/torture-s/991019-1.c.s
index e6a1ec13a..06ef324a8 100644
--- a/test/torture-s/991019-1.c.s
+++ b/test/torture-s/991019-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991019-1.c"
+	.file	"991019-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991023-1.c.s b/test/torture-s/991023-1.c.s
index d129004a5..ce274d99f 100644
--- a/test/torture-s/991023-1.c.s
+++ b/test/torture-s/991023-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991023-1.c"
+	.file	"991023-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	blah                    # @blah
 	.type	blah,@object
 	.section	.bss.blah,"aw",@nobits
@@ -43,5 +43,5 @@ blah:
 	.size	blah, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991030-1.c.s b/test/torture-s/991030-1.c.s
index 810550ec8..fb57fda06 100644
--- a/test/torture-s/991030-1.c.s
+++ b/test/torture-s/991030-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991030-1.c"
+	.file	"991030-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -35,6 +35,6 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991112-1.c.s b/test/torture-s/991112-1.c.s
index 5be28af24..6c5b4536a 100644
--- a/test/torture-s/991112-1.c.s
+++ b/test/torture-s/991112-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991112-1.c"
+	.file	"991112-1.c"
 	.section	.text.rl_show_char,"ax",@progbits
-	.hidden	rl_show_char
+	.hidden	rl_show_char            # -- Begin function rl_show_char
 	.globl	rl_show_char
 	.type	rl_show_char,@function
 rl_show_char:                           # @rl_show_char
@@ -13,9 +13,9 @@ rl_show_char:                           # @rl_show_char
 	.endfunc
 .Lfunc_end0:
 	.size	rl_show_char, .Lfunc_end0-rl_show_char
-
+                                        # -- End function
 	.section	.text.rl_character_len,"ax",@progbits
-	.hidden	rl_character_len
+	.hidden	rl_character_len        # -- Begin function rl_character_len
 	.globl	rl_character_len
 	.type	rl_character_len,@function
 rl_character_len:                       # @rl_character_len
@@ -30,9 +30,9 @@ rl_character_len:                       # @rl_character_len
 	.endfunc
 .Lfunc_end1:
 	.size	rl_character_len, .Lfunc_end1-rl_character_len
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,15 +50,15 @@ main:                                   # @main
 # BB#2:                                 # %if.end4
 	i32.const	$push4=, 0
 	return  	$pop4
-.LBB2_3:                                # %if.then3
+.LBB2_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	isprint, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/991118-1.c.s b/test/torture-s/991118-1.c.s
index 599c6c25e..9fca4861a 100644
--- a/test/torture-s/991118-1.c.s
+++ b/test/torture-s/991118-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991118-1.c"
+	.file	"991118-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -15,9 +15,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.sub2,"ax",@progbits
-	.hidden	sub2
+	.hidden	sub2                    # -- Begin function sub2
 	.globl	sub2
 	.type	sub2,@function
 sub2:                                   # @sub2
@@ -31,9 +31,9 @@ sub2:                                   # @sub2
 	.endfunc
 .Lfunc_end1:
 	.size	sub2, .Lfunc_end1-sub2
-
+                                        # -- End function
 	.section	.text.sub3,"ax",@progbits
-	.hidden	sub3
+	.hidden	sub3                    # -- Begin function sub3
 	.globl	sub3
 	.type	sub3,@function
 sub3:                                   # @sub3
@@ -47,9 +47,9 @@ sub3:                                   # @sub3
 	.endfunc
 .Lfunc_end2:
 	.size	sub3, .Lfunc_end2-sub3
-
+                                        # -- End function
 	.section	.text.sub4,"ax",@progbits
-	.hidden	sub4
+	.hidden	sub4                    # -- Begin function sub4
 	.globl	sub4
 	.type	sub4,@function
 sub4:                                   # @sub4
@@ -63,9 +63,9 @@ sub4:                                   # @sub4
 	.endfunc
 .Lfunc_end3:
 	.size	sub4, .Lfunc_end3-sub4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -164,14 +164,14 @@ main:                                   # @main
 	i32.const	$push40=, 0
 	call    	exit@FUNCTION, $pop40
 	unreachable
-.LBB4_9:                                # %if.then46
+.LBB4_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	tmp                     # @tmp
 	.type	tmp,@object
 	.section	.data.tmp,"aw",@progbits
@@ -237,6 +237,6 @@ tmp4:
 	.size	tmp4, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991201-1.c.s b/test/torture-s/991201-1.c.s
index 89b11a55f..6f5f50678 100644
--- a/test/torture-s/991201-1.c.s
+++ b/test/torture-s/991201-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991201-1.c"
+	.file	"991201-1.c"
 	.section	.text.reset_palette,"ax",@progbits
-	.hidden	reset_palette
+	.hidden	reset_palette           # -- Begin function reset_palette
 	.globl	reset_palette
 	.type	reset_palette,@function
 reset_palette:                          # @reset_palette
@@ -51,9 +51,9 @@ reset_palette:                          # @reset_palette
 	.endfunc
 .Lfunc_end0:
 	.size	reset_palette, .Lfunc_end0-reset_palette
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -72,9 +72,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -88,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a_con                   # @a_con
 	.type	a_con,@object
 	.section	.bss.a_con,"aw",@nobits
@@ -197,6 +197,6 @@ default_blu:
 	.size	default_blu, 64
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991202-1.c.s b/test/torture-s/991202-1.c.s
index 8118b767b..9d1bffaab 100644
--- a/test/torture-s/991202-1.c.s
+++ b/test/torture-s/991202-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991202-1.c"
+	.file	"991202-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -19,7 +19,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -39,5 +39,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991202-2.c.s b/test/torture-s/991202-2.c.s
index 4214dd08b..b732d724c 100644
--- a/test/torture-s/991202-2.c.s
+++ b/test/torture-s/991202-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991202-2.c"
+	.file	"991202-2.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -12,9 +12,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991202-3.c.s b/test/torture-s/991202-3.c.s
index 852ab242b..bee60f04b 100644
--- a/test/torture-s/991202-3.c.s
+++ b/test/torture-s/991202-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991202-3.c"
+	.file	"991202-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -31,9 +31,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.h,"ax",@progbits
-	.hidden	h
+	.hidden	h                       # -- Begin function h
 	.globl	h
 	.type	h,@function
 h:                                      # @h
@@ -46,9 +46,9 @@ h:                                      # @h
 	.endfunc
 .Lfunc_end2:
 	.size	h, .Lfunc_end2-h
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991216-1.c.s b/test/torture-s/991216-1.c.s
index daf52b01d..8d66dfe16 100644
--- a/test/torture-s/991216-1.c.s
+++ b/test/torture-s/991216-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991216-1.c"
+	.file	"991216-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -28,9 +28,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -61,9 +61,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -98,9 +98,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -139,9 +139,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -184,9 +184,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -233,9 +233,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -286,9 +286,9 @@ test7:                                  # @test7
 	.endfunc
 .Lfunc_end6:
 	.size	test7, .Lfunc_end6-test7
-
+                                        # -- End function
 	.section	.text.test8,"ax",@progbits
-	.hidden	test8
+	.hidden	test8                   # -- Begin function test8
 	.globl	test8
 	.type	test8,@function
 test8:                                  # @test8
@@ -343,9 +343,9 @@ test8:                                  # @test8
 	.endfunc
 .Lfunc_end7:
 	.size	test8, .Lfunc_end7-test8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -357,8 +357,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991216-2.c.s b/test/torture-s/991216-2.c.s
index 926f4c4fb..2ce2d48a6 100644
--- a/test/torture-s/991216-2.c.s
+++ b/test/torture-s/991216-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991216-2.c"
+	.file	"991216-2.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -9,10 +9,10 @@ test:                                   # @test
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push25=, $pop18, $pop19
+	i32.sub 	$push25=, $pop17, $pop19
 	tee_local	$push24=, $4=, $pop25
 	i32.store	__stack_pointer($pop20), $pop24
 	i32.store	12($4), $1
@@ -76,16 +76,16 @@ test:                                   # @test
 	i32.add 	$push22=, $4, $pop21
 	i32.store	__stack_pointer($pop23), $pop22
 	return
-.LBB0_8:                                # %if.then11
+.LBB0_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -93,10 +93,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
+	i32.const	$push35=, 0
+	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 288
-	i32.sub 	$push116=, $pop35, $pop36
+	i32.sub 	$push116=, $pop34, $pop36
 	tee_local	$push115=, $0=, $pop116
 	i32.store	__stack_pointer($pop37), $pop115
 	i32.const	$push0=, 85
@@ -255,8 +255,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/991216-4.c.s b/test/torture-s/991216-4.c.s
index 808870eb7..c65042ef6 100644
--- a/test/torture-s/991216-4.c.s
+++ b/test/torture-s/991216-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991216-4.c"
+	.file	"991216-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991221-1.c.s b/test/torture-s/991221-1.c.s
index 31291c190..d2627ba10 100644
--- a/test/torture-s/991221-1.c.s
+++ b/test/torture-s/991221-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991221-1.c"
+	.file	"991221-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991227-1.c.s b/test/torture-s/991227-1.c.s
index 4357b34e6..d0559b608 100644
--- a/test/torture-s/991227-1.c.s
+++ b/test/torture-s/991227-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991227-1.c"
+	.file	"991227-1.c"
 	.section	.text.doit,"ax",@progbits
-	.hidden	doit
+	.hidden	doit                    # -- Begin function doit
 	.globl	doit
 	.type	doit,@function
 doit:                                   # @doit
@@ -17,9 +17,9 @@ doit:                                   # @doit
 	.endfunc
 .Lfunc_end0:
 	.size	doit, .Lfunc_end0-doit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.cst8,"aM",@progbits,8
 .L.str:
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	.L.str.1, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991228-1.c.s b/test/torture-s/991228-1.c.s
index 63311708c..bde74f1cc 100644
--- a/test/torture-s/991228-1.c.s
+++ b/test/torture-s/991228-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/991228-1.c"
+	.file	"991228-1.c"
 	.section	.text.signbit,"ax",@progbits
-	.hidden	signbit
+	.hidden	signbit                 # -- Begin function signbit
 	.globl	signbit
 	.type	signbit,@function
 signbit:                                # @signbit
@@ -9,10 +9,10 @@ signbit:                                # @signbit
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push14=, $pop9, $pop10
+	i32.sub 	$push14=, $pop8, $pop10
 	tee_local	$push13=, $1=, $pop14
 	f64.store	8($pop13), $0
 	i32.const	$push11=, 8
@@ -29,9 +29,9 @@ signbit:                                # @signbit
 	.endfunc
 .Lfunc_end0:
 	.size	signbit, .Lfunc_end0-signbit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,10 +39,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push22=, $pop12, $pop13
+	i32.sub 	$push22=, $pop11, $pop13
 	tee_local	$push21=, $1=, $pop22
 	i32.store	__stack_pointer($pop14), $pop21
 	block   	
@@ -84,7 +84,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.data.u,"aw",@progbits
@@ -104,6 +104,6 @@ endianness_test:
 	.size	endianness_test, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/align-1.c.s b/test/torture-s/align-1.c.s
index 53533b6fb..8a4e170f0 100644
--- a/test/torture-s/align-1.c.s
+++ b/test/torture-s/align-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/align-1.c"
+	.file	"align-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/align-2.c.s b/test/torture-s/align-2.c.s
index 7852bc431..57bebd098 100644
--- a/test/torture-s/align-2.c.s
+++ b/test/torture-s/align-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/align-2.c"
+	.file	"align-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -193,14 +193,14 @@ main:                                   # @main
 # BB#28:                                # %if.end122
 	i32.const	$push94=, 0
 	return  	$pop94
-.LBB0_29:                               # %if.then121
+.LBB0_29:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s_c_s                   # @s_c_s
 	.type	s_c_s,@object
 	.section	.data.s_c_s,"aw",@progbits
@@ -361,5 +361,5 @@ s_d_ld:
 	.size	s_d_ld, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/align-3.c.s b/test/torture-s/align-3.c.s
index 47b8f857c..b3d4e3bf5 100644
--- a/test/torture-s/align-3.c.s
+++ b/test/torture-s/align-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/align-3.c"
+	.file	"align-3.c"
 	.section	.text.func,"ax",@progbits
-	.hidden	func
+	.hidden	func                    # -- Begin function func
 	.globl	func
 	.p2align	8
 	.type	func,@function
@@ -11,9 +11,9 @@ func:                                   # @func
 	.endfunc
 .Lfunc_end0:
 	.size	func, .Lfunc_end0-func
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,6 +24,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/alloca-1.c.s b/test/torture-s/alloca-1.c.s
index 52c0e2366..887fae75a 100644
--- a/test/torture-s/alloca-1.c.s
+++ b/test/torture-s/alloca-1.c.s
@@ -1,58 +1,30 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/alloca-1.c"
+	.file	"alloca-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
-	i32.const	$push5=, 32
-	i32.sub 	$push6=, $pop4, $pop5
-	i32.const	$push0=, 15
-	i32.and 	$push1=, $pop6, $pop0
-	i32.eqz 	$push2=, $pop1
-                                        # fallthrough-return: $pop2
+	i32.const	$push0=, 1
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
-	i32.const	$push5=, 32
-	i32.sub 	$push11=, $pop4, $pop5
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
-	block   	
-	i32.const	$push0=, 15
-	i32.and 	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push9=, 0
-	i32.const	$push7=, 32
-	i32.add 	$push8=, $0, $pop7
-	i32.store	__stack_pointer($pop9), $pop8
-	i32.const	$push2=, 0
-	return  	$pop2
-.LBB1_2:                                # %if.then
-	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
-	.functype	abort, void
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/anon-1.c.s b/test/torture-s/anon-1.c.s
index 4c6cc2087..63f32bfc8 100644
--- a/test/torture-s/anon-1.c.s
+++ b/test/torture-s/anon-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/anon-1.c"
+	.file	"anon-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,7 +16,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -27,4 +27,4 @@ foo:
 	.size	foo, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/arith-1.c.s b/test/torture-s/arith-1.c.s
index 59d5baaaa..998379c5b 100644
--- a/test/torture-s/arith-1.c.s
+++ b/test/torture-s/arith-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/arith-1.c"
+	.file	"arith-1.c"
 	.section	.text.sat_add,"ax",@progbits
-	.hidden	sat_add
+	.hidden	sat_add                 # -- Begin function sat_add
 	.globl	sat_add
 	.type	sat_add,@function
 sat_add:                                # @sat_add
@@ -18,9 +18,9 @@ sat_add:                                # @sat_add
 	.endfunc
 .Lfunc_end0:
 	.size	sat_add, .Lfunc_end0-sat_add
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/arith-rand-ll.c.s b/test/torture-s/arith-rand-ll.c.s
index aa4728677..39d9e0dc9 100644
--- a/test/torture-s/arith-rand-ll.c.s
+++ b/test/torture-s/arith-rand-ll.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/arith-rand-ll.c"
+	.file	"arith-rand-ll.c"
 	.section	.text.simple_rand,"ax",@progbits
-	.hidden	simple_rand
+	.hidden	simple_rand             # -- Begin function simple_rand
 	.globl	simple_rand
 	.type	simple_rand,@function
 simple_rand:                            # @simple_rand
@@ -23,420 +23,471 @@ simple_rand:                            # @simple_rand
 	.endfunc
 .Lfunc_end0:
 	.size	simple_rand, .Lfunc_end0-simple_rand
-
+                                        # -- End function
 	.section	.text.random_bitstring,"ax",@progbits
-	.hidden	random_bitstring
+	.hidden	random_bitstring        # -- Begin function random_bitstring
 	.globl	random_bitstring
 	.type	random_bitstring,@function
 random_bitstring:                       # @random_bitstring
 	.result 	i64
-	.local  	i64, i32, i64, i64, i32
+	.local  	i32, i32, i64, i64, i64
 # BB#0:                                 # %entry
-	i32.const	$4=, 0
-	i32.const	$push10=, 0
-	i64.load	$2=, simple_rand.seed($pop10)
-	i64.const	$3=, 0
-.LBB1_1:                                # %for.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.const	$push23=, 0
+	i32.const	$push22=, 0
+	i64.load	$push0=, simple_rand.seed($pop22)
+	i64.const	$push21=, 1103515245
+	i64.mul 	$push1=, $pop0, $pop21
+	i64.const	$push20=, 12345
+	i64.add 	$push19=, $pop1, $pop20
+	tee_local	$push18=, $3=, $pop19
+	i64.store	simple_rand.seed($pop23), $pop18
+	i64.const	$4=, 0
 	block   	
+	i64.const	$push17=, 9
+	i64.shr_u	$push16=, $3, $pop17
+	tee_local	$push15=, $2=, $pop16
+	i32.wrap/i64	$push2=, $pop15
+	i32.const	$push14=, 15
+	i32.and 	$push13=, $pop2, $pop14
+	tee_local	$push12=, $0=, $pop13
+	i32.eqz 	$push40=, $pop12
+	br_if   	0, $pop40       # 0: down to label0
+# BB#1:                                 # %if.else.preheader
+	copy_local	$1=, $0
+.LBB1_2:                                # %if.else
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.const	$push20=, 1103515245
-	i64.mul 	$push0=, $2, $pop20
-	i64.const	$push19=, 12345
-	i64.add 	$push18=, $pop0, $pop19
-	tee_local	$push17=, $2=, $pop18
-	i64.const	$push16=, 9
-	i64.shr_u	$push15=, $pop17, $pop16
-	tee_local	$push14=, $0=, $pop15
-	i32.wrap/i64	$push1=, $pop14
-	i32.const	$push13=, 15
-	i32.and 	$push12=, $pop1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.eqz 	$push26=, $pop11
-	br_if   	1, $pop26       # 1: down to label0
-# BB#2:                                 # %if.else
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.add 	$4=, $1, $4
-	i64.const	$push22=, 15
-	i64.and 	$push2=, $0, $pop22
-	i64.shl 	$3=, $3, $pop2
+	i64.const	$push25=, 15
+	i64.and 	$push3=, $2, $pop25
+	i64.shl 	$4=, $4, $pop3
 	block   	
-	i64.const	$push21=, 256
-	i64.and 	$push3=, $2, $pop21
-	i64.eqz 	$push4=, $pop3
-	br_if   	0, $pop4        # 0: down to label2
+	i64.const	$push24=, 256
+	i64.and 	$push4=, $3, $pop24
+	i64.eqz 	$push5=, $pop4
+	br_if   	0, $pop5        # 0: down to label2
 # BB#3:                                 # %if.then2
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push24=, 1
-	i32.shl 	$push5=, $pop24, $1
-	i32.const	$push23=, -1
-	i32.add 	$push6=, $pop5, $pop23
-	i64.extend_s/i32	$push7=, $pop6
-	i64.or  	$3=, $pop7, $3
+                                        #   in Loop: Header=BB1_2 Depth=1
+	i32.const	$push27=, 1
+	i32.shl 	$push6=, $pop27, $1
+	i32.const	$push26=, -1
+	i32.add 	$push7=, $pop6, $pop26
+	i64.extend_s/i32	$push8=, $pop7
+	i64.or  	$4=, $4, $pop8
 .LBB1_4:                                # %if.end
-                                        #   in Loop: Header=BB1_1 Depth=1
+                                        #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push25=, 71
-	i32.lt_u	$push8=, $4, $pop25
-	br_if   	0, $pop8        # 0: up to label1
-.LBB1_5:                                # %cleanup
+	i32.const	$push28=, 71
+	i32.ge_u	$push9=, $0, $pop28
+	br_if   	1, $pop9        # 1: down to label0
+# BB#5:                                 # %for.cond
+                                        #   in Loop: Header=BB1_2 Depth=1
+	i32.const	$push39=, 0
+	i64.const	$push38=, 1103515245
+	i64.mul 	$push10=, $3, $pop38
+	i64.const	$push37=, 12345
+	i64.add 	$push36=, $pop10, $pop37
+	tee_local	$push35=, $3=, $pop36
+	i64.store	simple_rand.seed($pop39), $pop35
+	i64.const	$push34=, 9
+	i64.shr_u	$push33=, $3, $pop34
+	tee_local	$push32=, $2=, $pop33
+	i32.wrap/i64	$push11=, $pop32
+	i32.const	$push31=, 15
+	i32.and 	$push30=, $pop11, $pop31
+	tee_local	$push29=, $1=, $pop30
+	i32.add 	$0=, $pop29, $0
+	br_if   	0, $1           # 0: up to label1
+.LBB1_6:                                # %cleanup
 	end_loop
 	end_block                       # label0:
-	i32.const	$push9=, 0
-	i64.store	simple_rand.seed($pop9), $2
-	copy_local	$push27=, $3
-                                        # fallthrough-return: $pop27
+	copy_local	$push41=, $4
+                                        # fallthrough-return: $pop41
 	.endfunc
 .Lfunc_end1:
 	.size	random_bitstring, .Lfunc_end1-random_bitstring
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i64, i64, i32, i32, i32, i32, i32, i64, i32, i64
+	.local  	i64, i64, i64, i32, i32, i32, i32, i32, i32, i32, i64, i64
 # BB#0:                                 # %entry
-	i32.const	$push76=, 0
-	i64.load	$2=, simple_rand.seed($pop76)
-	i64.const	$0=, 0
+	i32.const	$push80=, 0
+	i64.load	$2=, simple_rand.seed($pop80)
+	i64.const	$1=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB2_2 Depth 2
-                                        #     Child Loop BB2_7 Depth 2
+                                        #     Child Loop BB2_3 Depth 2
+                                        #     Child Loop BB2_10 Depth 2
 	block   	
 	block   	
 	block   	
 	block   	
 	loop    	                # label7:
-	i64.const	$9=, 0
-	i32.const	$10=, 0
-.LBB2_2:                                # %for.cond.i
+	copy_local	$0=, $1
+	block   	
+	block   	
+	i64.const	$push90=, 1103515245
+	i64.mul 	$push0=, $2, $pop90
+	i64.const	$push89=, 12345
+	i64.add 	$push88=, $pop0, $pop89
+	tee_local	$push87=, $1=, $pop88
+	i64.const	$push86=, 9
+	i64.shr_u	$push85=, $pop87, $pop86
+	tee_local	$push84=, $2=, $pop85
+	i32.wrap/i64	$push1=, $pop84
+	i32.const	$push83=, 15
+	i32.and 	$push82=, $pop1, $pop83
+	tee_local	$push81=, $8=, $pop82
+	i32.eqz 	$push208=, $pop81
+	br_if   	0, $pop208      # 0: down to label9
+# BB#2:                                 # %if.else.i.preheader
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i64.const	$10=, 0
+	copy_local	$9=, $8
+.LBB2_3:                                # %if.else.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
+	loop    	                # label10:
+	i64.const	$push92=, 15
+	i64.and 	$push2=, $2, $pop92
+	i64.shl 	$10=, $10, $pop2
 	block   	
-	loop    	                # label9:
-	i64.const	$push86=, 1103515245
-	i64.mul 	$push0=, $2, $pop86
-	i64.const	$push85=, 12345
-	i64.add 	$push84=, $pop0, $pop85
-	tee_local	$push83=, $2=, $pop84
-	i64.const	$push82=, 9
-	i64.shr_u	$push81=, $pop83, $pop82
-	tee_local	$push80=, $11=, $pop81
-	i32.wrap/i64	$push1=, $pop80
-	i32.const	$push79=, 15
-	i32.and 	$push78=, $pop1, $pop79
-	tee_local	$push77=, $1=, $pop78
-	i32.eqz 	$push186=, $pop77
-	br_if   	1, $pop186      # 1: down to label8
-# BB#3:                                 # %if.else.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	i32.add 	$10=, $1, $10
-	i64.const	$push88=, 15
-	i64.and 	$push2=, $11, $pop88
-	i64.shl 	$9=, $9, $pop2
-	block   	
-	i64.const	$push87=, 256
-	i64.and 	$push3=, $2, $pop87
+	i64.const	$push91=, 256
+	i64.and 	$push3=, $1, $pop91
 	i64.eqz 	$push4=, $pop3
-	br_if   	0, $pop4        # 0: down to label10
+	br_if   	0, $pop4        # 0: down to label11
 # BB#4:                                 # %if.then2.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	i32.const	$push90=, 1
-	i32.shl 	$push5=, $pop90, $1
-	i32.const	$push89=, -1
-	i32.add 	$push6=, $pop5, $pop89
+                                        #   in Loop: Header=BB2_3 Depth=2
+	i32.const	$push94=, 1
+	i32.shl 	$push5=, $pop94, $9
+	i32.const	$push93=, -1
+	i32.add 	$push6=, $pop5, $pop93
 	i64.extend_s/i32	$push7=, $pop6
-	i64.or  	$9=, $pop7, $9
+	i64.or  	$10=, $10, $pop7
 .LBB2_5:                                # %if.end.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	end_block                       # label10:
-	i32.const	$push91=, 71
-	i32.lt_u	$push8=, $10, $pop91
-	br_if   	0, $pop8        # 0: up to label9
-.LBB2_6:                                # %random_bitstring.exit
-                                        #   in Loop: Header=BB2_1 Depth=1
+                                        #   in Loop: Header=BB2_3 Depth=2
+	end_block                       # label11:
+	i32.const	$push95=, 71
+	i32.ge_u	$push8=, $8, $pop95
+	br_if   	2, $pop8        # 2: down to label8
+# BB#6:                                 # %for.cond.i
+                                        #   in Loop: Header=BB2_3 Depth=2
+	i64.const	$push105=, 1103515245
+	i64.mul 	$push9=, $1, $pop105
+	i64.const	$push104=, 12345
+	i64.add 	$push103=, $pop9, $pop104
+	tee_local	$push102=, $1=, $pop103
+	i64.const	$push101=, 9
+	i64.shr_u	$push100=, $pop102, $pop101
+	tee_local	$push99=, $2=, $pop100
+	i32.wrap/i64	$push10=, $pop99
+	i32.const	$push98=, 15
+	i32.and 	$push97=, $pop10, $pop98
+	tee_local	$push96=, $9=, $pop97
+	i32.add 	$8=, $pop96, $8
+	br_if   	0, $9           # 0: up to label10
+	br      	2               # 2: down to label8
+.LBB2_7:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
+	end_block                       # label9:
+	i64.const	$10=, 0
+.LBB2_8:                                # %random_bitstring.exit
+                                        #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label8:
-	i32.const	$10=, 0
-	i64.const	$11=, 0
-.LBB2_7:                                # %for.cond.i452
-                                        #   Parent Loop BB2_1 Depth=1
-                                        # =>  This Inner Loop Header: Depth=2
-	block   	
-	loop    	                # label12:
-	i64.const	$push101=, 1103515245
-	i64.mul 	$push9=, $2, $pop101
-	i64.const	$push100=, 12345
-	i64.add 	$push99=, $pop9, $pop100
-	tee_local	$push98=, $2=, $pop99
-	i64.const	$push97=, 9
-	i64.shr_u	$push96=, $pop98, $pop97
-	tee_local	$push95=, $3=, $pop96
-	i32.wrap/i64	$push10=, $pop95
-	i32.const	$push94=, 15
-	i32.and 	$push93=, $pop10, $pop94
-	tee_local	$push92=, $1=, $pop93
-	i32.eqz 	$push187=, $pop92
-	br_if   	1, $pop187      # 1: down to label11
-# BB#8:                                 # %if.else.i457
-                                        #   in Loop: Header=BB2_7 Depth=2
-	i32.add 	$10=, $1, $10
-	i64.const	$push103=, 15
-	i64.and 	$push11=, $3, $pop103
-	i64.shl 	$11=, $11, $pop11
 	block   	
-	i64.const	$push102=, 256
-	i64.and 	$push12=, $2, $pop102
-	i64.eqz 	$push13=, $pop12
-	br_if   	0, $pop13       # 0: down to label13
-# BB#9:                                 # %if.then2.i462
-                                        #   in Loop: Header=BB2_7 Depth=2
-	i32.const	$push105=, 1
-	i32.shl 	$push14=, $pop105, $1
-	i32.const	$push104=, -1
-	i32.add 	$push15=, $pop14, $pop104
-	i64.extend_s/i32	$push16=, $pop15
-	i64.or  	$11=, $pop16, $11
-.LBB2_10:                               # %if.end.i465
-                                        #   in Loop: Header=BB2_7 Depth=2
-	end_block                       # label13:
-	i32.const	$push106=, 71
-	i32.lt_u	$push17=, $10, $pop106
-	br_if   	0, $pop17       # 0: up to label12
-.LBB2_11:                               # %random_bitstring.exit467
+	i64.const	$push115=, 1103515245
+	i64.mul 	$push11=, $1, $pop115
+	i64.const	$push114=, 12345
+	i64.add 	$push113=, $pop11, $pop114
+	tee_local	$push112=, $2=, $pop113
+	i64.const	$push111=, 9
+	i64.shr_u	$push110=, $pop112, $pop111
+	tee_local	$push109=, $11=, $pop110
+	i32.wrap/i64	$push12=, $pop109
+	i32.const	$push108=, 15
+	i32.and 	$push107=, $pop12, $pop108
+	tee_local	$push106=, $8=, $pop107
+	i32.eqz 	$push209=, $pop106
+	br_if   	0, $pop209      # 0: down to label12
+# BB#9:                                 # %if.else.i459.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	end_loop
-	end_block                       # label11:
+	i64.const	$1=, 0
+	copy_local	$9=, $8
+.LBB2_10:                               # %if.else.i459
+                                        #   Parent Loop BB2_1 Depth=1
+                                        # =>  This Inner Loop Header: Depth=2
+	loop    	                # label13:
+	i64.const	$push117=, 15
+	i64.and 	$push13=, $11, $pop117
+	i64.shl 	$1=, $1, $pop13
 	block   	
-	i64.eqz 	$push18=, $11
-	br_if   	0, $pop18       # 0: down to label14
-# BB#12:                                # %cleanup.cont
-                                        #   in Loop: Header=BB2_1 Depth=1
+	i64.const	$push116=, 256
+	i64.and 	$push14=, $2, $pop116
+	i64.eqz 	$push15=, $pop14
+	br_if   	0, $pop15       # 0: down to label14
+# BB#11:                                # %if.then2.i464
+                                        #   in Loop: Header=BB2_10 Depth=2
+	i32.const	$push119=, 1
+	i32.shl 	$push16=, $pop119, $9
+	i32.const	$push118=, -1
+	i32.add 	$push17=, $pop16, $pop118
+	i64.extend_s/i32	$push18=, $pop17
+	i64.or  	$1=, $1, $pop18
+.LBB2_12:                               # %if.end.i467
+                                        #   in Loop: Header=BB2_10 Depth=2
+	end_block                       # label14:
 	block   	
-	i64.const	$push108=, 9223372036854775807
-	i64.and 	$push19=, $9, $pop108
-	i64.const	$push107=, 0
-	i64.ne  	$push20=, $pop19, $pop107
-	br_if   	0, $pop20       # 0: down to label15
-# BB#13:                                # %cleanup.cont
-                                        #   in Loop: Header=BB2_1 Depth=1
-	i64.const	$push109=, -1
-	i64.eq  	$push21=, $11, $pop109
-	br_if   	1, $pop21       # 1: down to label14
-.LBB2_14:                               # %if.end17
+	i32.const	$push120=, 71
+	i32.ge_u	$push19=, $8, $pop120
+	br_if   	0, $pop19       # 0: down to label15
+# BB#13:                                # %for.cond.i451
+                                        #   in Loop: Header=BB2_10 Depth=2
+	i64.const	$push130=, 1103515245
+	i64.mul 	$push20=, $2, $pop130
+	i64.const	$push129=, 12345
+	i64.add 	$push128=, $pop20, $pop129
+	tee_local	$push127=, $2=, $pop128
+	i64.const	$push126=, 9
+	i64.shr_u	$push125=, $pop127, $pop126
+	tee_local	$push124=, $11=, $pop125
+	i32.wrap/i64	$push21=, $pop124
+	i32.const	$push123=, 15
+	i32.and 	$push122=, $pop21, $pop123
+	tee_local	$push121=, $9=, $pop122
+	i32.add 	$8=, $pop121, $8
+	br_if   	1, $9           # 1: up to label13
+.LBB2_14:                               # %random_bitstring.exit469
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label15:
-	i64.rem_s	$push117=, $9, $11
-	tee_local	$push116=, $3=, $pop117
-	i64.const	$push115=, 63
-	i64.shr_s	$push114=, $3, $pop115
-	tee_local	$push113=, $3=, $pop114
-	i64.add 	$push24=, $pop116, $pop113
-	i64.xor 	$push25=, $pop24, $3
-	i64.const	$push112=, 63
-	i64.shr_s	$push111=, $11, $pop112
-	tee_local	$push110=, $3=, $pop111
-	i64.add 	$push22=, $11, $pop110
-	i64.xor 	$push23=, $pop22, $3
-	i64.ge_u	$push26=, $pop25, $pop23
-	br_if   	2, $pop26       # 2: down to label6
-# BB#15:                                # %save_time
-                                        #   in Loop: Header=BB2_1 Depth=1
-	i32.wrap/i64	$push119=, $11
-	tee_local	$push118=, $10=, $pop119
-	i32.eqz 	$push188=, $pop118
-	br_if   	0, $pop188      # 0: down to label14
-# BB#16:                                # %cleanup.cont65
+	end_loop
+	i64.eqz 	$push22=, $1
+	br_if   	0, $pop22       # 0: down to label12
+# BB#15:                                # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
-	i32.wrap/i64	$push122=, $9
-	tee_local	$push121=, $1=, $pop122
-	i32.const	$push120=, 2147483647
-	i32.and 	$push28=, $pop121, $pop120
-	br_if   	0, $pop28       # 0: down to label16
-# BB#17:                                # %cleanup.cont65
+	i64.const	$push132=, 9223372036854775807
+	i64.and 	$push23=, $10, $pop132
+	i64.const	$push131=, 0
+	i64.ne  	$push24=, $pop23, $pop131
+	br_if   	0, $pop24       # 0: down to label16
+# BB#16:                                # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push123=, -1
-	i32.eq  	$push29=, $10, $pop123
-	br_if   	1, $pop29       # 1: down to label14
-.LBB2_18:                               # %if.end79
+	i64.const	$push133=, -1
+	i64.eq  	$push25=, $1, $pop133
+	br_if   	1, $pop25       # 1: down to label12
+.LBB2_17:                               # %if.end17
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label16:
-	i32.rem_s	$push131=, $1, $10
-	tee_local	$push130=, $4=, $pop131
-	i32.const	$push129=, 31
-	i32.shr_s	$push128=, $4, $pop129
-	tee_local	$push127=, $6=, $pop128
-	i32.add 	$push32=, $pop130, $pop127
-	i32.xor 	$push33=, $pop32, $6
-	i32.const	$push126=, 31
-	i32.shr_s	$push125=, $10, $pop126
-	tee_local	$push124=, $6=, $pop125
-	i32.add 	$push30=, $10, $pop124
-	i32.xor 	$push31=, $pop30, $6
-	i32.ge_u	$push34=, $pop33, $pop31
-	br_if   	3, $pop34       # 3: down to label5
-# BB#19:                                # %lor.lhs.false103
+	i64.rem_s	$push141=, $10, $1
+	tee_local	$push140=, $11=, $pop141
+	i64.const	$push139=, 63
+	i64.shr_s	$push138=, $11, $pop139
+	tee_local	$push137=, $11=, $pop138
+	i64.add 	$push28=, $pop140, $pop137
+	i64.xor 	$push29=, $pop28, $11
+	i64.const	$push136=, 63
+	i64.shr_s	$push135=, $1, $pop136
+	tee_local	$push134=, $11=, $pop135
+	i64.add 	$push26=, $1, $pop134
+	i64.xor 	$push27=, $pop26, $11
+	i64.ge_u	$push30=, $pop29, $pop27
+	br_if   	2, $pop30       # 2: down to label6
+# BB#18:                                # %save_time
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.wrap/i64	$push143=, $1
+	tee_local	$push142=, $8=, $pop143
+	i32.eqz 	$push210=, $pop142
+	br_if   	0, $pop210      # 0: down to label12
+# BB#19:                                # %cleanup.cont65
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
-	i32.eqz 	$push189=, $4
-	br_if   	0, $pop189      # 0: down to label17
-# BB#20:                                # %lor.lhs.false103
+	i32.wrap/i64	$push146=, $10
+	tee_local	$push145=, $9=, $pop146
+	i32.const	$push144=, 2147483647
+	i32.and 	$push32=, $pop145, $pop144
+	br_if   	0, $pop32       # 0: down to label17
+# BB#20:                                # %cleanup.cont65
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.xor 	$push35=, $4, $1
-	i32.const	$push132=, -1
-	i32.le_s	$push36=, $pop35, $pop132
-	br_if   	4, $pop36       # 4: down to label5
-.LBB2_21:                               # %cleanup.cont118
+	i32.const	$push147=, -1
+	i32.eq  	$push33=, $8, $pop147
+	br_if   	1, $pop33       # 1: down to label12
+.LBB2_21:                               # %if.end79
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label17:
-	i32.const	$push133=, 65535
-	i32.and 	$push37=, $10, $pop133
-	i32.eqz 	$push190=, $pop37
-	br_if   	0, $pop190      # 0: down to label14
-# BB#22:                                # %cleanup.cont158
-                                        #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push154=, 16
-	i32.shl 	$push38=, $1, $pop154
-	i32.const	$push153=, 16
-	i32.shr_s	$push152=, $pop38, $pop153
+	i32.rem_s	$push155=, $9, $8
+	tee_local	$push154=, $3=, $pop155
+	i32.const	$push153=, 31
+	i32.shr_s	$push152=, $3, $pop153
 	tee_local	$push151=, $5=, $pop152
-	i32.const	$push150=, 16
-	i32.shl 	$push149=, $10, $pop150
-	tee_local	$push148=, $7=, $pop149
-	i32.const	$push147=, 16
-	i32.shr_s	$push146=, $pop148, $pop147
-	tee_local	$push145=, $4=, $pop146
-	i32.rem_s	$push39=, $pop151, $pop145
-	i32.const	$push144=, 16
-	i32.shl 	$push143=, $pop39, $pop144
-	tee_local	$push142=, $8=, $pop143
-	i32.const	$push141=, 16
-	i32.shr_s	$push140=, $pop142, $pop141
-	tee_local	$push139=, $6=, $pop140
-	i32.const	$push138=, 0
-	i32.sub 	$push41=, $pop138, $6
-	i32.const	$push137=, -65536
-	i32.gt_s	$push40=, $8, $pop137
-	i32.select	$push42=, $pop139, $pop41, $pop40
-	i32.const	$push136=, 0
-	i32.sub 	$push44=, $pop136, $4
-	i32.const	$push135=, -65536
-	i32.gt_s	$push43=, $7, $pop135
-	i32.select	$push45=, $4, $pop44, $pop43
-	i32.const	$push134=, 65535
-	i32.and 	$push46=, $pop45, $pop134
-	i32.ge_s	$push47=, $pop42, $pop46
-	br_if   	4, $pop47       # 4: down to label4
-# BB#23:                                # %lor.lhs.false197
+	i32.add 	$push36=, $pop154, $pop151
+	i32.xor 	$push37=, $pop36, $5
+	i32.const	$push150=, 31
+	i32.shr_s	$push149=, $8, $pop150
+	tee_local	$push148=, $5=, $pop149
+	i32.add 	$push34=, $8, $pop148
+	i32.xor 	$push35=, $pop34, $5
+	i32.ge_u	$push38=, $pop37, $pop35
+	br_if   	3, $pop38       # 3: down to label5
+# BB#22:                                # %lor.lhs.false103
+                                        #   in Loop: Header=BB2_1 Depth=1
+	block   	
+	i32.eqz 	$push211=, $3
+	br_if   	0, $pop211      # 0: down to label18
+# BB#23:                                # %lor.lhs.false103
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.div_s	$push48=, $5, $4
-	i32.mul 	$push49=, $pop48, $4
-	i32.add 	$push50=, $pop49, $6
-	i32.const	$push156=, 16
-	i32.shl 	$push51=, $pop50, $pop156
-	i32.const	$push155=, 16
-	i32.shr_s	$push52=, $pop51, $pop155
-	i32.ne  	$push53=, $pop52, $5
-	br_if   	4, $pop53       # 4: down to label4
-# BB#24:                                # %if.end209
+	i32.xor 	$push39=, $3, $9
+	i32.const	$push156=, -1
+	i32.le_s	$push40=, $pop39, $pop156
+	br_if   	4, $pop40       # 4: down to label5
+.LBB2_24:                               # %cleanup.cont118
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push157=, 255
-	i32.and 	$push55=, $10, $pop157
-	i32.eqz 	$push191=, $pop55
-	br_if   	0, $pop191      # 0: down to label14
-# BB#25:                                # %cleanup.cont249
+	end_block                       # label18:
+	i32.const	$push157=, 65535
+	i32.and 	$push41=, $8, $pop157
+	i32.eqz 	$push212=, $pop41
+	br_if   	0, $pop212      # 0: down to label12
+# BB#25:                                # %cleanup.cont158
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push178=, 24
-	i32.shl 	$push56=, $1, $pop178
-	i32.const	$push177=, 24
-	i32.shr_s	$push176=, $pop56, $pop177
-	tee_local	$push175=, $4=, $pop176
-	i32.const	$push174=, 24
-	i32.shl 	$push173=, $10, $pop174
+	i32.const	$push178=, 16
+	i32.shl 	$push42=, $9, $pop178
+	i32.const	$push177=, 16
+	i32.shr_s	$push176=, $pop42, $pop177
+	tee_local	$push175=, $5=, $pop176
+	i32.const	$push174=, 16
+	i32.shl 	$push173=, $8, $pop174
 	tee_local	$push172=, $6=, $pop173
-	i32.const	$push171=, 24
+	i32.const	$push171=, 16
 	i32.shr_s	$push170=, $pop172, $pop171
-	tee_local	$push169=, $10=, $pop170
-	i32.rem_s	$push57=, $pop175, $pop169
-	i32.const	$push168=, 24
-	i32.shl 	$push167=, $pop57, $pop168
-	tee_local	$push166=, $5=, $pop167
-	i32.const	$push165=, 24
+	tee_local	$push169=, $3=, $pop170
+	i32.rem_s	$push43=, $pop175, $pop169
+	i32.const	$push168=, 16
+	i32.shl 	$push167=, $pop43, $pop168
+	tee_local	$push166=, $7=, $pop167
+	i32.const	$push165=, 16
 	i32.shr_s	$push164=, $pop166, $pop165
-	tee_local	$push163=, $1=, $pop164
+	tee_local	$push163=, $4=, $pop164
 	i32.const	$push162=, 0
-	i32.sub 	$push59=, $pop162, $1
-	i32.const	$push161=, -16777216
-	i32.gt_s	$push58=, $5, $pop161
-	i32.select	$push60=, $pop163, $pop59, $pop58
+	i32.sub 	$push45=, $pop162, $4
+	i32.const	$push161=, -65536
+	i32.gt_s	$push44=, $7, $pop161
+	i32.select	$push46=, $pop163, $pop45, $pop44
 	i32.const	$push160=, 0
-	i32.sub 	$push62=, $pop160, $10
-	i32.const	$push159=, -16777216
-	i32.gt_s	$push61=, $6, $pop159
-	i32.select	$push63=, $10, $pop62, $pop61
-	i32.const	$push158=, 255
-	i32.and 	$push64=, $pop63, $pop158
-	i32.ge_s	$push65=, $pop60, $pop64
-	br_if   	5, $pop65       # 5: down to label3
-# BB#26:                                # %lor.lhs.false288
+	i32.sub 	$push48=, $pop160, $3
+	i32.const	$push159=, -65536
+	i32.gt_s	$push47=, $6, $pop159
+	i32.select	$push49=, $3, $pop48, $pop47
+	i32.const	$push158=, 65535
+	i32.and 	$push50=, $pop49, $pop158
+	i32.ge_s	$push51=, $pop46, $pop50
+	br_if   	4, $pop51       # 4: down to label4
+# BB#26:                                # %lor.lhs.false197
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.div_s	$push66=, $4, $10
-	i32.mul 	$push67=, $pop66, $10
-	i32.add 	$push68=, $pop67, $1
-	i32.const	$push180=, 24
-	i32.shl 	$push69=, $pop68, $pop180
-	i32.const	$push179=, 24
-	i32.shr_s	$push70=, $pop69, $pop179
-	i32.ne  	$push71=, $pop70, $4
-	br_if   	5, $pop71       # 5: down to label3
-.LBB2_27:                               # %cleanup301
+	i32.div_s	$push52=, $5, $3
+	i32.mul 	$push53=, $pop52, $3
+	i32.add 	$push54=, $pop53, $4
+	i32.const	$push180=, 16
+	i32.shl 	$push55=, $pop54, $pop180
+	i32.const	$push179=, 16
+	i32.shr_s	$push56=, $pop55, $pop179
+	i32.ne  	$push57=, $pop56, $5
+	br_if   	4, $pop57       # 4: down to label4
+# BB#27:                                # %if.end209
                                         #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label14:
-	i64.const	$push184=, 1
-	i64.add 	$push183=, $0, $pop184
-	tee_local	$push182=, $0=, $pop183
-	i64.const	$push181=, 10000
-	i64.lt_s	$push74=, $pop182, $pop181
-	br_if   	0, $pop74       # 0: up to label7
-# BB#28:                                # %for.end
+	i32.const	$push181=, 255
+	i32.and 	$push59=, $8, $pop181
+	i32.eqz 	$push213=, $pop59
+	br_if   	0, $pop213      # 0: down to label12
+# BB#28:                                # %cleanup.cont249
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$push202=, 24
+	i32.shl 	$push60=, $9, $pop202
+	i32.const	$push201=, 24
+	i32.shr_s	$push200=, $pop60, $pop201
+	tee_local	$push199=, $9=, $pop200
+	i32.const	$push198=, 24
+	i32.shl 	$push197=, $8, $pop198
+	tee_local	$push196=, $5=, $pop197
+	i32.const	$push195=, 24
+	i32.shr_s	$push194=, $pop196, $pop195
+	tee_local	$push193=, $8=, $pop194
+	i32.rem_s	$push61=, $pop199, $pop193
+	i32.const	$push192=, 24
+	i32.shl 	$push191=, $pop61, $pop192
+	tee_local	$push190=, $4=, $pop191
+	i32.const	$push189=, 24
+	i32.shr_s	$push188=, $pop190, $pop189
+	tee_local	$push187=, $3=, $pop188
+	i32.const	$push186=, 0
+	i32.sub 	$push63=, $pop186, $3
+	i32.const	$push185=, -16777216
+	i32.gt_s	$push62=, $4, $pop185
+	i32.select	$push64=, $pop187, $pop63, $pop62
+	i32.const	$push184=, 0
+	i32.sub 	$push66=, $pop184, $8
+	i32.const	$push183=, -16777216
+	i32.gt_s	$push65=, $5, $pop183
+	i32.select	$push67=, $8, $pop66, $pop65
+	i32.const	$push182=, 255
+	i32.and 	$push68=, $pop67, $pop182
+	i32.ge_s	$push69=, $pop64, $pop68
+	br_if   	5, $pop69       # 5: down to label3
+# BB#29:                                # %lor.lhs.false288
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.div_s	$push70=, $9, $8
+	i32.mul 	$push71=, $pop70, $8
+	i32.add 	$push72=, $pop71, $3
+	i32.const	$push204=, 24
+	i32.shl 	$push73=, $pop72, $pop204
+	i32.const	$push203=, 24
+	i32.shr_s	$push74=, $pop73, $pop203
+	i32.ne  	$push75=, $pop74, $9
+	br_if   	5, $pop75       # 5: down to label3
+.LBB2_30:                               # %cleanup301
+                                        #   in Loop: Header=BB2_1 Depth=1
+	end_block                       # label12:
+	i64.const	$push206=, 1
+	i64.add 	$1=, $0, $pop206
+	i64.const	$push205=, 9999
+	i64.lt_u	$push78=, $0, $pop205
+	br_if   	0, $pop78       # 0: up to label7
+# BB#31:                                # %for.end
 	end_loop
-	i32.const	$push75=, 0
-	i64.store	simple_rand.seed($pop75), $2
-	i32.const	$push185=, 0
-	call    	exit@FUNCTION, $pop185
+	i32.const	$push79=, 0
+	i64.store	simple_rand.seed($pop79), $2
+	i32.const	$push207=, 0
+	call    	exit@FUNCTION, $pop207
 	unreachable
-.LBB2_29:                               # %if.then32
+.LBB2_32:                               # %if.then32
 	end_block                       # label6:
-	i32.const	$push27=, 0
-	i64.store	simple_rand.seed($pop27), $2
+	i32.const	$push31=, 0
+	i64.store	simple_rand.seed($pop31), $2
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_30:                               # %if.then111
+.LBB2_33:                               # %if.then111
 	end_block                       # label5:
-	i32.const	$push73=, 0
-	i64.store	simple_rand.seed($pop73), $2
+	i32.const	$push77=, 0
+	i64.store	simple_rand.seed($pop77), $2
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_31:                               # %if.then208
+.LBB2_34:                               # %if.then208
 	end_block                       # label4:
-	i32.const	$push54=, 0
-	i64.store	simple_rand.seed($pop54), $2
+	i32.const	$push58=, 0
+	i64.store	simple_rand.seed($pop58), $2
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_32:                               # %if.then299
+.LBB2_35:                               # %if.then299
 	end_block                       # label3:
-	i32.const	$push72=, 0
-	i64.store	simple_rand.seed($pop72), $2
+	i32.const	$push76=, 0
+	i64.store	simple_rand.seed($pop76), $2
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	simple_rand.seed,@object # @simple_rand.seed
 	.section	.data.simple_rand.seed,"aw",@progbits
 	.p2align	3
@@ -445,6 +496,6 @@ simple_rand.seed:
 	.size	simple_rand.seed, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/arith-rand.c.s b/test/torture-s/arith-rand.c.s
index c4e7de280..291b11f80 100644
--- a/test/torture-s/arith-rand.c.s
+++ b/test/torture-s/arith-rand.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/arith-rand.c"
+	.file	"arith-rand.c"
 	.section	.text.simple_rand,"ax",@progbits
-	.hidden	simple_rand
+	.hidden	simple_rand             # -- Begin function simple_rand
 	.globl	simple_rand
 	.type	simple_rand,@function
 simple_rand:                            # @simple_rand
@@ -23,348 +23,394 @@ simple_rand:                            # @simple_rand
 	.endfunc
 .Lfunc_end0:
 	.size	simple_rand, .Lfunc_end0-simple_rand
-
+                                        # -- End function
 	.section	.text.random_bitstring,"ax",@progbits
-	.hidden	random_bitstring
+	.hidden	random_bitstring        # -- Begin function random_bitstring
 	.globl	random_bitstring
 	.type	random_bitstring,@function
 random_bitstring:                       # @random_bitstring
 	.result 	i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 0
-	i32.const	$push7=, 0
-	i32.load	$1=, simple_rand.seed($pop7)
 	i32.const	$3=, 0
-.LBB1_1:                                # %for.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.const	$push18=, 0
+	i32.const	$push17=, 0
+	i32.load	$push0=, simple_rand.seed($pop17)
+	i32.const	$push16=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop16
+	i32.const	$push15=, 12345
+	i32.add 	$push14=, $pop1, $pop15
+	tee_local	$push13=, $2=, $pop14
+	i32.store	simple_rand.seed($pop18), $pop13
 	block   	
+	i32.const	$push12=, 9
+	i32.shr_u	$push2=, $2, $pop12
+	i32.const	$push11=, 15
+	i32.and 	$push10=, $pop2, $pop11
+	tee_local	$push9=, $0=, $pop10
+	i32.eqz 	$push32=, $pop9
+	br_if   	0, $pop32       # 0: down to label0
+# BB#1:                                 # %if.else.preheader
+	copy_local	$1=, $0
+	i32.const	$3=, 0
+.LBB1_2:                                # %if.else
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push15=, 1103515245
-	i32.mul 	$push0=, $1, $pop15
-	i32.const	$push14=, 12345
-	i32.add 	$push13=, $pop0, $pop14
-	tee_local	$push12=, $1=, $pop13
-	i32.const	$push11=, 9
-	i32.shr_u	$push1=, $pop12, $pop11
-	i32.const	$push10=, 15
-	i32.and 	$push9=, $pop1, $pop10
-	tee_local	$push8=, $0=, $pop9
-	i32.eqz 	$push20=, $pop8
-	br_if   	1, $pop20       # 1: down to label0
-# BB#2:                                 # %if.else
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.add 	$3=, $0, $3
-	i32.shl 	$2=, $2, $0
+	i32.shl 	$3=, $3, $1
 	block   	
-	i32.const	$push16=, 256
-	i32.and 	$push2=, $1, $pop16
-	i32.eqz 	$push21=, $pop2
-	br_if   	0, $pop21       # 0: down to label2
+	i32.const	$push19=, 256
+	i32.and 	$push3=, $2, $pop19
+	i32.eqz 	$push33=, $pop3
+	br_if   	0, $pop33       # 0: down to label2
 # BB#3:                                 # %if.then1
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push18=, 1
-	i32.shl 	$push3=, $pop18, $0
-	i32.const	$push17=, -1
-	i32.add 	$push4=, $pop3, $pop17
-	i32.or  	$2=, $pop4, $2
+                                        #   in Loop: Header=BB1_2 Depth=1
+	i32.const	$push21=, 1
+	i32.shl 	$push4=, $pop21, $1
+	i32.const	$push20=, -1
+	i32.add 	$push5=, $pop4, $pop20
+	i32.or  	$3=, $pop5, $3
 .LBB1_4:                                # %if.end
-                                        #   in Loop: Header=BB1_1 Depth=1
+                                        #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push19=, 39
-	i32.lt_u	$push5=, $3, $pop19
-	br_if   	0, $pop5        # 0: up to label1
-.LBB1_5:                                # %cleanup
+	i32.const	$push22=, 39
+	i32.ge_u	$push6=, $0, $pop22
+	br_if   	1, $pop6        # 1: down to label0
+# BB#5:                                 # %for.cond
+                                        #   in Loop: Header=BB1_2 Depth=1
+	i32.const	$push31=, 0
+	i32.const	$push30=, 1103515245
+	i32.mul 	$push7=, $2, $pop30
+	i32.const	$push29=, 12345
+	i32.add 	$push28=, $pop7, $pop29
+	tee_local	$push27=, $2=, $pop28
+	i32.store	simple_rand.seed($pop31), $pop27
+	i32.const	$push26=, 9
+	i32.shr_u	$push8=, $2, $pop26
+	i32.const	$push25=, 15
+	i32.and 	$push24=, $pop8, $pop25
+	tee_local	$push23=, $1=, $pop24
+	i32.add 	$0=, $pop23, $0
+	br_if   	0, $1           # 0: up to label1
+.LBB1_6:                                # %cleanup
 	end_loop
 	end_block                       # label0:
-	i32.const	$push6=, 0
-	i32.store	simple_rand.seed($pop6), $1
-	copy_local	$push22=, $2
-                                        # fallthrough-return: $pop22
+	copy_local	$push34=, $3
+                                        # fallthrough-return: $pop34
 	.endfunc
 .Lfunc_end1:
 	.size	random_bitstring, .Lfunc_end1-random_bitstring
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push58=, 0
-	i32.load	$2=, simple_rand.seed($pop58)
-	i32.const	$0=, 0
+	i32.const	$push62=, 0
+	i32.load	$3=, simple_rand.seed($pop62)
+	i32.const	$7=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB2_2 Depth 2
-                                        #     Child Loop BB2_7 Depth 2
+                                        #     Child Loop BB2_3 Depth 2
+                                        #     Child Loop BB2_10 Depth 2
 	block   	
 	block   	
 	block   	
 	loop    	                # label6:
-	i32.const	$6=, 0
-	i32.const	$7=, 0
-.LBB2_2:                                # %for.cond.i
+	copy_local	$0=, $7
+	block   	
+	block   	
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push0=, $3, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$push68=, $pop0, $pop69
+	tee_local	$push67=, $2=, $pop68
+	i32.const	$push66=, 9
+	i32.shr_u	$push1=, $pop67, $pop66
+	i32.const	$push65=, 15
+	i32.and 	$push64=, $pop1, $pop65
+	tee_local	$push63=, $3=, $pop64
+	i32.eqz 	$push164=, $pop63
+	br_if   	0, $pop164      # 0: down to label8
+# BB#2:                                 # %if.else.i.preheader
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$1=, 0
+	copy_local	$7=, $3
+.LBB2_3:                                # %if.else.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
+	loop    	                # label9:
+	i32.shl 	$1=, $1, $7
 	block   	
-	loop    	                # label8:
-	i32.const	$push66=, 1103515245
-	i32.mul 	$push0=, $2, $pop66
-	i32.const	$push65=, 12345
-	i32.add 	$push64=, $pop0, $pop65
-	tee_local	$push63=, $2=, $pop64
-	i32.const	$push62=, 9
-	i32.shr_u	$push1=, $pop63, $pop62
-	i32.const	$push61=, 15
-	i32.and 	$push60=, $pop1, $pop61
-	tee_local	$push59=, $1=, $pop60
-	i32.eqz 	$push146=, $pop59
-	br_if   	1, $pop146      # 1: down to label7
-# BB#3:                                 # %if.else.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	i32.add 	$7=, $1, $7
-	i32.shl 	$6=, $6, $1
-	block   	
-	i32.const	$push67=, 256
-	i32.and 	$push2=, $2, $pop67
-	i32.eqz 	$push147=, $pop2
-	br_if   	0, $pop147      # 0: down to label9
+	i32.const	$push71=, 256
+	i32.and 	$push2=, $2, $pop71
+	i32.eqz 	$push165=, $pop2
+	br_if   	0, $pop165      # 0: down to label10
 # BB#4:                                 # %if.then1.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	i32.const	$push69=, 1
-	i32.shl 	$push3=, $pop69, $1
-	i32.const	$push68=, -1
-	i32.add 	$push4=, $pop3, $pop68
-	i32.or  	$6=, $pop4, $6
+                                        #   in Loop: Header=BB2_3 Depth=2
+	i32.const	$push73=, 1
+	i32.shl 	$push3=, $pop73, $7
+	i32.const	$push72=, -1
+	i32.add 	$push4=, $pop3, $pop72
+	i32.or  	$1=, $1, $pop4
 .LBB2_5:                                # %if.end.i
-                                        #   in Loop: Header=BB2_2 Depth=2
-	end_block                       # label9:
-	i32.const	$push70=, 39
-	i32.lt_u	$push5=, $7, $pop70
-	br_if   	0, $pop5        # 0: up to label8
-.LBB2_6:                                # %random_bitstring.exit
-                                        #   in Loop: Header=BB2_1 Depth=1
+                                        #   in Loop: Header=BB2_3 Depth=2
+	end_block                       # label10:
+	i32.const	$push74=, 39
+	i32.ge_u	$push5=, $3, $pop74
+	br_if   	2, $pop5        # 2: down to label7
+# BB#6:                                 # %for.cond.i
+                                        #   in Loop: Header=BB2_3 Depth=2
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push6=, $2, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$push80=, $pop6, $pop81
+	tee_local	$push79=, $2=, $pop80
+	i32.const	$push78=, 9
+	i32.shr_u	$push7=, $pop79, $pop78
+	i32.const	$push77=, 15
+	i32.and 	$push76=, $pop7, $pop77
+	tee_local	$push75=, $7=, $pop76
+	i32.add 	$3=, $pop75, $3
+	br_if   	0, $7           # 0: up to label9
+	br      	2               # 2: down to label7
+.LBB2_7:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
+	end_block                       # label8:
+	i32.const	$1=, 0
+.LBB2_8:                                # %random_bitstring.exit
+                                        #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label7:
-	i32.const	$7=, 0
-	i32.const	$8=, 0
-.LBB2_7:                                # %for.cond.i339
+	block   	
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push8=, $2, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$push88=, $pop8, $pop89
+	tee_local	$push87=, $3=, $pop88
+	i32.const	$push86=, 9
+	i32.shr_u	$push9=, $pop87, $pop86
+	i32.const	$push85=, 15
+	i32.and 	$push84=, $pop9, $pop85
+	tee_local	$push83=, $8=, $pop84
+	i32.eqz 	$push166=, $pop83
+	br_if   	0, $pop166      # 0: down to label11
+# BB#9:                                 # %if.else.i346.preheader
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$2=, 0
+	copy_local	$7=, $8
+.LBB2_10:                               # %if.else.i346
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
+	loop    	                # label12:
+	i32.shl 	$2=, $2, $7
 	block   	
-	loop    	                # label11:
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push6=, $2, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop6, $pop77
-	tee_local	$push75=, $2=, $pop76
-	i32.const	$push74=, 9
-	i32.shr_u	$push7=, $pop75, $pop74
-	i32.const	$push73=, 15
-	i32.and 	$push72=, $pop7, $pop73
-	tee_local	$push71=, $1=, $pop72
-	i32.eqz 	$push148=, $pop71
-	br_if   	1, $pop148      # 1: down to label10
-# BB#8:                                 # %if.else.i343
-                                        #   in Loop: Header=BB2_7 Depth=2
-	i32.add 	$8=, $1, $8
-	i32.shl 	$7=, $7, $1
+	i32.const	$push91=, 256
+	i32.and 	$push10=, $3, $pop91
+	i32.eqz 	$push167=, $pop10
+	br_if   	0, $pop167      # 0: down to label13
+# BB#11:                                # %if.then1.i350
+                                        #   in Loop: Header=BB2_10 Depth=2
+	i32.const	$push93=, 1
+	i32.shl 	$push11=, $pop93, $7
+	i32.const	$push92=, -1
+	i32.add 	$push12=, $pop11, $pop92
+	i32.or  	$2=, $2, $pop12
+.LBB2_12:                               # %if.end.i353
+                                        #   in Loop: Header=BB2_10 Depth=2
+	end_block                       # label13:
 	block   	
-	i32.const	$push79=, 256
-	i32.and 	$push8=, $2, $pop79
-	i32.eqz 	$push149=, $pop8
-	br_if   	0, $pop149      # 0: down to label12
-# BB#9:                                 # %if.then1.i347
-                                        #   in Loop: Header=BB2_7 Depth=2
-	i32.const	$push81=, 1
-	i32.shl 	$push9=, $pop81, $1
-	i32.const	$push80=, -1
-	i32.add 	$push10=, $pop9, $pop80
-	i32.or  	$7=, $pop10, $7
-.LBB2_10:                               # %if.end.i350
-                                        #   in Loop: Header=BB2_7 Depth=2
-	end_block                       # label12:
-	i32.const	$push82=, 39
-	i32.lt_u	$push11=, $8, $pop82
-	br_if   	0, $pop11       # 0: up to label11
-.LBB2_11:                               # %random_bitstring.exit352
+	i32.const	$push94=, 39
+	i32.ge_u	$push13=, $8, $pop94
+	br_if   	0, $pop13       # 0: down to label14
+# BB#13:                                # %for.cond.i339
+                                        #   in Loop: Header=BB2_10 Depth=2
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push14=, $3, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$push100=, $pop14, $pop101
+	tee_local	$push99=, $3=, $pop100
+	i32.const	$push98=, 9
+	i32.shr_u	$push15=, $pop99, $pop98
+	i32.const	$push97=, 15
+	i32.and 	$push96=, $pop15, $pop97
+	tee_local	$push95=, $7=, $pop96
+	i32.add 	$8=, $pop95, $8
+	br_if   	1, $7           # 1: up to label12
+.LBB2_14:                               # %random_bitstring.exit355
                                         #   in Loop: Header=BB2_1 Depth=1
+	end_block                       # label14:
 	end_loop
-	end_block                       # label10:
-	block   	
-	i32.eqz 	$push150=, $7
-	br_if   	0, $pop150      # 0: down to label13
-# BB#12:                                # %cleanup.cont
+	i32.eqz 	$push168=, $2
+	br_if   	0, $pop168      # 0: down to label11
+# BB#15:                                # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
-	i32.const	$push83=, 2147483647
-	i32.and 	$push12=, $6, $pop83
-	br_if   	0, $pop12       # 0: down to label14
-# BB#13:                                # %cleanup.cont
+	i32.const	$push103=, 2147483647
+	i32.and 	$push16=, $1, $pop103
+	br_if   	0, $pop16       # 0: down to label15
+# BB#16:                                # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push84=, -1
-	i32.eq  	$push13=, $7, $pop84
-	br_if   	1, $pop13       # 1: down to label13
-.LBB2_14:                               # %if.end25
+	i32.const	$push104=, -1
+	i32.eq  	$push17=, $2, $pop104
+	br_if   	1, $pop17       # 1: down to label11
+.LBB2_17:                               # %if.end25
                                         #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label14:
-	i32.rem_s	$push92=, $6, $7
-	tee_local	$push91=, $1=, $pop92
-	i32.const	$push90=, 31
-	i32.shr_s	$push89=, $1, $pop90
-	tee_local	$push88=, $1=, $pop89
-	i32.add 	$push16=, $pop91, $pop88
-	i32.xor 	$push17=, $pop16, $1
-	i32.const	$push87=, 31
-	i32.shr_s	$push86=, $7, $pop87
-	tee_local	$push85=, $1=, $pop86
-	i32.add 	$push14=, $7, $pop85
-	i32.xor 	$push15=, $pop14, $1
-	i32.ge_u	$push18=, $pop17, $pop15
-	br_if   	3, $pop18       # 3: down to label4
-# BB#15:                                # %cleanup.cont47
+	end_block                       # label15:
+	i32.rem_s	$push112=, $1, $2
+	tee_local	$push111=, $7=, $pop112
+	i32.const	$push110=, 31
+	i32.shr_s	$push109=, $7, $pop110
+	tee_local	$push108=, $7=, $pop109
+	i32.add 	$push20=, $pop111, $pop108
+	i32.xor 	$push21=, $pop20, $7
+	i32.const	$push107=, 31
+	i32.shr_s	$push106=, $2, $pop107
+	tee_local	$push105=, $7=, $pop106
+	i32.add 	$push18=, $2, $pop105
+	i32.xor 	$push19=, $pop18, $7
+	i32.ge_u	$push22=, $pop21, $pop19
+	br_if   	3, $pop22       # 3: down to label4
+# BB#18:                                # %cleanup.cont47
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push93=, 65535
-	i32.and 	$push20=, $7, $pop93
-	i32.eqz 	$push151=, $pop20
-	br_if   	0, $pop151      # 0: down to label13
-# BB#16:                                # %cleanup.cont86
+	i32.const	$push113=, 65535
+	i32.and 	$push24=, $2, $pop113
+	i32.eqz 	$push169=, $pop24
+	br_if   	0, $pop169      # 0: down to label11
+# BB#19:                                # %cleanup.cont86
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push114=, 16
-	i32.shl 	$push21=, $6, $pop114
-	i32.const	$push113=, 16
-	i32.shr_s	$push112=, $pop21, $pop113
-	tee_local	$push111=, $3=, $pop112
-	i32.const	$push110=, 16
-	i32.shl 	$push109=, $7, $pop110
-	tee_local	$push108=, $4=, $pop109
-	i32.const	$push107=, 16
-	i32.shr_s	$push106=, $pop108, $pop107
-	tee_local	$push105=, $1=, $pop106
-	i32.rem_s	$push22=, $pop111, $pop105
-	i32.const	$push104=, 16
-	i32.shl 	$push103=, $pop22, $pop104
-	tee_local	$push102=, $5=, $pop103
-	i32.const	$push101=, 16
-	i32.shr_s	$push100=, $pop102, $pop101
-	tee_local	$push99=, $8=, $pop100
-	i32.const	$push98=, 0
-	i32.sub 	$push24=, $pop98, $8
-	i32.const	$push97=, -65536
-	i32.gt_s	$push23=, $5, $pop97
-	i32.select	$push25=, $pop99, $pop24, $pop23
-	i32.const	$push96=, 0
-	i32.sub 	$push27=, $pop96, $1
-	i32.const	$push95=, -65536
-	i32.gt_s	$push26=, $4, $pop95
-	i32.select	$push28=, $1, $pop27, $pop26
-	i32.const	$push94=, 65535
-	i32.and 	$push29=, $pop28, $pop94
-	i32.ge_s	$push30=, $pop25, $pop29
-	br_if   	2, $pop30       # 2: down to label5
-# BB#17:                                # %lor.lhs.false125
+	i32.const	$push134=, 16
+	i32.shl 	$push25=, $1, $pop134
+	i32.const	$push133=, 16
+	i32.shr_s	$push132=, $pop25, $pop133
+	tee_local	$push131=, $8=, $pop132
+	i32.const	$push130=, 16
+	i32.shl 	$push129=, $2, $pop130
+	tee_local	$push128=, $5=, $pop129
+	i32.const	$push127=, 16
+	i32.shr_s	$push126=, $pop128, $pop127
+	tee_local	$push125=, $7=, $pop126
+	i32.rem_s	$push26=, $pop131, $pop125
+	i32.const	$push124=, 16
+	i32.shl 	$push123=, $pop26, $pop124
+	tee_local	$push122=, $6=, $pop123
+	i32.const	$push121=, 16
+	i32.shr_s	$push120=, $pop122, $pop121
+	tee_local	$push119=, $4=, $pop120
+	i32.const	$push118=, 0
+	i32.sub 	$push28=, $pop118, $4
+	i32.const	$push117=, -65536
+	i32.gt_s	$push27=, $6, $pop117
+	i32.select	$push29=, $pop119, $pop28, $pop27
+	i32.const	$push116=, 0
+	i32.sub 	$push31=, $pop116, $7
+	i32.const	$push115=, -65536
+	i32.gt_s	$push30=, $5, $pop115
+	i32.select	$push32=, $7, $pop31, $pop30
+	i32.const	$push114=, 65535
+	i32.and 	$push33=, $pop32, $pop114
+	i32.ge_s	$push34=, $pop29, $pop33
+	br_if   	2, $pop34       # 2: down to label5
+# BB#20:                                # %lor.lhs.false125
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.div_s	$push31=, $3, $1
-	i32.mul 	$push32=, $pop31, $1
-	i32.add 	$push33=, $pop32, $8
-	i32.const	$push116=, 16
-	i32.shl 	$push34=, $pop33, $pop116
-	i32.const	$push115=, 16
-	i32.shr_s	$push35=, $pop34, $pop115
-	i32.ne  	$push36=, $pop35, $3
-	br_if   	2, $pop36       # 2: down to label5
-# BB#18:                                # %if.end137
+	i32.div_s	$push35=, $8, $7
+	i32.mul 	$push36=, $pop35, $7
+	i32.add 	$push37=, $pop36, $4
+	i32.const	$push136=, 16
+	i32.shl 	$push38=, $pop37, $pop136
+	i32.const	$push135=, 16
+	i32.shr_s	$push39=, $pop38, $pop135
+	i32.ne  	$push40=, $pop39, $8
+	br_if   	2, $pop40       # 2: down to label5
+# BB#21:                                # %if.end137
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push117=, 255
-	i32.and 	$push38=, $7, $pop117
-	i32.eqz 	$push152=, $pop38
-	br_if   	0, $pop152      # 0: down to label13
-# BB#19:                                # %cleanup.cont177
+	i32.const	$push137=, 255
+	i32.and 	$push42=, $2, $pop137
+	i32.eqz 	$push170=, $pop42
+	br_if   	0, $pop170      # 0: down to label11
+# BB#22:                                # %cleanup.cont177
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push138=, 24
-	i32.shl 	$push39=, $6, $pop138
-	i32.const	$push137=, 24
-	i32.shr_s	$push136=, $pop39, $pop137
-	tee_local	$push135=, $6=, $pop136
-	i32.const	$push134=, 24
-	i32.shl 	$push133=, $7, $pop134
-	tee_local	$push132=, $8=, $pop133
-	i32.const	$push131=, 24
-	i32.shr_s	$push130=, $pop132, $pop131
-	tee_local	$push129=, $1=, $pop130
-	i32.rem_s	$push40=, $pop135, $pop129
-	i32.const	$push128=, 24
-	i32.shl 	$push127=, $pop40, $pop128
-	tee_local	$push126=, $3=, $pop127
-	i32.const	$push125=, 24
-	i32.shr_s	$push124=, $pop126, $pop125
-	tee_local	$push123=, $7=, $pop124
-	i32.const	$push122=, 0
-	i32.sub 	$push42=, $pop122, $7
-	i32.const	$push121=, -16777216
-	i32.gt_s	$push41=, $3, $pop121
-	i32.select	$push43=, $pop123, $pop42, $pop41
-	i32.const	$push120=, 0
-	i32.sub 	$push45=, $pop120, $1
-	i32.const	$push119=, -16777216
-	i32.gt_s	$push44=, $8, $pop119
-	i32.select	$push46=, $1, $pop45, $pop44
-	i32.const	$push118=, 255
-	i32.and 	$push47=, $pop46, $pop118
-	i32.ge_s	$push48=, $pop43, $pop47
-	br_if   	4, $pop48       # 4: down to label3
-# BB#20:                                # %lor.lhs.false216
+	i32.const	$push158=, 24
+	i32.shl 	$push43=, $1, $pop158
+	i32.const	$push157=, 24
+	i32.shr_s	$push156=, $pop43, $pop157
+	tee_local	$push155=, $1=, $pop156
+	i32.const	$push154=, 24
+	i32.shl 	$push153=, $2, $pop154
+	tee_local	$push152=, $8=, $pop153
+	i32.const	$push151=, 24
+	i32.shr_s	$push150=, $pop152, $pop151
+	tee_local	$push149=, $7=, $pop150
+	i32.rem_s	$push44=, $pop155, $pop149
+	i32.const	$push148=, 24
+	i32.shl 	$push147=, $pop44, $pop148
+	tee_local	$push146=, $4=, $pop147
+	i32.const	$push145=, 24
+	i32.shr_s	$push144=, $pop146, $pop145
+	tee_local	$push143=, $2=, $pop144
+	i32.const	$push142=, 0
+	i32.sub 	$push46=, $pop142, $2
+	i32.const	$push141=, -16777216
+	i32.gt_s	$push45=, $4, $pop141
+	i32.select	$push47=, $pop143, $pop46, $pop45
+	i32.const	$push140=, 0
+	i32.sub 	$push49=, $pop140, $7
+	i32.const	$push139=, -16777216
+	i32.gt_s	$push48=, $8, $pop139
+	i32.select	$push50=, $7, $pop49, $pop48
+	i32.const	$push138=, 255
+	i32.and 	$push51=, $pop50, $pop138
+	i32.ge_s	$push52=, $pop47, $pop51
+	br_if   	4, $pop52       # 4: down to label3
+# BB#23:                                # %lor.lhs.false216
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.div_s	$push49=, $6, $1
-	i32.mul 	$push50=, $pop49, $1
-	i32.add 	$push51=, $pop50, $7
-	i32.const	$push140=, 24
-	i32.shl 	$push52=, $pop51, $pop140
-	i32.const	$push139=, 24
-	i32.shr_s	$push53=, $pop52, $pop139
-	i32.ne  	$push54=, $pop53, $6
-	br_if   	4, $pop54       # 4: down to label3
-.LBB2_21:                               # %cleanup229
+	i32.div_s	$push53=, $1, $7
+	i32.mul 	$push54=, $pop53, $7
+	i32.add 	$push55=, $pop54, $2
+	i32.const	$push160=, 24
+	i32.shl 	$push56=, $pop55, $pop160
+	i32.const	$push159=, 24
+	i32.shr_s	$push57=, $pop56, $pop159
+	i32.ne  	$push58=, $pop57, $1
+	br_if   	4, $pop58       # 4: down to label3
+.LBB2_24:                               # %cleanup229
                                         #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label13:
-	i32.const	$push144=, 1
-	i32.add 	$push143=, $0, $pop144
-	tee_local	$push142=, $0=, $pop143
-	i32.const	$push141=, 1000
-	i32.lt_s	$push56=, $pop142, $pop141
-	br_if   	0, $pop56       # 0: up to label6
-# BB#22:                                # %for.end
+	end_block                       # label11:
+	i32.const	$push162=, 1
+	i32.add 	$7=, $0, $pop162
+	i32.const	$push161=, 999
+	i32.lt_u	$push60=, $0, $pop161
+	br_if   	0, $pop60       # 0: up to label6
+# BB#25:                                # %for.end
 	end_loop
-	i32.const	$push57=, 0
-	i32.store	simple_rand.seed($pop57), $2
-	i32.const	$push145=, 0
-	call    	exit@FUNCTION, $pop145
+	i32.const	$push61=, 0
+	i32.store	simple_rand.seed($pop61), $3
+	i32.const	$push163=, 0
+	call    	exit@FUNCTION, $pop163
 	unreachable
-.LBB2_23:                               # %if.then136
+.LBB2_26:                               # %if.then136
 	end_block                       # label5:
-	i32.const	$push37=, 0
-	i32.store	simple_rand.seed($pop37), $2
+	i32.const	$push41=, 0
+	i32.store	simple_rand.seed($pop41), $3
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_24:                               # %if.then40
+.LBB2_27:                               # %if.then40
 	end_block                       # label4:
-	i32.const	$push19=, 0
-	i32.store	simple_rand.seed($pop19), $2
+	i32.const	$push23=, 0
+	i32.store	simple_rand.seed($pop23), $3
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_25:                               # %if.then227
+.LBB2_28:                               # %if.then227
 	end_block                       # label3:
-	i32.const	$push55=, 0
-	i32.store	simple_rand.seed($pop55), $2
+	i32.const	$push59=, 0
+	i32.store	simple_rand.seed($pop59), $3
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	simple_rand.seed,@object # @simple_rand.seed
 	.section	.data.simple_rand.seed,"aw",@progbits
 	.p2align	2
@@ -373,6 +419,6 @@ simple_rand.seed:
 	.size	simple_rand.seed, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/ashldi-1.c.s b/test/torture-s/ashldi-1.c.s
index fb634c40e..2a06d40b8 100644
--- a/test/torture-s/ashldi-1.c.s
+++ b/test/torture-s/ashldi-1.c.s
@@ -1,63 +1,64 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ashldi-1.c"
+	.file	"ashldi-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i32
+	.local  	i32, i32, i32, i64
 # BB#0:                                 # %entry
-	i64.const	$0=, 0
-	i32.const	$2=, .Lswitch.table
+	i64.const	$3=, -1
+	i32.const	$1=, .Lswitch.table.main
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i64.const	$push6=, 81985529216486895
-	i64.shl 	$push0=, $pop6, $0
-	i64.load	$push1=, 0($2)
-	i64.ne  	$push2=, $pop0, $pop1
-	br_if   	1, $pop2        # 1: down to label0
+	i64.const	$push10=, 81985529216486895
+	i64.const	$push9=, 1
+	i64.add 	$push8=, $3, $pop9
+	tee_local	$push7=, $3=, $pop8
+	i64.shl 	$push1=, $pop10, $pop7
+	i64.load	$push2=, 0($1)
+	i64.ne  	$push3=, $pop1, $pop2
+	br_if   	1, $pop3        # 1: down to label0
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push11=, 8
-	i32.add 	$2=, $2, $pop11
-	i64.const	$push10=, 1
-	i64.add 	$push9=, $0, $pop10
-	tee_local	$push8=, $0=, $pop9
-	i64.const	$push7=, 64
-	i64.lt_s	$push3=, $pop8, $pop7
-	br_if   	0, $pop3        # 0: up to label1
-# BB#3:                                 # %constant_shift.exit.preheader
+	i32.const	$push12=, 8
+	i32.add 	$1=, $1, $pop12
+	i64.const	$push11=, 63
+	i64.lt_u	$push4=, $3, $pop11
+	br_if   	0, $pop4        # 0: up to label1
+# BB#3:                                 # %for.body4.preheader
 	end_loop
-	i32.const	$2=, 0
-	i32.const	$1=, .Lswitch.table
-.LBB0_4:                                # %constant_shift.exit
+	i32.const	$1=, 0
+	i32.const	$0=, .Lswitch.table.main
+.LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label3:
-	i32.const	$push12=, 1
-	i32.eqz 	$push18=, $pop12
-	br_if   	1, $pop18       # 1: down to label2
-# BB#5:                                 # %for.cond2
+	loop    	                # label2:
+	i32.const	$push13=, 64
+	i32.ge_u	$push5=, $1, $pop13
+	br_if   	1, $pop5        # 1: down to label0
+# BB#5:                                 # %switch.lookup
+                                        #   in Loop: Header=BB0_4 Depth=1
+	i32.const	$push14=, 1
+	i32.eqz 	$push18=, $pop14
+	br_if   	1, $pop18       # 1: down to label0
+# BB#6:                                 # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
 	i32.const	$push17=, 8
-	i32.add 	$1=, $1, $pop17
-	i32.const	$push16=, 1
-	i32.add 	$push15=, $2, $pop16
-	tee_local	$push14=, $2=, $pop15
-	i32.const	$push13=, 63
-	i32.le_s	$push4=, $pop14, $pop13
-	br_if   	0, $pop4        # 0: up to label3
-# BB#6:                                 # %for.end13
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, 62
+	i32.gt_u	$2=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$push0=, $1, $pop15
+	copy_local	$1=, $pop0
+	i32.eqz 	$push19=, $2
+	br_if   	0, $pop19       # 0: up to label2
+# BB#7:                                 # %for.end13
 	end_loop
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
-	unreachable
-.LBB0_7:                                # %if.then9
-	end_block                       # label2:
-	call    	abort@FUNCTION
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -66,11 +67,11 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+                                        # -- End function
+	.type	.Lswitch.table.main,@object # @switch.table.main
+	.section	.rodata..Lswitch.table.main,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.main:
 	.int64	81985529216486895       # 0x123456789abcdef
 	.int64	163971058432973790      # 0x2468acf13579bde
 	.int64	327942116865947580      # 0x48d159e26af37bc
@@ -135,9 +136,9 @@ main:                                   # @main
 	.int64	-2305843009213693952    # 0xe000000000000000
 	.int64	-4611686018427387904    # 0xc000000000000000
 	.int64	-9223372036854775808    # 0x8000000000000000
-	.size	.Lswitch.table, 512
+	.size	.Lswitch.table.main, 512
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/ashrdi-1.c.s b/test/torture-s/ashrdi-1.c.s
index 1be386609..c73b45997 100644
--- a/test/torture-s/ashrdi-1.c.s
+++ b/test/torture-s/ashrdi-1.c.s
@@ -1,125 +1,115 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ashrdi-1.c"
+	.file	"ashrdi-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32, i32
 # BB#0:                                 # %entry
-	i64.const	$0=, 0
+	i64.const	$0=, -1
 	i32.const	$2=, zext
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	block   	
-	loop    	                # label2:
-	i64.const	$push17=, 8526495107234113920
-	i64.shr_u	$push0=, $pop17, $0
+	loop    	                # label1:
+	i64.const	$push20=, 8526495107234113920
+	i64.const	$push19=, 1
+	i64.add 	$push18=, $0, $pop19
+	tee_local	$push17=, $0=, $pop18
+	i64.shr_u	$push0=, $pop20, $pop17
 	i64.load	$push1=, 0($2)
 	i64.ne  	$push2=, $pop0, $pop1
-	br_if   	1, $pop2        # 1: down to label1
+	br_if   	1, $pop2        # 1: down to label0
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.const	$push22=, 8
 	i32.add 	$2=, $2, $pop22
-	i64.const	$push21=, 1
-	i64.add 	$push20=, $0, $pop21
-	tee_local	$push19=, $0=, $pop20
-	i64.const	$push18=, 64
-	i64.lt_s	$push3=, $pop19, $pop18
-	br_if   	0, $pop3        # 0: up to label2
+	i64.const	$push21=, 63
+	i64.lt_u	$push3=, $0, $pop21
+	br_if   	0, $pop3        # 0: up to label1
 # BB#3:                                 # %for.body4.preheader
 	end_loop
-	i64.const	$0=, 0
+	i64.const	$0=, -1
 	i32.const	$2=, sext
 .LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i64.const	$push23=, -8152436031399644656
-	i64.shr_s	$push4=, $pop23, $0
+	loop    	                # label2:
+	i64.const	$push26=, -8152436031399644656
+	i64.const	$push25=, 1
+	i64.add 	$push24=, $0, $pop25
+	tee_local	$push23=, $0=, $pop24
+	i64.shr_s	$push4=, $pop26, $pop23
 	i64.load	$push5=, 0($2)
 	i64.ne  	$push6=, $pop4, $pop5
-	br_if   	1, $pop6        # 1: down to label1
+	br_if   	1, $pop6        # 1: down to label0
 # BB#5:                                 # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
 	i32.const	$push28=, 8
 	i32.add 	$2=, $2, $pop28
-	i64.const	$push27=, 1
-	i64.add 	$push26=, $0, $pop27
-	tee_local	$push25=, $0=, $pop26
-	i64.const	$push24=, 64
-	i64.lt_s	$push7=, $pop25, $pop24
-	br_if   	0, $pop7        # 0: up to label3
+	i64.const	$push27=, 63
+	i64.lt_u	$push7=, $0, $pop27
+	br_if   	0, $pop7        # 0: up to label2
 # BB#6:                                 # %for.body16.preheader
 	end_loop
-	i32.const	$2=, 0
+	i32.const	$2=, -1
 	i32.const	$1=, zext
 .LBB0_7:                                # %for.body16
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label4:
-	i64.const	$push29=, 8526495107234113920
-	i64.call	$push8=, constant_shift@FUNCTION, $pop29, $2
+	loop    	                # label3:
+	i64.const	$push32=, 8526495107234113920
+	i32.const	$push31=, 1
+	i32.add 	$push30=, $2, $pop31
+	tee_local	$push29=, $2=, $pop30
+	i64.call	$push8=, constant_shift@FUNCTION, $pop32, $pop29
 	i64.load	$push9=, 0($1)
 	i64.ne  	$push10=, $pop8, $pop9
-	br_if   	2, $pop10       # 2: down to label0
+	br_if   	1, $pop10       # 1: down to label0
 # BB#8:                                 # %for.cond14
                                         #   in Loop: Header=BB0_7 Depth=1
 	i32.const	$push34=, 8
 	i32.add 	$1=, $1, $pop34
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $2, $pop33
-	tee_local	$push31=, $2=, $pop32
-	i32.const	$push30=, 64
-	i32.lt_s	$push11=, $pop31, $pop30
-	br_if   	0, $pop11       # 0: up to label4
+	i32.const	$push33=, 63
+	i32.lt_u	$push11=, $2, $pop33
+	br_if   	0, $pop11       # 0: up to label3
 # BB#9:                                 # %for.body28.preheader
 	end_loop
-	i32.const	$2=, 0
+	i32.const	$2=, -1
 	i32.const	$1=, sext
 .LBB0_10:                               # %for.body28
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label6:
-	i64.const	$push35=, -8152436031399644656
-	i64.call	$push12=, constant_shift@FUNCTION, $pop35, $2
+	loop    	                # label4:
+	i64.const	$push38=, -8152436031399644656
+	i32.const	$push37=, 1
+	i32.add 	$push36=, $2, $pop37
+	tee_local	$push35=, $2=, $pop36
+	i64.call	$push12=, constant_shift@FUNCTION, $pop38, $pop35
 	i64.load	$push13=, 0($1)
 	i64.ne  	$push14=, $pop12, $pop13
-	br_if   	1, $pop14       # 1: down to label5
+	br_if   	1, $pop14       # 1: down to label0
 # BB#11:                                # %for.cond26
                                         #   in Loop: Header=BB0_10 Depth=1
 	i32.const	$push40=, 8
 	i32.add 	$1=, $1, $pop40
-	i32.const	$push39=, 1
-	i32.add 	$push38=, $2, $pop39
-	tee_local	$push37=, $2=, $pop38
-	i32.const	$push36=, 63
-	i32.le_s	$push15=, $pop37, $pop36
-	br_if   	0, $pop15       # 0: up to label6
+	i32.const	$push39=, 62
+	i32.le_u	$push15=, $2, $pop39
+	br_if   	0, $pop15       # 0: up to label4
 # BB#12:                                # %for.end37
 	end_loop
 	i32.const	$push16=, 0
 	call    	exit@FUNCTION, $pop16
 	unreachable
-.LBB0_13:                               # %if.then33
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_14:                               # %if.then
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_15:                               # %if.then21
+.LBB0_13:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.constant_shift,"ax",@progbits
-	.type	constant_shift,@function
+	.type	constant_shift,@function # -- Begin function constant_shift
 constant_shift:                         # @constant_shift
 	.param  	i64, i32
 	.result 	i64
@@ -127,7 +117,7 @@ constant_shift:                         # @constant_shift
 	block   	
 	i32.const	$push0=, 63
 	i32.gt_u	$push1=, $1, $pop0
-	br_if   	0, $pop1        # 0: down to label7
+	br_if   	0, $pop1        # 0: down to label5
 # BB#1:                                 # %entry
 	block   	
 	block   	
@@ -193,395 +183,395 @@ constant_shift:                         # @constant_shift
 	block   	
 	block   	
 	block   	
-	br_table 	$1, 1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 1 # 1: down to label70
-                                        # 0: down to label71
-                                        # 2: down to label69
-                                        # 3: down to label68
-                                        # 4: down to label67
-                                        # 5: down to label66
-                                        # 6: down to label65
-                                        # 7: down to label64
-                                        # 8: down to label63
-                                        # 9: down to label62
-                                        # 10: down to label61
-                                        # 11: down to label60
-                                        # 12: down to label59
-                                        # 13: down to label58
-                                        # 14: down to label57
-                                        # 15: down to label56
-                                        # 16: down to label55
-                                        # 17: down to label54
-                                        # 18: down to label53
-                                        # 19: down to label52
-                                        # 20: down to label51
-                                        # 21: down to label50
-                                        # 22: down to label49
-                                        # 23: down to label48
-                                        # 24: down to label47
-                                        # 25: down to label46
-                                        # 26: down to label45
-                                        # 27: down to label44
-                                        # 28: down to label43
-                                        # 29: down to label42
-                                        # 30: down to label41
-                                        # 31: down to label40
-                                        # 32: down to label39
-                                        # 33: down to label38
-                                        # 34: down to label37
-                                        # 35: down to label36
-                                        # 36: down to label35
-                                        # 37: down to label34
-                                        # 38: down to label33
-                                        # 39: down to label32
-                                        # 40: down to label31
-                                        # 41: down to label30
-                                        # 42: down to label29
-                                        # 43: down to label28
-                                        # 44: down to label27
-                                        # 45: down to label26
-                                        # 46: down to label25
-                                        # 47: down to label24
-                                        # 48: down to label23
-                                        # 49: down to label22
-                                        # 50: down to label21
-                                        # 51: down to label20
-                                        # 52: down to label19
-                                        # 53: down to label18
-                                        # 54: down to label17
-                                        # 55: down to label16
-                                        # 56: down to label15
-                                        # 57: down to label14
-                                        # 58: down to label13
-                                        # 59: down to label12
-                                        # 60: down to label11
-                                        # 61: down to label10
-                                        # 62: down to label9
-                                        # 63: down to label8
+	br_table 	$1, 1, 0, 27, 28, 12, 29, 30, 31, 32, 13, 33, 14, 15, 34, 16, 35, 17, 36, 37, 49, 38, 39, 40, 50, 18, 19, 51, 4, 52, 53, 41, 42, 43, 20, 5, 6, 7, 8, 54, 55, 21, 44, 56, 3, 22, 45, 60, 9, 23, 24, 2, 63, 61, 10, 57, 62, 11, 58, 25, 59, 26, 46, 47, 48, 1 # 1: down to label68
+                                        # 0: down to label69
+                                        # 27: down to label42
+                                        # 28: down to label41
+                                        # 12: down to label57
+                                        # 29: down to label40
+                                        # 30: down to label39
+                                        # 31: down to label38
+                                        # 32: down to label37
+                                        # 13: down to label56
+                                        # 33: down to label36
+                                        # 14: down to label55
+                                        # 15: down to label54
+                                        # 34: down to label35
+                                        # 16: down to label53
+                                        # 35: down to label34
+                                        # 17: down to label52
+                                        # 36: down to label33
+                                        # 37: down to label32
+                                        # 49: down to label20
+                                        # 38: down to label31
+                                        # 39: down to label30
+                                        # 40: down to label29
+                                        # 50: down to label19
+                                        # 18: down to label51
+                                        # 19: down to label50
+                                        # 51: down to label18
+                                        # 4: down to label65
+                                        # 52: down to label17
+                                        # 53: down to label16
+                                        # 41: down to label28
+                                        # 42: down to label27
+                                        # 43: down to label26
+                                        # 20: down to label49
+                                        # 5: down to label64
+                                        # 6: down to label63
+                                        # 7: down to label62
+                                        # 8: down to label61
+                                        # 54: down to label15
+                                        # 55: down to label14
+                                        # 21: down to label48
+                                        # 44: down to label25
+                                        # 56: down to label13
+                                        # 3: down to label66
+                                        # 22: down to label47
+                                        # 45: down to label24
+                                        # 60: down to label9
+                                        # 9: down to label60
+                                        # 23: down to label46
+                                        # 24: down to label45
+                                        # 2: down to label67
+                                        # 63: down to label6
+                                        # 61: down to label8
+                                        # 10: down to label59
+                                        # 57: down to label12
+                                        # 62: down to label7
+                                        # 11: down to label58
+                                        # 58: down to label11
+                                        # 25: down to label44
+                                        # 59: down to label10
+                                        # 26: down to label43
+                                        # 46: down to label23
+                                        # 47: down to label22
+                                        # 48: down to label21
 .LBB1_2:                                # %sw.bb1
-	end_block                       # label71:
+	end_block                       # label69:
 	i64.const	$push64=, 1
 	i64.shr_s	$0=, $0, $pop64
 .LBB1_3:                                # %sw.epilog
-	end_block                       # label70:
+	end_block                       # label68:
 	return  	$0
-.LBB1_4:                                # %sw.bb3
-	end_block                       # label69:
-	i64.const	$push63=, 2
-	i64.shr_s	$push65=, $0, $pop63
+.LBB1_4:                                # %sw.bb99
+	end_block                       # label67:
+	i64.const	$push15=, 50
+	i64.shr_s	$push65=, $0, $pop15
 	return  	$pop65
-.LBB1_5:                                # %sw.bb5
-	end_block                       # label68:
-	i64.const	$push62=, 3
-	i64.shr_s	$push66=, $0, $pop62
+.LBB1_5:                                # %sw.bb85
+	end_block                       # label66:
+	i64.const	$push22=, 43
+	i64.shr_s	$push66=, $0, $pop22
 	return  	$pop66
-.LBB1_6:                                # %sw.bb7
-	end_block                       # label67:
-	i64.const	$push61=, 4
-	i64.shr_s	$push67=, $0, $pop61
+.LBB1_6:                                # %sw.bb53
+	end_block                       # label65:
+	i64.const	$push38=, 27
+	i64.shr_s	$push67=, $0, $pop38
 	return  	$pop67
-.LBB1_7:                                # %sw.bb9
-	end_block                       # label66:
-	i64.const	$push60=, 5
-	i64.shr_s	$push68=, $0, $pop60
+.LBB1_7:                                # %sw.bb67
+	end_block                       # label64:
+	i64.const	$push31=, 34
+	i64.shr_s	$push68=, $0, $pop31
 	return  	$pop68
-.LBB1_8:                                # %sw.bb11
-	end_block                       # label65:
-	i64.const	$push59=, 6
-	i64.shr_s	$push69=, $0, $pop59
+.LBB1_8:                                # %sw.bb69
+	end_block                       # label63:
+	i64.const	$push30=, 35
+	i64.shr_s	$push69=, $0, $pop30
 	return  	$pop69
-.LBB1_9:                                # %sw.bb13
-	end_block                       # label64:
-	i64.const	$push58=, 7
-	i64.shr_s	$push70=, $0, $pop58
+.LBB1_9:                                # %sw.bb71
+	end_block                       # label62:
+	i64.const	$push29=, 36
+	i64.shr_s	$push70=, $0, $pop29
 	return  	$pop70
-.LBB1_10:                               # %sw.bb15
-	end_block                       # label63:
-	i64.const	$push57=, 8
-	i64.shr_s	$push71=, $0, $pop57
+.LBB1_10:                               # %sw.bb73
+	end_block                       # label61:
+	i64.const	$push28=, 37
+	i64.shr_s	$push71=, $0, $pop28
 	return  	$pop71
-.LBB1_11:                               # %sw.bb17
-	end_block                       # label62:
-	i64.const	$push56=, 9
-	i64.shr_s	$push72=, $0, $pop56
+.LBB1_11:                               # %sw.bb93
+	end_block                       # label60:
+	i64.const	$push18=, 47
+	i64.shr_s	$push72=, $0, $pop18
 	return  	$pop72
-.LBB1_12:                               # %sw.bb19
-	end_block                       # label61:
-	i64.const	$push55=, 10
-	i64.shr_s	$push73=, $0, $pop55
+.LBB1_12:                               # %sw.bb105
+	end_block                       # label59:
+	i64.const	$push12=, 53
+	i64.shr_s	$push73=, $0, $pop12
 	return  	$pop73
-.LBB1_13:                               # %sw.bb21
-	end_block                       # label60:
-	i64.const	$push54=, 11
-	i64.shr_s	$push74=, $0, $pop54
+.LBB1_13:                               # %sw.bb111
+	end_block                       # label58:
+	i64.const	$push9=, 56
+	i64.shr_s	$push74=, $0, $pop9
 	return  	$pop74
-.LBB1_14:                               # %sw.bb23
-	end_block                       # label59:
-	i64.const	$push53=, 12
-	i64.shr_s	$push75=, $0, $pop53
+.LBB1_14:                               # %sw.bb7
+	end_block                       # label57:
+	i64.const	$push61=, 4
+	i64.shr_s	$push75=, $0, $pop61
 	return  	$pop75
-.LBB1_15:                               # %sw.bb25
-	end_block                       # label58:
-	i64.const	$push52=, 13
-	i64.shr_s	$push76=, $0, $pop52
+.LBB1_15:                               # %sw.bb17
+	end_block                       # label56:
+	i64.const	$push56=, 9
+	i64.shr_s	$push76=, $0, $pop56
 	return  	$pop76
-.LBB1_16:                               # %sw.bb27
-	end_block                       # label57:
-	i64.const	$push51=, 14
-	i64.shr_s	$push77=, $0, $pop51
+.LBB1_16:                               # %sw.bb21
+	end_block                       # label55:
+	i64.const	$push54=, 11
+	i64.shr_s	$push77=, $0, $pop54
 	return  	$pop77
-.LBB1_17:                               # %sw.bb29
-	end_block                       # label56:
-	i64.const	$push50=, 15
-	i64.shr_s	$push78=, $0, $pop50
+.LBB1_17:                               # %sw.bb23
+	end_block                       # label54:
+	i64.const	$push53=, 12
+	i64.shr_s	$push78=, $0, $pop53
 	return  	$pop78
-.LBB1_18:                               # %sw.bb31
-	end_block                       # label55:
-	i64.const	$push49=, 16
-	i64.shr_s	$push79=, $0, $pop49
+.LBB1_18:                               # %sw.bb27
+	end_block                       # label53:
+	i64.const	$push51=, 14
+	i64.shr_s	$push79=, $0, $pop51
 	return  	$pop79
-.LBB1_19:                               # %sw.bb33
-	end_block                       # label54:
-	i64.const	$push48=, 17
-	i64.shr_s	$push80=, $0, $pop48
+.LBB1_19:                               # %sw.bb31
+	end_block                       # label52:
+	i64.const	$push49=, 16
+	i64.shr_s	$push80=, $0, $pop49
 	return  	$pop80
-.LBB1_20:                               # %sw.bb35
-	end_block                       # label53:
-	i64.const	$push47=, 18
-	i64.shr_s	$push81=, $0, $pop47
+.LBB1_20:                               # %sw.bb47
+	end_block                       # label51:
+	i64.const	$push41=, 24
+	i64.shr_s	$push81=, $0, $pop41
 	return  	$pop81
-.LBB1_21:                               # %sw.bb37
-	end_block                       # label52:
-	i64.const	$push46=, 19
-	i64.shr_s	$push82=, $0, $pop46
+.LBB1_21:                               # %sw.bb49
+	end_block                       # label50:
+	i64.const	$push40=, 25
+	i64.shr_s	$push82=, $0, $pop40
 	return  	$pop82
-.LBB1_22:                               # %sw.bb39
-	end_block                       # label51:
-	i64.const	$push45=, 20
-	i64.shr_s	$push83=, $0, $pop45
+.LBB1_22:                               # %sw.bb65
+	end_block                       # label49:
+	i64.const	$push32=, 33
+	i64.shr_s	$push83=, $0, $pop32
 	return  	$pop83
-.LBB1_23:                               # %sw.bb41
-	end_block                       # label50:
-	i64.const	$push44=, 21
-	i64.shr_s	$push84=, $0, $pop44
+.LBB1_23:                               # %sw.bb79
+	end_block                       # label48:
+	i64.const	$push25=, 40
+	i64.shr_s	$push84=, $0, $pop25
 	return  	$pop84
-.LBB1_24:                               # %sw.bb43
-	end_block                       # label49:
-	i64.const	$push43=, 22
-	i64.shr_s	$push85=, $0, $pop43
+.LBB1_24:                               # %sw.bb87
+	end_block                       # label47:
+	i64.const	$push21=, 44
+	i64.shr_s	$push85=, $0, $pop21
 	return  	$pop85
-.LBB1_25:                               # %sw.bb45
-	end_block                       # label48:
-	i64.const	$push42=, 23
-	i64.shr_s	$push86=, $0, $pop42
+.LBB1_25:                               # %sw.bb95
+	end_block                       # label46:
+	i64.const	$push17=, 48
+	i64.shr_s	$push86=, $0, $pop17
 	return  	$pop86
-.LBB1_26:                               # %sw.bb47
-	end_block                       # label47:
-	i64.const	$push41=, 24
-	i64.shr_s	$push87=, $0, $pop41
+.LBB1_26:                               # %sw.bb97
+	end_block                       # label45:
+	i64.const	$push16=, 49
+	i64.shr_s	$push87=, $0, $pop16
 	return  	$pop87
-.LBB1_27:                               # %sw.bb49
-	end_block                       # label46:
-	i64.const	$push40=, 25
-	i64.shr_s	$push88=, $0, $pop40
+.LBB1_27:                               # %sw.bb115
+	end_block                       # label44:
+	i64.const	$push7=, 58
+	i64.shr_s	$push88=, $0, $pop7
 	return  	$pop88
-.LBB1_28:                               # %sw.bb51
-	end_block                       # label45:
-	i64.const	$push39=, 26
-	i64.shr_s	$push89=, $0, $pop39
+.LBB1_28:                               # %sw.bb119
+	end_block                       # label43:
+	i64.const	$push5=, 60
+	i64.shr_s	$push89=, $0, $pop5
 	return  	$pop89
-.LBB1_29:                               # %sw.bb53
-	end_block                       # label44:
-	i64.const	$push38=, 27
-	i64.shr_s	$push90=, $0, $pop38
+.LBB1_29:                               # %sw.bb3
+	end_block                       # label42:
+	i64.const	$push63=, 2
+	i64.shr_s	$push90=, $0, $pop63
 	return  	$pop90
-.LBB1_30:                               # %sw.bb55
-	end_block                       # label43:
-	i64.const	$push37=, 28
-	i64.shr_s	$push91=, $0, $pop37
+.LBB1_30:                               # %sw.bb5
+	end_block                       # label41:
+	i64.const	$push62=, 3
+	i64.shr_s	$push91=, $0, $pop62
 	return  	$pop91
-.LBB1_31:                               # %sw.bb57
-	end_block                       # label42:
-	i64.const	$push36=, 29
-	i64.shr_s	$push92=, $0, $pop36
+.LBB1_31:                               # %sw.bb9
+	end_block                       # label40:
+	i64.const	$push60=, 5
+	i64.shr_s	$push92=, $0, $pop60
 	return  	$pop92
-.LBB1_32:                               # %sw.bb59
-	end_block                       # label41:
-	i64.const	$push35=, 30
-	i64.shr_s	$push93=, $0, $pop35
+.LBB1_32:                               # %sw.bb11
+	end_block                       # label39:
+	i64.const	$push59=, 6
+	i64.shr_s	$push93=, $0, $pop59
 	return  	$pop93
-.LBB1_33:                               # %sw.bb61
-	end_block                       # label40:
-	i64.const	$push34=, 31
-	i64.shr_s	$push94=, $0, $pop34
+.LBB1_33:                               # %sw.bb13
+	end_block                       # label38:
+	i64.const	$push58=, 7
+	i64.shr_s	$push94=, $0, $pop58
 	return  	$pop94
-.LBB1_34:                               # %sw.bb63
-	end_block                       # label39:
-	i64.const	$push33=, 32
-	i64.shr_s	$push95=, $0, $pop33
+.LBB1_34:                               # %sw.bb15
+	end_block                       # label37:
+	i64.const	$push57=, 8
+	i64.shr_s	$push95=, $0, $pop57
 	return  	$pop95
-.LBB1_35:                               # %sw.bb65
-	end_block                       # label38:
-	i64.const	$push32=, 33
-	i64.shr_s	$push96=, $0, $pop32
+.LBB1_35:                               # %sw.bb19
+	end_block                       # label36:
+	i64.const	$push55=, 10
+	i64.shr_s	$push96=, $0, $pop55
 	return  	$pop96
-.LBB1_36:                               # %sw.bb67
-	end_block                       # label37:
-	i64.const	$push31=, 34
-	i64.shr_s	$push97=, $0, $pop31
+.LBB1_36:                               # %sw.bb25
+	end_block                       # label35:
+	i64.const	$push52=, 13
+	i64.shr_s	$push97=, $0, $pop52
 	return  	$pop97
-.LBB1_37:                               # %sw.bb69
-	end_block                       # label36:
-	i64.const	$push30=, 35
-	i64.shr_s	$push98=, $0, $pop30
+.LBB1_37:                               # %sw.bb29
+	end_block                       # label34:
+	i64.const	$push50=, 15
+	i64.shr_s	$push98=, $0, $pop50
 	return  	$pop98
-.LBB1_38:                               # %sw.bb71
-	end_block                       # label35:
-	i64.const	$push29=, 36
-	i64.shr_s	$push99=, $0, $pop29
+.LBB1_38:                               # %sw.bb33
+	end_block                       # label33:
+	i64.const	$push48=, 17
+	i64.shr_s	$push99=, $0, $pop48
 	return  	$pop99
-.LBB1_39:                               # %sw.bb73
-	end_block                       # label34:
-	i64.const	$push28=, 37
-	i64.shr_s	$push100=, $0, $pop28
+.LBB1_39:                               # %sw.bb35
+	end_block                       # label32:
+	i64.const	$push47=, 18
+	i64.shr_s	$push100=, $0, $pop47
 	return  	$pop100
-.LBB1_40:                               # %sw.bb75
-	end_block                       # label33:
-	i64.const	$push27=, 38
-	i64.shr_s	$push101=, $0, $pop27
+.LBB1_40:                               # %sw.bb39
+	end_block                       # label31:
+	i64.const	$push45=, 20
+	i64.shr_s	$push101=, $0, $pop45
 	return  	$pop101
-.LBB1_41:                               # %sw.bb77
-	end_block                       # label32:
-	i64.const	$push26=, 39
-	i64.shr_s	$push102=, $0, $pop26
+.LBB1_41:                               # %sw.bb41
+	end_block                       # label30:
+	i64.const	$push44=, 21
+	i64.shr_s	$push102=, $0, $pop44
 	return  	$pop102
-.LBB1_42:                               # %sw.bb79
-	end_block                       # label31:
-	i64.const	$push25=, 40
-	i64.shr_s	$push103=, $0, $pop25
+.LBB1_42:                               # %sw.bb43
+	end_block                       # label29:
+	i64.const	$push43=, 22
+	i64.shr_s	$push103=, $0, $pop43
 	return  	$pop103
-.LBB1_43:                               # %sw.bb81
-	end_block                       # label30:
-	i64.const	$push24=, 41
-	i64.shr_s	$push104=, $0, $pop24
+.LBB1_43:                               # %sw.bb59
+	end_block                       # label28:
+	i64.const	$push35=, 30
+	i64.shr_s	$push104=, $0, $pop35
 	return  	$pop104
-.LBB1_44:                               # %sw.bb83
-	end_block                       # label29:
-	i64.const	$push23=, 42
-	i64.shr_s	$push105=, $0, $pop23
+.LBB1_44:                               # %sw.bb61
+	end_block                       # label27:
+	i64.const	$push34=, 31
+	i64.shr_s	$push105=, $0, $pop34
 	return  	$pop105
-.LBB1_45:                               # %sw.bb85
-	end_block                       # label28:
-	i64.const	$push22=, 43
-	i64.shr_s	$push106=, $0, $pop22
+.LBB1_45:                               # %sw.bb63
+	end_block                       # label26:
+	i64.const	$push33=, 32
+	i64.shr_s	$push106=, $0, $pop33
 	return  	$pop106
-.LBB1_46:                               # %sw.bb87
-	end_block                       # label27:
-	i64.const	$push21=, 44
-	i64.shr_s	$push107=, $0, $pop21
+.LBB1_46:                               # %sw.bb81
+	end_block                       # label25:
+	i64.const	$push24=, 41
+	i64.shr_s	$push107=, $0, $pop24
 	return  	$pop107
 .LBB1_47:                               # %sw.bb89
-	end_block                       # label26:
+	end_block                       # label24:
 	i64.const	$push20=, 45
 	i64.shr_s	$push108=, $0, $pop20
 	return  	$pop108
-.LBB1_48:                               # %sw.bb91
-	end_block                       # label25:
-	i64.const	$push19=, 46
-	i64.shr_s	$push109=, $0, $pop19
+.LBB1_48:                               # %sw.bb121
+	end_block                       # label23:
+	i64.const	$push4=, 61
+	i64.shr_s	$push109=, $0, $pop4
 	return  	$pop109
-.LBB1_49:                               # %sw.bb93
-	end_block                       # label24:
-	i64.const	$push18=, 47
-	i64.shr_s	$push110=, $0, $pop18
+.LBB1_49:                               # %sw.bb123
+	end_block                       # label22:
+	i64.const	$push3=, 62
+	i64.shr_s	$push110=, $0, $pop3
 	return  	$pop110
-.LBB1_50:                               # %sw.bb95
-	end_block                       # label23:
-	i64.const	$push17=, 48
-	i64.shr_s	$push111=, $0, $pop17
+.LBB1_50:                               # %sw.bb125
+	end_block                       # label21:
+	i64.const	$push2=, 63
+	i64.shr_s	$push111=, $0, $pop2
 	return  	$pop111
-.LBB1_51:                               # %sw.bb97
-	end_block                       # label22:
-	i64.const	$push16=, 49
-	i64.shr_s	$push112=, $0, $pop16
+.LBB1_51:                               # %sw.bb37
+	end_block                       # label20:
+	i64.const	$push46=, 19
+	i64.shr_s	$push112=, $0, $pop46
 	return  	$pop112
-.LBB1_52:                               # %sw.bb99
-	end_block                       # label21:
-	i64.const	$push15=, 50
-	i64.shr_s	$push113=, $0, $pop15
+.LBB1_52:                               # %sw.bb45
+	end_block                       # label19:
+	i64.const	$push42=, 23
+	i64.shr_s	$push113=, $0, $pop42
 	return  	$pop113
-.LBB1_53:                               # %sw.bb101
-	end_block                       # label20:
-	i64.const	$push14=, 51
-	i64.shr_s	$push114=, $0, $pop14
+.LBB1_53:                               # %sw.bb51
+	end_block                       # label18:
+	i64.const	$push39=, 26
+	i64.shr_s	$push114=, $0, $pop39
 	return  	$pop114
-.LBB1_54:                               # %sw.bb103
-	end_block                       # label19:
-	i64.const	$push13=, 52
-	i64.shr_s	$push115=, $0, $pop13
+.LBB1_54:                               # %sw.bb55
+	end_block                       # label17:
+	i64.const	$push37=, 28
+	i64.shr_s	$push115=, $0, $pop37
 	return  	$pop115
-.LBB1_55:                               # %sw.bb105
-	end_block                       # label18:
-	i64.const	$push12=, 53
-	i64.shr_s	$push116=, $0, $pop12
+.LBB1_55:                               # %sw.bb57
+	end_block                       # label16:
+	i64.const	$push36=, 29
+	i64.shr_s	$push116=, $0, $pop36
 	return  	$pop116
-.LBB1_56:                               # %sw.bb107
-	end_block                       # label17:
-	i64.const	$push11=, 54
-	i64.shr_s	$push117=, $0, $pop11
+.LBB1_56:                               # %sw.bb75
+	end_block                       # label15:
+	i64.const	$push27=, 38
+	i64.shr_s	$push117=, $0, $pop27
 	return  	$pop117
-.LBB1_57:                               # %sw.bb109
-	end_block                       # label16:
-	i64.const	$push10=, 55
-	i64.shr_s	$push118=, $0, $pop10
+.LBB1_57:                               # %sw.bb77
+	end_block                       # label14:
+	i64.const	$push26=, 39
+	i64.shr_s	$push118=, $0, $pop26
 	return  	$pop118
-.LBB1_58:                               # %sw.bb111
-	end_block                       # label15:
-	i64.const	$push9=, 56
-	i64.shr_s	$push119=, $0, $pop9
+.LBB1_58:                               # %sw.bb83
+	end_block                       # label13:
+	i64.const	$push23=, 42
+	i64.shr_s	$push119=, $0, $pop23
 	return  	$pop119
-.LBB1_59:                               # %sw.bb113
-	end_block                       # label14:
-	i64.const	$push8=, 57
-	i64.shr_s	$push120=, $0, $pop8
+.LBB1_59:                               # %sw.bb107
+	end_block                       # label12:
+	i64.const	$push11=, 54
+	i64.shr_s	$push120=, $0, $pop11
 	return  	$pop120
-.LBB1_60:                               # %sw.bb115
-	end_block                       # label13:
-	i64.const	$push7=, 58
-	i64.shr_s	$push121=, $0, $pop7
+.LBB1_60:                               # %sw.bb113
+	end_block                       # label11:
+	i64.const	$push8=, 57
+	i64.shr_s	$push121=, $0, $pop8
 	return  	$pop121
 .LBB1_61:                               # %sw.bb117
-	end_block                       # label12:
+	end_block                       # label10:
 	i64.const	$push6=, 59
 	i64.shr_s	$push122=, $0, $pop6
 	return  	$pop122
-.LBB1_62:                               # %sw.bb119
-	end_block                       # label11:
-	i64.const	$push5=, 60
-	i64.shr_s	$push123=, $0, $pop5
+.LBB1_62:                               # %sw.bb91
+	end_block                       # label9:
+	i64.const	$push19=, 46
+	i64.shr_s	$push123=, $0, $pop19
 	return  	$pop123
-.LBB1_63:                               # %sw.bb121
-	end_block                       # label10:
-	i64.const	$push4=, 61
-	i64.shr_s	$push124=, $0, $pop4
+.LBB1_63:                               # %sw.bb103
+	end_block                       # label8:
+	i64.const	$push13=, 52
+	i64.shr_s	$push124=, $0, $pop13
 	return  	$pop124
-.LBB1_64:                               # %sw.bb123
-	end_block                       # label9:
-	i64.const	$push3=, 62
-	i64.shr_s	$push125=, $0, $pop3
+.LBB1_64:                               # %sw.bb109
+	end_block                       # label7:
+	i64.const	$push10=, 55
+	i64.shr_s	$push125=, $0, $pop10
 	return  	$pop125
-.LBB1_65:                               # %sw.bb125
-	end_block                       # label8:
-	i64.const	$push2=, 63
-	i64.shr_s	$push126=, $0, $pop2
+.LBB1_65:                               # %sw.bb101
+	end_block                       # label6:
+	i64.const	$push14=, 51
+	i64.shr_s	$push126=, $0, $pop14
 	return  	$pop126
 .LBB1_66:                               # %sw.default
-	end_block                       # label7:
+	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	constant_shift, .Lfunc_end1-constant_shift
-
+                                        # -- End function
 	.type	zext,@object            # @zext
 	.section	.rodata.zext,"a",@progbits
 	.p2align	4
@@ -723,6 +713,6 @@ sext:
 	.size	sext, 512
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/bcp-1.c.s b/test/torture-s/bcp-1.c.s
index ac82bd9ad..ee2eb4cb0 100644
--- a/test/torture-s/bcp-1.c.s
+++ b/test/torture-s/bcp-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bcp-1.c"
+	.file	"bcp-1.c"
 	.section	.text.bad0,"ax",@progbits
-	.hidden	bad0
+	.hidden	bad0                    # -- Begin function bad0
 	.globl	bad0
 	.type	bad0,@function
 bad0:                                   # @bad0
@@ -12,9 +12,9 @@ bad0:                                   # @bad0
 	.endfunc
 .Lfunc_end0:
 	.size	bad0, .Lfunc_end0-bad0
-
+                                        # -- End function
 	.section	.text.bad1,"ax",@progbits
-	.hidden	bad1
+	.hidden	bad1                    # -- Begin function bad1
 	.globl	bad1
 	.type	bad1,@function
 bad1:                                   # @bad1
@@ -25,9 +25,9 @@ bad1:                                   # @bad1
 	.endfunc
 .Lfunc_end1:
 	.size	bad1, .Lfunc_end1-bad1
-
+                                        # -- End function
 	.section	.text.bad2,"ax",@progbits
-	.hidden	bad2
+	.hidden	bad2                    # -- Begin function bad2
 	.globl	bad2
 	.type	bad2,@function
 bad2:                                   # @bad2
@@ -39,9 +39,9 @@ bad2:                                   # @bad2
 	.endfunc
 .Lfunc_end2:
 	.size	bad2, .Lfunc_end2-bad2
-
+                                        # -- End function
 	.section	.text.bad3,"ax",@progbits
-	.hidden	bad3
+	.hidden	bad3                    # -- Begin function bad3
 	.globl	bad3
 	.type	bad3,@function
 bad3:                                   # @bad3
@@ -53,9 +53,9 @@ bad3:                                   # @bad3
 	.endfunc
 .Lfunc_end3:
 	.size	bad3, .Lfunc_end3-bad3
-
+                                        # -- End function
 	.section	.text.bad4,"ax",@progbits
-	.hidden	bad4
+	.hidden	bad4                    # -- Begin function bad4
 	.globl	bad4
 	.type	bad4,@function
 bad4:                                   # @bad4
@@ -67,9 +67,9 @@ bad4:                                   # @bad4
 	.endfunc
 .Lfunc_end4:
 	.size	bad4, .Lfunc_end4-bad4
-
+                                        # -- End function
 	.section	.text.bad5,"ax",@progbits
-	.hidden	bad5
+	.hidden	bad5                    # -- Begin function bad5
 	.globl	bad5
 	.type	bad5,@function
 bad5:                                   # @bad5
@@ -80,9 +80,9 @@ bad5:                                   # @bad5
 	.endfunc
 .Lfunc_end5:
 	.size	bad5, .Lfunc_end5-bad5
-
+                                        # -- End function
 	.section	.text.bad6,"ax",@progbits
-	.hidden	bad6
+	.hidden	bad6                    # -- Begin function bad6
 	.globl	bad6
 	.type	bad6,@function
 bad6:                                   # @bad6
@@ -94,9 +94,9 @@ bad6:                                   # @bad6
 	.endfunc
 .Lfunc_end6:
 	.size	bad6, .Lfunc_end6-bad6
-
+                                        # -- End function
 	.section	.text.bad7,"ax",@progbits
-	.hidden	bad7
+	.hidden	bad7                    # -- Begin function bad7
 	.globl	bad7
 	.type	bad7,@function
 bad7:                                   # @bad7
@@ -107,9 +107,9 @@ bad7:                                   # @bad7
 	.endfunc
 .Lfunc_end7:
 	.size	bad7, .Lfunc_end7-bad7
-
+                                        # -- End function
 	.section	.text.bad8,"ax",@progbits
-	.hidden	bad8
+	.hidden	bad8                    # -- Begin function bad8
 	.globl	bad8
 	.type	bad8,@function
 bad8:                                   # @bad8
@@ -120,9 +120,9 @@ bad8:                                   # @bad8
 	.endfunc
 .Lfunc_end8:
 	.size	bad8, .Lfunc_end8-bad8
-
+                                        # -- End function
 	.section	.text.bad9,"ax",@progbits
-	.hidden	bad9
+	.hidden	bad9                    # -- Begin function bad9
 	.globl	bad9
 	.type	bad9,@function
 bad9:                                   # @bad9
@@ -134,9 +134,9 @@ bad9:                                   # @bad9
 	.endfunc
 .Lfunc_end9:
 	.size	bad9, .Lfunc_end9-bad9
-
+                                        # -- End function
 	.section	.text.bad10,"ax",@progbits
-	.hidden	bad10
+	.hidden	bad10                   # -- Begin function bad10
 	.globl	bad10
 	.type	bad10,@function
 bad10:                                  # @bad10
@@ -147,9 +147,9 @@ bad10:                                  # @bad10
 	.endfunc
 .Lfunc_end10:
 	.size	bad10, .Lfunc_end10-bad10
-
+                                        # -- End function
 	.section	.text.good0,"ax",@progbits
-	.hidden	good0
+	.hidden	good0                   # -- Begin function good0
 	.globl	good0
 	.type	good0,@function
 good0:                                  # @good0
@@ -160,9 +160,9 @@ good0:                                  # @good0
 	.endfunc
 .Lfunc_end11:
 	.size	good0, .Lfunc_end11-good0
-
+                                        # -- End function
 	.section	.text.good1,"ax",@progbits
-	.hidden	good1
+	.hidden	good1                   # -- Begin function good1
 	.globl	good1
 	.type	good1,@function
 good1:                                  # @good1
@@ -173,9 +173,9 @@ good1:                                  # @good1
 	.endfunc
 .Lfunc_end12:
 	.size	good1, .Lfunc_end12-good1
-
+                                        # -- End function
 	.section	.text.good2,"ax",@progbits
-	.hidden	good2
+	.hidden	good2                   # -- Begin function good2
 	.globl	good2
 	.type	good2,@function
 good2:                                  # @good2
@@ -186,9 +186,9 @@ good2:                                  # @good2
 	.endfunc
 .Lfunc_end13:
 	.size	good2, .Lfunc_end13-good2
-
+                                        # -- End function
 	.section	.text.opt0,"ax",@progbits
-	.hidden	opt0
+	.hidden	opt0                    # -- Begin function opt0
 	.globl	opt0
 	.type	opt0,@function
 opt0:                                   # @opt0
@@ -199,9 +199,9 @@ opt0:                                   # @opt0
 	.endfunc
 .Lfunc_end14:
 	.size	opt0, .Lfunc_end14-opt0
-
+                                        # -- End function
 	.section	.text.opt1,"ax",@progbits
-	.hidden	opt1
+	.hidden	opt1                    # -- Begin function opt1
 	.globl	opt1
 	.type	opt1,@function
 opt1:                                   # @opt1
@@ -212,9 +212,9 @@ opt1:                                   # @opt1
 	.endfunc
 .Lfunc_end15:
 	.size	opt1, .Lfunc_end15-opt1
-
+                                        # -- End function
 	.section	.text.opt2,"ax",@progbits
-	.hidden	opt2
+	.hidden	opt2                    # -- Begin function opt2
 	.globl	opt2
 	.type	opt2,@function
 opt2:                                   # @opt2
@@ -225,9 +225,9 @@ opt2:                                   # @opt2
 	.endfunc
 .Lfunc_end16:
 	.size	opt2, .Lfunc_end16-opt2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -235,134 +235,113 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	block   	
 	block   	
-	block   	
-	block   	
 	i32.const	$push35=, 0
 	i32.load	$push0=, bad_t0($pop35)
 	i32.call_indirect	$push1=, $pop0
-	br_if   	0, $pop1        # 0: down to label3
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %for.cond
 	i32.const	$push36=, 0
 	i32.load	$push2=, bad_t0+4($pop36)
 	i32.call_indirect	$push3=, $pop2
-	br_if   	0, $pop3        # 0: down to label3
+	br_if   	0, $pop3        # 0: down to label1
 # BB#2:                                 # %for.cond.1
 	i32.const	$push37=, 0
 	i32.load	$push4=, bad_t0+8($pop37)
 	i32.call_indirect	$push5=, $pop4
-	br_if   	0, $pop5        # 0: down to label3
+	br_if   	0, $pop5        # 0: down to label1
 # BB#3:                                 # %for.cond.2
 	i32.const	$push38=, 0
 	i32.load	$push6=, bad_t0+12($pop38)
 	i32.call_indirect	$push7=, $pop6
-	br_if   	0, $pop7        # 0: down to label3
+	br_if   	0, $pop7        # 0: down to label1
 # BB#4:                                 # %for.cond.3
 	i32.const	$push39=, 0
 	i32.load	$push8=, bad_t0+16($pop39)
 	i32.call_indirect	$push9=, $pop8
-	br_if   	0, $pop9        # 0: down to label3
+	br_if   	0, $pop9        # 0: down to label1
 # BB#5:                                 # %for.cond.4
 	i32.const	$push40=, 0
 	i32.load	$push10=, bad_t0+20($pop40)
 	i32.call_indirect	$push11=, $pop10
-	br_if   	0, $pop11       # 0: down to label3
+	br_if   	0, $pop11       # 0: down to label1
 # BB#6:                                 # %for.cond.5
 	i32.const	$push42=, 1
 	i32.const	$push41=, 0
 	i32.load	$push12=, bad_t1($pop41)
 	i32.call_indirect	$push13=, $pop42, $pop12
-	br_if   	1, $pop13       # 1: down to label2
+	br_if   	0, $pop13       # 0: down to label1
 # BB#7:                                 # %for.cond1
 	i32.const	$push44=, 1
 	i32.const	$push43=, 0
 	i32.load	$push14=, bad_t1+4($pop43)
 	i32.call_indirect	$push15=, $pop44, $pop14
-	br_if   	1, $pop15       # 1: down to label2
+	br_if   	0, $pop15       # 0: down to label1
 # BB#8:                                 # %for.cond1.1
 	i32.const	$push17=, 1
 	i32.const	$push45=, 0
 	i32.load	$push16=, bad_t1+8($pop45)
 	i32.call_indirect	$push18=, $pop17, $pop16
-	br_if   	1, $pop18       # 1: down to label2
+	br_if   	0, $pop18       # 0: down to label1
 # BB#9:                                 # %for.cond1.2
 	i32.const	$push47=, .L.str
 	i32.const	$push46=, 0
 	i32.load	$push19=, bad_t2($pop46)
 	i32.call_indirect	$push20=, $pop47, $pop19
-	br_if   	2, $pop20       # 2: down to label1
+	br_if   	0, $pop20       # 0: down to label1
 # BB#10:                                # %for.cond12
 	i32.const	$push49=, .L.str
 	i32.const	$push48=, 0
 	i32.load	$push21=, bad_t2+4($pop48)
 	i32.call_indirect	$push22=, $pop49, $pop21
-	br_if   	2, $pop22       # 2: down to label1
+	br_if   	0, $pop22       # 0: down to label1
 # BB#11:                                # %for.cond12.1
-	block   	
 	i32.const	$push50=, 0
 	i32.load	$push23=, good_t0($pop50)
 	i32.call_indirect	$push24=, $pop23
 	i32.eqz 	$push57=, $pop24
-	br_if   	0, $pop57       # 0: down to label4
+	br_if   	0, $pop57       # 0: down to label1
 # BB#12:                                # %for.cond23
 	i32.const	$push51=, 0
 	i32.load	$push25=, good_t0+4($pop51)
 	i32.call_indirect	$push26=, $pop25
 	i32.eqz 	$push58=, $pop26
-	br_if   	0, $pop58       # 0: down to label4
+	br_if   	0, $pop58       # 0: down to label1
 # BB#13:                                # %for.cond23.1
 	i32.const	$push52=, 0
 	i32.load	$push27=, good_t0+8($pop52)
 	i32.call_indirect	$push28=, $pop27
-	br_if   	4, $pop28       # 4: down to label0
-.LBB17_14:                              # %if.then29
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB17_15:                              # %if.then
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB17_16:                              # %if.then7
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB17_17:                              # %if.then18
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB17_18:                              # %for.cond23.2
-	end_block                       # label0:
-	block   	
-	block   	
+	i32.eqz 	$push59=, $pop28
+	br_if   	0, $pop59       # 0: down to label1
+# BB#14:                                # %for.cond23.2
 	i32.const	$push53=, 0
 	i32.load	$push29=, opt_t0($pop53)
 	i32.call_indirect	$push30=, $pop29
-	i32.eqz 	$push59=, $pop30
-	br_if   	0, $pop59       # 0: down to label6
-# BB#19:                                # %for.cond34
+	i32.eqz 	$push60=, $pop30
+	br_if   	0, $pop60       # 0: down to label1
+# BB#15:                                # %for.cond34
 	i32.const	$push54=, 0
 	i32.load	$push31=, opt_t0+4($pop54)
 	i32.call_indirect	$push32=, $pop31
-	i32.eqz 	$push60=, $pop32
-	br_if   	0, $pop60       # 0: down to label6
-# BB#20:                                # %for.cond34.1
+	i32.eqz 	$push61=, $pop32
+	br_if   	0, $pop61       # 0: down to label1
+# BB#16:                                # %for.cond34.1
 	i32.const	$push55=, 0
 	i32.load	$push33=, opt_t0+8($pop55)
 	i32.call_indirect	$push34=, $pop33
-	br_if   	1, $pop34       # 1: down to label5
-.LBB17_21:                              # %if.then40
-	end_block                       # label6:
+	br_if   	1, $pop34       # 1: down to label0
+.LBB17_17:                              # %if.then
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB17_22:                              # %for.cond34.2
-	end_block                       # label5:
+.LBB17_18:                              # %for.cond34.2
+	end_block                       # label0:
 	i32.const	$push56=, 0
 	call    	exit@FUNCTION, $pop56
 	unreachable
 	.endfunc
 .Lfunc_end17:
 	.size	main, .Lfunc_end17-main
-
+                                        # -- End function
 	.hidden	bad_t0                  # @bad_t0
 	.type	bad_t0,@object
 	.section	.data.bad_t0,"aw",@progbits
@@ -436,6 +415,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/bf-layout-1.c.s b/test/torture-s/bf-layout-1.c.s
index 9a2345d17..b512aabe7 100644
--- a/test/torture-s/bf-layout-1.c.s
+++ b/test/torture-s/bf-layout-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bf-layout-1.c"
+	.file	"bf-layout-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -33,5 +33,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bf-pack-1.c.s b/test/torture-s/bf-pack-1.c.s
index 507fbf787..43e06711b 100644
--- a/test/torture-s/bf-pack-1.c.s
+++ b/test/torture-s/bf-pack-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bf-pack-1.c"
+	.file	"bf-pack-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -25,16 +25,16 @@ f:                                      # @f
 	br_if   	0, $pop7        # 0: down to label0
 # BB#2:                                 # %if.end6
 	return  	$0
-.LBB0_3:                                # %if.then5
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,10 +42,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push9=, $pop3, $pop4
+	i32.sub 	$push9=, $pop2, $pop4
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop5), $pop8
 	i64.const	$push0=, 95075992080948
@@ -59,8 +59,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/bf-sign-1.c.s b/test/torture-s/bf-sign-1.c.s
index 0e4cae08a..c8bb0dc38 100644
--- a/test/torture-s/bf-sign-1.c.s
+++ b/test/torture-s/bf-sign-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bf-sign-1.c"
+	.file	"bf-sign-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bf-sign-2.c.s b/test/torture-s/bf-sign-2.c.s
index 109ee4ace..7f9b678b8 100644
--- a/test/torture-s/bf-sign-2.c.s
+++ b/test/torture-s/bf-sign-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bf-sign-2.c"
+	.file	"bf-sign-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,85 +9,57 @@ main:                                   # @main
 	.local  	i64
 # BB#0:                                 # %entry
 	block   	
-	block   	
-	i32.const	$push37=, 0
-	i32.load8_u	$push0=, x($pop37)
-	i32.const	$push1=, 7
+	i32.const	$push21=, 0
+	i32.load8_u	$push0=, x($pop21)
+	i32.const	$push1=, 6
 	i32.and 	$push2=, $pop0, $pop1
-	i32.const	$push36=, -2
-	i32.add 	$push3=, $pop2, $pop36
-	i32.const	$push35=, 0
-	i32.ge_s	$push4=, $pop3, $pop35
-	br_if   	0, $pop4        # 0: down to label1
+	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push41=, 0
-	i32.load	$push5=, x+4($pop41)
-	i32.const	$push6=, 1
-	i32.shl 	$push7=, $pop5, $pop6
-	i32.const	$push40=, 1
-	i32.shr_s	$push8=, $pop7, $pop40
-	i32.const	$push39=, -2
-	i32.add 	$push9=, $pop8, $pop39
-	i32.const	$push38=, 0
-	i32.ge_s	$push10=, $pop9, $pop38
-	br_if   	0, $pop10       # 0: down to label1
+	i32.const	$push22=, 0
+	i32.load	$push3=, x+4($pop22)
+	i32.const	$push4=, 1
+	i32.shl 	$push5=, $pop3, $pop4
+	i32.const	$push6=, 3
+	i32.ge_s	$push7=, $pop5, $pop6
+	br_if   	0, $pop7        # 0: down to label0
 # BB#2:                                 # %if.end5
-	i32.const	$push46=, 0
-	i64.load	$push45=, x+8($pop46)
-	tee_local	$push44=, $0=, $pop45
-	i32.wrap/i64	$push11=, $pop44
-	i32.const	$push43=, -2
-	i32.add 	$push12=, $pop11, $pop43
-	i32.const	$push42=, 0
-	i32.ge_s	$push13=, $pop12, $pop42
-	br_if   	0, $pop13       # 0: down to label1
+	i32.const	$push25=, 0
+	i64.load	$push24=, x+8($pop25)
+	tee_local	$push23=, $0=, $pop24
+	i32.wrap/i64	$push8=, $pop23
+	i32.const	$push9=, 2
+	i32.ge_s	$push10=, $pop8, $pop9
+	br_if   	0, $pop10       # 0: down to label0
 # BB#3:                                 # %if.end13
-	i32.const	$push49=, 0
-	i64.load	$push14=, x+24($pop49)
-	i64.const	$push15=, 35
-	i64.shr_u	$push16=, $pop14, $pop15
-	i32.wrap/i64	$push17=, $pop16
-	i32.const	$push18=, 32767
-	i32.and 	$push19=, $pop17, $pop18
-	i32.const	$push48=, -2
-	i32.add 	$push20=, $pop19, $pop48
-	i32.const	$push47=, 0
-	i32.ge_s	$push21=, $pop20, $pop47
-	br_if   	0, $pop21       # 0: down to label1
+	i32.const	$push26=, 0
+	i32.load	$push11=, x+28($pop26)
+	i32.const	$push12=, 262128
+	i32.and 	$push13=, $pop11, $pop12
+	br_if   	0, $pop13       # 0: down to label0
 # BB#4:                                 # %if.end20
-	i64.const	$push22=, 32
-	i64.shr_u	$push23=, $0, $pop22
-	i32.wrap/i64	$push24=, $pop23
-	i32.const	$push25=, 2147483647
-	i32.and 	$push26=, $pop24, $pop25
-	i32.const	$push51=, -2
-	i32.add 	$push27=, $pop26, $pop51
-	i32.const	$push50=, 0
-	i32.ge_s	$push28=, $pop27, $pop50
-	br_if   	0, $pop28       # 0: down to label1
+	i64.const	$push14=, 9223372028264841216
+	i64.and 	$push15=, $0, $pop14
+	i64.const	$push16=, 4294967297
+	i64.ge_u	$push17=, $pop15, $pop16
+	br_if   	0, $pop17       # 0: down to label0
 # BB#5:                                 # %if.end35
-	i32.const	$push54=, 0
-	i32.load	$push29=, x+20($pop54)
-	i32.const	$push30=, 7
-	i32.and 	$push31=, $pop29, $pop30
-	i32.const	$push53=, -2
-	i32.add 	$push32=, $pop31, $pop53
-	i32.const	$push52=, 0
-	i32.lt_s	$push33=, $pop32, $pop52
-	br_if   	1, $pop33       # 1: down to label0
-.LBB0_6:                                # %if.then42
-	end_block                       # label1:
-	call    	abort@FUNCTION
+	i32.const	$push27=, 0
+	i32.load8_u	$push18=, x+20($pop27)
+	i32.const	$push19=, 6
+	i32.and 	$push20=, $pop18, $pop19
+	br_if   	0, $pop20       # 0: down to label0
+# BB#6:                                 # %if.end50
+	i32.const	$push28=, 0
+	call    	exit@FUNCTION, $pop28
 	unreachable
-.LBB0_7:                                # %if.end50
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
-	i32.const	$push34=, 0
-	call    	exit@FUNCTION, $pop34
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -98,6 +70,6 @@ x:
 	.size	x, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/bf64-1.c.s b/test/torture-s/bf64-1.c.s
index 1dc2775a7..a1bace9f9 100644
--- a/test/torture-s/bf64-1.c.s
+++ b/test/torture-s/bf64-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bf64-1.c"
+	.file	"bf64-1.c"
 	.section	.text.sub,"ax",@progbits
-	.hidden	sub
+	.hidden	sub                     # -- Begin function sub
 	.globl	sub
 	.type	sub,@function
 sub:                                    # @sub
@@ -15,9 +15,9 @@ sub:                                    # @sub
 	.endfunc
 .Lfunc_end0:
 	.size	sub, .Lfunc_end0-sub
-
+                                        # -- End function
 	.section	.text.sub2,"ax",@progbits
-	.hidden	sub2
+	.hidden	sub2                    # -- Begin function sub2
 	.globl	sub2
 	.type	sub2,@function
 sub2:                                   # @sub2
@@ -31,21 +31,21 @@ sub2:                                   # @sub2
 	.endfunc
 .Lfunc_end1:
 	.size	sub2, .Lfunc_end1-sub2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end22
+# BB#0:                                 # %if.end21
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bitfld-1.c.s b/test/torture-s/bitfld-1.c.s
index 5e689cbaf..36b603bdc 100644
--- a/test/torture-s/bitfld-1.c.s
+++ b/test/torture-s/bitfld-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-1.c"
+	.file	"bitfld-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,6 +13,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/bitfld-2.c.s b/test/torture-s/bitfld-2.c.s
index e08c3c1b2..6b44e4721 100644
--- a/test/torture-s/bitfld-2.c.s
+++ b/test/torture-s/bitfld-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-2.c"
+	.file	"bitfld-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bitfld-3.c.s b/test/torture-s/bitfld-3.c.s
index ba51c98ca..1dfc055e2 100644
--- a/test/torture-s/bitfld-3.c.s
+++ b/test/torture-s/bitfld-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-3.c"
+	.file	"bitfld-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -118,5 +118,5 @@ c:
 	.size	c, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-4.c.s b/test/torture-s/bitfld-4.c.s
index 4e60db687..8d0bd3e7d 100644
--- a/test/torture-s/bitfld-4.c.s
+++ b/test/torture-s/bitfld-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-4.c"
+	.file	"bitfld-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -37,5 +37,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-5.c.s b/test/torture-s/bitfld-5.c.s
index 675ff585e..ba1d043d1 100644
--- a/test/torture-s/bitfld-5.c.s
+++ b/test/torture-s/bitfld-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-5.c"
+	.file	"bitfld-5.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -21,9 +21,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -41,9 +41,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,10 +51,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push17=, $pop6, $pop7
+	i32.sub 	$push17=, $pop5, $pop7
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop8), $pop16
 	i32.const	$push0=, 0
@@ -78,7 +78,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lmain.s,@object        # @main.s
 	.section	.rodata.cst8,"aM",@progbits,8
 	.p2align	3
@@ -107,5 +107,5 @@ main:                                   # @main
 	.size	.Lmain.t, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-6.c.s b/test/torture-s/bitfld-6.c.s
index 553b7f122..109ff6a16 100644
--- a/test/torture-s/bitfld-6.c.s
+++ b/test/torture-s/bitfld-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bitfld-6.c"
+	.file	"bitfld-6.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/bswap-1.c.s b/test/torture-s/bswap-1.c.s
index 552ee423f..129241950 100644
--- a/test/torture-s/bswap-1.c.s
+++ b/test/torture-s/bswap-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/bswap-1.c"
+	.file	"bswap-1.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -47,9 +47,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -95,9 +95,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -154,14 +154,14 @@ main:                                   # @main
 # BB#8:                                 # %if.end36
 	i32.const	$push32=, 0
 	return  	$pop32
-.LBB2_9:                                # %if.then35
+.LBB2_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/builtin-bitops-1.c.s b/test/torture-s/builtin-bitops-1.c.s
index f5741b940..622bfca14 100644
--- a/test/torture-s/builtin-bitops-1.c.s
+++ b/test/torture-s/builtin-bitops-1.c.s
@@ -1,54 +1,51 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-bitops-1.c"
+	.file	"builtin-bitops-1.c"
 	.section	.text.my_ffs,"ax",@progbits
-	.hidden	my_ffs
+	.hidden	my_ffs                  # -- Begin function my_ffs
 	.globl	my_ffs
 	.type	my_ffs,@function
 my_ffs:                                 # @my_ffs
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label0
-# BB#1:                                 # %for.cond.preheader
-	i32.const	$2=, 1
-.LBB0_2:                                # %for.cond
+	i32.eqz 	$push11=, $0
+	br_if   	0, $pop11       # 0: down to label0
+# BB#1:                                 # %for.body.preheader
+	i32.const	$1=, 0
+.LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
-	copy_local	$push9=, $2
-	tee_local	$push8=, $3=, $pop9
-	i32.const	$push7=, -1
-	i32.add 	$push6=, $pop8, $pop7
-	tee_local	$push5=, $1=, $pop6
-	i32.const	$push4=, 31
-	i32.gt_u	$push0=, $pop5, $pop4
-	br_if   	1, $pop0        # 1: down to label1
-# BB#3:                                 # %for.body
+	i32.const	$push6=, 1
+	i32.shl 	$push0=, $pop6, $1
+	i32.and 	$push1=, $pop0, $0
+	br_if   	1, $pop1        # 1: down to label1
+# BB#3:                                 # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push11=, 1
-	i32.add 	$2=, $3, $pop11
 	i32.const	$push10=, 1
-	i32.shl 	$push1=, $pop10, $1
-	i32.and 	$push2=, $pop1, $0
-	i32.eqz 	$push13=, $pop2
-	br_if   	0, $pop13       # 0: up to label2
-.LBB0_4:                                # %cleanup
+	i32.add 	$push9=, $1, $pop10
+	tee_local	$push8=, $1=, $pop9
+	i32.const	$push7=, 32
+	i32.lt_u	$push2=, $pop8, $pop7
+	br_if   	0, $pop2        # 0: up to label2
+.LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	return  	$3
+	i32.const	$push3=, 1
+	i32.add 	$push5=, $1, $pop3
+	return  	$pop5
 .LBB0_5:
 	end_block                       # label0:
-	i32.const	$push3=, 0
-                                        # fallthrough-return: $pop3
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	my_ffs, .Lfunc_end0-my_ffs
-
+                                        # -- End function
 	.section	.text.my_ctz,"ax",@progbits
-	.hidden	my_ctz
+	.hidden	my_ctz                  # -- Begin function my_ctz
 	.globl	my_ctz
 	.type	my_ctz,@function
 my_ctz:                                 # @my_ctz
@@ -61,29 +58,32 @@ my_ctz:                                 # @my_ctz
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	i32.const	$push3=, 1
-	i32.shl 	$push0=, $pop3, $1
+	i32.const	$push4=, 1
+	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label3
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $1, $pop7
-	tee_local	$push5=, $1=, $pop6
-	i32.const	$push4=, 32
-	i32.lt_u	$push2=, $pop5, $pop4
+	i32.const	$push8=, 1
+	i32.add 	$push7=, $1, $pop8
+	tee_local	$push6=, $1=, $pop7
+	i32.const	$push5=, 32
+	i32.lt_u	$push2=, $pop6, $pop5
 	br_if   	0, $pop2        # 0: up to label4
-.LBB1_3:                                # %for.end
+# BB#3:                                 # %for.end
 	end_loop
+	i32.const	$push9=, 32
+	return  	$pop9
+.LBB1_4:
 	end_block                       # label3:
-	copy_local	$push8=, $1
-                                        # fallthrough-return: $pop8
+	copy_local	$push3=, $1
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end1:
 	.size	my_ctz, .Lfunc_end1-my_ctz
-
+                                        # -- End function
 	.section	.text.my_clz,"ax",@progbits
-	.hidden	my_clz
+	.hidden	my_clz                  # -- Begin function my_clz
 	.globl	my_clz
 	.type	my_clz,@function
 my_clz:                                 # @my_clz
@@ -97,37 +97,40 @@ my_clz:                                 # @my_clz
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label6:
-	i32.const	$push3=, 1
-	i32.shl 	$push0=, $pop3, $1
+	i32.const	$push4=, 1
+	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label5
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push8=, -1
-	i32.add 	$1=, $1, $pop8
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $2, $pop7
-	tee_local	$push5=, $2=, $pop6
-	i32.const	$push4=, 32
-	i32.lt_u	$push2=, $pop5, $pop4
+	i32.const	$push9=, -1
+	i32.add 	$1=, $1, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$push7=, $2, $pop8
+	tee_local	$push6=, $2=, $pop7
+	i32.const	$push5=, 32
+	i32.lt_u	$push2=, $pop6, $pop5
 	br_if   	0, $pop2        # 0: up to label6
-.LBB2_3:                                # %for.end
+# BB#3:                                 # %for.end
 	end_loop
+	i32.const	$push10=, 32
+	return  	$pop10
+.LBB2_4:
 	end_block                       # label5:
-	copy_local	$push9=, $2
-                                        # fallthrough-return: $pop9
+	copy_local	$push3=, $2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end2:
 	.size	my_clz, .Lfunc_end2-my_clz
-
+                                        # -- End function
 	.section	.text.my_clrsb,"ax",@progbits
-	.hidden	my_clrsb
+	.hidden	my_clrsb                # -- Begin function my_clrsb
 	.globl	my_clrsb
 	.type	my_clrsb,@function
 my_clrsb:                               # @my_clrsb
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$1=, $0, $pop0
@@ -136,34 +139,40 @@ my_clrsb:                               # @my_clrsb
 .LBB3_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label8:
+	block   	
+	loop    	                # label9:
 	i32.shr_u	$push1=, $0, $2
 	i32.const	$push7=, 1
 	i32.and 	$push2=, $pop1, $pop7
 	i32.ne  	$push3=, $pop2, $1
-	br_if   	1, $pop3        # 1: down to label7
+	br_if   	1, $pop3        # 1: down to label8
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB3_1 Depth=1
 	i32.const	$push12=, -1
 	i32.add 	$2=, $2, $pop12
+	i32.const	$4=, 32
 	i32.const	$push11=, 1
 	i32.add 	$push10=, $3, $pop11
 	tee_local	$push9=, $3=, $pop10
 	i32.const	$push8=, 32
 	i32.lt_u	$push4=, $pop9, $pop8
-	br_if   	0, $pop4        # 0: up to label8
-.LBB3_3:                                # %for.end
+	br_if   	0, $pop4        # 0: up to label9
+	br      	2               # 2: down to label7
+.LBB3_3:
 	end_loop
+	end_block                       # label8:
+	copy_local	$4=, $3
+.LBB3_4:                                # %for.end
 	end_block                       # label7:
 	i32.const	$push5=, -1
-	i32.add 	$push6=, $3, $pop5
+	i32.add 	$push6=, $4, $pop5
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end3:
 	.size	my_clrsb, .Lfunc_end3-my_clrsb
-
+                                        # -- End function
 	.section	.text.my_popcount,"ax",@progbits
-	.hidden	my_popcount
+	.hidden	my_popcount             # -- Begin function my_popcount
 	.globl	my_popcount
 	.type	my_popcount,@function
 my_popcount:                            # @my_popcount
@@ -175,19 +184,19 @@ my_popcount:                            # @my_popcount
 	i32.const	$2=, 0
 .LBB4_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label9:
+	loop    	                # label10:
 	i32.const	$push9=, 1
 	i32.shl 	$push0=, $pop9, $2
 	i32.and 	$push1=, $pop0, $0
 	i32.const	$push8=, 0
 	i32.ne  	$push2=, $pop1, $pop8
-	i32.add 	$1=, $pop2, $1
+	i32.add 	$1=, $1, $pop2
 	i32.const	$push7=, 1
 	i32.add 	$push6=, $2, $pop7
 	tee_local	$push5=, $2=, $pop6
 	i32.const	$push4=, 32
 	i32.ne  	$push3=, $pop5, $pop4
-	br_if   	0, $pop3        # 0: up to label9
+	br_if   	0, $pop3        # 0: up to label10
 # BB#2:                                 # %for.end
 	end_loop
 	copy_local	$push10=, $1
@@ -195,9 +204,9 @@ my_popcount:                            # @my_popcount
 	.endfunc
 .Lfunc_end4:
 	.size	my_popcount, .Lfunc_end4-my_popcount
-
+                                        # -- End function
 	.section	.text.my_parity,"ax",@progbits
-	.hidden	my_parity
+	.hidden	my_parity               # -- Begin function my_parity
 	.globl	my_parity
 	.type	my_parity,@function
 my_parity:                              # @my_parity
@@ -209,19 +218,19 @@ my_parity:                              # @my_parity
 	i32.const	$2=, 0
 .LBB5_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label10:
+	loop    	                # label11:
 	i32.const	$push11=, 1
 	i32.shl 	$push0=, $pop11, $2
 	i32.and 	$push1=, $pop0, $0
 	i32.const	$push10=, 0
 	i32.ne  	$push2=, $pop1, $pop10
-	i32.add 	$1=, $pop2, $1
+	i32.add 	$1=, $1, $pop2
 	i32.const	$push9=, 1
 	i32.add 	$push8=, $2, $pop9
 	tee_local	$push7=, $2=, $pop8
 	i32.const	$push6=, 32
 	i32.ne  	$push3=, $pop7, $pop6
-	br_if   	0, $pop3        # 0: up to label10
+	br_if   	0, $pop3        # 0: up to label11
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$push4=, 1
@@ -230,56 +239,53 @@ my_parity:                              # @my_parity
 	.endfunc
 .Lfunc_end5:
 	.size	my_parity, .Lfunc_end5-my_parity
-
+                                        # -- End function
 	.section	.text.my_ffsl,"ax",@progbits
-	.hidden	my_ffsl
+	.hidden	my_ffsl                 # -- Begin function my_ffsl
 	.globl	my_ffsl
 	.type	my_ffsl,@function
 my_ffsl:                                # @my_ffsl
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label11
-# BB#1:                                 # %for.cond.preheader
-	i32.const	$2=, 1
-.LBB6_2:                                # %for.cond
+	i32.eqz 	$push11=, $0
+	br_if   	0, $pop11       # 0: down to label12
+# BB#1:                                 # %for.body.preheader
+	i32.const	$1=, 0
+.LBB6_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label13:
-	copy_local	$push9=, $2
-	tee_local	$push8=, $3=, $pop9
-	i32.const	$push7=, -1
-	i32.add 	$push6=, $pop8, $pop7
-	tee_local	$push5=, $1=, $pop6
-	i32.const	$push4=, 31
-	i32.gt_u	$push0=, $pop5, $pop4
-	br_if   	1, $pop0        # 1: down to label12
-# BB#3:                                 # %for.body
+	loop    	                # label14:
+	i32.const	$push6=, 1
+	i32.shl 	$push0=, $pop6, $1
+	i32.and 	$push1=, $pop0, $0
+	br_if   	1, $pop1        # 1: down to label13
+# BB#3:                                 # %for.inc
                                         #   in Loop: Header=BB6_2 Depth=1
-	i32.const	$push11=, 1
-	i32.add 	$2=, $3, $pop11
 	i32.const	$push10=, 1
-	i32.shl 	$push1=, $pop10, $1
-	i32.and 	$push2=, $pop1, $0
-	i32.eqz 	$push13=, $pop2
-	br_if   	0, $pop13       # 0: up to label13
-.LBB6_4:                                # %cleanup
+	i32.add 	$push9=, $1, $pop10
+	tee_local	$push8=, $1=, $pop9
+	i32.const	$push7=, 32
+	i32.lt_u	$push2=, $pop8, $pop7
+	br_if   	0, $pop2        # 0: up to label14
+.LBB6_4:                                # %for.end
 	end_loop
-	end_block                       # label12:
-	return  	$3
+	end_block                       # label13:
+	i32.const	$push3=, 1
+	i32.add 	$push5=, $1, $pop3
+	return  	$pop5
 .LBB6_5:
-	end_block                       # label11:
-	i32.const	$push3=, 0
-                                        # fallthrough-return: $pop3
+	end_block                       # label12:
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end6:
 	.size	my_ffsl, .Lfunc_end6-my_ffsl
-
+                                        # -- End function
 	.section	.text.my_ctzl,"ax",@progbits
-	.hidden	my_ctzl
+	.hidden	my_ctzl                 # -- Begin function my_ctzl
 	.globl	my_ctzl
 	.type	my_ctzl,@function
 my_ctzl:                                # @my_ctzl
@@ -291,30 +297,33 @@ my_ctzl:                                # @my_ctzl
 .LBB7_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label15:
-	i32.const	$push3=, 1
-	i32.shl 	$push0=, $pop3, $1
+	loop    	                # label16:
+	i32.const	$push4=, 1
+	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
-	br_if   	1, $pop1        # 1: down to label14
+	br_if   	1, $pop1        # 1: down to label15
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB7_1 Depth=1
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $1, $pop7
-	tee_local	$push5=, $1=, $pop6
-	i32.const	$push4=, 32
-	i32.lt_u	$push2=, $pop5, $pop4
-	br_if   	0, $pop2        # 0: up to label15
-.LBB7_3:                                # %for.end
+	i32.const	$push8=, 1
+	i32.add 	$push7=, $1, $pop8
+	tee_local	$push6=, $1=, $pop7
+	i32.const	$push5=, 32
+	i32.lt_u	$push2=, $pop6, $pop5
+	br_if   	0, $pop2        # 0: up to label16
+# BB#3:                                 # %for.end
 	end_loop
-	end_block                       # label14:
-	copy_local	$push8=, $1
-                                        # fallthrough-return: $pop8
+	i32.const	$push9=, 32
+	return  	$pop9
+.LBB7_4:
+	end_block                       # label15:
+	copy_local	$push3=, $1
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end7:
 	.size	my_ctzl, .Lfunc_end7-my_ctzl
-
+                                        # -- End function
 	.section	.text.my_clzl,"ax",@progbits
-	.hidden	my_clzl
+	.hidden	my_clzl                 # -- Begin function my_clzl
 	.globl	my_clzl
 	.type	my_clzl,@function
 my_clzl:                                # @my_clzl
@@ -327,38 +336,41 @@ my_clzl:                                # @my_clzl
 .LBB8_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label17:
-	i32.const	$push3=, 1
-	i32.shl 	$push0=, $pop3, $1
+	loop    	                # label18:
+	i32.const	$push4=, 1
+	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
-	br_if   	1, $pop1        # 1: down to label16
+	br_if   	1, $pop1        # 1: down to label17
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB8_1 Depth=1
-	i32.const	$push8=, -1
-	i32.add 	$1=, $1, $pop8
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $2, $pop7
-	tee_local	$push5=, $2=, $pop6
-	i32.const	$push4=, 32
-	i32.lt_u	$push2=, $pop5, $pop4
-	br_if   	0, $pop2        # 0: up to label17
-.LBB8_3:                                # %for.end
+	i32.const	$push9=, -1
+	i32.add 	$1=, $1, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$push7=, $2, $pop8
+	tee_local	$push6=, $2=, $pop7
+	i32.const	$push5=, 32
+	i32.lt_u	$push2=, $pop6, $pop5
+	br_if   	0, $pop2        # 0: up to label18
+# BB#3:                                 # %for.end
 	end_loop
-	end_block                       # label16:
-	copy_local	$push9=, $2
-                                        # fallthrough-return: $pop9
+	i32.const	$push10=, 32
+	return  	$pop10
+.LBB8_4:
+	end_block                       # label17:
+	copy_local	$push3=, $2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end8:
 	.size	my_clzl, .Lfunc_end8-my_clzl
-
+                                        # -- End function
 	.section	.text.my_clrsbl,"ax",@progbits
-	.hidden	my_clrsbl
+	.hidden	my_clrsbl               # -- Begin function my_clrsbl
 	.globl	my_clrsbl
 	.type	my_clrsbl,@function
 my_clrsbl:                              # @my_clrsbl
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$1=, $0, $pop0
@@ -367,34 +379,40 @@ my_clrsbl:                              # @my_clrsbl
 .LBB9_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label19:
+	block   	
+	loop    	                # label21:
 	i32.shr_u	$push1=, $0, $2
 	i32.const	$push7=, 1
 	i32.and 	$push2=, $pop1, $pop7
 	i32.ne  	$push3=, $pop2, $1
-	br_if   	1, $pop3        # 1: down to label18
+	br_if   	1, $pop3        # 1: down to label20
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB9_1 Depth=1
 	i32.const	$push12=, -1
 	i32.add 	$2=, $2, $pop12
+	i32.const	$4=, 32
 	i32.const	$push11=, 1
 	i32.add 	$push10=, $3, $pop11
 	tee_local	$push9=, $3=, $pop10
 	i32.const	$push8=, 32
 	i32.lt_u	$push4=, $pop9, $pop8
-	br_if   	0, $pop4        # 0: up to label19
-.LBB9_3:                                # %for.end
+	br_if   	0, $pop4        # 0: up to label21
+	br      	2               # 2: down to label19
+.LBB9_3:
 	end_loop
-	end_block                       # label18:
+	end_block                       # label20:
+	copy_local	$4=, $3
+.LBB9_4:                                # %for.end
+	end_block                       # label19:
 	i32.const	$push5=, -1
-	i32.add 	$push6=, $3, $pop5
+	i32.add 	$push6=, $4, $pop5
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end9:
 	.size	my_clrsbl, .Lfunc_end9-my_clrsbl
-
+                                        # -- End function
 	.section	.text.my_popcountl,"ax",@progbits
-	.hidden	my_popcountl
+	.hidden	my_popcountl            # -- Begin function my_popcountl
 	.globl	my_popcountl
 	.type	my_popcountl,@function
 my_popcountl:                           # @my_popcountl
@@ -406,19 +424,19 @@ my_popcountl:                           # @my_popcountl
 	i32.const	$2=, 0
 .LBB10_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label20:
+	loop    	                # label22:
 	i32.const	$push9=, 1
 	i32.shl 	$push0=, $pop9, $2
 	i32.and 	$push1=, $pop0, $0
 	i32.const	$push8=, 0
 	i32.ne  	$push2=, $pop1, $pop8
-	i32.add 	$1=, $pop2, $1
+	i32.add 	$1=, $1, $pop2
 	i32.const	$push7=, 1
 	i32.add 	$push6=, $2, $pop7
 	tee_local	$push5=, $2=, $pop6
 	i32.const	$push4=, 32
 	i32.ne  	$push3=, $pop5, $pop4
-	br_if   	0, $pop3        # 0: up to label20
+	br_if   	0, $pop3        # 0: up to label22
 # BB#2:                                 # %for.end
 	end_loop
 	copy_local	$push10=, $1
@@ -426,9 +444,9 @@ my_popcountl:                           # @my_popcountl
 	.endfunc
 .Lfunc_end10:
 	.size	my_popcountl, .Lfunc_end10-my_popcountl
-
+                                        # -- End function
 	.section	.text.my_parityl,"ax",@progbits
-	.hidden	my_parityl
+	.hidden	my_parityl              # -- Begin function my_parityl
 	.globl	my_parityl
 	.type	my_parityl,@function
 my_parityl:                             # @my_parityl
@@ -440,19 +458,19 @@ my_parityl:                             # @my_parityl
 	i32.const	$2=, 0
 .LBB11_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label21:
+	loop    	                # label23:
 	i32.const	$push11=, 1
 	i32.shl 	$push0=, $pop11, $2
 	i32.and 	$push1=, $pop0, $0
 	i32.const	$push10=, 0
 	i32.ne  	$push2=, $pop1, $pop10
-	i32.add 	$1=, $pop2, $1
+	i32.add 	$1=, $1, $pop2
 	i32.const	$push9=, 1
 	i32.add 	$push8=, $2, $pop9
 	tee_local	$push7=, $2=, $pop8
 	i32.const	$push6=, 32
 	i32.ne  	$push3=, $pop7, $pop6
-	br_if   	0, $pop3        # 0: up to label21
+	br_if   	0, $pop3        # 0: up to label23
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$push4=, 1
@@ -461,56 +479,58 @@ my_parityl:                             # @my_parityl
 	.endfunc
 .Lfunc_end11:
 	.size	my_parityl, .Lfunc_end11-my_parityl
-
+                                        # -- End function
 	.section	.text.my_ffsll,"ax",@progbits
-	.hidden	my_ffsll
+	.hidden	my_ffsll                # -- Begin function my_ffsll
 	.globl	my_ffsll
 	.type	my_ffsll,@function
 my_ffsll:                               # @my_ffsll
 	.param  	i64
 	.result 	i32
-	.local  	i64, i32, i64, i32
+	.local  	i64, i32
 # BB#0:                                 # %entry
 	block   	
-	i64.eqz 	$push1=, $0
-	br_if   	0, $pop1        # 0: down to label22
-# BB#1:                                 # %for.cond.preheader
-	i64.const	$3=, 0
-	i32.const	$2=, 1
-.LBB12_2:                               # %for.cond
+	i64.eqz 	$push0=, $0
+	br_if   	0, $pop0        # 0: down to label24
+# BB#1:                                 # %for.body.preheader
+	i32.const	$2=, 0
+	i64.const	$1=, 0
+.LBB12_2:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label24:
-	copy_local	$4=, $2
-	i64.const	$push6=, 63
-	i64.gt_u	$push2=, $3, $pop6
-	br_if   	1, $pop2        # 1: down to label23
-# BB#3:                                 # %for.body
+	loop    	                # label26:
+	i64.const	$push9=, 1
+	i64.shl 	$push1=, $pop9, $1
+	i64.and 	$push2=, $pop1, $0
+	i64.const	$push8=, 0
+	i64.ne  	$push3=, $pop2, $pop8
+	br_if   	1, $pop3        # 1: down to label25
+# BB#3:                                 # %for.inc
                                         #   in Loop: Header=BB12_2 Depth=1
-	i32.const	$push9=, 1
-	i32.add 	$2=, $4, $pop9
-	i64.const	$push8=, 1
-	i64.shl 	$1=, $pop8, $3
-	i64.const	$push7=, 1
-	i64.add 	$push0=, $3, $pop7
-	copy_local	$3=, $pop0
-	i64.and 	$push3=, $1, $0
-	i64.eqz 	$push4=, $pop3
-	br_if   	0, $pop4        # 0: up to label24
-.LBB12_4:                               # %cleanup
+	i32.const	$push14=, 1
+	i32.add 	$2=, $2, $pop14
+	i64.const	$push13=, 1
+	i64.add 	$push12=, $1, $pop13
+	tee_local	$push11=, $1=, $pop12
+	i64.const	$push10=, 64
+	i64.lt_u	$push4=, $pop11, $pop10
+	br_if   	0, $pop4        # 0: up to label26
+.LBB12_4:                               # %for.end
 	end_loop
-	end_block                       # label23:
-	return  	$4
+	end_block                       # label25:
+	i32.const	$push5=, 1
+	i32.add 	$push7=, $2, $pop5
+	return  	$pop7
 .LBB12_5:
-	end_block                       # label22:
-	i32.const	$push5=, 0
-                                        # fallthrough-return: $pop5
+	end_block                       # label24:
+	i32.const	$push6=, 0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end12:
 	.size	my_ffsll, .Lfunc_end12-my_ffsll
-
+                                        # -- End function
 	.section	.text.my_ctzll,"ax",@progbits
-	.hidden	my_ctzll
+	.hidden	my_ctzll                # -- Begin function my_ctzll
 	.globl	my_ctzll
 	.type	my_ctzll,@function
 my_ctzll:                               # @my_ctzll
@@ -523,13 +543,13 @@ my_ctzll:                               # @my_ctzll
 .LBB13_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label26:
+	loop    	                # label28:
 	i64.const	$push5=, 1
 	i64.shl 	$push0=, $pop5, $1
 	i64.and 	$push1=, $pop0, $0
 	i64.const	$push4=, 0
 	i64.ne  	$push2=, $pop1, $pop4
-	br_if   	1, $pop2        # 1: down to label25
+	br_if   	1, $pop2        # 1: down to label27
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB13_1 Depth=1
 	i32.const	$push10=, 1
@@ -539,18 +559,18 @@ my_ctzll:                               # @my_ctzll
 	tee_local	$push7=, $1=, $pop8
 	i64.const	$push6=, 64
 	i64.lt_u	$push3=, $pop7, $pop6
-	br_if   	0, $pop3        # 0: up to label26
+	br_if   	0, $pop3        # 0: up to label28
 .LBB13_3:                               # %for.end
 	end_loop
-	end_block                       # label25:
+	end_block                       # label27:
 	copy_local	$push11=, $2
                                         # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end13:
 	.size	my_ctzll, .Lfunc_end13-my_ctzll
-
+                                        # -- End function
 	.section	.text.my_clzll,"ax",@progbits
-	.hidden	my_clzll
+	.hidden	my_clzll                # -- Begin function my_clzll
 	.globl	my_clzll
 	.type	my_clzll,@function
 my_clzll:                               # @my_clzll
@@ -564,13 +584,13 @@ my_clzll:                               # @my_clzll
 .LBB14_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label28:
+	loop    	                # label30:
 	i64.const	$push5=, 1
 	i64.shl 	$push0=, $pop5, $1
 	i64.and 	$push1=, $pop0, $0
 	i64.const	$push4=, 0
 	i64.ne  	$push2=, $pop1, $pop4
-	br_if   	1, $pop2        # 1: down to label27
+	br_if   	1, $pop2        # 1: down to label29
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB14_1 Depth=1
 	i64.const	$push11=, -1
@@ -582,18 +602,18 @@ my_clzll:                               # @my_clzll
 	tee_local	$push7=, $2=, $pop8
 	i64.const	$push6=, 64
 	i64.lt_u	$push3=, $pop7, $pop6
-	br_if   	0, $pop3        # 0: up to label28
+	br_if   	0, $pop3        # 0: up to label30
 .LBB14_3:                               # %for.end
 	end_loop
-	end_block                       # label27:
+	end_block                       # label29:
 	copy_local	$push12=, $3
                                         # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end14:
 	.size	my_clzll, .Lfunc_end14-my_clzll
-
+                                        # -- End function
 	.section	.text.my_clrsbll,"ax",@progbits
-	.hidden	my_clrsbll
+	.hidden	my_clrsbll              # -- Begin function my_clrsbll
 	.globl	my_clrsbll
 	.type	my_clrsbll,@function
 my_clrsbll:                             # @my_clrsbll
@@ -609,12 +629,12 @@ my_clrsbll:                             # @my_clrsbll
 .LBB15_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label30:
+	loop    	                # label32:
 	i64.shr_u	$push1=, $0, $2
 	i64.const	$push7=, 1
 	i64.and 	$push2=, $pop1, $pop7
 	i64.ne  	$push3=, $pop2, $1
-	br_if   	1, $pop3        # 1: down to label29
+	br_if   	1, $pop3        # 1: down to label31
 # BB#2:                                 # %for.inc
                                         #   in Loop: Header=BB15_1 Depth=1
 	i64.const	$push13=, -1
@@ -626,19 +646,19 @@ my_clrsbll:                             # @my_clrsbll
 	tee_local	$push9=, $3=, $pop10
 	i64.const	$push8=, 64
 	i64.lt_u	$push4=, $pop9, $pop8
-	br_if   	0, $pop4        # 0: up to label30
+	br_if   	0, $pop4        # 0: up to label32
 .LBB15_3:                               # %for.end
 	end_loop
-	end_block                       # label29:
+	end_block                       # label31:
 	i32.const	$push5=, -1
 	i32.add 	$push6=, $4, $pop5
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end15:
 	.size	my_clrsbll, .Lfunc_end15-my_clrsbll
-
+                                        # -- End function
 	.section	.text.my_popcountll,"ax",@progbits
-	.hidden	my_popcountll
+	.hidden	my_popcountll           # -- Begin function my_popcountll
 	.globl	my_popcountll
 	.type	my_popcountll,@function
 my_popcountll:                          # @my_popcountll
@@ -650,19 +670,19 @@ my_popcountll:                          # @my_popcountll
 	i64.const	$1=, 0
 .LBB16_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label31:
+	loop    	                # label33:
 	i64.const	$push9=, 1
 	i64.shl 	$push0=, $pop9, $1
 	i64.and 	$push1=, $pop0, $0
 	i64.const	$push8=, 0
 	i64.ne  	$push2=, $pop1, $pop8
-	i32.add 	$2=, $pop2, $2
+	i32.add 	$2=, $2, $pop2
 	i64.const	$push7=, 1
 	i64.add 	$push6=, $1, $pop7
 	tee_local	$push5=, $1=, $pop6
 	i64.const	$push4=, 64
 	i64.ne  	$push3=, $pop5, $pop4
-	br_if   	0, $pop3        # 0: up to label31
+	br_if   	0, $pop3        # 0: up to label33
 # BB#2:                                 # %for.end
 	end_loop
 	copy_local	$push10=, $2
@@ -670,9 +690,9 @@ my_popcountll:                          # @my_popcountll
 	.endfunc
 .Lfunc_end16:
 	.size	my_popcountll, .Lfunc_end16-my_popcountll
-
+                                        # -- End function
 	.section	.text.my_parityll,"ax",@progbits
-	.hidden	my_parityll
+	.hidden	my_parityll             # -- Begin function my_parityll
 	.globl	my_parityll
 	.type	my_parityll,@function
 my_parityll:                            # @my_parityll
@@ -684,19 +704,19 @@ my_parityll:                            # @my_parityll
 	i64.const	$1=, 0
 .LBB17_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label32:
+	loop    	                # label34:
 	i64.const	$push11=, 1
 	i64.shl 	$push0=, $pop11, $1
 	i64.and 	$push1=, $pop0, $0
 	i64.const	$push10=, 0
 	i64.ne  	$push2=, $pop1, $pop10
-	i32.add 	$2=, $pop2, $2
+	i32.add 	$2=, $2, $pop2
 	i64.const	$push9=, 1
 	i64.add 	$push8=, $1, $pop9
 	tee_local	$push7=, $1=, $pop8
 	i64.const	$push6=, 64
 	i64.ne  	$push3=, $pop7, $pop6
-	br_if   	0, $pop3        # 0: up to label32
+	br_if   	0, $pop3        # 0: up to label34
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$push4=, 1
@@ -705,971 +725,939 @@ my_parityll:                            # @my_parityll
 	.endfunc
 .Lfunc_end17:
 	.size	my_parityll, .Lfunc_end17-my_parityll
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i64, i32, i32, i64, i64, i64, i32
+	.local  	i32, i32, i32, i32, i64, i32, i32, i32, i64, i64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
 .LBB18_1:                               # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB18_3 Depth 2
                                         #     Child Loop BB18_9 Depth 2
-                                        #     Child Loop BB18_13 Depth 2
-                                        #     Child Loop BB18_17 Depth 2
-                                        #     Child Loop BB18_21 Depth 2
+                                        #     Child Loop BB18_14 Depth 2
+                                        #     Child Loop BB18_19 Depth 2
                                         #     Child Loop BB18_24 Depth 2
+                                        #     Child Loop BB18_27 Depth 2
 	block   	
-	block   	
-	loop    	                # label35:
-	i32.const	$push208=, 2
-	i32.shl 	$push1=, $0, $pop208
-	i32.const	$push207=, ints
-	i32.add 	$push206=, $pop1, $pop207
-	tee_local	$push205=, $1=, $pop206
-	i32.load	$push204=, 0($pop205)
-	tee_local	$push203=, $10=, $pop204
-	i32.ctz 	$push202=, $pop203
-	tee_local	$push201=, $2=, $pop202
-	i32.const	$push200=, 1
-	i32.add 	$push2=, $pop201, $pop200
-	i32.const	$push199=, 0
-	i32.select	$6=, $pop2, $pop199, $10
+	loop    	                # label36:
+	i32.const	$push203=, 2
+	i32.shl 	$push0=, $0, $pop203
+	i32.const	$push202=, ints
+	i32.add 	$push201=, $pop0, $pop202
+	tee_local	$push200=, $5=, $pop201
+	i32.load	$push199=, 0($pop200)
+	tee_local	$push198=, $11=, $pop199
+	i32.ctz 	$push197=, $pop198
+	tee_local	$push196=, $2=, $pop197
+	i32.const	$push195=, 1
+	i32.add 	$push1=, $pop196, $pop195
+	i32.const	$push194=, 0
+	i32.select	$6=, $pop1, $pop194, $11
 	i32.const	$3=, 0
 	block   	
-	i32.eqz 	$push400=, $10
-	br_if   	0, $pop400      # 0: down to label36
-# BB#2:                                 # %for.cond.i.preheader
+	i32.eqz 	$push382=, $11
+	br_if   	0, $pop382      # 0: down to label37
+# BB#2:                                 # %for.body.i.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$5=, 0
-.LBB18_3:                               # %for.cond.i
+	i32.const	$3=, 0
+.LBB18_3:                               # %for.body.i
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label38:
-	copy_local	$push211=, $5
-	tee_local	$push210=, $3=, $pop211
-	i32.const	$push209=, 31
-	i32.gt_u	$push3=, $pop210, $pop209
-	br_if   	1, $pop3        # 1: down to label37
-# BB#4:                                 # %for.body.i
+	loop    	                # label39:
+	i32.const	$push204=, 1
+	i32.shl 	$push2=, $pop204, $3
+	i32.and 	$push3=, $pop2, $11
+	br_if   	1, $pop3        # 1: down to label38
+# BB#4:                                 # %for.inc.i
                                         #   in Loop: Header=BB18_3 Depth=2
-	i32.const	$push213=, 1
-	i32.add 	$5=, $3, $pop213
-	i32.const	$push212=, 1
-	i32.shl 	$push4=, $pop212, $3
-	i32.and 	$push5=, $pop4, $10
-	i32.eqz 	$push401=, $pop5
-	br_if   	0, $pop401      # 0: up to label38
-.LBB18_5:                               # %my_ffs.exit.loopexit
+	i32.const	$push208=, 1
+	i32.add 	$push207=, $3, $pop208
+	tee_local	$push206=, $3=, $pop207
+	i32.const	$push205=, 32
+	i32.lt_u	$push4=, $pop206, $pop205
+	br_if   	0, $pop4        # 0: up to label39
+.LBB18_5:                               # %for.end.i
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	end_block                       # label37:
-	i32.const	$push214=, 1
-	i32.add 	$3=, $3, $pop214
+	end_block                       # label38:
+	i32.const	$push209=, 1
+	i32.add 	$3=, $3, $pop209
 .LBB18_6:                               # %my_ffs.exit
                                         #   in Loop: Header=BB18_1 Depth=1
-	end_block                       # label36:
-	i32.ne  	$push6=, $6, $3
-	br_if   	1, $pop6        # 1: down to label34
+	end_block                       # label37:
+	i32.ne  	$push5=, $6, $3
+	br_if   	1, $pop5        # 1: down to label35
 # BB#7:                                 # %if.end
                                         #   in Loop: Header=BB18_1 Depth=1
 	block   	
-	i32.eqz 	$push402=, $10
-	br_if   	0, $pop402      # 0: down to label39
+	i32.eqz 	$push383=, $11
+	br_if   	0, $pop383      # 0: down to label40
 # BB#8:                                 # %land.lhs.true
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.clz 	$6=, $10
-	i32.const	$5=, 0
+	i32.clz 	$1=, $11
+	i32.const	$6=, 0
 	i32.const	$3=, 31
-.LBB18_9:                               # %for.body.i816
+.LBB18_9:                               # %for.body.i822
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label41:
-	i32.const	$push215=, 1
-	i32.shl 	$push7=, $pop215, $3
-	i32.and 	$push8=, $pop7, $10
-	br_if   	1, $pop8        # 1: down to label40
-# BB#10:                                # %for.inc.i819
+	block   	
+	loop    	                # label43:
+	i32.const	$push210=, 1
+	i32.shl 	$push6=, $pop210, $3
+	i32.and 	$push7=, $pop6, $11
+	br_if   	1, $pop7        # 1: down to label42
+# BB#10:                                # %for.inc.i825
                                         #   in Loop: Header=BB18_9 Depth=2
-	i32.const	$push220=, -1
-	i32.add 	$3=, $3, $pop220
-	i32.const	$push219=, 1
-	i32.add 	$push218=, $5, $pop219
-	tee_local	$push217=, $5=, $pop218
-	i32.const	$push216=, 32
-	i32.lt_u	$push9=, $pop217, $pop216
-	br_if   	0, $pop9        # 0: up to label41
-.LBB18_11:                              # %my_clz.exit
-                                        #   in Loop: Header=BB18_1 Depth=1
+	i32.const	$push215=, -1
+	i32.add 	$3=, $3, $pop215
+	i32.const	$7=, 32
+	i32.const	$push214=, 1
+	i32.add 	$push213=, $6, $pop214
+	tee_local	$push212=, $6=, $pop213
+	i32.const	$push211=, 32
+	i32.lt_u	$push8=, $pop212, $pop211
+	br_if   	0, $pop8        # 0: up to label43
+	br      	2               # 2: down to label41
+.LBB18_11:                              #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	end_block                       # label40:
-	i32.ne  	$push10=, $6, $5
-	br_if   	2, $pop10       # 2: down to label34
-# BB#12:                                # %land.lhs.true13
+	end_block                       # label42:
+	copy_local	$7=, $6
+.LBB18_12:                              # %my_clz.exit
+                                        #   in Loop: Header=BB18_1 Depth=1
+	end_block                       # label41:
+	i32.ne  	$push9=, $1, $7
+	br_if   	2, $pop9        # 2: down to label35
+# BB#13:                                # %land.lhs.true13
                                         #   in Loop: Header=BB18_1 Depth=1
 	i32.const	$3=, 0
-.LBB18_13:                              # %for.body.i875
+.LBB18_14:                              # %for.body.i890
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label43:
-	i32.const	$push221=, 1
-	i32.shl 	$push11=, $pop221, $3
-	i32.and 	$push12=, $pop11, $10
-	br_if   	1, $pop12       # 1: down to label42
-# BB#14:                                # %for.inc.i878
-                                        #   in Loop: Header=BB18_13 Depth=2
-	i32.const	$push225=, 1
-	i32.add 	$push224=, $3, $pop225
-	tee_local	$push223=, $3=, $pop224
-	i32.const	$push222=, 32
-	i32.lt_u	$push13=, $pop223, $pop222
-	br_if   	0, $pop13       # 0: up to label43
-.LBB18_15:                              # %my_ctz.exit
-                                        #   in Loop: Header=BB18_1 Depth=1
+	block   	
+	loop    	                # label46:
+	i32.const	$push216=, 1
+	i32.shl 	$push10=, $pop216, $3
+	i32.and 	$push11=, $pop10, $11
+	br_if   	1, $pop11       # 1: down to label45
+# BB#15:                                # %for.inc.i893
+                                        #   in Loop: Header=BB18_14 Depth=2
+	i32.const	$6=, 32
+	i32.const	$push220=, 1
+	i32.add 	$push219=, $3, $pop220
+	tee_local	$push218=, $3=, $pop219
+	i32.const	$push217=, 32
+	i32.lt_u	$push12=, $pop218, $pop217
+	br_if   	0, $pop12       # 0: up to label46
+	br      	2               # 2: down to label44
+.LBB18_16:                              #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	end_block                       # label42:
-	i32.ne  	$push14=, $2, $3
-	br_if   	2, $pop14       # 2: down to label34
-.LBB18_16:                              # %if.end19
+	end_block                       # label45:
+	copy_local	$6=, $3
+.LBB18_17:                              # %my_ctz.exit
                                         #   in Loop: Header=BB18_1 Depth=1
-	end_block                       # label39:
-	i32.call	$2=, __builtin_clrsb@FUNCTION, $10
-	i32.load	$push228=, 0($1)
-	tee_local	$push227=, $3=, $pop228
-	i32.const	$push226=, 31
-	i32.shr_u	$6=, $pop227, $pop226
-	i32.const	$5=, 1
-	i32.const	$10=, 30
-.LBB18_17:                              # %for.body.i948
+	end_block                       # label44:
+	i32.ne  	$push13=, $2, $6
+	br_if   	2, $pop13       # 2: down to label35
+.LBB18_18:                              # %if.end19
+                                        #   in Loop: Header=BB18_1 Depth=1
+	end_block                       # label40:
+	i32.call	$2=, __builtin_clrsb@FUNCTION, $11
+	i32.load	$push223=, 0($5)
+	tee_local	$push222=, $3=, $pop223
+	i32.const	$push221=, 31
+	i32.shr_u	$7=, $pop222, $pop221
+	i32.const	$6=, 1
+	i32.const	$11=, 30
+.LBB18_19:                              # %for.body.i975
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label45:
-	i32.shr_u	$push15=, $3, $10
-	i32.const	$push229=, 1
-	i32.and 	$push16=, $pop15, $pop229
-	i32.ne  	$push17=, $pop16, $6
-	br_if   	1, $pop17       # 1: down to label44
-# BB#18:                                # %for.inc.i951
-                                        #   in Loop: Header=BB18_17 Depth=2
-	i32.const	$push234=, -1
-	i32.add 	$10=, $10, $pop234
-	i32.const	$push233=, 1
-	i32.add 	$push232=, $5, $pop233
-	tee_local	$push231=, $5=, $pop232
-	i32.const	$push230=, 32
-	i32.lt_u	$push18=, $pop231, $pop230
-	br_if   	0, $pop18       # 0: up to label45
-.LBB18_19:                              # %my_clrsb.exit
-                                        #   in Loop: Header=BB18_1 Depth=1
+	block   	
+	loop    	                # label49:
+	i32.shr_u	$push14=, $3, $11
+	i32.const	$push224=, 1
+	i32.and 	$push15=, $pop14, $pop224
+	i32.ne  	$push16=, $pop15, $7
+	br_if   	1, $pop16       # 1: down to label48
+# BB#20:                                # %for.inc.i978
+                                        #   in Loop: Header=BB18_19 Depth=2
+	i32.const	$push229=, -1
+	i32.add 	$11=, $11, $pop229
+	i32.const	$5=, 32
+	i32.const	$push228=, 1
+	i32.add 	$push227=, $6, $pop228
+	tee_local	$push226=, $6=, $pop227
+	i32.const	$push225=, 32
+	i32.lt_u	$push17=, $pop226, $pop225
+	br_if   	0, $pop17       # 0: up to label49
+	br      	2               # 2: down to label47
+.LBB18_21:                              #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	end_block                       # label44:
-	i32.const	$push235=, -1
-	i32.add 	$push19=, $5, $pop235
-	i32.ne  	$push20=, $2, $pop19
-	br_if   	1, $pop20       # 1: down to label34
-# BB#20:                                # %for.body.i1030.preheader
+	end_block                       # label48:
+	copy_local	$5=, $6
+.LBB18_22:                              # %my_clrsb.exit
+                                        #   in Loop: Header=BB18_1 Depth=1
+	end_block                       # label47:
+	i32.const	$push230=, -1
+	i32.add 	$push18=, $5, $pop230
+	i32.ne  	$push19=, $2, $pop18
+	br_if   	1, $pop19       # 1: down to label35
+# BB#23:                                # %for.body.i1069.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$5=, 0
-	i32.const	$10=, 0
-.LBB18_21:                              # %for.body.i1030
+	i32.const	$6=, 0
+	i32.const	$11=, 0
+.LBB18_24:                              # %for.body.i1069
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label46:
-	i32.const	$push241=, 1
-	i32.shl 	$push21=, $pop241, $10
-	i32.and 	$push22=, $pop21, $3
-	i32.const	$push240=, 0
-	i32.ne  	$push23=, $pop22, $pop240
-	i32.add 	$5=, $pop23, $5
-	i32.const	$push239=, 1
-	i32.add 	$push238=, $10, $pop239
-	tee_local	$push237=, $10=, $pop238
-	i32.const	$push236=, 32
-	i32.ne  	$push24=, $pop237, $pop236
-	br_if   	0, $pop24       # 0: up to label46
-# BB#22:                                # %my_popcount.exit
+	loop    	                # label50:
+	i32.const	$push236=, 1
+	i32.shl 	$push20=, $pop236, $11
+	i32.and 	$push21=, $pop20, $3
+	i32.const	$push235=, 0
+	i32.ne  	$push22=, $pop21, $pop235
+	i32.add 	$6=, $6, $pop22
+	i32.const	$push234=, 1
+	i32.add 	$push233=, $11, $pop234
+	tee_local	$push232=, $11=, $pop233
+	i32.const	$push231=, 32
+	i32.ne  	$push23=, $pop232, $pop231
+	br_if   	0, $pop23       # 0: up to label50
+# BB#25:                                # %my_popcount.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	i32.popcnt	$push25=, $3
-	i32.ne  	$push26=, $pop25, $5
-	br_if   	1, $pop26       # 1: down to label34
-# BB#23:                                # %for.body.i1109.preheader
+	i32.popcnt	$push24=, $3
+	i32.ne  	$push25=, $pop24, $6
+	br_if   	1, $pop25       # 1: down to label35
+# BB#26:                                # %for.body.i1160.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$6=, 0
-	i32.const	$10=, 0
-.LBB18_24:                              # %for.body.i1109
+	i32.const	$7=, 0
+	i32.const	$11=, 0
+.LBB18_27:                              # %for.body.i1160
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label47:
-	i32.const	$push247=, 1
-	i32.shl 	$push27=, $pop247, $10
-	i32.and 	$push28=, $pop27, $3
-	i32.const	$push246=, 0
-	i32.ne  	$push29=, $pop28, $pop246
-	i32.add 	$6=, $pop29, $6
-	i32.const	$push245=, 1
-	i32.add 	$push244=, $10, $pop245
-	tee_local	$push243=, $10=, $pop244
-	i32.const	$push242=, 32
-	i32.ne  	$push30=, $pop243, $pop242
-	br_if   	0, $pop30       # 0: up to label47
-# BB#25:                                # %my_parity.exit
+	loop    	                # label51:
+	i32.const	$push242=, 1
+	i32.shl 	$push26=, $pop242, $11
+	i32.and 	$push27=, $pop26, $3
+	i32.const	$push241=, 0
+	i32.ne  	$push28=, $pop27, $pop241
+	i32.add 	$7=, $7, $pop28
+	i32.const	$push240=, 1
+	i32.add 	$push239=, $11, $pop240
+	tee_local	$push238=, $11=, $pop239
+	i32.const	$push237=, 32
+	i32.ne  	$push29=, $pop238, $pop237
+	br_if   	0, $pop29       # 0: up to label51
+# BB#28:                                # %my_parity.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	i32.xor 	$push31=, $6, $5
-	i32.const	$push248=, 1
-	i32.and 	$push32=, $pop31, $pop248
-	br_if   	1, $pop32       # 1: down to label34
-# BB#26:                                # %for.cond
+	i32.xor 	$push30=, $7, $6
+	i32.const	$push243=, 1
+	i32.and 	$push31=, $pop30, $pop243
+	br_if   	1, $pop31       # 1: down to label35
+# BB#29:                                # %for.cond
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$push252=, 1
-	i32.add 	$push251=, $0, $pop252
-	tee_local	$push250=, $0=, $pop251
-	i32.const	$push249=, 13
-	i32.lt_u	$push33=, $pop250, $pop249
-	br_if   	0, $pop33       # 0: up to label35
-# BB#27:                                # %for.body41.preheader
+	i32.const	$push247=, 1
+	i32.add 	$push246=, $0, $pop247
+	tee_local	$push245=, $0=, $pop246
+	i32.const	$push244=, 13
+	i32.lt_u	$push32=, $pop245, $pop244
+	br_if   	0, $pop32       # 0: up to label36
+# BB#30:                                # %for.body41.preheader
 	end_loop
 	i32.const	$0=, 0
-.LBB18_28:                              # %for.body41
+.LBB18_31:                              # %for.body41
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB18_30 Depth 2
-                                        #     Child Loop BB18_36 Depth 2
-                                        #     Child Loop BB18_40 Depth 2
+                                        #     Child Loop BB18_33 Depth 2
+                                        #     Child Loop BB18_39 Depth 2
                                         #     Child Loop BB18_44 Depth 2
-                                        #     Child Loop BB18_48 Depth 2
-                                        #     Child Loop BB18_51 Depth 2
-	loop    	                # label48:
-	i32.const	$push262=, 2
-	i32.shl 	$push34=, $0, $pop262
-	i32.const	$push261=, longs
-	i32.add 	$push260=, $pop34, $pop261
-	tee_local	$push259=, $1=, $pop260
-	i32.load	$push258=, 0($pop259)
-	tee_local	$push257=, $10=, $pop258
-	i32.ctz 	$push256=, $pop257
-	tee_local	$push255=, $2=, $pop256
-	i32.const	$push254=, 1
-	i32.add 	$push35=, $pop255, $pop254
-	i32.const	$push253=, 0
-	i32.select	$6=, $pop35, $pop253, $10
+                                        #     Child Loop BB18_49 Depth 2
+                                        #     Child Loop BB18_54 Depth 2
+                                        #     Child Loop BB18_57 Depth 2
+	loop    	                # label52:
+	i32.const	$push257=, 2
+	i32.shl 	$push33=, $0, $pop257
+	i32.const	$push256=, longs
+	i32.add 	$push255=, $pop33, $pop256
+	tee_local	$push254=, $5=, $pop255
+	i32.load	$push253=, 0($pop254)
+	tee_local	$push252=, $11=, $pop253
+	i32.ctz 	$push251=, $pop252
+	tee_local	$push250=, $2=, $pop251
+	i32.const	$push249=, 1
+	i32.add 	$push34=, $pop250, $pop249
+	i32.const	$push248=, 0
+	i32.select	$6=, $pop34, $pop248, $11
 	i32.const	$3=, 0
 	block   	
-	i32.eqz 	$push403=, $10
-	br_if   	0, $pop403      # 0: down to label49
-# BB#29:                                # %for.cond.i1185.preheader
-                                        #   in Loop: Header=BB18_28 Depth=1
-	i32.const	$5=, 0
-.LBB18_30:                              # %for.cond.i1185
-                                        #   Parent Loop BB18_28 Depth=1
+	i32.eqz 	$push384=, $11
+	br_if   	0, $pop384      # 0: down to label53
+# BB#32:                                # %for.body.i1250.preheader
+                                        #   in Loop: Header=BB18_31 Depth=1
+	i32.const	$3=, 0
+.LBB18_33:                              # %for.body.i1250
+                                        #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label51:
-	copy_local	$push265=, $5
-	tee_local	$push264=, $3=, $pop265
-	i32.const	$push263=, 31
-	i32.gt_u	$push36=, $pop264, $pop263
-	br_if   	1, $pop36       # 1: down to label50
-# BB#31:                                # %for.body.i1189
-                                        #   in Loop: Header=BB18_30 Depth=2
-	i32.const	$push267=, 1
-	i32.add 	$5=, $3, $pop267
-	i32.const	$push266=, 1
-	i32.shl 	$push37=, $pop266, $3
-	i32.and 	$push38=, $pop37, $10
-	i32.eqz 	$push404=, $pop38
-	br_if   	0, $pop404      # 0: up to label51
-.LBB18_32:                              # %my_ffsl.exit.loopexit
-                                        #   in Loop: Header=BB18_28 Depth=1
+	loop    	                # label55:
+	i32.const	$push258=, 1
+	i32.shl 	$push35=, $pop258, $3
+	i32.and 	$push36=, $pop35, $11
+	br_if   	1, $pop36       # 1: down to label54
+# BB#34:                                # %for.inc.i1253
+                                        #   in Loop: Header=BB18_33 Depth=2
+	i32.const	$push262=, 1
+	i32.add 	$push261=, $3, $pop262
+	tee_local	$push260=, $3=, $pop261
+	i32.const	$push259=, 32
+	i32.lt_u	$push37=, $pop260, $pop259
+	br_if   	0, $pop37       # 0: up to label55
+.LBB18_35:                              # %for.end.i1256
+                                        #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	end_block                       # label50:
-	i32.const	$push268=, 1
-	i32.add 	$3=, $3, $pop268
-.LBB18_33:                              # %my_ffsl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
-	end_block                       # label49:
-	i32.ne  	$push39=, $6, $3
-	br_if   	1, $pop39       # 1: down to label34
-# BB#34:                                # %if.end49
-                                        #   in Loop: Header=BB18_28 Depth=1
+	end_block                       # label54:
+	i32.const	$push263=, 1
+	i32.add 	$3=, $3, $pop263
+.LBB18_36:                              # %my_ffsl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_block                       # label53:
+	i32.ne  	$push38=, $6, $3
+	br_if   	1, $pop38       # 1: down to label35
+# BB#37:                                # %if.end49
+                                        #   in Loop: Header=BB18_31 Depth=1
 	block   	
-	i32.eqz 	$push405=, $10
-	br_if   	0, $pop405      # 0: down to label52
-# BB#35:                                # %land.lhs.true52
-                                        #   in Loop: Header=BB18_28 Depth=1
-	i32.clz 	$6=, $10
-	i32.const	$5=, 0
+	i32.eqz 	$push385=, $11
+	br_if   	0, $pop385      # 0: down to label56
+# BB#38:                                # %land.lhs.true52
+                                        #   in Loop: Header=BB18_31 Depth=1
+	i32.clz 	$1=, $11
+	i32.const	$6=, 0
 	i32.const	$3=, 31
-.LBB18_36:                              # %for.body.i1266
-                                        #   Parent Loop BB18_28 Depth=1
+.LBB18_39:                              # %for.body.i1344
+                                        #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label54:
-	i32.const	$push269=, 1
-	i32.shl 	$push40=, $pop269, $3
-	i32.and 	$push41=, $pop40, $10
-	br_if   	1, $pop41       # 1: down to label53
-# BB#37:                                # %for.inc.i1269
-                                        #   in Loop: Header=BB18_36 Depth=2
-	i32.const	$push274=, -1
-	i32.add 	$3=, $3, $pop274
-	i32.const	$push273=, 1
-	i32.add 	$push272=, $5, $pop273
-	tee_local	$push271=, $5=, $pop272
-	i32.const	$push270=, 32
-	i32.lt_u	$push42=, $pop271, $pop270
-	br_if   	0, $pop42       # 0: up to label54
-.LBB18_38:                              # %my_clzl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
+	block   	
+	loop    	                # label59:
+	i32.const	$push264=, 1
+	i32.shl 	$push39=, $pop264, $3
+	i32.and 	$push40=, $pop39, $11
+	br_if   	1, $pop40       # 1: down to label58
+# BB#40:                                # %for.inc.i1347
+                                        #   in Loop: Header=BB18_39 Depth=2
+	i32.const	$push269=, -1
+	i32.add 	$3=, $3, $pop269
+	i32.const	$7=, 32
+	i32.const	$push268=, 1
+	i32.add 	$push267=, $6, $pop268
+	tee_local	$push266=, $6=, $pop267
+	i32.const	$push265=, 32
+	i32.lt_u	$push41=, $pop266, $pop265
+	br_if   	0, $pop41       # 0: up to label59
+	br      	2               # 2: down to label57
+.LBB18_41:                              #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	end_block                       # label53:
-	i32.ne  	$push43=, $6, $5
-	br_if   	2, $pop43       # 2: down to label34
-# BB#39:                                # %land.lhs.true61
-                                        #   in Loop: Header=BB18_28 Depth=1
+	end_block                       # label58:
+	copy_local	$7=, $6
+.LBB18_42:                              # %my_clzl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_block                       # label57:
+	i32.ne  	$push42=, $1, $7
+	br_if   	2, $pop42       # 2: down to label35
+# BB#43:                                # %land.lhs.true61
+                                        #   in Loop: Header=BB18_31 Depth=1
 	i32.const	$3=, 0
-.LBB18_40:                              # %for.body.i1345
-                                        #   Parent Loop BB18_28 Depth=1
+.LBB18_44:                              # %for.body.i1435
+                                        #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label56:
-	i32.const	$push275=, 1
-	i32.shl 	$push44=, $pop275, $3
-	i32.and 	$push45=, $pop44, $10
-	br_if   	1, $pop45       # 1: down to label55
-# BB#41:                                # %for.inc.i1348
-                                        #   in Loop: Header=BB18_40 Depth=2
-	i32.const	$push279=, 1
-	i32.add 	$push278=, $3, $pop279
-	tee_local	$push277=, $3=, $pop278
-	i32.const	$push276=, 32
-	i32.lt_u	$push46=, $pop277, $pop276
-	br_if   	0, $pop46       # 0: up to label56
-.LBB18_42:                              # %my_ctzl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
-	end_loop
-	end_block                       # label55:
-	i32.ne  	$push47=, $2, $3
-	br_if   	2, $pop47       # 2: down to label34
-.LBB18_43:                              # %if.end67
-                                        #   in Loop: Header=BB18_28 Depth=1
-	end_block                       # label52:
-	i32.call	$2=, __builtin_clrsbl@FUNCTION, $10
-	i32.load	$push282=, 0($1)
-	tee_local	$push281=, $3=, $pop282
-	i32.const	$push280=, 31
-	i32.shr_u	$6=, $pop281, $pop280
-	i32.const	$5=, 1
-	i32.const	$10=, 30
-.LBB18_44:                              # %for.body.i1426
-                                        #   Parent Loop BB18_28 Depth=1
-                                        # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label58:
-	i32.shr_u	$push48=, $3, $10
-	i32.const	$push283=, 1
-	i32.and 	$push49=, $pop48, $pop283
-	i32.ne  	$push50=, $pop49, $6
-	br_if   	1, $pop50       # 1: down to label57
-# BB#45:                                # %for.inc.i1429
+	loop    	                # label62:
+	i32.const	$push270=, 1
+	i32.shl 	$push43=, $pop270, $3
+	i32.and 	$push44=, $pop43, $11
+	br_if   	1, $pop44       # 1: down to label61
+# BB#45:                                # %for.inc.i1438
                                         #   in Loop: Header=BB18_44 Depth=2
-	i32.const	$push288=, -1
-	i32.add 	$10=, $10, $pop288
-	i32.const	$push287=, 1
-	i32.add 	$push286=, $5, $pop287
-	tee_local	$push285=, $5=, $pop286
-	i32.const	$push284=, 32
-	i32.lt_u	$push51=, $pop285, $pop284
-	br_if   	0, $pop51       # 0: up to label58
-.LBB18_46:                              # %my_clrsbl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
+	i32.const	$6=, 32
+	i32.const	$push274=, 1
+	i32.add 	$push273=, $3, $pop274
+	tee_local	$push272=, $3=, $pop273
+	i32.const	$push271=, 32
+	i32.lt_u	$push45=, $pop272, $pop271
+	br_if   	0, $pop45       # 0: up to label62
+	br      	2               # 2: down to label60
+.LBB18_46:                              #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	end_block                       # label57:
-	i32.const	$push289=, -1
-	i32.add 	$push52=, $5, $pop289
-	i32.ne  	$push53=, $2, $pop52
-	br_if   	1, $pop53       # 1: down to label34
-# BB#47:                                # %for.body.i1511.preheader
-                                        #   in Loop: Header=BB18_28 Depth=1
-	i32.const	$5=, 0
-	i32.const	$10=, 0
-.LBB18_48:                              # %for.body.i1511
-                                        #   Parent Loop BB18_28 Depth=1
+	end_block                       # label61:
+	copy_local	$6=, $3
+.LBB18_47:                              # %my_ctzl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_block                       # label60:
+	i32.ne  	$push46=, $2, $6
+	br_if   	2, $pop46       # 2: down to label35
+.LBB18_48:                              # %if.end67
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_block                       # label56:
+	i32.call	$2=, __builtin_clrsbl@FUNCTION, $11
+	i32.load	$push277=, 0($5)
+	tee_local	$push276=, $3=, $pop277
+	i32.const	$push275=, 31
+	i32.shr_u	$7=, $pop276, $pop275
+	i32.const	$6=, 1
+	i32.const	$11=, 30
+.LBB18_49:                              # %for.body.i1528
+                                        #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label59:
-	i32.const	$push295=, 1
-	i32.shl 	$push54=, $pop295, $10
-	i32.and 	$push55=, $pop54, $3
-	i32.const	$push294=, 0
-	i32.ne  	$push56=, $pop55, $pop294
-	i32.add 	$5=, $pop56, $5
-	i32.const	$push293=, 1
-	i32.add 	$push292=, $10, $pop293
-	tee_local	$push291=, $10=, $pop292
-	i32.const	$push290=, 32
-	i32.ne  	$push57=, $pop291, $pop290
-	br_if   	0, $pop57       # 0: up to label59
-# BB#49:                                # %my_popcountl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
+	block   	
+	block   	
+	loop    	                # label65:
+	i32.shr_u	$push47=, $3, $11
+	i32.const	$push278=, 1
+	i32.and 	$push48=, $pop47, $pop278
+	i32.ne  	$push49=, $pop48, $7
+	br_if   	1, $pop49       # 1: down to label64
+# BB#50:                                # %for.inc.i1531
+                                        #   in Loop: Header=BB18_49 Depth=2
+	i32.const	$push283=, -1
+	i32.add 	$11=, $11, $pop283
+	i32.const	$5=, 32
+	i32.const	$push282=, 1
+	i32.add 	$push281=, $6, $pop282
+	tee_local	$push280=, $6=, $pop281
+	i32.const	$push279=, 32
+	i32.lt_u	$push50=, $pop280, $pop279
+	br_if   	0, $pop50       # 0: up to label65
+	br      	2               # 2: down to label63
+.LBB18_51:                              #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	i32.popcnt	$push58=, $3
-	i32.ne  	$push59=, $pop58, $5
-	br_if   	1, $pop59       # 1: down to label34
-# BB#50:                                # %for.body.i1591.preheader
-                                        #   in Loop: Header=BB18_28 Depth=1
+	end_block                       # label64:
+	copy_local	$5=, $6
+.LBB18_52:                              # %my_clrsbl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_block                       # label63:
+	i32.const	$push284=, -1
+	i32.add 	$push51=, $5, $pop284
+	i32.ne  	$push52=, $2, $pop51
+	br_if   	1, $pop52       # 1: down to label35
+# BB#53:                                # %for.body.i1625.preheader
+                                        #   in Loop: Header=BB18_31 Depth=1
 	i32.const	$6=, 0
-	i32.const	$10=, 0
-.LBB18_51:                              # %for.body.i1591
-                                        #   Parent Loop BB18_28 Depth=1
+	i32.const	$11=, 0
+.LBB18_54:                              # %for.body.i1625
+                                        #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label60:
-	i32.const	$push301=, 1
-	i32.shl 	$push60=, $pop301, $10
-	i32.and 	$push61=, $pop60, $3
-	i32.const	$push300=, 0
-	i32.ne  	$push62=, $pop61, $pop300
-	i32.add 	$6=, $pop62, $6
-	i32.const	$push299=, 1
-	i32.add 	$push298=, $10, $pop299
-	tee_local	$push297=, $10=, $pop298
-	i32.const	$push296=, 32
-	i32.ne  	$push63=, $pop297, $pop296
-	br_if   	0, $pop63       # 0: up to label60
-# BB#52:                                # %my_parityl.exit
-                                        #   in Loop: Header=BB18_28 Depth=1
+	loop    	                # label66:
+	i32.const	$push290=, 1
+	i32.shl 	$push53=, $pop290, $11
+	i32.and 	$push54=, $pop53, $3
+	i32.const	$push289=, 0
+	i32.ne  	$push55=, $pop54, $pop289
+	i32.add 	$6=, $6, $pop55
+	i32.const	$push288=, 1
+	i32.add 	$push287=, $11, $pop288
+	tee_local	$push286=, $11=, $pop287
+	i32.const	$push285=, 32
+	i32.ne  	$push56=, $pop286, $pop285
+	br_if   	0, $pop56       # 0: up to label66
+# BB#55:                                # %my_popcountl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	i32.xor 	$push64=, $6, $5
-	i32.const	$push302=, 1
-	i32.and 	$push65=, $pop64, $pop302
-	br_if   	1, $pop65       # 1: down to label34
-# BB#53:                                # %for.cond39
-                                        #   in Loop: Header=BB18_28 Depth=1
-	i32.const	$push306=, 1
-	i32.add 	$push305=, $0, $pop306
-	tee_local	$push304=, $0=, $pop305
-	i32.const	$push303=, 13
-	i32.lt_u	$push66=, $pop304, $pop303
-	br_if   	0, $pop66       # 0: up to label48
-# BB#54:                                # %for.body92.preheader
+	i32.popcnt	$push57=, $3
+	i32.ne  	$push58=, $pop57, $6
+	br_if   	1, $pop58       # 1: down to label35
+# BB#56:                                # %for.body.i1717.preheader
+                                        #   in Loop: Header=BB18_31 Depth=1
+	i32.const	$7=, 0
+	i32.const	$11=, 0
+.LBB18_57:                              # %for.body.i1717
+                                        #   Parent Loop BB18_31 Depth=1
+                                        # =>  This Inner Loop Header: Depth=2
+	loop    	                # label67:
+	i32.const	$push296=, 1
+	i32.shl 	$push59=, $pop296, $11
+	i32.and 	$push60=, $pop59, $3
+	i32.const	$push295=, 0
+	i32.ne  	$push61=, $pop60, $pop295
+	i32.add 	$7=, $7, $pop61
+	i32.const	$push294=, 1
+	i32.add 	$push293=, $11, $pop294
+	tee_local	$push292=, $11=, $pop293
+	i32.const	$push291=, 32
+	i32.ne  	$push62=, $pop292, $pop291
+	br_if   	0, $pop62       # 0: up to label67
+# BB#58:                                # %my_parityl.exit
+                                        #   in Loop: Header=BB18_31 Depth=1
+	end_loop
+	i32.xor 	$push63=, $7, $6
+	i32.const	$push297=, 1
+	i32.and 	$push64=, $pop63, $pop297
+	br_if   	1, $pop64       # 1: down to label35
+# BB#59:                                # %for.cond39
+                                        #   in Loop: Header=BB18_31 Depth=1
+	i32.const	$push301=, 1
+	i32.add 	$push300=, $0, $pop301
+	tee_local	$push299=, $0=, $pop300
+	i32.const	$push298=, 13
+	i32.lt_u	$push65=, $pop299, $pop298
+	br_if   	0, $pop65       # 0: up to label52
+# BB#60:                                # %for.body92.preheader
 	end_loop
-	i32.const	$5=, 0
-.LBB18_55:                              # %for.body92
+	i32.const	$6=, 0
+.LBB18_61:                              # %for.body92
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB18_57 Depth 2
-                                        #     Child Loop BB18_62 Depth 2
-                                        #     Child Loop BB18_66 Depth 2
-                                        #     Child Loop BB18_70 Depth 2
-                                        #     Child Loop BB18_74 Depth 2
+                                        #     Child Loop BB18_63 Depth 2
+                                        #     Child Loop BB18_69 Depth 2
+                                        #     Child Loop BB18_73 Depth 2
                                         #     Child Loop BB18_77 Depth 2
-	loop    	                # label61:
-	i32.const	$push318=, 0
-	i32.const	$push317=, 3
-	i32.shl 	$push67=, $5, $pop317
-	i32.const	$push316=, longlongs
-	i32.add 	$push315=, $pop67, $pop316
-	tee_local	$push314=, $1=, $pop315
-	i64.load	$push313=, 0($pop314)
-	tee_local	$push312=, $9=, $pop313
-	i64.ctz 	$push311=, $pop312
-	tee_local	$push310=, $4=, $pop311
-	i64.const	$push309=, 1
-	i64.add 	$push68=, $pop310, $pop309
-	i32.wrap/i64	$push69=, $pop68
-	i64.eqz 	$push308=, $9
-	tee_local	$push307=, $6=, $pop308
-	i32.select	$0=, $pop318, $pop69, $pop307
-	i32.const	$10=, 0
+                                        #     Child Loop BB18_81 Depth 2
+                                        #     Child Loop BB18_84 Depth 2
+	loop    	                # label68:
+	i32.const	$push313=, 0
+	i32.const	$push312=, 3
+	i32.shl 	$push66=, $6, $pop312
+	i32.const	$push311=, longlongs
+	i32.add 	$push310=, $pop66, $pop311
+	tee_local	$push309=, $7=, $pop310
+	i64.load	$push308=, 0($pop309)
+	tee_local	$push307=, $9=, $pop308
+	i64.ctz 	$push67=, $pop307
+	i32.wrap/i64	$push306=, $pop67
+	tee_local	$push305=, $0=, $pop306
+	i32.const	$push304=, 1
+	i32.add 	$push68=, $pop305, $pop304
+	i64.eqz 	$push303=, $9
+	tee_local	$push302=, $3=, $pop303
+	i32.select	$5=, $pop313, $pop68, $pop302
+	i32.const	$11=, 0
 	block   	
-	br_if   	0, $6           # 0: down to label62
-# BB#56:                                # %for.cond.i1667.preheader
-                                        #   in Loop: Header=BB18_55 Depth=1
-	i64.const	$8=, 0
-	i32.const	$3=, 1
-.LBB18_57:                              # %for.cond.i1667
-                                        #   Parent Loop BB18_55 Depth=1
+	br_if   	0, $3           # 0: down to label69
+# BB#62:                                # %for.body.i1808.preheader
+                                        #   in Loop: Header=BB18_61 Depth=1
+	i32.const	$11=, 0
+	i64.const	$10=, 0
+.LBB18_63:                              # %for.body.i1808
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label63:
-	copy_local	$10=, $3
-	i64.const	$push319=, 63
-	i64.gt_u	$push70=, $8, $pop319
-	br_if   	1, $pop70       # 1: down to label62
-# BB#58:                                # %for.body.i1671
-                                        #   in Loop: Header=BB18_57 Depth=2
-	i32.const	$push322=, 1
-	i32.add 	$3=, $10, $pop322
-	i64.const	$push321=, 1
-	i64.shl 	$7=, $pop321, $8
-	i64.const	$push320=, 1
-	i64.add 	$push0=, $8, $pop320
-	copy_local	$8=, $pop0
-	i64.and 	$push71=, $7, $9
-	i64.eqz 	$push72=, $pop71
-	br_if   	0, $pop72       # 0: up to label63
-.LBB18_59:                              # %my_ffsll.exit1673
-                                        #   in Loop: Header=BB18_55 Depth=1
+	block   	
+	loop    	                # label71:
+	i64.const	$push315=, 1
+	i64.shl 	$push69=, $pop315, $10
+	i64.and 	$push70=, $pop69, $9
+	i64.const	$push314=, 0
+	i64.ne  	$push71=, $pop70, $pop314
+	br_if   	1, $pop71       # 1: down to label70
+# BB#64:                                # %for.inc.i1812
+                                        #   in Loop: Header=BB18_63 Depth=2
+	i32.const	$push320=, 1
+	i32.add 	$11=, $11, $pop320
+	i64.const	$push319=, 1
+	i64.add 	$push318=, $10, $pop319
+	tee_local	$push317=, $10=, $pop318
+	i64.const	$push316=, 64
+	i64.lt_u	$push72=, $pop317, $pop316
+	br_if   	0, $pop72       # 0: up to label71
+.LBB18_65:                              # %for.end.i1815
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	end_block                       # label62:
-	i32.ne  	$push73=, $0, $10
-	br_if   	1, $pop73       # 1: down to label34
-# BB#60:                                # %if.end100
-                                        #   in Loop: Header=BB18_55 Depth=1
+	end_block                       # label70:
+	i32.const	$push321=, 1
+	i32.add 	$11=, $11, $pop321
+.LBB18_66:                              # %my_ffsll.exit1817
+                                        #   in Loop: Header=BB18_61 Depth=1
+	end_block                       # label69:
+	i32.ne  	$push73=, $5, $11
+	br_if   	1, $pop73       # 1: down to label35
+# BB#67:                                # %if.end100
+                                        #   in Loop: Header=BB18_61 Depth=1
 	block   	
-	br_if   	0, $6           # 0: down to label64
-# BB#61:                                # %land.lhs.true103
-                                        #   in Loop: Header=BB18_55 Depth=1
+	br_if   	0, $3           # 0: down to label72
+# BB#68:                                # %land.lhs.true103
+                                        #   in Loop: Header=BB18_61 Depth=1
 	i64.clz 	$push74=, $9
 	i32.wrap/i64	$3=, $pop74
-	i32.const	$10=, 0
-	i64.const	$7=, 0
-	i64.const	$8=, 63
-.LBB18_62:                              # %for.body.i1739
-                                        #   Parent Loop BB18_55 Depth=1
+	i32.const	$11=, 0
+	i64.const	$8=, 0
+	i64.const	$10=, 63
+.LBB18_69:                              # %for.body.i1893
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label66:
-	i64.const	$push324=, 1
-	i64.shl 	$push75=, $pop324, $8
+	loop    	                # label74:
+	i64.const	$push323=, 1
+	i64.shl 	$push75=, $pop323, $10
 	i64.and 	$push76=, $pop75, $9
-	i64.const	$push323=, 0
-	i64.ne  	$push77=, $pop76, $pop323
-	br_if   	1, $pop77       # 1: down to label65
-# BB#63:                                # %for.inc.i1743
-                                        #   in Loop: Header=BB18_62 Depth=2
-	i64.const	$push330=, -1
-	i64.add 	$8=, $8, $pop330
-	i32.const	$push329=, 1
-	i32.add 	$10=, $10, $pop329
-	i64.const	$push328=, 1
-	i64.add 	$push327=, $7, $pop328
-	tee_local	$push326=, $7=, $pop327
-	i64.const	$push325=, 64
-	i64.lt_u	$push78=, $pop326, $pop325
-	br_if   	0, $pop78       # 0: up to label66
-.LBB18_64:                              # %my_clzll.exit1745
-                                        #   in Loop: Header=BB18_55 Depth=1
+	i64.const	$push322=, 0
+	i64.ne  	$push77=, $pop76, $pop322
+	br_if   	1, $pop77       # 1: down to label73
+# BB#70:                                # %for.inc.i1897
+                                        #   in Loop: Header=BB18_69 Depth=2
+	i64.const	$push329=, -1
+	i64.add 	$10=, $10, $pop329
+	i32.const	$push328=, 1
+	i32.add 	$11=, $11, $pop328
+	i64.const	$push327=, 1
+	i64.add 	$push326=, $8, $pop327
+	tee_local	$push325=, $8=, $pop326
+	i64.const	$push324=, 64
+	i64.lt_u	$push78=, $pop325, $pop324
+	br_if   	0, $pop78       # 0: up to label74
+.LBB18_71:                              # %my_clzll.exit1900
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	end_block                       # label65:
-	i32.ne  	$push79=, $3, $10
-	br_if   	2, $pop79       # 2: down to label34
-# BB#65:                                # %land.lhs.true113
-                                        #   in Loop: Header=BB18_55 Depth=1
-	i32.wrap/i64	$3=, $4
-	i32.const	$10=, 0
-	i64.const	$8=, 0
-.LBB18_66:                              # %for.body.i1781
-                                        #   Parent Loop BB18_55 Depth=1
+	end_block                       # label73:
+	i32.ne  	$push79=, $11, $3
+	br_if   	2, $pop79       # 2: down to label35
+# BB#72:                                # %land.lhs.true113
+                                        #   in Loop: Header=BB18_61 Depth=1
+	i32.const	$11=, 0
+	i64.const	$10=, 0
+.LBB18_73:                              # %for.body.i1939
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label68:
-	i64.const	$push332=, 1
-	i64.shl 	$push80=, $pop332, $8
+	loop    	                # label76:
+	i64.const	$push331=, 1
+	i64.shl 	$push80=, $pop331, $10
 	i64.and 	$push81=, $pop80, $9
-	i64.const	$push331=, 0
-	i64.ne  	$push82=, $pop81, $pop331
-	br_if   	1, $pop82       # 1: down to label67
-# BB#67:                                # %for.inc.i1785
-                                        #   in Loop: Header=BB18_66 Depth=2
-	i32.const	$push337=, 1
-	i32.add 	$10=, $10, $pop337
-	i64.const	$push336=, 1
-	i64.add 	$push335=, $8, $pop336
-	tee_local	$push334=, $8=, $pop335
-	i64.const	$push333=, 64
-	i64.lt_u	$push83=, $pop334, $pop333
-	br_if   	0, $pop83       # 0: up to label68
-.LBB18_68:                              # %my_ctzll.exit1787
-                                        #   in Loop: Header=BB18_55 Depth=1
+	i64.const	$push330=, 0
+	i64.ne  	$push82=, $pop81, $pop330
+	br_if   	1, $pop82       # 1: down to label75
+# BB#74:                                # %for.inc.i1943
+                                        #   in Loop: Header=BB18_73 Depth=2
+	i32.const	$push336=, 1
+	i32.add 	$11=, $11, $pop336
+	i64.const	$push335=, 1
+	i64.add 	$push334=, $10, $pop335
+	tee_local	$push333=, $10=, $pop334
+	i64.const	$push332=, 64
+	i64.lt_u	$push83=, $pop333, $pop332
+	br_if   	0, $pop83       # 0: up to label76
+.LBB18_75:                              # %my_ctzll.exit1946
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	end_block                       # label67:
-	i32.ne  	$push84=, $3, $10
-	br_if   	2, $pop84       # 2: down to label34
-.LBB18_69:                              # %if.end120
-                                        #   in Loop: Header=BB18_55 Depth=1
-	end_block                       # label64:
+	end_block                       # label75:
+	i32.ne  	$push84=, $11, $0
+	br_if   	2, $pop84       # 2: down to label35
+.LBB18_76:                              # %if.end120
+                                        #   in Loop: Header=BB18_61 Depth=1
+	end_block                       # label72:
 	i32.call	$3=, __builtin_clrsbll@FUNCTION, $9
-	i64.load	$push340=, 0($1)
-	tee_local	$push339=, $9=, $pop340
-	i64.const	$push338=, 63
-	i64.shr_u	$4=, $pop339, $pop338
-	i32.const	$10=, 1
-	i64.const	$7=, 1
-	i64.const	$8=, 62
-.LBB18_70:                              # %for.body.i1845
-                                        #   Parent Loop BB18_55 Depth=1
+	i64.load	$push339=, 0($7)
+	tee_local	$push338=, $10=, $pop339
+	i64.const	$push337=, 63
+	i64.shr_u	$4=, $pop338, $pop337
+	i32.const	$11=, 1
+	i64.const	$8=, 1
+	i64.const	$9=, 62
+.LBB18_77:                              # %for.body.i2010
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label70:
-	i64.shr_u	$push85=, $9, $8
-	i64.const	$push341=, 1
-	i64.and 	$push86=, $pop85, $pop341
+	loop    	                # label78:
+	i64.shr_u	$push85=, $10, $9
+	i64.const	$push340=, 1
+	i64.and 	$push86=, $pop85, $pop340
 	i64.ne  	$push87=, $pop86, $4
-	br_if   	1, $pop87       # 1: down to label69
-# BB#71:                                # %for.inc.i1849
-                                        #   in Loop: Header=BB18_70 Depth=2
-	i64.const	$push347=, -1
-	i64.add 	$8=, $8, $pop347
-	i32.const	$push346=, 1
-	i32.add 	$10=, $10, $pop346
-	i64.const	$push345=, 1
-	i64.add 	$push344=, $7, $pop345
-	tee_local	$push343=, $7=, $pop344
-	i64.const	$push342=, 64
-	i64.lt_u	$push88=, $pop343, $pop342
-	br_if   	0, $pop88       # 0: up to label70
-.LBB18_72:                              # %my_clrsbll.exit1852
-                                        #   in Loop: Header=BB18_55 Depth=1
+	br_if   	1, $pop87       # 1: down to label77
+# BB#78:                                # %for.inc.i2014
+                                        #   in Loop: Header=BB18_77 Depth=2
+	i64.const	$push346=, -1
+	i64.add 	$9=, $9, $pop346
+	i32.const	$push345=, 1
+	i32.add 	$11=, $11, $pop345
+	i64.const	$push344=, 1
+	i64.add 	$push343=, $8, $pop344
+	tee_local	$push342=, $8=, $pop343
+	i64.const	$push341=, 64
+	i64.lt_u	$push88=, $pop342, $pop341
+	br_if   	0, $pop88       # 0: up to label78
+.LBB18_79:                              # %my_clrsbll.exit2018
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	end_block                       # label69:
-	i32.const	$push348=, -1
-	i32.add 	$push89=, $10, $pop348
+	end_block                       # label77:
+	i32.const	$push347=, -1
+	i32.add 	$push89=, $11, $pop347
 	i32.ne  	$push90=, $3, $pop89
-	br_if   	1, $pop90       # 1: down to label34
-# BB#73:                                # %if.end127
-                                        #   in Loop: Header=BB18_55 Depth=1
-	i64.popcnt	$7=, $9
-	i32.const	$10=, 0
-	i64.const	$8=, 0
-.LBB18_74:                              # %for.body.i1928
-                                        #   Parent Loop BB18_55 Depth=1
+	br_if   	1, $pop90       # 1: down to label35
+# BB#80:                                # %if.end127
+                                        #   in Loop: Header=BB18_61 Depth=1
+	i64.popcnt	$8=, $10
+	i32.const	$11=, 0
+	i64.const	$9=, 0
+.LBB18_81:                              # %for.body.i2103
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label71:
-	i64.const	$push354=, 1
-	i64.shl 	$push91=, $pop354, $8
-	i64.and 	$push92=, $pop91, $9
-	i64.const	$push353=, 0
-	i64.ne  	$push93=, $pop92, $pop353
-	i32.add 	$10=, $pop93, $10
-	i64.const	$push352=, 1
-	i64.add 	$push351=, $8, $pop352
-	tee_local	$push350=, $8=, $pop351
-	i64.const	$push349=, 64
-	i64.ne  	$push94=, $pop350, $pop349
-	br_if   	0, $pop94       # 0: up to label71
-# BB#75:                                # %my_popcountll.exit1929
-                                        #   in Loop: Header=BB18_55 Depth=1
+	loop    	                # label79:
+	i64.const	$push353=, 1
+	i64.shl 	$push91=, $pop353, $9
+	i64.and 	$push92=, $pop91, $10
+	i64.const	$push352=, 0
+	i64.ne  	$push93=, $pop92, $pop352
+	i32.add 	$11=, $11, $pop93
+	i64.const	$push351=, 1
+	i64.add 	$push350=, $9, $pop351
+	tee_local	$push349=, $9=, $pop350
+	i64.const	$push348=, 64
+	i64.ne  	$push94=, $pop349, $pop348
+	br_if   	0, $pop94       # 0: up to label79
+# BB#82:                                # %my_popcountll.exit2105
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	i32.wrap/i64	$push95=, $7
-	i32.ne  	$push96=, $pop95, $10
-	br_if   	1, $pop96       # 1: down to label34
-# BB#76:                                # %for.body.i2005.preheader
-                                        #   in Loop: Header=BB18_55 Depth=1
+	i32.wrap/i64	$push95=, $8
+	i32.ne  	$push96=, $11, $pop95
+	br_if   	1, $pop96       # 1: down to label35
+# BB#83:                                # %for.body.i2190.preheader
+                                        #   in Loop: Header=BB18_61 Depth=1
 	i32.const	$3=, 0
-	i64.const	$8=, 0
-.LBB18_77:                              # %for.body.i2005
-                                        #   Parent Loop BB18_55 Depth=1
+	i64.const	$9=, 0
+.LBB18_84:                              # %for.body.i2190
+                                        #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label72:
-	i64.const	$push360=, 1
-	i64.shl 	$push97=, $pop360, $8
-	i64.and 	$push98=, $pop97, $9
-	i64.const	$push359=, 0
-	i64.ne  	$push99=, $pop98, $pop359
-	i32.add 	$3=, $pop99, $3
-	i64.const	$push358=, 1
-	i64.add 	$push357=, $8, $pop358
-	tee_local	$push356=, $8=, $pop357
-	i64.const	$push355=, 64
-	i64.ne  	$push100=, $pop356, $pop355
-	br_if   	0, $pop100      # 0: up to label72
-# BB#78:                                # %my_parityll.exit2007
-                                        #   in Loop: Header=BB18_55 Depth=1
+	loop    	                # label80:
+	i64.const	$push359=, 1
+	i64.shl 	$push97=, $pop359, $9
+	i64.and 	$push98=, $pop97, $10
+	i64.const	$push358=, 0
+	i64.ne  	$push99=, $pop98, $pop358
+	i32.add 	$3=, $3, $pop99
+	i64.const	$push357=, 1
+	i64.add 	$push356=, $9, $pop357
+	tee_local	$push355=, $9=, $pop356
+	i64.const	$push354=, 64
+	i64.ne  	$push100=, $pop355, $pop354
+	br_if   	0, $pop100      # 0: up to label80
+# BB#85:                                # %my_parityll.exit2193
+                                        #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	i32.xor 	$push101=, $3, $10
-	i32.const	$push361=, 1
-	i32.and 	$push102=, $pop101, $pop361
-	br_if   	2, $pop102      # 2: down to label33
-# BB#79:                                # %for.cond90
-                                        #   in Loop: Header=BB18_55 Depth=1
-	i32.const	$push365=, 1
-	i32.add 	$push364=, $5, $pop365
-	tee_local	$push363=, $5=, $pop364
-	i32.const	$push362=, 12
-	i32.le_u	$push103=, $pop363, $pop362
-	br_if   	0, $pop103      # 0: up to label61
-# BB#80:                                # %if.end148
+	i32.xor 	$push101=, $3, $11
+	i32.const	$push360=, 1
+	i32.and 	$push102=, $pop101, $pop360
+	br_if   	1, $pop102      # 1: down to label35
+# BB#86:                                # %for.cond90
+                                        #   in Loop: Header=BB18_61 Depth=1
+	i32.const	$push364=, 1
+	i32.add 	$push363=, $6, $pop364
+	tee_local	$push362=, $6=, $pop363
+	i32.const	$push361=, 12
+	i32.le_u	$push103=, $pop362, $pop361
+	br_if   	0, $pop103      # 0: up to label68
+# BB#87:                                # %if.end148
 	end_loop
 	i32.const	$push104=, 0
 	i32.call	$push105=, __builtin_clrsb@FUNCTION, $pop104
 	i32.const	$push106=, 31
 	i32.ne  	$push107=, $pop105, $pop106
-	br_if   	0, $pop107      # 0: down to label34
-# BB#81:                                # %my_clrsb.exit2515
+	br_if   	0, $pop107      # 0: down to label35
+# BB#88:                                # %my_clrsb.exit2772
 	i32.const	$push108=, 1
 	i32.call	$push109=, __builtin_clrsb@FUNCTION, $pop108
 	i32.const	$push110=, 30
 	i32.ne  	$push111=, $pop109, $pop110
-	br_if   	0, $pop111      # 0: down to label34
-# BB#82:                                # %if.end198
+	br_if   	0, $pop111      # 0: down to label35
+# BB#89:                                # %if.end198
 	i32.const	$push112=, -2147483648
 	i32.call	$push113=, __builtin_clrsb@FUNCTION, $pop112
-	br_if   	0, $pop113      # 0: down to label34
-# BB#83:                                # %my_clrsb.exit2362
+	br_if   	0, $pop113      # 0: down to label35
+# BB#90:                                # %my_clrsb.exit2596
 	i32.const	$push114=, 1073741824
 	i32.call	$push115=, __builtin_clrsb@FUNCTION, $pop114
-	br_if   	0, $pop115      # 0: down to label34
-# BB#84:                                # %my_clrsb.exit2288
+	br_if   	0, $pop115      # 0: down to label35
+# BB#91:                                # %my_clrsb.exit2512
 	i32.const	$push116=, 65536
 	i32.call	$push117=, __builtin_clrsb@FUNCTION, $pop116
 	i32.const	$push118=, 14
 	i32.ne  	$push119=, $pop117, $pop118
-	br_if   	0, $pop119      # 0: down to label34
-# BB#85:                                # %my_clrsb.exit2215
+	br_if   	0, $pop119      # 0: down to label35
+# BB#92:                                # %my_clrsb.exit2429
 	i32.const	$push120=, 32768
 	i32.call	$push121=, __builtin_clrsb@FUNCTION, $pop120
 	i32.const	$push122=, 15
 	i32.ne  	$push123=, $pop121, $pop122
-	br_if   	0, $pop123      # 0: down to label34
-# BB#86:                                # %my_clrsb.exit2140
+	br_if   	0, $pop123      # 0: down to label35
+# BB#93:                                # %my_clrsb.exit2344
 	i32.const	$push124=, -1515870811
 	i32.call	$push125=, __builtin_clrsb@FUNCTION, $pop124
-	br_if   	0, $pop125      # 0: down to label34
-# BB#87:                                # %my_clrsb.exit2073
+	br_if   	0, $pop125      # 0: down to label35
+# BB#94:                                # %my_clrsb.exit2268
 	i32.const	$push126=, 1515870810
 	i32.call	$push127=, __builtin_clrsb@FUNCTION, $pop126
-	br_if   	0, $pop127      # 0: down to label34
-# BB#88:                                # %for.body.i1989
+	br_if   	0, $pop127      # 0: down to label35
+# BB#95:                                # %if.end348
 	i32.const	$push128=, -889323520
 	i32.call	$push129=, __builtin_clrsb@FUNCTION, $pop128
 	i32.const	$push130=, 1
 	i32.ne  	$push131=, $pop129, $pop130
-	br_if   	0, $pop131      # 0: down to label34
-# BB#89:                                # %for.body.i1912
+	br_if   	0, $pop131      # 0: down to label35
+# BB#96:                                # %if.end373
 	i32.const	$push132=, 13303296
 	i32.call	$push133=, __builtin_clrsb@FUNCTION, $pop132
 	i32.const	$push134=, 7
 	i32.ne  	$push135=, $pop133, $pop134
-	br_if   	0, $pop135      # 0: down to label34
-# BB#90:                                # %for.body.i1832
+	br_if   	0, $pop135      # 0: down to label35
+# BB#97:                                # %if.end398
 	i32.const	$push136=, 51966
 	i32.call	$push137=, __builtin_clrsb@FUNCTION, $pop136
 	i32.const	$push138=, 15
 	i32.ne  	$push139=, $pop137, $pop138
-	br_if   	0, $pop139      # 0: down to label34
-# BB#91:                                # %if.end423
-	i32.const	$push366=, -1
-	i32.call	$5=, __builtin_clrsb@FUNCTION, $pop366
-	i32.const	$10=, 30
+	br_if   	0, $pop139      # 0: down to label35
+# BB#98:                                # %if.end423
+	i32.const	$push365=, -1
+	i32.call	$7=, __builtin_clrsb@FUNCTION, $pop365
+	i32.const	$11=, 30
 	i32.const	$3=, 1
-.LBB18_92:                              # %for.body.i1769
+.LBB18_99:                              # %for.body.i1926
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label74:
-	i32.const	$push368=, -1
-	i32.shr_u	$push140=, $pop368, $10
-	i32.const	$push367=, 1
-	i32.and 	$push141=, $pop140, $pop367
-	i32.eqz 	$push406=, $pop141
-	br_if   	1, $pop406      # 1: down to label73
-# BB#93:                                # %for.inc.i1772
-                                        #   in Loop: Header=BB18_92 Depth=1
-	i32.const	$push373=, -1
-	i32.add 	$10=, $10, $pop373
-	i32.const	$push372=, 1
-	i32.add 	$push371=, $3, $pop372
-	tee_local	$push370=, $3=, $pop371
-	i32.const	$push369=, 32
-	i32.lt_u	$push142=, $pop370, $pop369
-	br_if   	0, $pop142      # 0: up to label74
-.LBB18_94:                              # %my_clrsb.exit1775
+	block   	
+	loop    	                # label83:
+	i32.const	$push367=, -1
+	i32.shr_u	$push140=, $pop367, $11
+	i32.const	$push366=, 1
+	i32.and 	$push141=, $pop140, $pop366
+	i32.eqz 	$push386=, $pop141
+	br_if   	1, $pop386      # 1: down to label82
+# BB#100:                               # %for.inc.i1929
+                                        #   in Loop: Header=BB18_99 Depth=1
+	i32.const	$push372=, -1
+	i32.add 	$11=, $11, $pop372
+	i32.const	$6=, 32
+	i32.const	$push371=, 1
+	i32.add 	$push370=, $3, $pop371
+	tee_local	$push369=, $3=, $pop370
+	i32.const	$push368=, 32
+	i32.lt_u	$push142=, $pop369, $pop368
+	br_if   	0, $pop142      # 0: up to label83
+	br      	2               # 2: down to label81
+.LBB18_101:
 	end_loop
-	end_block                       # label73:
+	end_block                       # label82:
+	copy_local	$6=, $3
+.LBB18_102:                             # %my_clrsb.exit1933
+	end_block                       # label81:
 	i32.const	$push143=, -1
-	i32.add 	$push144=, $3, $pop143
-	i32.ne  	$push145=, $5, $pop144
-	br_if   	0, $pop145      # 0: down to label34
-# BB#95:                                # %if.end440
-	i64.const	$8=, 0
-	i64.const	$push374=, 0
-	i32.call	$push146=, __builtin_clrsbll@FUNCTION, $pop374
-	i32.const	$push147=, 63
-	i32.ne  	$push148=, $pop146, $pop147
-	br_if   	0, $pop148      # 0: down to label34
-# BB#96:                                # %for.body.i1691.preheader
-.LBB18_97:                              # %for.body.i1691
+	i32.add 	$push144=, $6, $pop143
+	i32.ne  	$push145=, $7, $pop144
+	br_if   	0, $pop145      # 0: down to label35
+# BB#103:                               # %if.end440
+	i64.const	$push146=, 0
+	i32.call	$push147=, __builtin_clrsbll@FUNCTION, $pop146
+	i32.const	$push148=, 63
+	i32.ne  	$push149=, $pop147, $pop148
+	br_if   	0, $pop149      # 0: down to label35
+# BB#104:                               # %for.body.i1836
+	i64.const	$push150=, 1
+	i32.call	$push151=, __builtin_clrsbll@FUNCTION, $pop150
+	i32.const	$push152=, 62
+	i32.ne  	$push153=, $pop151, $pop152
+	br_if   	0, $pop153      # 0: down to label35
+# BB#105:                               # %for.body.i1725
+	i64.const	$push154=, -9223372036854775808
+	i32.call	$push155=, __builtin_clrsbll@FUNCTION, $pop154
+	br_if   	0, $pop155      # 0: down to label35
+# BB#106:                               # %for.body.i1632
+	i64.const	$push156=, 2
+	i32.call	$push157=, __builtin_clrsbll@FUNCTION, $pop156
+	i32.const	$push158=, 61
+	i32.ne  	$push159=, $pop157, $pop158
+	br_if   	0, $pop159      # 0: down to label35
+# BB#107:                               # %for.body.i1540
+	i64.const	$push160=, 4611686018427387904
+	i32.call	$push161=, __builtin_clrsbll@FUNCTION, $pop160
+	br_if   	0, $pop161      # 0: down to label35
+# BB#108:                               # %for.body.i1446
+	i64.const	$push162=, 4294967296
+	i32.call	$push163=, __builtin_clrsbll@FUNCTION, $pop162
+	i32.const	$push164=, 30
+	i32.ne  	$push165=, $pop163, $pop164
+	br_if   	0, $pop165      # 0: down to label35
+# BB#109:                               # %for.body.i1355
+	i64.const	$push166=, 2147483648
+	i32.call	$push167=, __builtin_clrsbll@FUNCTION, $pop166
+	i32.const	$push168=, 31
+	i32.ne  	$push169=, $pop167, $pop168
+	br_if   	0, $pop169      # 0: down to label35
+# BB#110:                               # %my_clrsbll.exit1243
+	i64.const	$push170=, -6510615555426900571
+	i32.call	$push171=, __builtin_clrsbll@FUNCTION, $pop170
+	br_if   	0, $pop171      # 0: down to label35
+# BB#111:                               # %my_clrsbll.exit1151
+	i64.const	$push172=, 6510615555426900570
+	i32.call	$push173=, __builtin_clrsbll@FUNCTION, $pop172
+	br_if   	0, $pop173      # 0: down to label35
+# BB#112:                               # %if.end665
+	i64.const	$push174=, -3819392241693097984
+	i32.call	$push175=, __builtin_clrsbll@FUNCTION, $pop174
+	i32.const	$push176=, 1
+	i32.ne  	$push177=, $pop175, $pop176
+	br_if   	0, $pop177      # 0: down to label35
+# BB#113:                               # %if.end690
+	i64.const	$push178=, 223195676147712
+	i32.call	$push179=, __builtin_clrsbll@FUNCTION, $pop178
+	i32.const	$push180=, 15
+	i32.ne  	$push181=, $pop179, $pop180
+	br_if   	0, $pop181      # 0: down to label35
+# BB#114:                               # %if.end715
+	i64.const	$push182=, 3405695742
+	i32.call	$push183=, __builtin_clrsbll@FUNCTION, $pop182
+	i32.const	$push184=, 31
+	i32.ne  	$push185=, $pop183, $pop184
+	br_if   	0, $pop185      # 0: down to label35
+# BB#115:                               # %if.end740
+	i64.const	$push373=, -1
+	i32.call	$3=, __builtin_clrsbll@FUNCTION, $pop373
+	i64.const	$9=, 62
+	i64.const	$10=, 1
+	i32.const	$11=, 1
+.LBB18_116:                             # %for.body.i812
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label76:
-	i64.const	$push375=, 63
-	i64.eq  	$push149=, $8, $pop375
-	br_if   	1, $pop149      # 1: down to label75
-# BB#98:                                # %for.inc.i1695
-                                        #   in Loop: Header=BB18_97 Depth=1
+	loop    	                # label85:
+	i64.const	$push375=, -1
+	i64.shr_u	$push186=, $pop375, $9
+	i64.const	$push374=, 1
+	i64.and 	$push187=, $pop186, $pop374
+	i64.eqz 	$push188=, $pop187
+	br_if   	1, $pop188      # 1: down to label84
+# BB#117:                               # %for.inc.i816
+                                        #   in Loop: Header=BB18_116 Depth=1
+	i64.const	$push381=, -1
+	i64.add 	$9=, $9, $pop381
+	i32.const	$push380=, 1
+	i32.add 	$11=, $11, $pop380
 	i64.const	$push379=, 1
-	i64.add 	$push378=, $8, $pop379
-	tee_local	$push377=, $8=, $pop378
+	i64.add 	$push378=, $10, $pop379
+	tee_local	$push377=, $10=, $pop378
 	i64.const	$push376=, 64
-	i64.lt_u	$push150=, $pop377, $pop376
-	br_if   	0, $pop150      # 0: up to label76
-# BB#99:                                # %if.then460
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB18_100:                             # %if.end465
-	end_block                       # label75:
-	i64.const	$push380=, 1
-	i32.call	$10=, __builtin_clrsbll@FUNCTION, $pop380
-	i64.const	$8=, 1
-.LBB18_101:                             # %for.body.i1655
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	block   	
-	loop    	                # label79:
-	i64.const	$push381=, 63
-	i64.eq  	$push151=, $8, $pop381
-	br_if   	1, $pop151      # 1: down to label78
-# BB#102:                               # %for.inc.i1659
-                                        #   in Loop: Header=BB18_101 Depth=1
-	i64.const	$push385=, 1
-	i64.add 	$push384=, $8, $pop385
-	tee_local	$push383=, $8=, $pop384
-	i64.const	$push382=, 64
-	i64.lt_u	$push152=, $pop383, $pop382
-	br_if   	0, $pop152      # 0: up to label79
-# BB#103:
-	end_loop
-	i32.const	$push197=, 63
-	i32.eq  	$push153=, $10, $pop197
-	br_if   	1, $pop153      # 1: down to label77
-	br      	2               # 2: down to label34
-.LBB18_104:
-	end_block                       # label78:
-	i32.const	$push198=, 62
-	i32.ne  	$push154=, $10, $pop198
-	br_if   	1, $pop154      # 1: down to label34
-.LBB18_105:                             # %for.body.i1598.preheader
-	end_block                       # label77:
-	i64.const	$8=, 0
-.LBB18_106:                             # %for.body.i1598
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label81:
-	i64.const	$push386=, 63
-	i64.eq  	$push155=, $8, $pop386
-	br_if   	1, $pop155      # 1: down to label80
-# BB#107:                               # %for.inc.i1602
-                                        #   in Loop: Header=BB18_106 Depth=1
-	i64.const	$push390=, 1
-	i64.add 	$push389=, $8, $pop390
-	tee_local	$push388=, $8=, $pop389
-	i64.const	$push387=, 64
-	i64.lt_u	$push156=, $pop388, $pop387
-	br_if   	0, $pop156      # 0: up to label81
-# BB#108:                               # %if.then489
+	i64.lt_u	$push189=, $pop377, $pop376
+	br_if   	0, $pop189      # 0: up to label85
+.LBB18_118:                             # %my_clrsbll.exit
 	end_loop
-	call    	abort@FUNCTION
+	end_block                       # label84:
+	i32.const	$push190=, -1
+	i32.add 	$push191=, $11, $pop190
+	i32.ne  	$push192=, $3, $pop191
+	br_if   	0, $pop192      # 0: down to label35
+# BB#119:                               # %if.end753
+	i32.const	$push193=, 0
+	call    	exit@FUNCTION, $pop193
 	unreachable
-.LBB18_109:                             # %if.end490
-	end_block                       # label80:
-	i64.const	$push157=, -9223372036854775808
-	i32.call	$push158=, __builtin_clrsbll@FUNCTION, $pop157
-	br_if   	0, $pop158      # 0: down to label34
-# BB#110:                               # %for.body.i1494
-	i64.const	$push159=, 2
-	i32.call	$push160=, __builtin_clrsbll@FUNCTION, $pop159
-	i32.const	$push161=, 61
-	i32.ne  	$push162=, $pop160, $pop161
-	br_if   	0, $pop162      # 0: down to label34
-# BB#111:                               # %my_clrsbll.exit1419
-	i64.const	$push163=, 4611686018427387904
-	i32.call	$push164=, __builtin_clrsbll@FUNCTION, $pop163
-	br_if   	0, $pop164      # 0: down to label34
-# BB#112:                               # %for.body.i1333
-	i64.const	$push165=, 4294967296
-	i32.call	$push166=, __builtin_clrsbll@FUNCTION, $pop165
-	i32.const	$push167=, 30
-	i32.ne  	$push168=, $pop166, $pop167
-	br_if   	0, $pop168      # 0: down to label34
-# BB#113:                               # %for.body.i1253
-	i64.const	$push169=, 2147483648
-	i32.call	$push170=, __builtin_clrsbll@FUNCTION, $pop169
-	i32.const	$push171=, 31
-	i32.ne  	$push172=, $pop170, $pop171
-	br_if   	0, $pop172      # 0: down to label34
-# BB#114:                               # %my_clrsbll.exit1180
-	i64.const	$push173=, -6510615555426900571
-	i32.call	$push174=, __builtin_clrsbll@FUNCTION, $pop173
-	br_if   	0, $pop174      # 0: down to label34
-# BB#115:                               # %my_clrsbll.exit1100
-	i64.const	$push175=, 6510615555426900570
-	i32.call	$push176=, __builtin_clrsbll@FUNCTION, $pop175
-	br_if   	0, $pop176      # 0: down to label34
-# BB#116:                               # %for.body.i1015
-	i64.const	$push177=, -3819392241693097984
-	i32.call	$push178=, __builtin_clrsbll@FUNCTION, $pop177
-	i32.const	$push179=, 1
-	i32.ne  	$push180=, $pop178, $pop179
-	br_if   	0, $pop180      # 0: down to label34
-# BB#117:                               # %for.body.i939
-	i64.const	$push181=, 223195676147712
-	i32.call	$push182=, __builtin_clrsbll@FUNCTION, $pop181
-	i32.const	$push183=, 15
-	i32.ne  	$push184=, $pop182, $pop183
-	br_if   	0, $pop184      # 0: down to label34
-# BB#118:                               # %for.body.i864
-	i64.const	$push185=, 3405695742
-	i32.call	$push186=, __builtin_clrsbll@FUNCTION, $pop185
-	i32.const	$push187=, 31
-	i32.ne  	$push188=, $pop186, $pop187
-	br_if   	0, $pop188      # 0: down to label34
-# BB#119:                               # %if.end740
-	i64.const	$push391=, -1
-	i32.call	$3=, __builtin_clrsbll@FUNCTION, $pop391
-	i64.const	$8=, 62
-	i64.const	$9=, 1
-	i32.const	$10=, 1
-.LBB18_120:                             # %for.body.i810
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label83:
-	i64.const	$push393=, -1
-	i64.shr_u	$push189=, $pop393, $8
-	i64.const	$push392=, 1
-	i64.and 	$push190=, $pop189, $pop392
-	i64.eqz 	$push191=, $pop190
-	br_if   	1, $pop191      # 1: down to label82
-# BB#121:                               # %for.inc.i
-                                        #   in Loop: Header=BB18_120 Depth=1
-	i64.const	$push399=, -1
-	i64.add 	$8=, $8, $pop399
-	i32.const	$push398=, 1
-	i32.add 	$10=, $10, $pop398
-	i64.const	$push397=, 1
-	i64.add 	$push396=, $9, $pop397
-	tee_local	$push395=, $9=, $pop396
-	i64.const	$push394=, 64
-	i64.lt_u	$push192=, $pop395, $pop394
-	br_if   	0, $pop192      # 0: up to label83
-.LBB18_122:                             # %my_clrsbll.exit
-	end_loop
-	end_block                       # label82:
-	i32.const	$push193=, -1
-	i32.add 	$push194=, $10, $pop193
-	i32.ne  	$push195=, $3, $pop194
-	br_if   	0, $pop195      # 0: down to label34
-# BB#123:                               # %if.end753
-	i32.const	$push196=, 0
-	call    	exit@FUNCTION, $pop196
-	unreachable
-.LBB18_124:                             # %if.then37
-	end_block                       # label34:
-	call    	abort@FUNCTION
-	unreachable
-.LBB18_125:                             # %if.then140
-	end_block                       # label33:
+.LBB18_120:                             # %if.then
+	end_block                       # label35:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end18:
 	.size	main, .Lfunc_end18-main
-
+                                        # -- End function
 	.hidden	ints                    # @ints
 	.type	ints,@object
 	.section	.data.ints,"aw",@progbits
@@ -1734,7 +1722,7 @@ longlongs:
 	.size	longlongs, 104
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	__builtin_clrsb, i32
 	.functype	__builtin_clrsbl, i32
diff --git a/test/torture-s/builtin-constant.c.s b/test/torture-s/builtin-constant.c.s
index ce4073017..24be5e3a8 100644
--- a/test/torture-s/builtin-constant.c.s
+++ b/test/torture-s/builtin-constant.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-constant.c"
+	.file	"builtin-constant.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,9 +21,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -47,6 +47,6 @@ main:                                   # @main
 	.size	.L.str, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-1.c.s b/test/torture-s/builtin-prefetch-1.c.s
index beeb845bf..b636c46e6 100644
--- a/test/torture-s/builtin-prefetch-1.c.s
+++ b/test/torture-s/builtin-prefetch-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-1.c"
+	.file	"builtin-prefetch-1.c"
 	.section	.text.good_const,"ax",@progbits
-	.hidden	good_const
+	.hidden	good_const              # -- Begin function good_const
 	.globl	good_const
 	.type	good_const,@function
 good_const:                             # @good_const
@@ -11,9 +11,9 @@ good_const:                             # @good_const
 	.endfunc
 .Lfunc_end0:
 	.size	good_const, .Lfunc_end0-good_const
-
+                                        # -- End function
 	.section	.text.good_enum,"ax",@progbits
-	.hidden	good_enum
+	.hidden	good_enum               # -- Begin function good_enum
 	.globl	good_enum
 	.type	good_enum,@function
 good_enum:                              # @good_enum
@@ -23,9 +23,9 @@ good_enum:                              # @good_enum
 	.endfunc
 .Lfunc_end1:
 	.size	good_enum, .Lfunc_end1-good_enum
-
+                                        # -- End function
 	.section	.text.good_expr,"ax",@progbits
-	.hidden	good_expr
+	.hidden	good_expr               # -- Begin function good_expr
 	.globl	good_expr
 	.type	good_expr,@function
 good_expr:                              # @good_expr
@@ -35,9 +35,9 @@ good_expr:                              # @good_expr
 	.endfunc
 .Lfunc_end2:
 	.size	good_expr, .Lfunc_end2-good_expr
-
+                                        # -- End function
 	.section	.text.good_vararg,"ax",@progbits
-	.hidden	good_vararg
+	.hidden	good_vararg             # -- Begin function good_vararg
 	.globl	good_vararg
 	.type	good_vararg,@function
 good_vararg:                            # @good_vararg
@@ -47,9 +47,9 @@ good_vararg:                            # @good_vararg
 	.endfunc
 .Lfunc_end3:
 	.size	good_vararg, .Lfunc_end3-good_vararg
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,19 +57,15 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$push0=, arr
 	call    	good_const@FUNCTION, $pop0
-	i32.const	$push4=, arr
-	call    	good_enum@FUNCTION, $pop4
-	i32.const	$push3=, arr
-	call    	good_expr@FUNCTION, $pop3
 	i32.const	$push2=, arr
-	call    	good_vararg@FUNCTION, $pop2
+	call    	good_enum@FUNCTION, $pop2
 	i32.const	$push1=, 0
 	call    	exit@FUNCTION, $pop1
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.bss.arr,"aw",@nobits
@@ -80,5 +76,5 @@ arr:
 	.size	arr, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-2.c.s b/test/torture-s/builtin-prefetch-2.c.s
index d494f0a01..0099a7ec8 100644
--- a/test/torture-s/builtin-prefetch-2.c.s
+++ b/test/torture-s/builtin-prefetch-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-2.c"
+	.file	"builtin-prefetch-2.c"
 	.section	.text.simple_global,"ax",@progbits
-	.hidden	simple_global
+	.hidden	simple_global           # -- Begin function simple_global
 	.globl	simple_global
 	.type	simple_global,@function
 simple_global:                          # @simple_global
@@ -10,9 +10,9 @@ simple_global:                          # @simple_global
 	.endfunc
 .Lfunc_end0:
 	.size	simple_global, .Lfunc_end0-simple_global
-
+                                        # -- End function
 	.section	.text.simple_file,"ax",@progbits
-	.hidden	simple_file
+	.hidden	simple_file             # -- Begin function simple_file
 	.globl	simple_file
 	.type	simple_file,@function
 simple_file:                            # @simple_file
@@ -21,9 +21,9 @@ simple_file:                            # @simple_file
 	.endfunc
 .Lfunc_end1:
 	.size	simple_file, .Lfunc_end1-simple_file
-
+                                        # -- End function
 	.section	.text.simple_static_local,"ax",@progbits
-	.hidden	simple_static_local
+	.hidden	simple_static_local     # -- Begin function simple_static_local
 	.globl	simple_static_local
 	.type	simple_static_local,@function
 simple_static_local:                    # @simple_static_local
@@ -32,19 +32,19 @@ simple_static_local:                    # @simple_static_local
 	.endfunc
 .Lfunc_end2:
 	.size	simple_static_local, .Lfunc_end2-simple_static_local
-
+                                        # -- End function
 	.section	.text.simple_local,"ax",@progbits
-	.hidden	simple_local
+	.hidden	simple_local            # -- Begin function simple_local
 	.globl	simple_local
 	.type	simple_local,@function
 simple_local:                           # @simple_local
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push3=, 0
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 416
-	i32.sub 	$push8=, $pop1, $pop2
+	i32.sub 	$push8=, $pop0, $pop2
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop3), $pop7
 	i32.const	$push6=, 0
@@ -55,26 +55,26 @@ simple_local:                           # @simple_local
 	.endfunc
 .Lfunc_end3:
 	.size	simple_local, .Lfunc_end3-simple_local
-
+                                        # -- End function
 	.section	.text.simple_arg,"ax",@progbits
-	.hidden	simple_arg
+	.hidden	simple_arg              # -- Begin function simple_arg
 	.globl	simple_arg
 	.type	simple_arg,@function
 simple_arg:                             # @simple_arg
 	.param  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push3=, $pop1, $pop2
+	i32.sub 	$push3=, $pop0, $pop2
 	i32.store	12($pop3), $2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
 	.size	simple_arg, .Lfunc_end4-simple_arg
-
+                                        # -- End function
 	.section	.text.expr_global,"ax",@progbits
-	.hidden	expr_global
+	.hidden	expr_global             # -- Begin function expr_global
 	.globl	expr_global
 	.type	expr_global,@function
 expr_global:                            # @expr_global
@@ -83,50 +83,52 @@ expr_global:                            # @expr_global
 	.endfunc
 .Lfunc_end5:
 	.size	expr_global, .Lfunc_end5-expr_global
-
+                                        # -- End function
 	.section	.text.expr_local,"ax",@progbits
-	.hidden	expr_local
+	.hidden	expr_local              # -- Begin function expr_local
 	.globl	expr_local
 	.type	expr_local,@function
 expr_local:                             # @expr_local
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 80
-	i32.sub 	$drop=, $pop1, $pop2
+	i32.sub 	$drop=, $pop0, $pop2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
 	.size	expr_local, .Lfunc_end6-expr_local
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
+	.local  	i32
 # BB#0:                                 # %entry
-	call    	simple_global@FUNCTION
-	call    	simple_file@FUNCTION
-	call    	simple_static_local@FUNCTION
-	i32.const	$push3=, glob_int_arr
-	i32.const	$push0=, 0
-	i32.load	$push2=, glob_ptr_int($pop0)
-	i32.const	$push7=, 0
-	i32.load	$push1=, glob_int($pop7)
-	call    	simple_arg@FUNCTION, $pop3, $pop2, $pop1
 	i32.const	$push6=, 0
-	i32.const	$push4=, str
-	i32.store	str+16($pop6), $pop4
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
+	i32.const	$push5=, 416
+	i32.sub 	$push10=, $pop3, $pop5
+	tee_local	$push9=, $0=, $pop10
+	i32.store	__stack_pointer($pop6), $pop9
+	i32.const	$push0=, 0
+	i32.load	$push1=, glob_int($pop0)
+	i32.store	8($0), $pop1
+	i32.const	$push8=, 0
+	i32.const	$push2=, str
+	i32.store	str+16($pop8), $pop2
 	call    	expr_global@FUNCTION
 	call    	expr_local@FUNCTION
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 	.endfunc
 .Lfunc_end7:
 	.size	main, .Lfunc_end7-main
-
+                                        # -- End function
 	.hidden	glob_int_arr            # @glob_int_arr
 	.type	glob_int_arr,@object
 	.section	.bss.glob_int_arr,"aw",@nobits
@@ -201,5 +203,5 @@ simple_static_local.ix:
 	.size	simple_static_local.ix, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-3.c.s b/test/torture-s/builtin-prefetch-3.c.s
index ac766c75c..c76f2428e 100644
--- a/test/torture-s/builtin-prefetch-3.c.s
+++ b/test/torture-s/builtin-prefetch-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-3.c"
+	.file	"builtin-prefetch-3.c"
 	.section	.text.simple_vol_global,"ax",@progbits
-	.hidden	simple_vol_global
+	.hidden	simple_vol_global       # -- Begin function simple_vol_global
 	.globl	simple_vol_global
 	.type	simple_vol_global,@function
 simple_vol_global:                      # @simple_vol_global
@@ -14,9 +14,9 @@ simple_vol_global:                      # @simple_vol_global
 	.endfunc
 .Lfunc_end0:
 	.size	simple_vol_global, .Lfunc_end0-simple_vol_global
-
+                                        # -- End function
 	.section	.text.simple_vol_file,"ax",@progbits
-	.hidden	simple_vol_file
+	.hidden	simple_vol_file         # -- Begin function simple_vol_file
 	.globl	simple_vol_file
 	.type	simple_vol_file,@function
 simple_vol_file:                        # @simple_vol_file
@@ -29,76 +29,76 @@ simple_vol_file:                        # @simple_vol_file
 	.endfunc
 .Lfunc_end1:
 	.size	simple_vol_file, .Lfunc_end1-simple_vol_file
-
+                                        # -- End function
 	.section	.text.expr_vol_global,"ax",@progbits
-	.hidden	expr_vol_global
+	.hidden	expr_vol_global         # -- Begin function expr_vol_global
 	.globl	expr_vol_global
 	.type	expr_vol_global,@function
 expr_vol_global:                        # @expr_vol_global
+	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, vol_ptr_str($pop0)
-	i32.const	$push29=, 0
-	i32.load	$drop=, vol_ptr_vol_str($pop29)
 	i32.const	$push28=, 0
-	i32.load	$drop=, vol_ptr_str($pop28)
+	i32.load	$drop=, vol_ptr_vol_str($pop28)
 	i32.const	$push27=, 0
-	i32.load	$drop=, vol_ptr_vol_str($pop27)
+	i32.load	$drop=, vol_ptr_str($pop27)
 	i32.const	$push26=, 0
-	i32.load	$drop=, vol_ptr_str($pop26)
+	i32.load	$drop=, vol_ptr_vol_str($pop26)
 	i32.const	$push25=, 0
-	i32.load	$drop=, vol_ptr_vol_str($pop25)
+	i32.load	$drop=, vol_ptr_str($pop25)
 	i32.const	$push24=, 0
-	i32.load	$drop=, vol_str+16($pop24)
+	i32.load	$drop=, vol_ptr_vol_str($pop24)
 	i32.const	$push23=, 0
-	i32.load	$drop=, vol_ptr_str($pop23)
+	i32.load	$drop=, vol_str+16($pop23)
 	i32.const	$push22=, 0
-	i32.load	$push1=, ptr_vol_str($pop22)
-	i32.load	$drop=, 16($pop1)
+	i32.load	$drop=, vol_ptr_str($pop22)
 	i32.const	$push21=, 0
-	i32.load	$push2=, vol_ptr_vol_str($pop21)
-	i32.load	$drop=, 16($pop2)
-	i32.const	$push20=, 0
-	i32.load	$drop=, vol_str+16($pop20)
-	i32.const	$push19=, 0
-	i32.load	$drop=, vol_ptr_str($pop19)
+	i32.load	$push20=, ptr_vol_str($pop21)
+	tee_local	$push19=, $0=, $pop20
+	i32.load	$drop=, 16($pop19)
 	i32.const	$push18=, 0
-	i32.load	$push3=, ptr_vol_str($pop18)
-	i32.load	$drop=, 16($pop3)
+	i32.load	$push1=, vol_ptr_vol_str($pop18)
+	i32.load	$drop=, 16($pop1)
 	i32.const	$push17=, 0
-	i32.load	$push4=, vol_ptr_vol_str($pop17)
-	i32.load	$drop=, 16($pop4)
+	i32.load	$drop=, vol_str+16($pop17)
 	i32.const	$push16=, 0
-	i32.load	$drop=, glob_vol_ptr_int($pop16)
+	i32.load	$drop=, vol_ptr_str($pop16)
+	i32.load	$drop=, 16($0)
 	i32.const	$push15=, 0
-	i32.load	$drop=, glob_vol_ptr_vol_int($pop15)
+	i32.load	$push2=, vol_ptr_vol_str($pop15)
+	i32.load	$drop=, 16($pop2)
 	i32.const	$push14=, 0
 	i32.load	$drop=, glob_vol_ptr_int($pop14)
 	i32.const	$push13=, 0
 	i32.load	$drop=, glob_vol_ptr_vol_int($pop13)
 	i32.const	$push12=, 0
-	i32.load	$drop=, glob_vol_int($pop12)
+	i32.load	$drop=, glob_vol_ptr_int($pop12)
 	i32.const	$push11=, 0
-	i32.load	$drop=, glob_vol_ptr_int($pop11)
+	i32.load	$drop=, glob_vol_ptr_vol_int($pop11)
 	i32.const	$push10=, 0
-	i32.load	$drop=, glob_vol_ptr_vol_int($pop10)
+	i32.load	$drop=, glob_vol_int($pop10)
 	i32.const	$push9=, 0
 	i32.load	$drop=, glob_vol_ptr_int($pop9)
 	i32.const	$push8=, 0
-	i32.load	$drop=, glob_vol_int($pop8)
+	i32.load	$drop=, glob_vol_ptr_vol_int($pop8)
 	i32.const	$push7=, 0
-	i32.load	$drop=, glob_vol_int($pop7)
+	i32.load	$drop=, glob_vol_ptr_int($pop7)
 	i32.const	$push6=, 0
-	i32.load	$drop=, glob_vol_ptr_vol_int($pop6)
+	i32.load	$drop=, glob_vol_int($pop6)
 	i32.const	$push5=, 0
 	i32.load	$drop=, glob_vol_int($pop5)
+	i32.const	$push4=, 0
+	i32.load	$drop=, glob_vol_ptr_vol_int($pop4)
+	i32.const	$push3=, 0
+	i32.load	$drop=, glob_vol_int($pop3)
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	expr_vol_global, .Lfunc_end2-expr_vol_global
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -119,7 +119,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	glob_int                # @glob_int
 	.type	glob_int,@object
 	.section	.data.glob_int,"aw",@progbits
@@ -264,5 +264,5 @@ stat_int_arr:
 	.size	stat_int_arr, 400
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-4.c.s b/test/torture-s/builtin-prefetch-4.c.s
index 77431c5b2..aa96f7be7 100644
--- a/test/torture-s/builtin-prefetch-4.c.s
+++ b/test/torture-s/builtin-prefetch-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-4.c"
+	.file	"builtin-prefetch-4.c"
 	.section	.text.assign_arg_ptr,"ax",@progbits
-	.hidden	assign_arg_ptr
+	.hidden	assign_arg_ptr          # -- Begin function assign_arg_ptr
 	.globl	assign_arg_ptr
 	.type	assign_arg_ptr,@function
 assign_arg_ptr:                         # @assign_arg_ptr
@@ -13,26 +13,22 @@ assign_arg_ptr:                         # @assign_arg_ptr
 	.endfunc
 .Lfunc_end0:
 	.size	assign_arg_ptr, .Lfunc_end0-assign_arg_ptr
-
+                                        # -- End function
 	.section	.text.assign_glob_ptr,"ax",@progbits
-	.hidden	assign_glob_ptr
+	.hidden	assign_glob_ptr         # -- Begin function assign_glob_ptr
 	.globl	assign_glob_ptr
 	.type	assign_glob_ptr,@function
 assign_glob_ptr:                        # @assign_glob_ptr
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push3=, ptr($pop0)
-	tee_local	$push2=, $0=, $pop3
-	i32.eq  	$push1=, $pop2, $0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, 1
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	assign_glob_ptr, .Lfunc_end1-assign_glob_ptr
-
+                                        # -- End function
 	.section	.text.assign_arg_idx,"ax",@progbits
-	.hidden	assign_arg_idx
+	.hidden	assign_arg_idx          # -- Begin function assign_arg_idx
 	.globl	assign_arg_idx
 	.type	assign_arg_idx,@function
 assign_arg_idx:                         # @assign_arg_idx
@@ -44,26 +40,22 @@ assign_arg_idx:                         # @assign_arg_idx
 	.endfunc
 .Lfunc_end2:
 	.size	assign_arg_idx, .Lfunc_end2-assign_arg_idx
-
+                                        # -- End function
 	.section	.text.assign_glob_idx,"ax",@progbits
-	.hidden	assign_glob_idx
+	.hidden	assign_glob_idx         # -- Begin function assign_glob_idx
 	.globl	assign_glob_idx
 	.type	assign_glob_idx,@function
 assign_glob_idx:                        # @assign_glob_idx
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push3=, arrindex($pop0)
-	tee_local	$push2=, $0=, $pop3
-	i32.eq  	$push1=, $pop2, $0
-                                        # fallthrough-return: $pop1
+	i32.const	$push0=, 1
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end3:
 	.size	assign_glob_idx, .Lfunc_end3-assign_glob_idx
-
+                                        # -- End function
 	.section	.text.preinc_arg_ptr,"ax",@progbits
-	.hidden	preinc_arg_ptr
+	.hidden	preinc_arg_ptr          # -- Begin function preinc_arg_ptr
 	.globl	preinc_arg_ptr
 	.type	preinc_arg_ptr,@function
 preinc_arg_ptr:                         # @preinc_arg_ptr
@@ -75,9 +67,9 @@ preinc_arg_ptr:                         # @preinc_arg_ptr
 	.endfunc
 .Lfunc_end4:
 	.size	preinc_arg_ptr, .Lfunc_end4-preinc_arg_ptr
-
+                                        # -- End function
 	.section	.text.preinc_glob_ptr,"ax",@progbits
-	.hidden	preinc_glob_ptr
+	.hidden	preinc_glob_ptr         # -- Begin function preinc_glob_ptr
 	.globl	preinc_glob_ptr
 	.type	preinc_glob_ptr,@function
 preinc_glob_ptr:                        # @preinc_glob_ptr
@@ -94,9 +86,9 @@ preinc_glob_ptr:                        # @preinc_glob_ptr
 	.endfunc
 .Lfunc_end5:
 	.size	preinc_glob_ptr, .Lfunc_end5-preinc_glob_ptr
-
+                                        # -- End function
 	.section	.text.postinc_arg_ptr,"ax",@progbits
-	.hidden	postinc_arg_ptr
+	.hidden	postinc_arg_ptr         # -- Begin function postinc_arg_ptr
 	.globl	postinc_arg_ptr
 	.type	postinc_arg_ptr,@function
 postinc_arg_ptr:                        # @postinc_arg_ptr
@@ -108,9 +100,9 @@ postinc_arg_ptr:                        # @postinc_arg_ptr
 	.endfunc
 .Lfunc_end6:
 	.size	postinc_arg_ptr, .Lfunc_end6-postinc_arg_ptr
-
+                                        # -- End function
 	.section	.text.postinc_glob_ptr,"ax",@progbits
-	.hidden	postinc_glob_ptr
+	.hidden	postinc_glob_ptr        # -- Begin function postinc_glob_ptr
 	.globl	postinc_glob_ptr
 	.type	postinc_glob_ptr,@function
 postinc_glob_ptr:                       # @postinc_glob_ptr
@@ -127,9 +119,9 @@ postinc_glob_ptr:                       # @postinc_glob_ptr
 	.endfunc
 .Lfunc_end7:
 	.size	postinc_glob_ptr, .Lfunc_end7-postinc_glob_ptr
-
+                                        # -- End function
 	.section	.text.predec_arg_ptr,"ax",@progbits
-	.hidden	predec_arg_ptr
+	.hidden	predec_arg_ptr          # -- Begin function predec_arg_ptr
 	.globl	predec_arg_ptr
 	.type	predec_arg_ptr,@function
 predec_arg_ptr:                         # @predec_arg_ptr
@@ -141,9 +133,9 @@ predec_arg_ptr:                         # @predec_arg_ptr
 	.endfunc
 .Lfunc_end8:
 	.size	predec_arg_ptr, .Lfunc_end8-predec_arg_ptr
-
+                                        # -- End function
 	.section	.text.predec_glob_ptr,"ax",@progbits
-	.hidden	predec_glob_ptr
+	.hidden	predec_glob_ptr         # -- Begin function predec_glob_ptr
 	.globl	predec_glob_ptr
 	.type	predec_glob_ptr,@function
 predec_glob_ptr:                        # @predec_glob_ptr
@@ -160,9 +152,9 @@ predec_glob_ptr:                        # @predec_glob_ptr
 	.endfunc
 .Lfunc_end9:
 	.size	predec_glob_ptr, .Lfunc_end9-predec_glob_ptr
-
+                                        # -- End function
 	.section	.text.postdec_arg_ptr,"ax",@progbits
-	.hidden	postdec_arg_ptr
+	.hidden	postdec_arg_ptr         # -- Begin function postdec_arg_ptr
 	.globl	postdec_arg_ptr
 	.type	postdec_arg_ptr,@function
 postdec_arg_ptr:                        # @postdec_arg_ptr
@@ -174,9 +166,9 @@ postdec_arg_ptr:                        # @postdec_arg_ptr
 	.endfunc
 .Lfunc_end10:
 	.size	postdec_arg_ptr, .Lfunc_end10-postdec_arg_ptr
-
+                                        # -- End function
 	.section	.text.postdec_glob_ptr,"ax",@progbits
-	.hidden	postdec_glob_ptr
+	.hidden	postdec_glob_ptr        # -- Begin function postdec_glob_ptr
 	.globl	postdec_glob_ptr
 	.type	postdec_glob_ptr,@function
 postdec_glob_ptr:                       # @postdec_glob_ptr
@@ -193,9 +185,9 @@ postdec_glob_ptr:                       # @postdec_glob_ptr
 	.endfunc
 .Lfunc_end11:
 	.size	postdec_glob_ptr, .Lfunc_end11-postdec_glob_ptr
-
+                                        # -- End function
 	.section	.text.preinc_arg_idx,"ax",@progbits
-	.hidden	preinc_arg_idx
+	.hidden	preinc_arg_idx          # -- Begin function preinc_arg_idx
 	.globl	preinc_arg_idx
 	.type	preinc_arg_idx,@function
 preinc_arg_idx:                         # @preinc_arg_idx
@@ -207,9 +199,9 @@ preinc_arg_idx:                         # @preinc_arg_idx
 	.endfunc
 .Lfunc_end12:
 	.size	preinc_arg_idx, .Lfunc_end12-preinc_arg_idx
-
+                                        # -- End function
 	.section	.text.preinc_glob_idx,"ax",@progbits
-	.hidden	preinc_glob_idx
+	.hidden	preinc_glob_idx         # -- Begin function preinc_glob_idx
 	.globl	preinc_glob_idx
 	.type	preinc_glob_idx,@function
 preinc_glob_idx:                        # @preinc_glob_idx
@@ -226,9 +218,9 @@ preinc_glob_idx:                        # @preinc_glob_idx
 	.endfunc
 .Lfunc_end13:
 	.size	preinc_glob_idx, .Lfunc_end13-preinc_glob_idx
-
+                                        # -- End function
 	.section	.text.postinc_arg_idx,"ax",@progbits
-	.hidden	postinc_arg_idx
+	.hidden	postinc_arg_idx         # -- Begin function postinc_arg_idx
 	.globl	postinc_arg_idx
 	.type	postinc_arg_idx,@function
 postinc_arg_idx:                        # @postinc_arg_idx
@@ -240,9 +232,9 @@ postinc_arg_idx:                        # @postinc_arg_idx
 	.endfunc
 .Lfunc_end14:
 	.size	postinc_arg_idx, .Lfunc_end14-postinc_arg_idx
-
+                                        # -- End function
 	.section	.text.postinc_glob_idx,"ax",@progbits
-	.hidden	postinc_glob_idx
+	.hidden	postinc_glob_idx        # -- Begin function postinc_glob_idx
 	.globl	postinc_glob_idx
 	.type	postinc_glob_idx,@function
 postinc_glob_idx:                       # @postinc_glob_idx
@@ -259,9 +251,9 @@ postinc_glob_idx:                       # @postinc_glob_idx
 	.endfunc
 .Lfunc_end15:
 	.size	postinc_glob_idx, .Lfunc_end15-postinc_glob_idx
-
+                                        # -- End function
 	.section	.text.predec_arg_idx,"ax",@progbits
-	.hidden	predec_arg_idx
+	.hidden	predec_arg_idx          # -- Begin function predec_arg_idx
 	.globl	predec_arg_idx
 	.type	predec_arg_idx,@function
 predec_arg_idx:                         # @predec_arg_idx
@@ -273,9 +265,9 @@ predec_arg_idx:                         # @predec_arg_idx
 	.endfunc
 .Lfunc_end16:
 	.size	predec_arg_idx, .Lfunc_end16-predec_arg_idx
-
+                                        # -- End function
 	.section	.text.predec_glob_idx,"ax",@progbits
-	.hidden	predec_glob_idx
+	.hidden	predec_glob_idx         # -- Begin function predec_glob_idx
 	.globl	predec_glob_idx
 	.type	predec_glob_idx,@function
 predec_glob_idx:                        # @predec_glob_idx
@@ -292,9 +284,9 @@ predec_glob_idx:                        # @predec_glob_idx
 	.endfunc
 .Lfunc_end17:
 	.size	predec_glob_idx, .Lfunc_end17-predec_glob_idx
-
+                                        # -- End function
 	.section	.text.postdec_arg_idx,"ax",@progbits
-	.hidden	postdec_arg_idx
+	.hidden	postdec_arg_idx         # -- Begin function postdec_arg_idx
 	.globl	postdec_arg_idx
 	.type	postdec_arg_idx,@function
 postdec_arg_idx:                        # @postdec_arg_idx
@@ -306,9 +298,9 @@ postdec_arg_idx:                        # @postdec_arg_idx
 	.endfunc
 .Lfunc_end18:
 	.size	postdec_arg_idx, .Lfunc_end18-postdec_arg_idx
-
+                                        # -- End function
 	.section	.text.postdec_glob_idx,"ax",@progbits
-	.hidden	postdec_glob_idx
+	.hidden	postdec_glob_idx        # -- Begin function postdec_glob_idx
 	.globl	postdec_glob_idx
 	.type	postdec_glob_idx,@function
 postdec_glob_idx:                       # @postdec_glob_idx
@@ -325,9 +317,9 @@ postdec_glob_idx:                       # @postdec_glob_idx
 	.endfunc
 .Lfunc_end19:
 	.size	postdec_glob_idx, .Lfunc_end19-postdec_glob_idx
-
+                                        # -- End function
 	.section	.text.getptr,"ax",@progbits
-	.hidden	getptr
+	.hidden	getptr                  # -- Begin function getptr
 	.globl	getptr
 	.type	getptr,@function
 getptr:                                 # @getptr
@@ -346,9 +338,9 @@ getptr:                                 # @getptr
 	.endfunc
 .Lfunc_end20:
 	.size	getptr, .Lfunc_end20-getptr
-
+                                        # -- End function
 	.section	.text.funccall_arg_ptr,"ax",@progbits
-	.hidden	funccall_arg_ptr
+	.hidden	funccall_arg_ptr        # -- Begin function funccall_arg_ptr
 	.globl	funccall_arg_ptr
 	.type	funccall_arg_ptr,@function
 funccall_arg_ptr:                       # @funccall_arg_ptr
@@ -368,9 +360,9 @@ funccall_arg_ptr:                       # @funccall_arg_ptr
 	.endfunc
 .Lfunc_end21:
 	.size	funccall_arg_ptr, .Lfunc_end21-funccall_arg_ptr
-
+                                        # -- End function
 	.section	.text.getint,"ax",@progbits
-	.hidden	getint
+	.hidden	getint                  # -- Begin function getint
 	.globl	getint
 	.type	getint,@function
 getint:                                 # @getint
@@ -389,9 +381,9 @@ getint:                                 # @getint
 	.endfunc
 .Lfunc_end22:
 	.size	getint, .Lfunc_end22-getint
-
+                                        # -- End function
 	.section	.text.funccall_arg_idx,"ax",@progbits
-	.hidden	funccall_arg_idx
+	.hidden	funccall_arg_idx        # -- Begin function funccall_arg_idx
 	.globl	funccall_arg_idx
 	.type	funccall_arg_idx,@function
 funccall_arg_idx:                       # @funccall_arg_idx
@@ -400,98 +392,56 @@ funccall_arg_idx:                       # @funccall_arg_idx
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push7=, 0
-	i32.load	$push1=, getintcnt($pop7)
-	i32.const	$push2=, 1
-	i32.add 	$push6=, $pop1, $pop2
-	tee_local	$push5=, $2=, $pop6
-	i32.store	getintcnt($pop0), $pop5
-	i32.const	$push4=, 1
-	i32.eq  	$push3=, $2, $pop4
+	i32.const	$push6=, 0
+	i32.load	$push5=, getintcnt($pop6)
+	tee_local	$push4=, $2=, $pop5
+	i32.const	$push1=, 1
+	i32.add 	$push2=, $pop4, $pop1
+	i32.store	getintcnt($pop0), $pop2
+	i32.eqz 	$push3=, $2
                                         # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end23:
 	.size	funccall_arg_idx, .Lfunc_end23-funccall_arg_idx
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
+	.local  	i32
+# BB#0:                                 # %if.end76
+	i32.const	$push7=, 0
+	i32.const	$push6=, 0
+	i32.load	$push5=, getptrcnt($pop6)
+	tee_local	$push4=, $0=, $pop5
+	i32.const	$push3=, 1
+	i32.add 	$push0=, $pop4, $pop3
+	i32.store	getptrcnt($pop7), $pop0
 	block   	
-	i32.const	$push9=, 0
-	i32.load	$push8=, ptr($pop9)
-	tee_local	$push7=, $0=, $pop8
-	i32.ne  	$push0=, $pop7, $0
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end4
-	i32.const	$push12=, 0
-	i32.load	$push11=, arrindex($pop12)
-	tee_local	$push10=, $0=, $pop11
-	i32.ne  	$push1=, $pop10, $0
-	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end44
-	i32.const	$push17=, 0
-	i32.const	$push16=, 1
-	i32.add 	$push15=, $0, $pop16
-	tee_local	$push14=, $1=, $pop15
-	i32.store	arrindex($pop17), $pop14
-	i32.const	$push13=, 1
-	i32.eqz 	$push34=, $pop13
-	br_if   	0, $pop34       # 0: down to label0
-# BB#3:                                 # %if.end52
-	i32.const	$push19=, 0
-	i32.const	$push2=, 2
-	i32.add 	$push3=, $0, $pop2
-	i32.store	arrindex($pop19), $pop3
-	i32.const	$push18=, 1
-	i32.eqz 	$push35=, $pop18
-	br_if   	0, $pop35       # 0: down to label0
-# BB#4:                                 # %if.end64
-	i32.const	$push21=, 0
-	i32.store	arrindex($pop21), $1
-	i32.const	$push20=, 1
-	i32.eqz 	$push36=, $pop20
-	br_if   	0, $pop36       # 0: down to label0
-# BB#5:                                 # %if.end72
-	i32.const	$push23=, 0
-	i32.store	arrindex($pop23), $0
-	i32.const	$push22=, 1
-	i32.eqz 	$push37=, $pop22
-	br_if   	0, $pop37       # 0: down to label0
-# BB#6:                                 # %if.end76
-	i32.const	$push28=, 0
-	i32.const	$push27=, 0
-	i32.load	$push26=, getptrcnt($pop27)
-	tee_local	$push25=, $0=, $pop26
-	i32.const	$push24=, 1
-	i32.add 	$push4=, $pop25, $pop24
-	i32.store	getptrcnt($pop28), $pop4
 	br_if   	0, $0           # 0: down to label0
-# BB#7:                                 # %if.end80
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load	$push31=, getintcnt($pop32)
-	tee_local	$push30=, $0=, $pop31
-	i32.const	$push29=, 1
-	i32.add 	$push5=, $pop30, $pop29
-	i32.store	getintcnt($pop33), $pop5
+# BB#1:                                 # %if.end80
+	i32.const	$push12=, 0
+	i32.const	$push11=, 0
+	i32.load	$push10=, getintcnt($pop11)
+	tee_local	$push9=, $0=, $pop10
+	i32.const	$push8=, 1
+	i32.add 	$push1=, $pop9, $pop8
+	i32.store	getintcnt($pop12), $pop1
 	br_if   	0, $0           # 0: down to label0
-# BB#8:                                 # %if.end84
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+# BB#2:                                 # %if.end84
+	i32.const	$push2=, 0
+	call    	exit@FUNCTION, $pop2
 	unreachable
-.LBB24_9:                               # %if.then83
+.LBB24_3:                               # %if.then79
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end24:
 	.size	main, .Lfunc_end24-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.bss.arr,"aw",@nobits
@@ -538,6 +488,6 @@ getintcnt:
 	.size	getintcnt, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-5.c.s b/test/torture-s/builtin-prefetch-5.c.s
index 59be2e902..27cb5e511 100644
--- a/test/torture-s/builtin-prefetch-5.c.s
+++ b/test/torture-s/builtin-prefetch-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-5.c"
+	.file	"builtin-prefetch-5.c"
 	.section	.text.arg_ptr,"ax",@progbits
-	.hidden	arg_ptr
+	.hidden	arg_ptr                 # -- Begin function arg_ptr
 	.globl	arg_ptr
 	.type	arg_ptr,@function
 arg_ptr:                                # @arg_ptr
@@ -11,9 +11,9 @@ arg_ptr:                                # @arg_ptr
 	.endfunc
 .Lfunc_end0:
 	.size	arg_ptr, .Lfunc_end0-arg_ptr
-
+                                        # -- End function
 	.section	.text.arg_idx,"ax",@progbits
-	.hidden	arg_idx
+	.hidden	arg_idx                 # -- Begin function arg_idx
 	.globl	arg_idx
 	.type	arg_idx,@function
 arg_idx:                                # @arg_idx
@@ -23,9 +23,9 @@ arg_idx:                                # @arg_idx
 	.endfunc
 .Lfunc_end1:
 	.size	arg_idx, .Lfunc_end1-arg_idx
-
+                                        # -- End function
 	.section	.text.glob_ptr,"ax",@progbits
-	.hidden	glob_ptr
+	.hidden	glob_ptr                # -- Begin function glob_ptr
 	.globl	glob_ptr
 	.type	glob_ptr,@function
 glob_ptr:                               # @glob_ptr
@@ -34,9 +34,9 @@ glob_ptr:                               # @glob_ptr
 	.endfunc
 .Lfunc_end2:
 	.size	glob_ptr, .Lfunc_end2-glob_ptr
-
+                                        # -- End function
 	.section	.text.glob_idx,"ax",@progbits
-	.hidden	glob_idx
+	.hidden	glob_idx                # -- Begin function glob_idx
 	.globl	glob_idx
 	.type	glob_idx,@function
 glob_idx:                               # @glob_idx
@@ -45,9 +45,9 @@ glob_idx:                               # @glob_idx
 	.endfunc
 .Lfunc_end3:
 	.size	glob_idx, .Lfunc_end3-glob_idx
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,8 +56,6 @@ main:                                   # @main
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	idx($pop1), $pop0
-	call    	glob_ptr@FUNCTION
-	call    	glob_idx@FUNCTION
 	i32.const	$push9=, 0
 	i32.const	$push2=, 2
 	i32.store	idx($pop9), $pop2
@@ -67,15 +65,13 @@ main:                                   # @main
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $pop3, $pop4
 	i32.store	ptr($pop8), $pop5
-	call    	glob_ptr@FUNCTION
-	call    	glob_idx@FUNCTION
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.bss.arr,"aw",@nobits
@@ -113,5 +109,5 @@ s:
 	.size	s, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-prefetch-6.c.s b/test/torture-s/builtin-prefetch-6.c.s
index 84098ae75..befe5a644 100644
--- a/test/torture-s/builtin-prefetch-6.c.s
+++ b/test/torture-s/builtin-prefetch-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-6.c"
+	.file	"builtin-prefetch-6.c"
 	.section	.text.init_addrs,"ax",@progbits
-	.hidden	init_addrs
+	.hidden	init_addrs              # -- Begin function init_addrs
 	.globl	init_addrs
 	.type	init_addrs,@function
 init_addrs:                             # @init_addrs
@@ -9,94 +9,61 @@ init_addrs:                             # @init_addrs
 	i32.const	$push1=, 0
 	i64.const	$push0=, 8589934593
 	i64.store	bad_addr($pop1), $pop0
-	i32.const	$push55=, 0
-	i64.const	$push2=, 34359738372
-	i64.store	bad_addr+8($pop55), $pop2
-	i32.const	$push54=, 0
-	i64.const	$push3=, 137438953488
-	i64.store	bad_addr+16($pop54), $pop3
-	i32.const	$push53=, 0
-	i64.const	$push4=, 549755813952
-	i64.store	bad_addr+24($pop53), $pop4
-	i32.const	$push52=, 0
-	i64.const	$push5=, 2199023255808
-	i64.store	bad_addr+32($pop52), $pop5
-	i32.const	$push51=, 0
-	i32.const	$push6=, 1024
-	i32.store	bad_addr+40($pop51), $pop6
-	i32.const	$push50=, 0
-	i32.const	$push7=, 2048
-	i32.store	bad_addr+44($pop50), $pop7
-	i32.const	$push49=, 0
-	i32.const	$push8=, 4096
-	i32.store	bad_addr+48($pop49), $pop8
-	i32.const	$push48=, 0
-	i32.const	$push9=, 8192
-	i32.store	bad_addr+52($pop48), $pop9
-	i32.const	$push47=, 0
-	i32.const	$push10=, 16384
-	i32.store	bad_addr+56($pop47), $pop10
-	i32.const	$push46=, 0
-	i32.const	$push11=, 32768
-	i32.store	bad_addr+60($pop46), $pop11
-	i32.const	$push45=, 0
-	i32.const	$push12=, 65536
-	i32.store	bad_addr+64($pop45), $pop12
-	i32.const	$push44=, 0
-	i32.const	$push13=, 131072
-	i32.store	bad_addr+68($pop44), $pop13
-	i32.const	$push43=, 0
-	i32.const	$push14=, 262144
-	i32.store	bad_addr+72($pop43), $pop14
-	i32.const	$push42=, 0
-	i32.const	$push15=, 524288
-	i32.store	bad_addr+76($pop42), $pop15
-	i32.const	$push41=, 0
-	i32.const	$push16=, 1048576
-	i32.store	bad_addr+80($pop41), $pop16
-	i32.const	$push40=, 0
-	i32.const	$push17=, 2097152
-	i32.store	bad_addr+84($pop40), $pop17
-	i32.const	$push39=, 0
-	i32.const	$push18=, 4194304
-	i32.store	bad_addr+88($pop39), $pop18
-	i32.const	$push38=, 0
-	i32.const	$push19=, 8388608
-	i32.store	bad_addr+92($pop38), $pop19
-	i32.const	$push37=, 0
-	i32.const	$push20=, 16777216
-	i32.store	bad_addr+96($pop37), $pop20
-	i32.const	$push36=, 0
-	i32.const	$push21=, 33554432
-	i32.store	bad_addr+100($pop36), $pop21
-	i32.const	$push35=, 0
-	i32.const	$push22=, 67108864
-	i32.store	bad_addr+104($pop35), $pop22
-	i32.const	$push34=, 0
-	i32.const	$push23=, 134217728
-	i32.store	bad_addr+108($pop34), $pop23
 	i32.const	$push33=, 0
-	i32.const	$push24=, 268435456
-	i32.store	bad_addr+112($pop33), $pop24
+	i64.const	$push2=, 34359738372
+	i64.store	bad_addr+8($pop33), $pop2
 	i32.const	$push32=, 0
-	i32.const	$push25=, 536870912
-	i32.store	bad_addr+116($pop32), $pop25
+	i64.const	$push3=, 137438953488
+	i64.store	bad_addr+16($pop32), $pop3
 	i32.const	$push31=, 0
-	i32.const	$push26=, 1073741824
-	i32.store	bad_addr+120($pop31), $pop26
+	i64.const	$push4=, 549755813952
+	i64.store	bad_addr+24($pop31), $pop4
 	i32.const	$push30=, 0
-	i32.const	$push27=, -2147483648
-	i32.store	bad_addr+124($pop30), $pop27
+	i64.const	$push5=, 2199023255808
+	i64.store	bad_addr+32($pop30), $pop5
 	i32.const	$push29=, 0
-	i32.const	$push28=, 33
-	i32.store	arr_used($pop29), $pop28
+	i64.const	$push6=, 8796093023232
+	i64.store	bad_addr+40($pop29), $pop6
+	i32.const	$push28=, 0
+	i64.const	$push7=, 35184372092928
+	i64.store	bad_addr+48($pop28), $pop7
+	i32.const	$push27=, 0
+	i64.const	$push8=, 140737488371712
+	i64.store	bad_addr+56($pop27), $pop8
+	i32.const	$push26=, 0
+	i64.const	$push9=, 562949953486848
+	i64.store	bad_addr+64($pop26), $pop9
+	i32.const	$push25=, 0
+	i64.const	$push10=, 2251799813947392
+	i64.store	bad_addr+72($pop25), $pop10
+	i32.const	$push24=, 0
+	i64.const	$push11=, 9007199255789568
+	i64.store	bad_addr+80($pop24), $pop11
+	i32.const	$push23=, 0
+	i64.const	$push12=, 36028797023158272
+	i64.store	bad_addr+88($pop23), $pop12
+	i32.const	$push22=, 0
+	i64.const	$push13=, 144115188092633088
+	i64.store	bad_addr+96($pop22), $pop13
+	i32.const	$push21=, 0
+	i64.const	$push14=, 576460752370532352
+	i64.store	bad_addr+104($pop21), $pop14
+	i32.const	$push20=, 0
+	i64.const	$push15=, 2305843009482129408
+	i64.store	bad_addr+112($pop20), $pop15
+	i32.const	$push19=, 0
+	i64.const	$push16=, -9223372035781033984
+	i64.store	bad_addr+120($pop19), $pop16
+	i32.const	$push18=, 0
+	i32.const	$push17=, 33
+	i32.store	arr_used($pop18), $pop17
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	init_addrs, .Lfunc_end0-init_addrs
-
+                                        # -- End function
 	.section	.text.prefetch_for_read,"ax",@progbits
-	.hidden	prefetch_for_read
+	.hidden	prefetch_for_read       # -- Begin function prefetch_for_read
 	.globl	prefetch_for_read
 	.type	prefetch_for_read,@function
 prefetch_for_read:                      # @prefetch_for_read
@@ -116,9 +83,9 @@ prefetch_for_read:                      # @prefetch_for_read
 	.endfunc
 .Lfunc_end1:
 	.size	prefetch_for_read, .Lfunc_end1-prefetch_for_read
-
+                                        # -- End function
 	.section	.text.prefetch_for_write,"ax",@progbits
-	.hidden	prefetch_for_write
+	.hidden	prefetch_for_write      # -- Begin function prefetch_for_write
 	.globl	prefetch_for_write
 	.type	prefetch_for_write,@function
 prefetch_for_write:                     # @prefetch_for_write
@@ -138,9 +105,9 @@ prefetch_for_write:                     # @prefetch_for_write
 	.endfunc
 .Lfunc_end2:
 	.size	prefetch_for_write, .Lfunc_end2-prefetch_for_write
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -155,7 +122,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	bad_addr                # @bad_addr
 	.type	bad_addr,@object
 	.section	.bss.bad_addr,"aw",@nobits
@@ -175,5 +142,5 @@ arr_used:
 	.size	arr_used, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/builtin-types-compatible-p.c.s b/test/torture-s/builtin-types-compatible-p.c.s
index 50df7ef35..97d9992d6 100644
--- a/test/torture-s/builtin-types-compatible-p.c.s
+++ b/test/torture-s/builtin-types-compatible-p.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/builtin-types-compatible-p.c"
+	.file	"builtin-types-compatible-p.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -42,5 +42,5 @@ rootbeer:
 	.size	rootbeer, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/call-trap-1.c.s b/test/torture-s/call-trap-1.c.s
index 45dd883d2..9488aa1ce 100644
--- a/test/torture-s/call-trap-1.c.s
+++ b/test/torture-s/call-trap-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/call-trap-1.c"
+	.file	"call-trap-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -24,9 +24,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cbrt.c.s b/test/torture-s/cbrt.c.s
index 2ea04d463..80c2cf23a 100644
--- a/test/torture-s/cbrt.c.s
+++ b/test/torture-s/cbrt.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cbrt.c"
+	.file	"cbrt.c"
 	.section	.text.cbrtl,"ax",@progbits
-	.hidden	cbrtl
+	.hidden	cbrtl                   # -- Begin function cbrtl
 	.globl	cbrtl
 	.type	cbrtl,@function
 cbrtl:                                  # @cbrtl
@@ -9,151 +9,151 @@ cbrtl:                                  # @cbrtl
 	.result 	f64
 	.local  	i64, i32, i32, f64, f64, i32
 # BB#0:                                 # %entry
-	i32.const	$push57=, 0
-	i32.load	$push58=, __stack_pointer($pop57)
-	i32.const	$push59=, 16
-	i32.sub 	$push69=, $pop58, $pop59
-	tee_local	$push68=, $6=, $pop69
+	i32.const	$push59=, 0
+	i32.load	$push58=, __stack_pointer($pop59)
+	i32.const	$push60=, 16
+	i32.sub 	$push68=, $pop58, $pop60
+	tee_local	$push67=, $6=, $pop68
+	f64.store	0($pop67), $0
 	i64.const	$push0=, 0
-	i64.store	8($pop68), $pop0
-	f64.store	0($6), $0
+	i64.store	8($6), $pop0
 	block   	
-	i64.reinterpret/f64	$push67=, $0
-	tee_local	$push66=, $1=, $pop67
+	i64.reinterpret/f64	$push66=, $0
+	tee_local	$push65=, $1=, $pop66
 	i64.const	$push1=, 32
-	i64.shr_u	$push2=, $pop66, $pop1
-	i32.wrap/i64	$push65=, $pop2
-	tee_local	$push64=, $3=, $pop65
-	i32.const	$push3=, -2147483648
-	i32.and 	$push63=, $pop64, $pop3
-	tee_local	$push62=, $2=, $pop63
-	i32.xor 	$push61=, $pop62, $3
-	tee_local	$push60=, $3=, $pop61
-	i32.const	$push4=, 2146435072
-	i32.lt_s	$push5=, $pop60, $pop4
-	br_if   	0, $pop5        # 0: down to label0
+	i64.shr_u	$push2=, $pop65, $pop1
+	i32.wrap/i64	$push64=, $pop2
+	tee_local	$push63=, $3=, $pop64
+	i32.const	$push4=, 2147483647
+	i32.and 	$push62=, $pop63, $pop4
+	tee_local	$push61=, $2=, $pop62
+	i32.const	$push5=, 2146435072
+	i32.lt_u	$push6=, $pop61, $pop5
+	br_if   	0, $pop6        # 0: down to label0
 # BB#1:                                 # %if.then
-	f64.add 	$push70=, $0, $0
-	return  	$pop70
+	f64.add 	$push69=, $0, $0
+	return  	$pop69
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
-	i32.wrap/i64	$push6=, $1
-	i32.or  	$push7=, $pop6, $3
-	i32.eqz 	$push90=, $pop7
-	br_if   	0, $pop90       # 0: down to label1
+	i32.wrap/i64	$push7=, $1
+	i32.or  	$push8=, $2, $pop7
+	i32.eqz 	$push89=, $pop8
+	br_if   	0, $pop89       # 0: down to label1
 # BB#3:                                 # %if.end13
-	i32.store	4($6), $3
+	i32.const	$push3=, -2147483648
+	i32.and 	$3=, $3, $pop3
+	i32.store	4($6), $2
 	block   	
 	block   	
-	i32.const	$push8=, 1048575
-	i32.gt_s	$push9=, $3, $pop8
-	br_if   	0, $pop9        # 0: down to label3
+	i32.const	$push9=, 1048575
+	i32.gt_u	$push10=, $2, $pop9
+	br_if   	0, $pop10       # 0: down to label3
 # BB#4:                                 # %if.then18
-	i32.const	$push13=, 1129316352
-	i32.store	12($6), $pop13
-	f64.load	$push14=, 8($6)
-	f64.mul 	$push72=, $pop14, $0
-	tee_local	$push71=, $5=, $pop72
-	f64.store	8($6), $pop71
-	i64.reinterpret/f64	$push15=, $5
-	i64.const	$push16=, 32
-	i64.shr_u	$push17=, $pop15, $pop16
-	i32.wrap/i64	$push18=, $pop17
-	i32.const	$push19=, 3
-	i32.div_u	$push20=, $pop18, $pop19
-	i32.const	$push21=, 696219795
-	i32.add 	$3=, $pop20, $pop21
+	i32.const	$push14=, 1129316352
+	i32.store	12($6), $pop14
+	f64.load	$push15=, 8($6)
+	f64.mul 	$push71=, $pop15, $0
+	tee_local	$push70=, $5=, $pop71
+	f64.store	8($6), $pop70
+	i64.reinterpret/f64	$push16=, $5
+	i64.const	$push17=, 32
+	i64.shr_u	$push18=, $pop16, $pop17
+	i32.wrap/i64	$push19=, $pop18
+	i32.const	$push20=, 3
+	i32.div_u	$push21=, $pop19, $pop20
+	i32.const	$push22=, 696219795
+	i32.add 	$2=, $pop21, $pop22
 	br      	1               # 1: down to label2
 .LBB0_5:                                # %if.else
 	end_block                       # label3:
-	i32.const	$push10=, 3
-	i32.div_u	$push11=, $3, $pop10
-	i32.const	$push12=, 715094163
-	i32.add 	$3=, $pop11, $pop12
+	i32.const	$push11=, 3
+	i32.div_u	$push12=, $2, $pop11
+	i32.const	$push13=, 715094163
+	i32.add 	$2=, $pop12, $pop13
 .LBB0_6:                                # %if.end31
 	end_block                       # label2:
-	i32.store	12($6), $3
-	f64.load	$push89=, 8($6)
-	tee_local	$push88=, $5=, $pop89
-	f64.const	$push31=, 0x1.9b6db6db6db6ep0
-	f64.mul 	$push22=, $5, $5
-	f64.load	$push87=, 0($6)
-	tee_local	$push86=, $4=, $pop87
-	f64.div 	$push23=, $pop22, $pop86
-	f64.mul 	$push24=, $5, $pop23
-	f64.const	$push25=, 0x1.15f15f15f15f1p-1
-	f64.add 	$push85=, $pop24, $pop25
-	tee_local	$push84=, $5=, $pop85
-	f64.const	$push28=, 0x1.6a0ea0ea0ea0fp0
-	f64.add 	$push29=, $pop84, $pop28
-	f64.const	$push26=, -0x1.691de2532c834p-1
-	f64.div 	$push27=, $pop26, $5
-	f64.add 	$push30=, $pop29, $pop27
-	f64.div 	$push32=, $pop31, $pop30
-	f64.const	$push33=, 0x1.6db6db6db6db7p-2
-	f64.add 	$push34=, $pop32, $pop33
-	f64.mul 	$push83=, $pop88, $pop34
-	tee_local	$push82=, $5=, $pop83
-	f64.store	8($6), $pop82
-	i32.const	$push35=, 0
-	i32.store	8($6), $pop35
-	i64.reinterpret/f64	$push36=, $5
-	i64.const	$push37=, 32
-	i64.shr_u	$push38=, $pop36, $pop37
-	i32.wrap/i64	$push39=, $pop38
-	i32.const	$push40=, 1
-	i32.add 	$push41=, $pop39, $pop40
-	i32.store	12($6), $pop41
-	f64.load	$push81=, 8($6)
-	tee_local	$push80=, $5=, $pop81
-	f64.mul 	$push42=, $5, $5
-	f64.div 	$push79=, $4, $pop42
-	tee_local	$push78=, $4=, $pop79
-	f64.sub 	$push45=, $pop78, $5
-	f64.add 	$push43=, $5, $5
-	f64.add 	$push44=, $pop43, $4
-	f64.div 	$push46=, $pop45, $pop44
-	f64.mul 	$push47=, $5, $pop46
-	f64.add 	$push77=, $pop80, $pop47
-	tee_local	$push76=, $5=, $pop77
-	f64.store	8($6), $pop76
-	i64.reinterpret/f64	$push48=, $5
-	i64.const	$push75=, 32
-	i64.shr_u	$push49=, $pop48, $pop75
-	i32.wrap/i64	$push50=, $pop49
-	i32.or  	$push51=, $pop50, $2
-	i32.store	12($6), $pop51
-	f64.load	$push74=, 8($6)
-	tee_local	$push73=, $5=, $pop74
-	f64.mul 	$push52=, $5, $5
-	f64.div 	$push53=, $0, $pop52
-	f64.sub 	$push54=, $5, $pop53
-	f64.const	$push55=, -0x1.5555555555555p-2
-	f64.mul 	$push56=, $pop54, $pop55
-	f64.add 	$0=, $pop73, $pop56
+	i32.store	12($6), $2
+	f64.load	$push88=, 8($6)
+	tee_local	$push87=, $5=, $pop88
+	f64.const	$push32=, 0x1.9b6db6db6db6ep0
+	f64.mul 	$push23=, $5, $5
+	f64.load	$push86=, 0($6)
+	tee_local	$push85=, $4=, $pop86
+	f64.div 	$push24=, $pop23, $pop85
+	f64.mul 	$push25=, $5, $pop24
+	f64.const	$push26=, 0x1.15f15f15f15f1p-1
+	f64.add 	$push84=, $pop25, $pop26
+	tee_local	$push83=, $5=, $pop84
+	f64.const	$push29=, 0x1.6a0ea0ea0ea0fp0
+	f64.add 	$push30=, $pop83, $pop29
+	f64.const	$push27=, -0x1.691de2532c834p-1
+	f64.div 	$push28=, $pop27, $5
+	f64.add 	$push31=, $pop30, $pop28
+	f64.div 	$push33=, $pop32, $pop31
+	f64.const	$push34=, 0x1.6db6db6db6db7p-2
+	f64.add 	$push35=, $pop33, $pop34
+	f64.mul 	$push82=, $pop87, $pop35
+	tee_local	$push81=, $5=, $pop82
+	f64.store	8($6), $pop81
+	i32.const	$push36=, 0
+	i32.store	8($6), $pop36
+	i64.reinterpret/f64	$push37=, $5
+	i64.const	$push38=, 32
+	i64.shr_u	$push39=, $pop37, $pop38
+	i32.wrap/i64	$push40=, $pop39
+	i32.const	$push41=, 1
+	i32.add 	$push42=, $pop40, $pop41
+	i32.store	12($6), $pop42
+	f64.load	$push80=, 8($6)
+	tee_local	$push79=, $5=, $pop80
+	f64.mul 	$push43=, $5, $5
+	f64.div 	$push78=, $4, $pop43
+	tee_local	$push77=, $4=, $pop78
+	f64.sub 	$push46=, $pop77, $5
+	f64.add 	$push44=, $5, $5
+	f64.add 	$push45=, $pop44, $4
+	f64.div 	$push47=, $pop46, $pop45
+	f64.mul 	$push48=, $5, $pop47
+	f64.add 	$push76=, $pop79, $pop48
+	tee_local	$push75=, $5=, $pop76
+	f64.store	8($6), $pop75
+	i64.reinterpret/f64	$push49=, $5
+	i64.const	$push74=, 32
+	i64.shr_u	$push50=, $pop49, $pop74
+	i32.wrap/i64	$push51=, $pop50
+	i32.or  	$push52=, $3, $pop51
+	i32.store	12($6), $pop52
+	f64.load	$push73=, 8($6)
+	tee_local	$push72=, $5=, $pop73
+	f64.mul 	$push53=, $5, $5
+	f64.div 	$push54=, $0, $pop53
+	f64.sub 	$push55=, $5, $pop54
+	f64.const	$push56=, -0x1.5555555555555p-2
+	f64.mul 	$push57=, $pop55, $pop56
+	f64.add 	$0=, $pop72, $pop57
 .LBB0_7:                                # %cleanup
 	end_block                       # label1:
-	copy_local	$push91=, $0
-                                        # fallthrough-return: $pop91
+	copy_local	$push90=, $0
+                                        # fallthrough-return: $pop90
 	.endfunc
 .Lfunc_end0:
 	.size	cbrtl, .Lfunc_end0-cbrtl
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cmpdi-1.c.s b/test/torture-s/cmpdi-1.c.s
index b171faf6d..cd5fb3ecd 100644
--- a/test/torture-s/cmpdi-1.c.s
+++ b/test/torture-s/cmpdi-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cmpdi-1.c"
+	.file	"cmpdi-1.c"
 	.section	.text.feq,"ax",@progbits
-	.hidden	feq
+	.hidden	feq                     # -- Begin function feq
 	.globl	feq
 	.type	feq,@function
 feq:                                    # @feq
@@ -16,9 +16,9 @@ feq:                                    # @feq
 	.endfunc
 .Lfunc_end0:
 	.size	feq, .Lfunc_end0-feq
-
+                                        # -- End function
 	.section	.text.fne,"ax",@progbits
-	.hidden	fne
+	.hidden	fne                     # -- Begin function fne
 	.globl	fne
 	.type	fne,@function
 fne:                                    # @fne
@@ -33,9 +33,9 @@ fne:                                    # @fne
 	.endfunc
 .Lfunc_end1:
 	.size	fne, .Lfunc_end1-fne
-
+                                        # -- End function
 	.section	.text.flt,"ax",@progbits
-	.hidden	flt
+	.hidden	flt                     # -- Begin function flt
 	.globl	flt
 	.type	flt,@function
 flt:                                    # @flt
@@ -50,9 +50,9 @@ flt:                                    # @flt
 	.endfunc
 .Lfunc_end2:
 	.size	flt, .Lfunc_end2-flt
-
+                                        # -- End function
 	.section	.text.fge,"ax",@progbits
-	.hidden	fge
+	.hidden	fge                     # -- Begin function fge
 	.globl	fge
 	.type	fge,@function
 fge:                                    # @fge
@@ -67,9 +67,9 @@ fge:                                    # @fge
 	.endfunc
 .Lfunc_end3:
 	.size	fge, .Lfunc_end3-fge
-
+                                        # -- End function
 	.section	.text.fgt,"ax",@progbits
-	.hidden	fgt
+	.hidden	fgt                     # -- Begin function fgt
 	.globl	fgt
 	.type	fgt,@function
 fgt:                                    # @fgt
@@ -84,9 +84,9 @@ fgt:                                    # @fgt
 	.endfunc
 .Lfunc_end4:
 	.size	fgt, .Lfunc_end4-fgt
-
+                                        # -- End function
 	.section	.text.fle,"ax",@progbits
-	.hidden	fle
+	.hidden	fle                     # -- Begin function fle
 	.globl	fle
 	.type	fle,@function
 fle:                                    # @fle
@@ -101,9 +101,9 @@ fle:                                    # @fle
 	.endfunc
 .Lfunc_end5:
 	.size	fle, .Lfunc_end5-fle
-
+                                        # -- End function
 	.section	.text.fltu,"ax",@progbits
-	.hidden	fltu
+	.hidden	fltu                    # -- Begin function fltu
 	.globl	fltu
 	.type	fltu,@function
 fltu:                                   # @fltu
@@ -118,9 +118,9 @@ fltu:                                   # @fltu
 	.endfunc
 .Lfunc_end6:
 	.size	fltu, .Lfunc_end6-fltu
-
+                                        # -- End function
 	.section	.text.fgeu,"ax",@progbits
-	.hidden	fgeu
+	.hidden	fgeu                    # -- Begin function fgeu
 	.globl	fgeu
 	.type	fgeu,@function
 fgeu:                                   # @fgeu
@@ -135,9 +135,9 @@ fgeu:                                   # @fgeu
 	.endfunc
 .Lfunc_end7:
 	.size	fgeu, .Lfunc_end7-fgeu
-
+                                        # -- End function
 	.section	.text.fgtu,"ax",@progbits
-	.hidden	fgtu
+	.hidden	fgtu                    # -- Begin function fgtu
 	.globl	fgtu
 	.type	fgtu,@function
 fgtu:                                   # @fgtu
@@ -152,9 +152,9 @@ fgtu:                                   # @fgtu
 	.endfunc
 .Lfunc_end8:
 	.size	fgtu, .Lfunc_end8-fgtu
-
+                                        # -- End function
 	.section	.text.fleu,"ax",@progbits
-	.hidden	fleu
+	.hidden	fleu                    # -- Begin function fleu
 	.globl	fleu
 	.type	fleu,@function
 fleu:                                   # @fleu
@@ -169,9 +169,9 @@ fleu:                                   # @fleu
 	.endfunc
 .Lfunc_end9:
 	.size	fleu, .Lfunc_end9-fleu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -187,11 +187,11 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push45=, 3
-	i32.shl 	$push0=, $0, $pop45
+	i32.shl 	$push1=, $0, $pop45
 	i32.const	$push44=, args
-	i32.add 	$push1=, $pop0, $pop44
-	i64.load	$1=, 0($pop1)
-	i32.const	$3=, 0
+	i32.add 	$push2=, $pop1, $pop44
+	i64.load	$1=, 0($pop2)
+	i32.const	$3=, -1
 .LBB10_2:                               # %for.body3
                                         #   Parent Loop BB10_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
@@ -202,108 +202,108 @@ main:                                   # @main
 	tee_local	$push48=, $5=, $pop49
 	i64.eq  	$push47=, $1, $pop48
 	tee_local	$push46=, $6=, $pop47
-	i32.select	$push2=, $pop51, $pop50, $pop46
-	i32.load	$push3=, 0($4)
-	i32.ne  	$push4=, $pop2, $pop3
-	br_if   	2, $pop4        # 2: down to label0
+	i32.select	$push3=, $pop51, $pop50, $pop46
+	i32.load	$push4=, 0($4)
+	i32.ne  	$push5=, $pop3, $pop4
+	br_if   	2, $pop5        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push54=, 140
 	i32.const	$push53=, 13
-	i32.select	$push5=, $pop54, $pop53, $6
+	i32.select	$push6=, $pop54, $pop53, $6
 	i32.const	$push52=, 4
-	i32.add 	$push6=, $4, $pop52
-	i32.load	$push7=, 0($pop6)
-	i32.ne  	$push8=, $pop5, $pop7
-	br_if   	2, $pop8        # 2: down to label0
+	i32.add 	$push7=, $4, $pop52
+	i32.load	$push8=, 0($pop7)
+	i32.ne  	$push9=, $pop6, $pop8
+	br_if   	2, $pop9        # 2: down to label0
 # BB#4:                                 # %if.end10
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push59=, 13
 	i32.const	$push58=, 140
 	i64.lt_s	$push57=, $1, $5
 	tee_local	$push56=, $6=, $pop57
-	i32.select	$push9=, $pop59, $pop58, $pop56
+	i32.select	$push10=, $pop59, $pop58, $pop56
 	i32.const	$push55=, 8
-	i32.add 	$push10=, $4, $pop55
-	i32.load	$push11=, 0($pop10)
-	i32.ne  	$push12=, $pop9, $pop11
-	br_if   	2, $pop12       # 2: down to label0
+	i32.add 	$push11=, $4, $pop55
+	i32.load	$push12=, 0($pop11)
+	i32.ne  	$push13=, $pop10, $pop12
+	br_if   	2, $pop13       # 2: down to label0
 # BB#5:                                 # %if.end15
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push62=, 140
 	i32.const	$push61=, 13
-	i32.select	$push13=, $pop62, $pop61, $6
+	i32.select	$push14=, $pop62, $pop61, $6
 	i32.const	$push60=, 12
-	i32.add 	$push14=, $4, $pop60
-	i32.load	$push15=, 0($pop14)
-	i32.ne  	$push16=, $pop13, $pop15
-	br_if   	2, $pop16       # 2: down to label0
+	i32.add 	$push15=, $4, $pop60
+	i32.load	$push16=, 0($pop15)
+	i32.ne  	$push17=, $pop14, $pop16
+	br_if   	2, $pop17       # 2: down to label0
 # BB#6:                                 # %if.end20
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push67=, 13
 	i32.const	$push66=, 140
 	i64.gt_s	$push65=, $1, $5
 	tee_local	$push64=, $6=, $pop65
-	i32.select	$push17=, $pop67, $pop66, $pop64
+	i32.select	$push18=, $pop67, $pop66, $pop64
 	i32.const	$push63=, 16
-	i32.add 	$push18=, $4, $pop63
-	i32.load	$push19=, 0($pop18)
-	i32.ne  	$push20=, $pop17, $pop19
-	br_if   	2, $pop20       # 2: down to label0
+	i32.add 	$push19=, $4, $pop63
+	i32.load	$push20=, 0($pop19)
+	i32.ne  	$push21=, $pop18, $pop20
+	br_if   	2, $pop21       # 2: down to label0
 # BB#7:                                 # %if.end25
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push70=, 140
 	i32.const	$push69=, 13
-	i32.select	$push21=, $pop70, $pop69, $6
+	i32.select	$push22=, $pop70, $pop69, $6
 	i32.const	$push68=, 20
-	i32.add 	$push22=, $4, $pop68
-	i32.load	$push23=, 0($pop22)
-	i32.ne  	$push24=, $pop21, $pop23
-	br_if   	2, $pop24       # 2: down to label0
+	i32.add 	$push23=, $4, $pop68
+	i32.load	$push24=, 0($pop23)
+	i32.ne  	$push25=, $pop22, $pop24
+	br_if   	2, $pop25       # 2: down to label0
 # BB#8:                                 # %if.end30
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push75=, 13
 	i32.const	$push74=, 140
 	i64.lt_u	$push73=, $1, $5
 	tee_local	$push72=, $6=, $pop73
-	i32.select	$push25=, $pop75, $pop74, $pop72
+	i32.select	$push26=, $pop75, $pop74, $pop72
 	i32.const	$push71=, 24
-	i32.add 	$push26=, $4, $pop71
-	i32.load	$push27=, 0($pop26)
-	i32.ne  	$push28=, $pop25, $pop27
-	br_if   	2, $pop28       # 2: down to label0
+	i32.add 	$push27=, $4, $pop71
+	i32.load	$push28=, 0($pop27)
+	i32.ne  	$push29=, $pop26, $pop28
+	br_if   	2, $pop29       # 2: down to label0
 # BB#9:                                 # %if.end35
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push78=, 140
 	i32.const	$push77=, 13
-	i32.select	$push29=, $pop78, $pop77, $6
+	i32.select	$push30=, $pop78, $pop77, $6
 	i32.const	$push76=, 28
-	i32.add 	$push30=, $4, $pop76
-	i32.load	$push31=, 0($pop30)
-	i32.ne  	$push32=, $pop29, $pop31
-	br_if   	2, $pop32       # 2: down to label0
+	i32.add 	$push31=, $4, $pop76
+	i32.load	$push32=, 0($pop31)
+	i32.ne  	$push33=, $pop30, $pop32
+	br_if   	2, $pop33       # 2: down to label0
 # BB#10:                                # %if.end40
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push83=, 13
 	i32.const	$push82=, 140
 	i64.gt_u	$push81=, $1, $5
 	tee_local	$push80=, $6=, $pop81
-	i32.select	$push33=, $pop83, $pop82, $pop80
+	i32.select	$push34=, $pop83, $pop82, $pop80
 	i32.const	$push79=, 32
-	i32.add 	$push34=, $4, $pop79
-	i32.load	$push35=, 0($pop34)
-	i32.ne  	$push36=, $pop33, $pop35
-	br_if   	2, $pop36       # 2: down to label0
+	i32.add 	$push35=, $4, $pop79
+	i32.load	$push36=, 0($pop35)
+	i32.ne  	$push37=, $pop34, $pop36
+	br_if   	2, $pop37       # 2: down to label0
 # BB#11:                                # %if.end45
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push86=, 140
 	i32.const	$push85=, 13
-	i32.select	$push37=, $pop86, $pop85, $6
+	i32.select	$push38=, $pop86, $pop85, $6
 	i32.const	$push84=, 36
-	i32.add 	$push38=, $4, $pop84
-	i32.load	$push39=, 0($pop38)
-	i32.ne  	$push40=, $pop37, $pop39
-	br_if   	2, $pop40       # 2: down to label0
+	i32.add 	$push39=, $4, $pop84
+	i32.load	$push40=, 0($pop39)
+	i32.ne  	$push41=, $pop38, $pop40
+	br_if   	2, $pop41       # 2: down to label0
 # BB#12:                                # %if.end50
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push92=, 40
@@ -313,31 +313,31 @@ main:                                   # @main
 	i32.const	$push90=, 1
 	i32.add 	$push89=, $3, $pop90
 	tee_local	$push88=, $3=, $pop89
-	i32.const	$push87=, 8
-	i32.lt_s	$push41=, $pop88, $pop87
-	br_if   	0, $pop41       # 0: up to label2
+	i32.const	$push87=, 7
+	i32.lt_u	$push42=, $pop88, $pop87
+	br_if   	0, $pop42       # 0: up to label2
 # BB#13:                                # %for.end
                                         #   in Loop: Header=BB10_1 Depth=1
 	end_loop
-	i32.const	$push96=, 1
-	i32.add 	$push95=, $0, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 8
-	i32.lt_s	$push42=, $pop94, $pop93
-	br_if   	0, $pop42       # 0: up to label1
+	i32.const	$push94=, 7
+	i32.lt_u	$2=, $0, $pop94
+	i32.const	$push93=, 1
+	i32.add 	$push0=, $0, $pop93
+	copy_local	$0=, $pop0
+	br_if   	0, $2           # 0: up to label1
 # BB#14:                                # %for.end53
 	end_loop
 	i32.const	$push43=, 0
 	call    	exit@FUNCTION, $pop43
 	unreachable
-.LBB10_15:                              # %if.then49
+.LBB10_15:                              # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	main, .Lfunc_end10-main
-
+                                        # -- End function
 	.hidden	args                    # @args
 	.type	args,@object
 	.section	.data.args,"aw",@progbits
@@ -1003,6 +1003,6 @@ correct_results:
 	.size	correct_results, 2560
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/cmpsf-1.c.s b/test/torture-s/cmpsf-1.c.s
index 313330001..8f5112331 100644
--- a/test/torture-s/cmpsf-1.c.s
+++ b/test/torture-s/cmpsf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cmpsf-1.c"
+	.file	"cmpsf-1.c"
 	.section	.text.feq,"ax",@progbits
-	.hidden	feq
+	.hidden	feq                     # -- Begin function feq
 	.globl	feq
 	.type	feq,@function
 feq:                                    # @feq
@@ -16,9 +16,9 @@ feq:                                    # @feq
 	.endfunc
 .Lfunc_end0:
 	.size	feq, .Lfunc_end0-feq
-
+                                        # -- End function
 	.section	.text.fne,"ax",@progbits
-	.hidden	fne
+	.hidden	fne                     # -- Begin function fne
 	.globl	fne
 	.type	fne,@function
 fne:                                    # @fne
@@ -33,9 +33,9 @@ fne:                                    # @fne
 	.endfunc
 .Lfunc_end1:
 	.size	fne, .Lfunc_end1-fne
-
+                                        # -- End function
 	.section	.text.flt,"ax",@progbits
-	.hidden	flt
+	.hidden	flt                     # -- Begin function flt
 	.globl	flt
 	.type	flt,@function
 flt:                                    # @flt
@@ -50,9 +50,9 @@ flt:                                    # @flt
 	.endfunc
 .Lfunc_end2:
 	.size	flt, .Lfunc_end2-flt
-
+                                        # -- End function
 	.section	.text.fge,"ax",@progbits
-	.hidden	fge
+	.hidden	fge                     # -- Begin function fge
 	.globl	fge
 	.type	fge,@function
 fge:                                    # @fge
@@ -71,9 +71,9 @@ fge:                                    # @fge
 	.endfunc
 .Lfunc_end3:
 	.size	fge, .Lfunc_end3-fge
-
+                                        # -- End function
 	.section	.text.fgt,"ax",@progbits
-	.hidden	fgt
+	.hidden	fgt                     # -- Begin function fgt
 	.globl	fgt
 	.type	fgt,@function
 fgt:                                    # @fgt
@@ -88,9 +88,9 @@ fgt:                                    # @fgt
 	.endfunc
 .Lfunc_end4:
 	.size	fgt, .Lfunc_end4-fgt
-
+                                        # -- End function
 	.section	.text.fle,"ax",@progbits
-	.hidden	fle
+	.hidden	fle                     # -- Begin function fle
 	.globl	fle
 	.type	fle,@function
 fle:                                    # @fle
@@ -109,9 +109,9 @@ fle:                                    # @fle
 	.endfunc
 .Lfunc_end5:
 	.size	fle, .Lfunc_end5-fle
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -127,11 +127,11 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push35=, 2
-	i32.shl 	$push0=, $0, $pop35
+	i32.shl 	$push1=, $0, $pop35
 	i32.const	$push34=, args
-	i32.add 	$push1=, $pop0, $pop34
-	f32.load	$1=, 0($pop1)
-	i32.const	$3=, 0
+	i32.add 	$push2=, $pop1, $pop34
+	f32.load	$1=, 0($pop2)
+	i32.const	$3=, -1
 .LBB6_2:                                # %for.body3
                                         #   Parent Loop BB6_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
@@ -140,72 +140,72 @@ main:                                   # @main
 	i32.const	$push38=, 140
 	f32.load	$push37=, 0($2)
 	tee_local	$push36=, $5=, $pop37
-	f32.eq  	$push2=, $1, $pop36
-	i32.select	$push3=, $pop39, $pop38, $pop2
-	i32.load	$push4=, 0($4)
-	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	2, $pop5        # 2: down to label0
+	f32.eq  	$push3=, $1, $pop36
+	i32.select	$push4=, $pop39, $pop38, $pop3
+	i32.load	$push5=, 0($4)
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	2, $pop6        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push42=, 13
 	i32.const	$push41=, 140
-	f32.ne  	$push6=, $1, $5
-	i32.select	$push7=, $pop42, $pop41, $pop6
+	f32.ne  	$push7=, $1, $5
+	i32.select	$push8=, $pop42, $pop41, $pop7
 	i32.const	$push40=, 4
-	i32.add 	$push8=, $4, $pop40
-	i32.load	$push9=, 0($pop8)
-	i32.ne  	$push10=, $pop7, $pop9
-	br_if   	2, $pop10       # 2: down to label0
+	i32.add 	$push9=, $4, $pop40
+	i32.load	$push10=, 0($pop9)
+	i32.ne  	$push11=, $pop8, $pop10
+	br_if   	2, $pop11       # 2: down to label0
 # BB#4:                                 # %if.end10
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push47=, 13
 	i32.const	$push46=, 140
 	f32.lt  	$push45=, $1, $5
 	tee_local	$push44=, $6=, $pop45
-	i32.select	$push11=, $pop47, $pop46, $pop44
+	i32.select	$push12=, $pop47, $pop46, $pop44
 	i32.const	$push43=, 8
-	i32.add 	$push12=, $4, $pop43
-	i32.load	$push13=, 0($pop12)
-	i32.ne  	$push14=, $pop11, $pop13
-	br_if   	2, $pop14       # 2: down to label0
+	i32.add 	$push13=, $4, $pop43
+	i32.load	$push14=, 0($pop13)
+	i32.ne  	$push15=, $pop12, $pop14
+	br_if   	2, $pop15       # 2: down to label0
 # BB#5:                                 # %if.end15
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push52=, 140
 	i32.const	$push51=, 13
-	f32.ne  	$push16=, $1, $1
-	f32.ne  	$push15=, $5, $5
-	i32.or  	$push50=, $pop16, $pop15
+	f32.ne  	$push17=, $1, $1
+	f32.ne  	$push16=, $5, $5
+	i32.or  	$push50=, $pop17, $pop16
 	tee_local	$push49=, $7=, $pop50
-	i32.or  	$push17=, $6, $pop49
-	i32.select	$push18=, $pop52, $pop51, $pop17
+	i32.or  	$push18=, $6, $pop49
+	i32.select	$push19=, $pop52, $pop51, $pop18
 	i32.const	$push48=, 12
-	i32.add 	$push19=, $4, $pop48
-	i32.load	$push20=, 0($pop19)
-	i32.ne  	$push21=, $pop18, $pop20
-	br_if   	2, $pop21       # 2: down to label0
+	i32.add 	$push20=, $4, $pop48
+	i32.load	$push21=, 0($pop20)
+	i32.ne  	$push22=, $pop19, $pop21
+	br_if   	2, $pop22       # 2: down to label0
 # BB#6:                                 # %if.end20
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push57=, 13
 	i32.const	$push56=, 140
 	f32.gt  	$push55=, $1, $5
 	tee_local	$push54=, $6=, $pop55
-	i32.select	$push22=, $pop57, $pop56, $pop54
+	i32.select	$push23=, $pop57, $pop56, $pop54
 	i32.const	$push53=, 16
-	i32.add 	$push23=, $4, $pop53
-	i32.load	$push24=, 0($pop23)
-	i32.ne  	$push25=, $pop22, $pop24
-	br_if   	2, $pop25       # 2: down to label0
+	i32.add 	$push24=, $4, $pop53
+	i32.load	$push25=, 0($pop24)
+	i32.ne  	$push26=, $pop23, $pop25
+	br_if   	2, $pop26       # 2: down to label0
 # BB#7:                                 # %if.end25
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push60=, 140
 	i32.const	$push59=, 13
-	i32.or  	$push26=, $6, $7
-	i32.select	$push27=, $pop60, $pop59, $pop26
+	i32.or  	$push27=, $6, $7
+	i32.select	$push28=, $pop60, $pop59, $pop27
 	i32.const	$push58=, 20
-	i32.add 	$push28=, $4, $pop58
-	i32.load	$push29=, 0($pop28)
-	i32.ne  	$push30=, $pop27, $pop29
-	br_if   	2, $pop30       # 2: down to label0
+	i32.add 	$push29=, $4, $pop58
+	i32.load	$push30=, 0($pop29)
+	i32.ne  	$push31=, $pop28, $pop30
+	br_if   	2, $pop31       # 2: down to label0
 # BB#8:                                 # %if.end30
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push66=, 24
@@ -215,31 +215,31 @@ main:                                   # @main
 	i32.const	$push64=, 1
 	i32.add 	$push63=, $3, $pop64
 	tee_local	$push62=, $3=, $pop63
-	i32.const	$push61=, 8
-	i32.lt_s	$push31=, $pop62, $pop61
-	br_if   	0, $pop31       # 0: up to label2
+	i32.const	$push61=, 7
+	i32.lt_u	$push32=, $pop62, $pop61
+	br_if   	0, $pop32       # 0: up to label2
 # BB#9:                                 # %for.end
                                         #   in Loop: Header=BB6_1 Depth=1
 	end_loop
-	i32.const	$push70=, 1
-	i32.add 	$push69=, $0, $pop70
-	tee_local	$push68=, $0=, $pop69
-	i32.const	$push67=, 8
-	i32.lt_s	$push32=, $pop68, $pop67
-	br_if   	0, $pop32       # 0: up to label1
+	i32.const	$push68=, 7
+	i32.lt_u	$2=, $0, $pop68
+	i32.const	$push67=, 1
+	i32.add 	$push0=, $0, $pop67
+	copy_local	$0=, $pop0
+	br_if   	0, $2           # 0: up to label1
 # BB#10:                                # %for.end33
 	end_loop
 	i32.const	$push33=, 0
 	call    	exit@FUNCTION, $pop33
 	unreachable
-.LBB6_11:                               # %if.then29
+.LBB6_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
-
+                                        # -- End function
 	.hidden	args                    # @args
 	.type	args,@object
 	.section	.data.args,"aw",@progbits
@@ -649,6 +649,6 @@ correct_results:
 	.size	correct_results, 1536
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/cmpsi-1.c.s b/test/torture-s/cmpsi-1.c.s
index 15bac462a..05795d2b2 100644
--- a/test/torture-s/cmpsi-1.c.s
+++ b/test/torture-s/cmpsi-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cmpsi-1.c"
+	.file	"cmpsi-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -23,9 +23,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -47,9 +47,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.dummy,"ax",@progbits
-	.hidden	dummy
+	.hidden	dummy                   # -- Begin function dummy
 	.globl	dummy
 	.type	dummy,@function
 dummy:                                  # @dummy
@@ -61,9 +61,9 @@ dummy:                                  # @dummy
 	.endfunc
 .Lfunc_end2:
 	.size	dummy, .Lfunc_end2-dummy
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,8 +75,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/cmpsi-2.c.s b/test/torture-s/cmpsi-2.c.s
index 61e293c69..9bdf4825b 100644
--- a/test/torture-s/cmpsi-2.c.s
+++ b/test/torture-s/cmpsi-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c"
+	.file	"cmpsi-2.c"
 	.section	.text.feq,"ax",@progbits
-	.hidden	feq
+	.hidden	feq                     # -- Begin function feq
 	.globl	feq
 	.type	feq,@function
 feq:                                    # @feq
@@ -16,9 +16,9 @@ feq:                                    # @feq
 	.endfunc
 .Lfunc_end0:
 	.size	feq, .Lfunc_end0-feq
-
+                                        # -- End function
 	.section	.text.fne,"ax",@progbits
-	.hidden	fne
+	.hidden	fne                     # -- Begin function fne
 	.globl	fne
 	.type	fne,@function
 fne:                                    # @fne
@@ -33,9 +33,9 @@ fne:                                    # @fne
 	.endfunc
 .Lfunc_end1:
 	.size	fne, .Lfunc_end1-fne
-
+                                        # -- End function
 	.section	.text.flt,"ax",@progbits
-	.hidden	flt
+	.hidden	flt                     # -- Begin function flt
 	.globl	flt
 	.type	flt,@function
 flt:                                    # @flt
@@ -50,9 +50,9 @@ flt:                                    # @flt
 	.endfunc
 .Lfunc_end2:
 	.size	flt, .Lfunc_end2-flt
-
+                                        # -- End function
 	.section	.text.fge,"ax",@progbits
-	.hidden	fge
+	.hidden	fge                     # -- Begin function fge
 	.globl	fge
 	.type	fge,@function
 fge:                                    # @fge
@@ -67,9 +67,9 @@ fge:                                    # @fge
 	.endfunc
 .Lfunc_end3:
 	.size	fge, .Lfunc_end3-fge
-
+                                        # -- End function
 	.section	.text.fgt,"ax",@progbits
-	.hidden	fgt
+	.hidden	fgt                     # -- Begin function fgt
 	.globl	fgt
 	.type	fgt,@function
 fgt:                                    # @fgt
@@ -84,9 +84,9 @@ fgt:                                    # @fgt
 	.endfunc
 .Lfunc_end4:
 	.size	fgt, .Lfunc_end4-fgt
-
+                                        # -- End function
 	.section	.text.fle,"ax",@progbits
-	.hidden	fle
+	.hidden	fle                     # -- Begin function fle
 	.globl	fle
 	.type	fle,@function
 fle:                                    # @fle
@@ -101,9 +101,9 @@ fle:                                    # @fle
 	.endfunc
 .Lfunc_end5:
 	.size	fle, .Lfunc_end5-fle
-
+                                        # -- End function
 	.section	.text.fltu,"ax",@progbits
-	.hidden	fltu
+	.hidden	fltu                    # -- Begin function fltu
 	.globl	fltu
 	.type	fltu,@function
 fltu:                                   # @fltu
@@ -118,9 +118,9 @@ fltu:                                   # @fltu
 	.endfunc
 .Lfunc_end6:
 	.size	fltu, .Lfunc_end6-fltu
-
+                                        # -- End function
 	.section	.text.fgeu,"ax",@progbits
-	.hidden	fgeu
+	.hidden	fgeu                    # -- Begin function fgeu
 	.globl	fgeu
 	.type	fgeu,@function
 fgeu:                                   # @fgeu
@@ -135,9 +135,9 @@ fgeu:                                   # @fgeu
 	.endfunc
 .Lfunc_end7:
 	.size	fgeu, .Lfunc_end7-fgeu
-
+                                        # -- End function
 	.section	.text.fgtu,"ax",@progbits
-	.hidden	fgtu
+	.hidden	fgtu                    # -- Begin function fgtu
 	.globl	fgtu
 	.type	fgtu,@function
 fgtu:                                   # @fgtu
@@ -152,9 +152,9 @@ fgtu:                                   # @fgtu
 	.endfunc
 .Lfunc_end8:
 	.size	fgtu, .Lfunc_end8-fgtu
-
+                                        # -- End function
 	.section	.text.fleu,"ax",@progbits
-	.hidden	fleu
+	.hidden	fleu                    # -- Begin function fleu
 	.globl	fleu
 	.type	fleu,@function
 fleu:                                   # @fleu
@@ -169,9 +169,9 @@ fleu:                                   # @fleu
 	.endfunc
 .Lfunc_end9:
 	.size	fleu, .Lfunc_end9-fleu
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -187,11 +187,11 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push45=, 2
-	i32.shl 	$push0=, $0, $pop45
+	i32.shl 	$push1=, $0, $pop45
 	i32.const	$push44=, args
-	i32.add 	$push1=, $pop0, $pop44
-	i32.load	$1=, 0($pop1)
-	i32.const	$3=, 0
+	i32.add 	$push2=, $pop1, $pop44
+	i32.load	$1=, 0($pop2)
+	i32.const	$3=, -1
 .LBB10_2:                               # %for.body3
                                         #   Parent Loop BB10_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
@@ -202,108 +202,108 @@ main:                                   # @main
 	tee_local	$push48=, $5=, $pop49
 	i32.eq  	$push47=, $1, $pop48
 	tee_local	$push46=, $6=, $pop47
-	i32.select	$push2=, $pop51, $pop50, $pop46
-	i32.load	$push3=, 0($4)
-	i32.ne  	$push4=, $pop2, $pop3
-	br_if   	2, $pop4        # 2: down to label0
+	i32.select	$push3=, $pop51, $pop50, $pop46
+	i32.load	$push4=, 0($4)
+	i32.ne  	$push5=, $pop3, $pop4
+	br_if   	2, $pop5        # 2: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push54=, 140
 	i32.const	$push53=, 13
-	i32.select	$push5=, $pop54, $pop53, $6
+	i32.select	$push6=, $pop54, $pop53, $6
 	i32.const	$push52=, 4
-	i32.add 	$push6=, $4, $pop52
-	i32.load	$push7=, 0($pop6)
-	i32.ne  	$push8=, $pop5, $pop7
-	br_if   	2, $pop8        # 2: down to label0
+	i32.add 	$push7=, $4, $pop52
+	i32.load	$push8=, 0($pop7)
+	i32.ne  	$push9=, $pop6, $pop8
+	br_if   	2, $pop9        # 2: down to label0
 # BB#4:                                 # %if.end10
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push59=, 13
 	i32.const	$push58=, 140
 	i32.lt_s	$push57=, $1, $5
 	tee_local	$push56=, $6=, $pop57
-	i32.select	$push9=, $pop59, $pop58, $pop56
+	i32.select	$push10=, $pop59, $pop58, $pop56
 	i32.const	$push55=, 8
-	i32.add 	$push10=, $4, $pop55
-	i32.load	$push11=, 0($pop10)
-	i32.ne  	$push12=, $pop9, $pop11
-	br_if   	2, $pop12       # 2: down to label0
+	i32.add 	$push11=, $4, $pop55
+	i32.load	$push12=, 0($pop11)
+	i32.ne  	$push13=, $pop10, $pop12
+	br_if   	2, $pop13       # 2: down to label0
 # BB#5:                                 # %if.end15
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push62=, 140
 	i32.const	$push61=, 13
-	i32.select	$push13=, $pop62, $pop61, $6
+	i32.select	$push14=, $pop62, $pop61, $6
 	i32.const	$push60=, 12
-	i32.add 	$push14=, $4, $pop60
-	i32.load	$push15=, 0($pop14)
-	i32.ne  	$push16=, $pop13, $pop15
-	br_if   	2, $pop16       # 2: down to label0
+	i32.add 	$push15=, $4, $pop60
+	i32.load	$push16=, 0($pop15)
+	i32.ne  	$push17=, $pop14, $pop16
+	br_if   	2, $pop17       # 2: down to label0
 # BB#6:                                 # %if.end20
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push67=, 13
 	i32.const	$push66=, 140
 	i32.gt_s	$push65=, $1, $5
 	tee_local	$push64=, $6=, $pop65
-	i32.select	$push17=, $pop67, $pop66, $pop64
+	i32.select	$push18=, $pop67, $pop66, $pop64
 	i32.const	$push63=, 16
-	i32.add 	$push18=, $4, $pop63
-	i32.load	$push19=, 0($pop18)
-	i32.ne  	$push20=, $pop17, $pop19
-	br_if   	2, $pop20       # 2: down to label0
+	i32.add 	$push19=, $4, $pop63
+	i32.load	$push20=, 0($pop19)
+	i32.ne  	$push21=, $pop18, $pop20
+	br_if   	2, $pop21       # 2: down to label0
 # BB#7:                                 # %if.end25
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push70=, 140
 	i32.const	$push69=, 13
-	i32.select	$push21=, $pop70, $pop69, $6
+	i32.select	$push22=, $pop70, $pop69, $6
 	i32.const	$push68=, 20
-	i32.add 	$push22=, $4, $pop68
-	i32.load	$push23=, 0($pop22)
-	i32.ne  	$push24=, $pop21, $pop23
-	br_if   	2, $pop24       # 2: down to label0
+	i32.add 	$push23=, $4, $pop68
+	i32.load	$push24=, 0($pop23)
+	i32.ne  	$push25=, $pop22, $pop24
+	br_if   	2, $pop25       # 2: down to label0
 # BB#8:                                 # %if.end30
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push75=, 13
 	i32.const	$push74=, 140
 	i32.lt_u	$push73=, $1, $5
 	tee_local	$push72=, $6=, $pop73
-	i32.select	$push25=, $pop75, $pop74, $pop72
+	i32.select	$push26=, $pop75, $pop74, $pop72
 	i32.const	$push71=, 24
-	i32.add 	$push26=, $4, $pop71
-	i32.load	$push27=, 0($pop26)
-	i32.ne  	$push28=, $pop25, $pop27
-	br_if   	2, $pop28       # 2: down to label0
+	i32.add 	$push27=, $4, $pop71
+	i32.load	$push28=, 0($pop27)
+	i32.ne  	$push29=, $pop26, $pop28
+	br_if   	2, $pop29       # 2: down to label0
 # BB#9:                                 # %if.end35
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push78=, 140
 	i32.const	$push77=, 13
-	i32.select	$push29=, $pop78, $pop77, $6
+	i32.select	$push30=, $pop78, $pop77, $6
 	i32.const	$push76=, 28
-	i32.add 	$push30=, $4, $pop76
-	i32.load	$push31=, 0($pop30)
-	i32.ne  	$push32=, $pop29, $pop31
-	br_if   	2, $pop32       # 2: down to label0
+	i32.add 	$push31=, $4, $pop76
+	i32.load	$push32=, 0($pop31)
+	i32.ne  	$push33=, $pop30, $pop32
+	br_if   	2, $pop33       # 2: down to label0
 # BB#10:                                # %if.end40
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push83=, 13
 	i32.const	$push82=, 140
 	i32.gt_u	$push81=, $1, $5
 	tee_local	$push80=, $5=, $pop81
-	i32.select	$push33=, $pop83, $pop82, $pop80
+	i32.select	$push34=, $pop83, $pop82, $pop80
 	i32.const	$push79=, 32
-	i32.add 	$push34=, $4, $pop79
-	i32.load	$push35=, 0($pop34)
-	i32.ne  	$push36=, $pop33, $pop35
-	br_if   	2, $pop36       # 2: down to label0
+	i32.add 	$push35=, $4, $pop79
+	i32.load	$push36=, 0($pop35)
+	i32.ne  	$push37=, $pop34, $pop36
+	br_if   	2, $pop37       # 2: down to label0
 # BB#11:                                # %if.end45
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push86=, 140
 	i32.const	$push85=, 13
-	i32.select	$push37=, $pop86, $pop85, $5
+	i32.select	$push38=, $pop86, $pop85, $5
 	i32.const	$push84=, 36
-	i32.add 	$push38=, $4, $pop84
-	i32.load	$push39=, 0($pop38)
-	i32.ne  	$push40=, $pop37, $pop39
-	br_if   	2, $pop40       # 2: down to label0
+	i32.add 	$push39=, $4, $pop84
+	i32.load	$push40=, 0($pop39)
+	i32.ne  	$push41=, $pop38, $pop40
+	br_if   	2, $pop41       # 2: down to label0
 # BB#12:                                # %if.end50
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push92=, 40
@@ -313,31 +313,31 @@ main:                                   # @main
 	i32.const	$push90=, 1
 	i32.add 	$push89=, $3, $pop90
 	tee_local	$push88=, $3=, $pop89
-	i32.const	$push87=, 8
-	i32.lt_s	$push41=, $pop88, $pop87
-	br_if   	0, $pop41       # 0: up to label2
+	i32.const	$push87=, 7
+	i32.lt_u	$push42=, $pop88, $pop87
+	br_if   	0, $pop42       # 0: up to label2
 # BB#13:                                # %for.end
                                         #   in Loop: Header=BB10_1 Depth=1
 	end_loop
-	i32.const	$push96=, 1
-	i32.add 	$push95=, $0, $pop96
-	tee_local	$push94=, $0=, $pop95
-	i32.const	$push93=, 8
-	i32.lt_s	$push42=, $pop94, $pop93
-	br_if   	0, $pop42       # 0: up to label1
+	i32.const	$push94=, 7
+	i32.lt_u	$1=, $0, $pop94
+	i32.const	$push93=, 1
+	i32.add 	$push0=, $0, $pop93
+	copy_local	$0=, $pop0
+	br_if   	0, $1           # 0: up to label1
 # BB#14:                                # %for.end53
 	end_loop
 	i32.const	$push43=, 0
 	call    	exit@FUNCTION, $pop43
 	unreachable
-.LBB10_15:                              # %if.then49
+.LBB10_15:                              # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	main, .Lfunc_end10-main
-
+                                        # -- End function
 	.hidden	args                    # @args
 	.type	args,@object
 	.section	.data.args,"aw",@progbits
@@ -1003,6 +1003,6 @@ correct_results:
 	.size	correct_results, 2560
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/compare-1.c.s b/test/torture-s/compare-1.c.s
index 87d6a2d68..8ba7427c2 100644
--- a/test/torture-s/compare-1.c.s
+++ b/test/torture-s/compare-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/compare-1.c"
+	.file	"compare-1.c"
 	.section	.text.ieq,"ax",@progbits
-	.hidden	ieq
+	.hidden	ieq                     # -- Begin function ieq
 	.globl	ieq
 	.type	ieq,@function
 ieq:                                    # @ieq
@@ -12,80 +12,68 @@ ieq:                                    # @ieq
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.ne  	$push1=, $0, $1
 	tee_local	$push0=, $0=, $pop1
 	i32.eqz 	$push2=, $pop0
-	br_if   	0, $pop2        # 0: down to label4
+	br_if   	0, $pop2        # 0: down to label3
 # BB#1:                                 # %if.else
-	i32.eqz 	$push3=, $2
-	br_if   	1, $pop3        # 1: down to label3
-	br      	2               # 2: down to label2
+	br_if   	2, $2           # 2: down to label1
+	br      	1               # 1: down to label2
 .LBB0_2:                                # %if.then
-	end_block                       # label4:
-	i32.eqz 	$push4=, $2
-	br_if   	2, $pop4        # 2: down to label1
-.LBB0_3:                                # %if.end6
 	end_block                       # label3:
+	i32.eqz 	$push3=, $2
+	br_if   	1, $pop3        # 1: down to label1
+.LBB0_3:                                # %if.end6
+	end_block                       # label2:
 	block   	
 	block   	
-	br_if   	0, $0           # 0: down to label6
+	br_if   	0, $0           # 0: down to label5
 # BB#4:                                 # %if.then10
-	br_if   	1, $2           # 1: down to label5
-# BB#5:                                 # %if.then12
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_6:                                # %if.else14
-	end_block                       # label6:
-	br_if   	1, $2           # 1: down to label2
-.LBB0_7:                                # %if.end18
+	i32.eqz 	$push4=, $2
+	br_if   	2, $pop4        # 2: down to label1
+	br      	1               # 1: down to label4
+.LBB0_5:                                # %if.else14
 	end_block                       # label5:
+	br_if   	1, $2           # 1: down to label1
+.LBB0_6:                                # %if.end18
+	end_block                       # label4:
 	block   	
 	block   	
 	i32.eqz 	$push5=, $0
-	br_if   	0, $pop5        # 0: down to label8
-# BB#8:                                 # %if.else26
-	i32.eqz 	$push6=, $2
-	br_if   	1, $pop6        # 1: down to label7
-	br      	2               # 2: down to label2
-.LBB0_9:                                # %if.then22
-	end_block                       # label8:
-	i32.eqz 	$push7=, $2
-	br_if   	3, $pop7        # 3: down to label0
-.LBB0_10:                               # %if.end30
+	br_if   	0, $pop5        # 0: down to label7
+# BB#7:                                 # %if.else26
+	br_if   	2, $2           # 2: down to label1
+	br      	1               # 1: down to label6
+.LBB0_8:                                # %if.then22
 	end_block                       # label7:
+	i32.eqz 	$push6=, $2
+	br_if   	1, $pop6        # 1: down to label1
+.LBB0_9:                                # %if.end30
+	end_block                       # label6:
 	block   	
-	block   	
-	br_if   	0, $0           # 0: down to label10
-# BB#11:                                # %if.then34
-	br_if   	1, $2           # 1: down to label9
-# BB#12:                                # %if.then36
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_13:                               # %if.else38
-	end_block                       # label10:
-	br_if   	1, $2           # 1: down to label2
-.LBB0_14:                               # %if.end42
-	end_block                       # label9:
-	return  	$2
-.LBB0_15:                               # %if.then40
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_16:                               # %if.then2
+	br_if   	0, $0           # 0: down to label8
+# BB#10:                                # %if.then34
+	i32.eqz 	$push7=, $2
+	br_if   	1, $pop7        # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_11:                               # %if.else38
+	end_block                       # label8:
+	i32.eqz 	$push8=, $2
+	br_if   	1, $pop8        # 1: down to label0
+.LBB0_12:                               # %if.then2
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB0_17:                               # %if.then24
+.LBB0_13:                               # %if.end42
 	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+	copy_local	$push9=, $2
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	ieq, .Lfunc_end0-ieq
-
+                                        # -- End function
 	.section	.text.ine,"ax",@progbits
-	.hidden	ine
+	.hidden	ine                     # -- Begin function ine
 	.globl	ine
 	.type	ine,@function
 ine:                                    # @ine
@@ -96,30 +84,28 @@ ine:                                    # @ine
 	block   	
 	block   	
 	i32.ne  	$push0=, $0, $1
-	br_if   	0, $pop0        # 0: down to label13
+	br_if   	0, $pop0        # 0: down to label11
 # BB#1:                                 # %if.else
 	i32.eqz 	$push1=, $2
-	br_if   	1, $pop1        # 1: down to label12
-# BB#2:                                 # %if.then4
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_3:                                # %if.then
-	end_block                       # label13:
+	br_if   	1, $pop1        # 1: down to label10
+	br      	2               # 2: down to label9
+.LBB1_2:                                # %if.then
+	end_block                       # label11:
 	i32.eqz 	$push2=, $2
-	br_if   	1, $pop2        # 1: down to label11
-.LBB1_4:                                # %if.end6
-	end_block                       # label12:
+	br_if   	1, $pop2        # 1: down to label9
+.LBB1_3:                                # %if.end6
+	end_block                       # label10:
 	return  	$2
-.LBB1_5:                                # %if.then2
-	end_block                       # label11:
+.LBB1_4:                                # %if.then2
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	ine, .Lfunc_end1-ine
-
+                                        # -- End function
 	.section	.text.ilt,"ax",@progbits
-	.hidden	ilt
+	.hidden	ilt                     # -- Begin function ilt
 	.globl	ilt
 	.type	ilt,@function
 ilt:                                    # @ilt
@@ -130,28 +116,26 @@ ilt:                                    # @ilt
 	block   	
 	block   	
 	i32.ge_s	$push0=, $0, $1
-	br_if   	0, $pop0        # 0: down to label16
+	br_if   	0, $pop0        # 0: down to label14
 # BB#1:                                 # %if.then
-	br_if   	1, $2           # 1: down to label15
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB2_3:                                # %if.else
-	end_block                       # label16:
-	br_if   	1, $2           # 1: down to label14
-.LBB2_4:                                # %if.end6
-	end_block                       # label15:
-	return  	$2
-.LBB2_5:                                # %if.then4
+	br_if   	1, $2           # 1: down to label13
+	br      	2               # 2: down to label12
+.LBB2_2:                                # %if.else
 	end_block                       # label14:
+	br_if   	1, $2           # 1: down to label12
+.LBB2_3:                                # %if.end6
+	end_block                       # label13:
+	return  	$2
+.LBB2_4:                                # %if.then2
+	end_block                       # label12:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	ilt, .Lfunc_end2-ilt
-
+                                        # -- End function
 	.section	.text.ile,"ax",@progbits
-	.hidden	ile
+	.hidden	ile                     # -- Begin function ile
 	.globl	ile
 	.type	ile,@function
 ile:                                    # @ile
@@ -162,30 +146,28 @@ ile:                                    # @ile
 	block   	
 	block   	
 	i32.le_s	$push0=, $0, $1
-	br_if   	0, $pop0        # 0: down to label19
+	br_if   	0, $pop0        # 0: down to label17
 # BB#1:                                 # %if.else
 	i32.eqz 	$push1=, $2
-	br_if   	1, $pop1        # 1: down to label18
-# BB#2:                                 # %if.then4
-	call    	abort@FUNCTION
-	unreachable
-.LBB3_3:                                # %if.then
-	end_block                       # label19:
+	br_if   	1, $pop1        # 1: down to label16
+	br      	2               # 2: down to label15
+.LBB3_2:                                # %if.then
+	end_block                       # label17:
 	i32.eqz 	$push2=, $2
-	br_if   	1, $pop2        # 1: down to label17
-.LBB3_4:                                # %if.end6
-	end_block                       # label18:
+	br_if   	1, $pop2        # 1: down to label15
+.LBB3_3:                                # %if.end6
+	end_block                       # label16:
 	return  	$2
-.LBB3_5:                                # %if.then2
-	end_block                       # label17:
+.LBB3_4:                                # %if.then2
+	end_block                       # label15:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	ile, .Lfunc_end3-ile
-
+                                        # -- End function
 	.section	.text.igt,"ax",@progbits
-	.hidden	igt
+	.hidden	igt                     # -- Begin function igt
 	.globl	igt
 	.type	igt,@function
 igt:                                    # @igt
@@ -196,28 +178,26 @@ igt:                                    # @igt
 	block   	
 	block   	
 	i32.le_s	$push0=, $0, $1
-	br_if   	0, $pop0        # 0: down to label22
+	br_if   	0, $pop0        # 0: down to label20
 # BB#1:                                 # %if.then
-	br_if   	1, $2           # 1: down to label21
-# BB#2:                                 # %if.then2
-	call    	abort@FUNCTION
-	unreachable
-.LBB4_3:                                # %if.else
-	end_block                       # label22:
-	br_if   	1, $2           # 1: down to label20
-.LBB4_4:                                # %if.end6
-	end_block                       # label21:
-	return  	$2
-.LBB4_5:                                # %if.then4
+	br_if   	1, $2           # 1: down to label19
+	br      	2               # 2: down to label18
+.LBB4_2:                                # %if.else
 	end_block                       # label20:
+	br_if   	1, $2           # 1: down to label18
+.LBB4_3:                                # %if.end6
+	end_block                       # label19:
+	return  	$2
+.LBB4_4:                                # %if.then2
+	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	igt, .Lfunc_end4-igt
-
+                                        # -- End function
 	.section	.text.ige,"ax",@progbits
-	.hidden	ige
+	.hidden	ige                     # -- Begin function ige
 	.globl	ige
 	.type	ige,@function
 ige:                                    # @ige
@@ -228,30 +208,28 @@ ige:                                    # @ige
 	block   	
 	block   	
 	i32.ge_s	$push0=, $0, $1
-	br_if   	0, $pop0        # 0: down to label25
+	br_if   	0, $pop0        # 0: down to label23
 # BB#1:                                 # %if.else
 	i32.eqz 	$push1=, $2
-	br_if   	1, $pop1        # 1: down to label24
-# BB#2:                                 # %if.then4
-	call    	abort@FUNCTION
-	unreachable
-.LBB5_3:                                # %if.then
-	end_block                       # label25:
+	br_if   	1, $pop1        # 1: down to label22
+	br      	2               # 2: down to label21
+.LBB5_2:                                # %if.then
+	end_block                       # label23:
 	i32.eqz 	$push2=, $2
-	br_if   	1, $pop2        # 1: down to label23
-.LBB5_4:                                # %if.end6
-	end_block                       # label24:
+	br_if   	1, $pop2        # 1: down to label21
+.LBB5_3:                                # %if.end6
+	end_block                       # label22:
 	return  	$2
-.LBB5_5:                                # %if.then2
-	end_block                       # label23:
+.LBB5_4:                                # %if.then2
+	end_block                       # label21:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end5:
 	.size	ige, .Lfunc_end5-ige
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -262,7 +240,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/compare-2.c.s b/test/torture-s/compare-2.c.s
index 9adf055b8..6362c88a4 100644
--- a/test/torture-s/compare-2.c.s
+++ b/test/torture-s/compare-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/compare-2.c"
+	.file	"compare-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,6 +28,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/compare-3.c.s b/test/torture-s/compare-3.c.s
index dba5d8db7..76278182d 100644
--- a/test/torture-s/compare-3.c.s
+++ b/test/torture-s/compare-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/compare-3.c"
+	.file	"compare-3.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -11,9 +11,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -23,9 +23,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -35,9 +35,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -47,9 +47,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -59,9 +59,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -71,9 +71,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.all_tests,"ax",@progbits
-	.hidden	all_tests
+	.hidden	all_tests               # -- Begin function all_tests
 	.globl	all_tests
 	.type	all_tests,@function
 all_tests:                              # @all_tests
@@ -83,9 +83,9 @@ all_tests:                              # @all_tests
 	.endfunc
 .Lfunc_end6:
 	.size	all_tests, .Lfunc_end6-all_tests
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -96,6 +96,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end7:
 	.size	main, .Lfunc_end7-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/complex-1.c.s b/test/torture-s/complex-1.c.s
index cbac62b68..814659fc2 100644
--- a/test/torture-s/complex-1.c.s
+++ b/test/torture-s/complex-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-1.c"
+	.file	"complex-1.c"
 	.section	.text.g0,"ax",@progbits
-	.hidden	g0
+	.hidden	g0                      # -- Begin function g0
 	.globl	g0
 	.type	g0,@function
 g0:                                     # @g0
@@ -13,9 +13,9 @@ g0:                                     # @g0
 	.endfunc
 .Lfunc_end0:
 	.size	g0, .Lfunc_end0-g0
-
+                                        # -- End function
 	.section	.text.g1,"ax",@progbits
-	.hidden	g1
+	.hidden	g1                      # -- Begin function g1
 	.globl	g1
 	.type	g1,@function
 g1:                                     # @g1
@@ -27,9 +27,9 @@ g1:                                     # @g1
 	.endfunc
 .Lfunc_end1:
 	.size	g1, .Lfunc_end1-g1
-
+                                        # -- End function
 	.section	.text.g2,"ax",@progbits
-	.hidden	g2
+	.hidden	g2                      # -- Begin function g2
 	.globl	g2
 	.type	g2,@function
 g2:                                     # @g2
@@ -41,9 +41,9 @@ g2:                                     # @g2
 	.endfunc
 .Lfunc_end2:
 	.size	g2, .Lfunc_end2-g2
-
+                                        # -- End function
 	.section	.text.xcexp,"ax",@progbits
-	.hidden	xcexp
+	.hidden	xcexp                   # -- Begin function xcexp
 	.globl	xcexp
 	.type	xcexp,@function
 xcexp:                                  # @xcexp
@@ -57,21 +57,21 @@ xcexp:                                  # @xcexp
 	.endfunc
 .Lfunc_end3:
 	.size	xcexp, .Lfunc_end3-xcexp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# BB#0:                                 # %if.end5
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-2.c.s b/test/torture-s/complex-2.c.s
index 2aaa9e57e..120891cc5 100644
--- a/test/torture-s/complex-2.c.s
+++ b/test/torture-s/complex-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-2.c"
+	.file	"complex-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -19,9 +19,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	f64.const	$push7=, 0x1p0
 	f64.ne  	$push3=, $pop0, $pop7
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end26
+# BB#2:                                 # %if.end25
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	ag                      # @ag
 	.type	ag,@object
 	.section	.data.ag,"aw",@progbits
@@ -72,6 +72,6 @@ bg:
 	.size	bg, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-3.c.s b/test/torture-s/complex-3.c.s
index dd0518c95..68239cb1c 100644
--- a/test/torture-s/complex-3.c.s
+++ b/test/torture-s/complex-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-3.c"
+	.file	"complex-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,9 +13,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-4.c.s b/test/torture-s/complex-4.c.s
index 9a4172db4..d29b7ec91 100644
--- a/test/torture-s/complex-4.c.s
+++ b/test/torture-s/complex-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-4.c"
+	.file	"complex-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-5.c.s b/test/torture-s/complex-5.c.s
index e5226a7a3..de353198f 100644
--- a/test/torture-s/complex-5.c.s
+++ b/test/torture-s/complex-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-5.c"
+	.file	"complex-5.c"
 	.section	.text.p,"ax",@progbits
-	.hidden	p
+	.hidden	p                       # -- Begin function p
 	.globl	p
 	.type	p,@function
 p:                                      # @p
@@ -19,9 +19,9 @@ p:                                      # @p
 	.endfunc
 .Lfunc_end0:
 	.size	p, .Lfunc_end0-p
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,10 +29,10 @@ main:                                   # @main
 	.local  	f32, f32, f32, f32, i32
 # BB#0:                                 # %entry
 	i32.const	$push18=, 0
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push40=, $pop16, $pop17
+	i32.sub 	$push40=, $pop15, $pop17
 	tee_local	$push39=, $4=, $pop40
 	i32.store	__stack_pointer($pop18), $pop39
 	i32.const	$push38=, 0
@@ -91,7 +91,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -132,7 +132,7 @@ z:
 	.size	z, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	__divsc3, void, i32, f32, f32, f32, f32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-6.c.s b/test/torture-s/complex-6.c.s
index 8a270edb1..0589cb770 100644
--- a/test/torture-s/complex-6.c.s
+++ b/test/torture-s/complex-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-6.c"
+	.file	"complex-6.c"
 	.section	.text.ctest_float,"ax",@progbits
-	.hidden	ctest_float
+	.hidden	ctest_float             # -- Begin function ctest_float
 	.globl	ctest_float
 	.type	ctest_float,@function
 ctest_float:                            # @ctest_float
@@ -16,9 +16,9 @@ ctest_float:                            # @ctest_float
 	.endfunc
 .Lfunc_end0:
 	.size	ctest_float, .Lfunc_end0-ctest_float
-
+                                        # -- End function
 	.section	.text.test_float,"ax",@progbits
-	.hidden	test_float
+	.hidden	test_float              # -- Begin function test_float
 	.globl	test_float
 	.type	test_float,@function
 test_float:                             # @test_float
@@ -27,9 +27,9 @@ test_float:                             # @test_float
 	.endfunc
 .Lfunc_end1:
 	.size	test_float, .Lfunc_end1-test_float
-
+                                        # -- End function
 	.section	.text.ctest_double,"ax",@progbits
-	.hidden	ctest_double
+	.hidden	ctest_double            # -- Begin function ctest_double
 	.globl	ctest_double
 	.type	ctest_double,@function
 ctest_double:                           # @ctest_double
@@ -44,9 +44,9 @@ ctest_double:                           # @ctest_double
 	.endfunc
 .Lfunc_end2:
 	.size	ctest_double, .Lfunc_end2-ctest_double
-
+                                        # -- End function
 	.section	.text.test_double,"ax",@progbits
-	.hidden	test_double
+	.hidden	test_double             # -- Begin function test_double
 	.globl	test_double
 	.type	test_double,@function
 test_double:                            # @test_double
@@ -55,9 +55,9 @@ test_double:                            # @test_double
 	.endfunc
 .Lfunc_end3:
 	.size	test_double, .Lfunc_end3-test_double
-
+                                        # -- End function
 	.section	.text.ctest_long_double,"ax",@progbits
-	.hidden	ctest_long_double
+	.hidden	ctest_long_double       # -- Begin function ctest_long_double
 	.globl	ctest_long_double
 	.type	ctest_long_double,@function
 ctest_long_double:                      # @ctest_long_double
@@ -65,10 +65,10 @@ ctest_long_double:                      # @ctest_long_double
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push18=, 0
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push26=, $pop16, $pop17
+	i32.sub 	$push26=, $pop15, $pop17
 	tee_local	$push25=, $2=, $pop26
 	i32.store	__stack_pointer($pop18), $pop25
 	i64.const	$push5=, 0
@@ -102,9 +102,9 @@ ctest_long_double:                      # @ctest_long_double
 	.endfunc
 .Lfunc_end4:
 	.size	ctest_long_double, .Lfunc_end4-ctest_long_double
-
+                                        # -- End function
 	.section	.text.test_long_double,"ax",@progbits
-	.hidden	test_long_double
+	.hidden	test_long_double        # -- Begin function test_long_double
 	.globl	test_long_double
 	.type	test_long_double,@function
 test_long_double:                       # @test_long_double
@@ -113,9 +113,9 @@ test_long_double:                       # @test_long_double
 	.endfunc
 .Lfunc_end5:
 	.size	test_long_double, .Lfunc_end5-test_long_double
-
+                                        # -- End function
 	.section	.text.ctest_int,"ax",@progbits
-	.hidden	ctest_int
+	.hidden	ctest_int               # -- Begin function ctest_int
 	.globl	ctest_int
 	.type	ctest_int,@function
 ctest_int:                              # @ctest_int
@@ -131,9 +131,9 @@ ctest_int:                              # @ctest_int
 	.endfunc
 .Lfunc_end6:
 	.size	ctest_int, .Lfunc_end6-ctest_int
-
+                                        # -- End function
 	.section	.text.test_int,"ax",@progbits
-	.hidden	test_int
+	.hidden	test_int                # -- Begin function test_int
 	.globl	test_int
 	.type	test_int,@function
 test_int:                               # @test_int
@@ -142,9 +142,9 @@ test_int:                               # @test_int
 	.endfunc
 .Lfunc_end7:
 	.size	test_int, .Lfunc_end7-test_int
-
+                                        # -- End function
 	.section	.text.ctest_long_int,"ax",@progbits
-	.hidden	ctest_long_int
+	.hidden	ctest_long_int          # -- Begin function ctest_long_int
 	.globl	ctest_long_int
 	.type	ctest_long_int,@function
 ctest_long_int:                         # @ctest_long_int
@@ -160,9 +160,9 @@ ctest_long_int:                         # @ctest_long_int
 	.endfunc
 .Lfunc_end8:
 	.size	ctest_long_int, .Lfunc_end8-ctest_long_int
-
+                                        # -- End function
 	.section	.text.test_long_int,"ax",@progbits
-	.hidden	test_long_int
+	.hidden	test_long_int           # -- Begin function test_long_int
 	.globl	test_long_int
 	.type	test_long_int,@function
 test_long_int:                          # @test_long_int
@@ -171,9 +171,9 @@ test_long_int:                          # @test_long_int
 	.endfunc
 .Lfunc_end9:
 	.size	test_long_int, .Lfunc_end9-test_long_int
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -187,7 +187,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end10:
 	.size	main, .Lfunc_end10-main
-
+                                        # -- End function
 	.hidden	err                     # @err
 	.type	err,@object
 	.section	.bss.err,"aw",@nobits
@@ -198,4 +198,4 @@ err:
 	.size	err, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/complex-7.c.s b/test/torture-s/complex-7.c.s
index 38163f16b..8164539f2 100644
--- a/test/torture-s/complex-7.c.s
+++ b/test/torture-s/complex-7.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/complex-7.c"
+	.file	"complex-7.c"
 	.section	.text.check_float,"ax",@progbits
-	.hidden	check_float
+	.hidden	check_float             # -- Begin function check_float
 	.globl	check_float
 	.type	check_float,@function
 check_float:                            # @check_float
@@ -77,9 +77,9 @@ check_float:                            # @check_float
 	.endfunc
 .Lfunc_end0:
 	.size	check_float, .Lfunc_end0-check_float
-
+                                        # -- End function
 	.section	.text.check_double,"ax",@progbits
-	.hidden	check_double
+	.hidden	check_double            # -- Begin function check_double
 	.globl	check_double
 	.type	check_double,@function
 check_double:                           # @check_double
@@ -155,9 +155,9 @@ check_double:                           # @check_double
 	.endfunc
 .Lfunc_end1:
 	.size	check_double, .Lfunc_end1-check_double
-
+                                        # -- End function
 	.section	.text.check_long_double,"ax",@progbits
-	.hidden	check_long_double
+	.hidden	check_long_double       # -- Begin function check_long_double
 	.globl	check_long_double
 	.type	check_long_double,@function
 check_long_double:                      # @check_long_double
@@ -217,7 +217,7 @@ check_long_double:                      # @check_long_double
 	i32.const	$push43=, 0
 	i64.load	$9=, ld3($pop43)
 	i64.load	$push17=, 0($3)
-	i32.call	$1=, __netf2@FUNCTION, $pop17, $7, $9, $8
+	i32.call	$2=, __netf2@FUNCTION, $pop17, $7, $9, $8
 	i32.const	$push18=, 24
 	i32.add 	$push19=, $3, $pop18
 	i64.load	$7=, 0($pop19)
@@ -226,7 +226,7 @@ check_long_double:                      # @check_long_double
 	i64.load	$9=, ld3+24($pop42)
 	i32.const	$push41=, 0
 	i64.load	$6=, ld3+16($pop41)
-	br_if   	0, $1           # 0: down to label2
+	br_if   	0, $2           # 0: down to label2
 # BB#5:                                 # %lor.lhs.false4
 	i32.call	$push20=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop20       # 0: down to label2
@@ -239,7 +239,7 @@ check_long_double:                      # @check_long_double
 	i32.const	$push46=, 0
 	i64.load	$9=, ld4($pop46)
 	i64.load	$push24=, 0($4)
-	i32.call	$1=, __netf2@FUNCTION, $pop24, $7, $9, $8
+	i32.call	$2=, __netf2@FUNCTION, $pop24, $7, $9, $8
 	i32.const	$push25=, 24
 	i32.add 	$push26=, $4, $pop25
 	i64.load	$7=, 0($pop26)
@@ -248,7 +248,7 @@ check_long_double:                      # @check_long_double
 	i64.load	$9=, ld4+24($pop45)
 	i32.const	$push44=, 0
 	i64.load	$6=, ld4+16($pop44)
-	br_if   	0, $1           # 0: down to label2
+	br_if   	0, $2           # 0: down to label2
 # BB#7:                                 # %lor.lhs.false8
 	i32.call	$push27=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop27       # 0: down to label2
@@ -261,7 +261,7 @@ check_long_double:                      # @check_long_double
 	i32.const	$push49=, 0
 	i64.load	$9=, ld5($pop49)
 	i64.load	$push31=, 0($5)
-	i32.call	$1=, __netf2@FUNCTION, $pop31, $7, $9, $8
+	i32.call	$2=, __netf2@FUNCTION, $pop31, $7, $9, $8
 	i32.const	$push32=, 24
 	i32.add 	$push33=, $5, $pop32
 	i64.load	$7=, 0($pop33)
@@ -270,7 +270,7 @@ check_long_double:                      # @check_long_double
 	i64.load	$9=, ld5+24($pop48)
 	i32.const	$push47=, 0
 	i64.load	$6=, ld5+16($pop47)
-	br_if   	0, $1           # 0: down to label2
+	br_if   	0, $2           # 0: down to label2
 # BB#9:                                 # %lor.lhs.false12
 	i32.call	$push34=, __eqtf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop34       # 0: down to label2
@@ -283,343 +283,331 @@ check_long_double:                      # @check_long_double
 	.endfunc
 .Lfunc_end2:
 	.size	check_long_double, .Lfunc_end2-check_long_double
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32, i32, i32, i32, i32, i32
+	.local  	f32, f64, f64, f64, f64, f64, f64, f64, f64, f64, i64, i64, i32, i64, i64, i64, i32, i64, i64, i64, i32, i64, i64, i64, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push62=, 0
-	i32.const	$push59=, 0
-	i32.load	$push60=, __stack_pointer($pop59)
-	i32.const	$push61=, 576
-	i32.sub 	$push200=, $pop60, $pop61
-	tee_local	$push199=, $45=, $pop200
-	i32.store	__stack_pointer($pop62), $pop199
+	i32.const	$push75=, 0
+	i32.const	$push73=, 0
+	i32.load	$push72=, __stack_pointer($pop73)
+	i32.const	$push74=, 576
+	i32.sub 	$push208=, $pop72, $pop74
+	tee_local	$push207=, $26=, $pop208
+	i32.store	__stack_pointer($pop75), $pop207
 	i32.const	$push0=, 0
-	f32.load	$0=, f1($pop0)
+	f32.load	$push1=, f1($pop0)
+	f32.store	568($26), $pop1
+	i32.const	$push206=, 0
+	f32.load	$push2=, f1+4($pop206)
+	f32.store	572($26), $pop2
+	i32.const	$push205=, 0
+	f32.load	$push3=, f2($pop205)
+	f32.store	560($26), $pop3
+	i32.const	$push204=, 0
+	f32.load	$push4=, f2+4($pop204)
+	f32.store	564($26), $pop4
+	i32.const	$push203=, 0
+	f32.load	$push5=, f3($pop203)
+	f32.store	552($26), $pop5
+	i32.const	$push202=, 0
+	f32.load	$push6=, f3+4($pop202)
+	f32.store	556($26), $pop6
+	i32.const	$push201=, 0
+	f32.load	$push7=, f4($pop201)
+	f32.store	544($26), $pop7
+	i32.const	$push200=, 0
+	f32.load	$push8=, f4+4($pop200)
+	f32.store	548($26), $pop8
+	i32.const	$push199=, 0
+	f32.load	$push9=, f5($pop199)
+	f32.store	536($26), $pop9
 	i32.const	$push198=, 0
-	f32.load	$1=, f1+4($pop198)
+	f32.load	$0=, f5+4($pop198)
+	i64.load	$push10=, 568($26)
+	i64.store	280($26), $pop10
+	f32.store	540($26), $0
+	i64.load	$push11=, 560($26)
+	i64.store	272($26), $pop11
+	i64.load	$push12=, 552($26)
+	i64.store	264($26), $pop12
+	i64.load	$push13=, 544($26)
+	i64.store	256($26), $pop13
+	i64.load	$push14=, 536($26)
+	i64.store	248($26), $pop14
+	i32.const	$push76=, 280
+	i32.add 	$push77=, $26, $pop76
+	i32.const	$push78=, 272
+	i32.add 	$push79=, $26, $pop78
+	i32.const	$push80=, 264
+	i32.add 	$push81=, $26, $pop80
+	i32.const	$push82=, 256
+	i32.add 	$push83=, $26, $pop82
+	i32.const	$push84=, 248
+	i32.add 	$push85=, $26, $pop84
+	call    	check_float@FUNCTION, $26, $pop77, $pop79, $pop81, $pop83, $pop85
 	i32.const	$push197=, 0
-	f32.load	$2=, f2($pop197)
+	f64.load	$1=, d1($pop197)
 	i32.const	$push196=, 0
-	f32.load	$3=, f2+4($pop196)
+	f64.load	$push15=, d1+8($pop196)
+	f64.store	528($26), $pop15
 	i32.const	$push195=, 0
-	f32.load	$4=, f3($pop195)
+	f64.load	$2=, d2($pop195)
 	i32.const	$push194=, 0
-	f32.load	$5=, f3+4($pop194)
+	f64.load	$3=, d2+8($pop194)
 	i32.const	$push193=, 0
-	f32.load	$6=, f4($pop193)
+	f64.load	$4=, d3($pop193)
 	i32.const	$push192=, 0
-	f32.load	$7=, f4+4($pop192)
+	f64.load	$5=, d3+8($pop192)
 	i32.const	$push191=, 0
-	f32.load	$8=, f5($pop191)
+	f64.load	$6=, d4($pop191)
 	i32.const	$push190=, 0
-	f32.load	$9=, f5+4($pop190)
-	f32.store	568($45), $0
-	f32.store	572($45), $1
-	f32.store	560($45), $2
-	f32.store	564($45), $3
-	f32.store	552($45), $4
-	f32.store	556($45), $5
-	f32.store	544($45), $6
-	f32.store	548($45), $7
-	f32.store	540($45), $9
-	f32.store	536($45), $8
-	i64.load	$push1=, 568($45)
-	i64.store	280($45):p2align=2, $pop1
-	i32.const	$push63=, 272
-	i32.add 	$push64=, $45, $pop63
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $pop64, $pop2
-	i32.load	$push4=, 564($45)
-	i32.store	0($pop3), $pop4
-	i32.load	$push5=, 560($45)
-	i32.store	272($45), $pop5
-	i32.const	$push65=, 264
-	i32.add 	$push66=, $45, $pop65
-	i32.const	$push189=, 4
-	i32.add 	$push6=, $pop66, $pop189
-	i32.load	$push7=, 556($45)
-	i32.store	0($pop6), $pop7
-	i32.load	$push8=, 552($45)
-	i32.store	264($45), $pop8
-	i64.load	$push9=, 544($45)
-	i64.store	256($45):p2align=2, $pop9
-	i64.load	$push10=, 536($45)
-	i64.store	248($45):p2align=2, $pop10
-	i32.const	$push67=, 280
-	i32.add 	$push68=, $45, $pop67
-	i32.const	$push69=, 272
-	i32.add 	$push70=, $45, $pop69
-	i32.const	$push71=, 264
-	i32.add 	$push72=, $45, $pop71
-	i32.const	$push73=, 256
-	i32.add 	$push74=, $45, $pop73
-	i32.const	$push75=, 248
-	i32.add 	$push76=, $45, $pop75
-	call    	check_float@FUNCTION, $45, $pop68, $pop70, $pop72, $pop74, $pop76
+	f64.load	$7=, d4+8($pop190)
+	i32.const	$push189=, 0
+	f64.load	$8=, d5($pop189)
 	i32.const	$push188=, 0
-	f64.load	$10=, d1($pop188)
-	i32.const	$push187=, 0
-	f64.load	$11=, d1+8($pop187)
-	i32.const	$push186=, 0
-	f64.load	$12=, d2($pop186)
-	i32.const	$push185=, 0
-	f64.load	$13=, d2+8($pop185)
-	i32.const	$push184=, 0
-	f64.load	$14=, d3($pop184)
+	f64.load	$9=, d5+8($pop188)
+	i32.const	$push86=, 232
+	i32.add 	$push87=, $26, $pop86
+	i32.const	$push16=, 8
+	i32.add 	$push17=, $pop87, $pop16
+	i64.load	$push18=, 528($26)
+	i64.store	0($pop17), $pop18
+	f64.store	512($26), $3
+	i32.const	$push88=, 216
+	i32.add 	$push89=, $26, $pop88
+	i32.const	$push187=, 8
+	i32.add 	$push19=, $pop89, $pop187
+	i64.load	$push20=, 512($26)
+	i64.store	0($pop19), $pop20
+	f64.store	520($26), $1
+	f64.store	504($26), $2
+	f64.store	488($26), $4
+	f64.store	496($26), $5
+	f64.store	472($26), $6
+	f64.store	480($26), $7
+	f64.store	456($26), $8
+	f64.store	464($26), $9
+	i64.load	$push21=, 520($26)
+	i64.store	232($26), $pop21
+	i64.load	$push22=, 504($26)
+	i64.store	216($26), $pop22
+	i32.const	$push90=, 200
+	i32.add 	$push91=, $26, $pop90
+	i32.const	$push186=, 8
+	i32.add 	$push23=, $pop91, $pop186
+	i64.load	$push24=, 496($26)
+	i64.store	0($pop23), $pop24
+	i64.load	$push25=, 488($26)
+	i64.store	200($26), $pop25
+	i32.const	$push92=, 184
+	i32.add 	$push93=, $26, $pop92
+	i32.const	$push185=, 8
+	i32.add 	$push26=, $pop93, $pop185
+	i64.load	$push27=, 480($26)
+	i64.store	0($pop26), $pop27
+	i64.load	$push28=, 472($26)
+	i64.store	184($26), $pop28
+	i32.const	$push94=, 168
+	i32.add 	$push95=, $26, $pop94
+	i32.const	$push184=, 8
+	i32.add 	$push29=, $pop95, $pop184
+	i64.load	$push30=, 464($26)
+	i64.store	0($pop29), $pop30
+	i64.load	$push31=, 456($26)
+	i64.store	168($26), $pop31
+	i32.const	$push96=, 232
+	i32.add 	$push97=, $26, $pop96
+	i32.const	$push98=, 216
+	i32.add 	$push99=, $26, $pop98
+	i32.const	$push100=, 200
+	i32.add 	$push101=, $26, $pop100
+	i32.const	$push102=, 184
+	i32.add 	$push103=, $26, $pop102
+	i32.const	$push104=, 168
+	i32.add 	$push105=, $26, $pop104
+	call    	check_double@FUNCTION, $26, $pop97, $pop99, $pop101, $pop103, $pop105
 	i32.const	$push183=, 0
-	f64.load	$15=, d3+8($pop183)
+	i64.load	$10=, ld1($pop183)
 	i32.const	$push182=, 0
-	f64.load	$16=, d4($pop182)
-	i32.const	$push181=, 0
-	f64.load	$17=, d4+8($pop181)
-	i32.const	$push180=, 0
-	f64.load	$18=, d5($pop180)
+	i64.load	$11=, ld1+8($pop182)
+	i32.const	$push106=, 416
+	i32.add 	$push107=, $26, $pop106
+	i32.const	$push32=, 24
+	i32.add 	$push181=, $pop107, $pop32
+	tee_local	$push180=, $12=, $pop181
 	i32.const	$push179=, 0
-	f64.load	$19=, d5+8($pop179)
-	f64.store	520($45), $10
-	f64.store	528($45), $11
-	f64.store	504($45), $12
-	f64.store	512($45), $13
-	f64.store	488($45), $14
-	f64.store	496($45), $15
-	f64.store	472($45), $16
-	f64.store	480($45), $17
-	f64.store	464($45), $19
-	f64.store	456($45), $18
-	i32.const	$push77=, 232
-	i32.add 	$push78=, $45, $pop77
-	i32.const	$push11=, 8
-	i32.add 	$push12=, $pop78, $pop11
-	i64.load	$push13=, 528($45)
-	i64.store	0($pop12), $pop13
-	i32.const	$push79=, 216
-	i32.add 	$push80=, $45, $pop79
-	i32.const	$push178=, 8
-	i32.add 	$push14=, $pop80, $pop178
-	i64.load	$push15=, 512($45)
-	i64.store	0($pop14), $pop15
-	i64.load	$push16=, 520($45)
-	i64.store	232($45), $pop16
-	i64.load	$push17=, 504($45)
-	i64.store	216($45), $pop17
-	i32.const	$push81=, 200
-	i32.add 	$push82=, $45, $pop81
-	i32.const	$push177=, 8
-	i32.add 	$push18=, $pop82, $pop177
-	i64.load	$push19=, 496($45)
-	i64.store	0($pop18), $pop19
-	i64.load	$push20=, 488($45)
-	i64.store	200($45), $pop20
-	i32.const	$push83=, 184
-	i32.add 	$push84=, $45, $pop83
-	i32.const	$push176=, 8
-	i32.add 	$push21=, $pop84, $pop176
-	i64.load	$push22=, 480($45)
-	i64.store	0($pop21), $pop22
-	i64.load	$push23=, 472($45)
-	i64.store	184($45), $pop23
-	i32.const	$push85=, 168
-	i32.add 	$push86=, $45, $pop85
-	i32.const	$push175=, 8
-	i32.add 	$push24=, $pop86, $pop175
-	i64.load	$push25=, 464($45)
-	i64.store	0($pop24), $pop25
-	i64.load	$push26=, 456($45)
-	i64.store	168($45), $pop26
-	i32.const	$push87=, 232
-	i32.add 	$push88=, $45, $pop87
-	i32.const	$push89=, 216
-	i32.add 	$push90=, $45, $pop89
-	i32.const	$push91=, 200
-	i32.add 	$push92=, $45, $pop91
-	i32.const	$push93=, 184
-	i32.add 	$push94=, $45, $pop93
-	i32.const	$push95=, 168
-	i32.add 	$push96=, $45, $pop95
-	call    	check_double@FUNCTION, $45, $pop88, $pop90, $pop92, $pop94, $pop96
-	i32.const	$push174=, 0
-	i64.load	$20=, ld1($pop174)
-	i32.const	$push173=, 0
-	i64.load	$21=, ld1+8($pop173)
+	i64.load	$push33=, ld1+24($pop179)
+	i64.store	0($pop180), $pop33
+	i32.const	$push178=, 0
+	i64.load	$13=, ld1+16($pop178)
+	i32.const	$push177=, 0
+	i64.load	$14=, ld2($pop177)
+	i32.const	$push176=, 0
+	i64.load	$15=, ld2+8($pop176)
+	i32.const	$push108=, 384
+	i32.add 	$push109=, $26, $pop108
+	i32.const	$push175=, 24
+	i32.add 	$push174=, $pop109, $pop175
+	tee_local	$push173=, $16=, $pop174
 	i32.const	$push172=, 0
-	i64.load	$22=, ld1+16($pop172)
+	i64.load	$push34=, ld2+24($pop172)
+	i64.store	0($pop173), $pop34
 	i32.const	$push171=, 0
-	i64.load	$23=, ld1+24($pop171)
+	i64.load	$17=, ld2+16($pop171)
 	i32.const	$push170=, 0
-	i64.load	$24=, ld2($pop170)
+	i64.load	$18=, ld3($pop170)
 	i32.const	$push169=, 0
-	i64.load	$25=, ld2+8($pop169)
-	i32.const	$push168=, 0
-	i64.load	$26=, ld2+16($pop168)
-	i32.const	$push167=, 0
-	i64.load	$27=, ld2+24($pop167)
-	i32.const	$push166=, 0
-	i64.load	$28=, ld3($pop166)
+	i64.load	$19=, ld3+8($pop169)
+	i32.const	$push110=, 352
+	i32.add 	$push111=, $26, $pop110
+	i32.const	$push168=, 24
+	i32.add 	$push167=, $pop111, $pop168
+	tee_local	$push166=, $20=, $pop167
 	i32.const	$push165=, 0
-	i64.load	$29=, ld3+8($pop165)
+	i64.load	$push35=, ld3+24($pop165)
+	i64.store	0($pop166), $pop35
 	i32.const	$push164=, 0
-	i64.load	$30=, ld3+16($pop164)
+	i64.load	$21=, ld3+16($pop164)
 	i32.const	$push163=, 0
-	i64.load	$31=, ld3+24($pop163)
+	i64.load	$22=, ld4($pop163)
 	i32.const	$push162=, 0
-	i64.load	$32=, ld4($pop162)
-	i32.const	$push161=, 0
-	i64.load	$33=, ld4+8($pop161)
-	i32.const	$push160=, 0
-	i64.load	$34=, ld4+16($pop160)
-	i32.const	$push159=, 0
-	i64.load	$35=, ld4+24($pop159)
+	i64.load	$23=, ld4+8($pop162)
+	i32.const	$push112=, 320
+	i32.add 	$push113=, $26, $pop112
+	i32.const	$push161=, 24
+	i32.add 	$push160=, $pop113, $pop161
+	tee_local	$push159=, $24=, $pop160
 	i32.const	$push158=, 0
-	i64.load	$36=, ld5($pop158)
+	i64.load	$push36=, ld4+24($pop158)
+	i64.store	0($pop159), $pop36
+	i64.store	424($26), $11
+	i64.store	416($26), $10
+	i64.store	432($26), $13
+	i64.store	392($26), $15
+	i64.store	384($26), $14
+	i64.store	400($26), $17
+	i64.store	360($26), $19
+	i64.store	352($26), $18
+	i64.store	368($26), $21
+	i64.store	328($26), $23
+	i64.store	320($26), $22
 	i32.const	$push157=, 0
-	i64.load	$37=, ld5+8($pop157)
+	i64.load	$push37=, ld4+16($pop157)
+	i64.store	336($26), $pop37
 	i32.const	$push156=, 0
-	i64.load	$38=, ld5+16($pop156)
+	i64.load	$push38=, ld5+8($pop156)
+	i64.store	296($26), $pop38
 	i32.const	$push155=, 0
-	i64.load	$39=, ld5+24($pop155)
-	i64.store	424($45), $21
-	i64.store	416($45), $20
-	i32.const	$push97=, 416
-	i32.add 	$push98=, $45, $pop97
-	i32.const	$push27=, 24
-	i32.add 	$push154=, $pop98, $pop27
-	tee_local	$push153=, $40=, $pop154
-	i64.store	0($pop153), $23
-	i64.store	432($45), $22
-	i32.const	$push99=, 384
-	i32.add 	$push100=, $45, $pop99
-	i32.const	$push152=, 24
-	i32.add 	$push151=, $pop100, $pop152
-	tee_local	$push150=, $41=, $pop151
-	i64.store	0($pop150), $27
-	i64.store	392($45), $25
-	i64.store	384($45), $24
-	i64.store	400($45), $26
-	i32.const	$push101=, 352
-	i32.add 	$push102=, $45, $pop101
+	i64.load	$push39=, ld5($pop155)
+	i64.store	288($26), $pop39
+	i32.const	$push154=, 0
+	i64.load	$10=, ld5+16($pop154)
+	i32.const	$push114=, 288
+	i32.add 	$push115=, $26, $pop114
+	i32.const	$push153=, 24
+	i32.add 	$push152=, $pop115, $pop153
+	tee_local	$push151=, $25=, $pop152
+	i32.const	$push150=, 0
+	i64.load	$push40=, ld5+24($pop150)
+	i64.store	0($pop151), $pop40
+	i32.const	$push116=, 128
+	i32.add 	$push117=, $26, $pop116
 	i32.const	$push149=, 24
-	i32.add 	$push148=, $pop102, $pop149
-	tee_local	$push147=, $42=, $pop148
-	i64.store	0($pop147), $31
-	i64.store	360($45), $29
-	i64.store	352($45), $28
-	i64.store	368($45), $30
-	i32.const	$push103=, 320
-	i32.add 	$push104=, $45, $pop103
-	i32.const	$push146=, 24
-	i32.add 	$push145=, $pop104, $pop146
-	tee_local	$push144=, $43=, $pop145
-	i64.store	0($pop144), $35
-	i64.store	336($45), $34
-	i32.const	$push105=, 288
-	i32.add 	$push106=, $45, $pop105
-	i32.const	$push143=, 24
-	i32.add 	$push142=, $pop106, $pop143
-	tee_local	$push141=, $44=, $pop142
-	i64.store	0($pop141), $39
-	i64.store	328($45), $33
-	i64.store	320($45), $32
-	i64.store	304($45), $38
-	i64.store	296($45), $37
-	i64.store	288($45), $36
-	i32.const	$push107=, 128
-	i32.add 	$push108=, $45, $pop107
-	i32.const	$push140=, 24
-	i32.add 	$push28=, $pop108, $pop140
-	i64.load	$push29=, 0($40)
-	i64.store	0($pop28), $pop29
-	i32.const	$push109=, 128
-	i32.add 	$push110=, $45, $pop109
-	i32.const	$push30=, 16
-	i32.add 	$push31=, $pop110, $pop30
-	i64.load	$push32=, 432($45)
-	i64.store	0($pop31), $pop32
-	i64.load	$push33=, 424($45)
-	i64.store	136($45), $pop33
-	i64.load	$push34=, 416($45)
-	i64.store	128($45), $pop34
-	i32.const	$push111=, 96
-	i32.add 	$push112=, $45, $pop111
-	i32.const	$push139=, 24
-	i32.add 	$push35=, $pop112, $pop139
-	i64.load	$push36=, 0($41)
-	i64.store	0($pop35), $pop36
-	i32.const	$push113=, 96
-	i32.add 	$push114=, $45, $pop113
-	i32.const	$push138=, 16
-	i32.add 	$push37=, $pop114, $pop138
-	i64.load	$push38=, 400($45)
-	i64.store	0($pop37), $pop38
-	i64.load	$push39=, 392($45)
-	i64.store	104($45), $pop39
-	i64.load	$push40=, 384($45)
-	i64.store	96($45), $pop40
-	i32.const	$push115=, 64
-	i32.add 	$push116=, $45, $pop115
-	i32.const	$push137=, 24
-	i32.add 	$push41=, $pop116, $pop137
-	i64.load	$push42=, 0($42)
+	i32.add 	$push41=, $pop117, $pop149
+	i64.load	$push42=, 0($12)
 	i64.store	0($pop41), $pop42
-	i32.const	$push117=, 64
-	i32.add 	$push118=, $45, $pop117
-	i32.const	$push136=, 16
-	i32.add 	$push43=, $pop118, $pop136
-	i64.load	$push44=, 368($45)
-	i64.store	0($pop43), $pop44
-	i64.load	$push45=, 360($45)
-	i64.store	72($45), $pop45
-	i64.load	$push46=, 352($45)
-	i64.store	64($45), $pop46
-	i32.const	$push119=, 32
-	i32.add 	$push120=, $45, $pop119
-	i32.const	$push135=, 24
-	i32.add 	$push47=, $pop120, $pop135
-	i64.load	$push48=, 0($43)
-	i64.store	0($pop47), $pop48
-	i32.const	$push121=, 32
-	i32.add 	$push122=, $45, $pop121
-	i32.const	$push134=, 16
-	i32.add 	$push49=, $pop122, $pop134
-	i64.load	$push50=, 336($45)
-	i64.store	0($pop49), $pop50
-	i64.load	$push51=, 328($45)
-	i64.store	40($45), $pop51
-	i64.load	$push52=, 320($45)
-	i64.store	32($45), $pop52
-	i32.const	$push133=, 24
-	i32.add 	$push53=, $45, $pop133
-	i64.load	$push54=, 0($44)
-	i64.store	0($pop53), $pop54
-	i32.const	$push132=, 16
-	i32.add 	$push55=, $45, $pop132
-	i64.load	$push56=, 304($45)
-	i64.store	0($pop55), $pop56
-	i64.load	$push57=, 296($45)
-	i64.store	8($45), $pop57
-	i64.load	$push58=, 288($45)
-	i64.store	0($45), $pop58
-	i32.const	$push123=, 128
-	i32.add 	$push124=, $45, $pop123
-	i32.const	$push125=, 96
-	i32.add 	$push126=, $45, $pop125
-	i32.const	$push127=, 64
-	i32.add 	$push128=, $45, $pop127
-	i32.const	$push129=, 32
-	i32.add 	$push130=, $45, $pop129
-	call    	check_long_double@FUNCTION, $45, $pop124, $pop126, $pop128, $pop130, $45
-	i32.const	$push131=, 0
-	call    	exit@FUNCTION, $pop131
+	i32.const	$push118=, 128
+	i32.add 	$push119=, $26, $pop118
+	i32.const	$push43=, 16
+	i32.add 	$push44=, $pop119, $pop43
+	i64.load	$push45=, 432($26)
+	i64.store	0($pop44), $pop45
+	i64.store	304($26), $10
+	i64.load	$push46=, 416($26)
+	i64.store	128($26), $pop46
+	i64.load	$push47=, 424($26)
+	i64.store	136($26), $pop47
+	i32.const	$push120=, 96
+	i32.add 	$push121=, $26, $pop120
+	i32.const	$push148=, 24
+	i32.add 	$push48=, $pop121, $pop148
+	i64.load	$push49=, 0($16)
+	i64.store	0($pop48), $pop49
+	i32.const	$push122=, 96
+	i32.add 	$push123=, $26, $pop122
+	i32.const	$push147=, 16
+	i32.add 	$push50=, $pop123, $pop147
+	i64.load	$push51=, 400($26)
+	i64.store	0($pop50), $pop51
+	i64.load	$push52=, 392($26)
+	i64.store	104($26), $pop52
+	i64.load	$push53=, 384($26)
+	i64.store	96($26), $pop53
+	i32.const	$push124=, 64
+	i32.add 	$push125=, $26, $pop124
+	i32.const	$push146=, 24
+	i32.add 	$push54=, $pop125, $pop146
+	i64.load	$push55=, 0($20)
+	i64.store	0($pop54), $pop55
+	i32.const	$push126=, 64
+	i32.add 	$push127=, $26, $pop126
+	i32.const	$push145=, 16
+	i32.add 	$push56=, $pop127, $pop145
+	i64.load	$push57=, 368($26)
+	i64.store	0($pop56), $pop57
+	i64.load	$push58=, 360($26)
+	i64.store	72($26), $pop58
+	i64.load	$push59=, 352($26)
+	i64.store	64($26), $pop59
+	i32.const	$push128=, 32
+	i32.add 	$push129=, $26, $pop128
+	i32.const	$push144=, 24
+	i32.add 	$push60=, $pop129, $pop144
+	i64.load	$push61=, 0($24)
+	i64.store	0($pop60), $pop61
+	i32.const	$push130=, 32
+	i32.add 	$push131=, $26, $pop130
+	i32.const	$push143=, 16
+	i32.add 	$push62=, $pop131, $pop143
+	i64.load	$push63=, 336($26)
+	i64.store	0($pop62), $pop63
+	i64.load	$push64=, 328($26)
+	i64.store	40($26), $pop64
+	i64.load	$push65=, 320($26)
+	i64.store	32($26), $pop65
+	i32.const	$push142=, 24
+	i32.add 	$push66=, $26, $pop142
+	i64.load	$push67=, 0($25)
+	i64.store	0($pop66), $pop67
+	i32.const	$push141=, 16
+	i32.add 	$push68=, $26, $pop141
+	i64.load	$push69=, 304($26)
+	i64.store	0($pop68), $pop69
+	i64.load	$push70=, 296($26)
+	i64.store	8($26), $pop70
+	i64.load	$push71=, 288($26)
+	i64.store	0($26), $pop71
+	i32.const	$push132=, 128
+	i32.add 	$push133=, $26, $pop132
+	i32.const	$push134=, 96
+	i32.add 	$push135=, $26, $pop134
+	i32.const	$push136=, 64
+	i32.add 	$push137=, $26, $pop136
+	i32.const	$push138=, 32
+	i32.add 	$push139=, $26, $pop138
+	call    	check_long_double@FUNCTION, $26, $pop133, $pop135, $pop137, $pop139, $26
+	i32.const	$push140=, 0
+	call    	exit@FUNCTION, $pop140
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	f1                      # @f1
 	.type	f1,@object
 	.section	.data.f1,"aw",@progbits
@@ -781,6 +769,6 @@ ld5:
 	.size	ld5, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/compndlit-1.c.s b/test/torture-s/compndlit-1.c.s
index a4fc8b6ca..d881913db 100644
--- a/test/torture-s/compndlit-1.c.s
+++ b/test/torture-s/compndlit-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/compndlit-1.c"
+	.file	"compndlit-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -48,6 +48,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/const-addr-expr-1.c.s b/test/torture-s/const-addr-expr-1.c.s
index 95d454d8f..86ac2f328 100644
--- a/test/torture-s/const-addr-expr-1.c.s
+++ b/test/torture-s/const-addr-expr-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/const-addr-expr-1.c"
+	.file	"const-addr-expr-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,14 +25,14 @@ main:                                   # @main
 # BB#2:                                 # %if.end3
 	i32.const	$push8=, 0
 	return  	$pop8
-.LBB0_3:                                # %if.then2
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -76,5 +76,5 @@ Upgd_minor_ID1:
 	.size	Upgd_minor_ID1, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/conversion.c.s b/test/torture-s/conversion.c.s
index 6886b573f..a88d401b7 100644
--- a/test/torture-s/conversion.c.s
+++ b/test/torture-s/conversion.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/conversion.c"
+	.file	"conversion.c"
 	.section	.text.u2f,"ax",@progbits
-	.hidden	u2f
+	.hidden	u2f                     # -- Begin function u2f
 	.globl	u2f
 	.type	u2f,@function
 u2f:                                    # @u2f
@@ -13,9 +13,9 @@ u2f:                                    # @u2f
 	.endfunc
 .Lfunc_end0:
 	.size	u2f, .Lfunc_end0-u2f
-
+                                        # -- End function
 	.section	.text.u2d,"ax",@progbits
-	.hidden	u2d
+	.hidden	u2d                     # -- Begin function u2d
 	.globl	u2d
 	.type	u2d,@function
 u2d:                                    # @u2d
@@ -27,9 +27,9 @@ u2d:                                    # @u2d
 	.endfunc
 .Lfunc_end1:
 	.size	u2d, .Lfunc_end1-u2d
-
+                                        # -- End function
 	.section	.text.u2ld,"ax",@progbits
-	.hidden	u2ld
+	.hidden	u2ld                    # -- Begin function u2ld
 	.globl	u2ld
 	.type	u2ld,@function
 u2ld:                                   # @u2ld
@@ -37,10 +37,10 @@ u2ld:                                   # @u2ld
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
+	i32.sub 	$push14=, $pop5, $pop7
 	tee_local	$push13=, $2=, $pop14
 	i32.store	__stack_pointer($pop8), $pop13
 	call    	__floatunsitf@FUNCTION, $2, $1
@@ -60,9 +60,9 @@ u2ld:                                   # @u2ld
 	.endfunc
 .Lfunc_end2:
 	.size	u2ld, .Lfunc_end2-u2ld
-
+                                        # -- End function
 	.section	.text.s2f,"ax",@progbits
-	.hidden	s2f
+	.hidden	s2f                     # -- Begin function s2f
 	.globl	s2f
 	.type	s2f,@function
 s2f:                                    # @s2f
@@ -74,9 +74,9 @@ s2f:                                    # @s2f
 	.endfunc
 .Lfunc_end3:
 	.size	s2f, .Lfunc_end3-s2f
-
+                                        # -- End function
 	.section	.text.s2d,"ax",@progbits
-	.hidden	s2d
+	.hidden	s2d                     # -- Begin function s2d
 	.globl	s2d
 	.type	s2d,@function
 s2d:                                    # @s2d
@@ -88,9 +88,9 @@ s2d:                                    # @s2d
 	.endfunc
 .Lfunc_end4:
 	.size	s2d, .Lfunc_end4-s2d
-
+                                        # -- End function
 	.section	.text.s2ld,"ax",@progbits
-	.hidden	s2ld
+	.hidden	s2ld                    # -- Begin function s2ld
 	.globl	s2ld
 	.type	s2ld,@function
 s2ld:                                   # @s2ld
@@ -98,10 +98,10 @@ s2ld:                                   # @s2ld
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
+	i32.sub 	$push14=, $pop5, $pop7
 	tee_local	$push13=, $2=, $pop14
 	i32.store	__stack_pointer($pop8), $pop13
 	call    	__floatsitf@FUNCTION, $2, $1
@@ -121,65 +121,63 @@ s2ld:                                   # @s2ld
 	.endfunc
 .Lfunc_end5:
 	.size	s2ld, .Lfunc_end5-s2ld
-
+                                        # -- End function
 	.section	.text.fnear,"ax",@progbits
-	.hidden	fnear
+	.hidden	fnear                   # -- Begin function fnear
 	.globl	fnear
 	.type	fnear,@function
 fnear:                                  # @fnear
 	.param  	f32, f32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 1
 	block   	
-	f32.sub 	$push5=, $0, $1
-	tee_local	$push4=, $1=, $pop5
+	f32.sub 	$push6=, $0, $1
+	tee_local	$push5=, $1=, $pop6
 	f32.const	$push0=, 0x0p0
-	f32.eq  	$push1=, $pop4, $pop0
+	f32.ne  	$push1=, $pop5, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.rhs
+# BB#1:                                 # %lor.end
+	i32.const	$push7=, 1
+	return  	$pop7
+.LBB6_2:                                # %lor.rhs
+	end_block                       # label0:
 	f32.div 	$push2=, $0, $1
 	f32.const	$push3=, 0x1.e848p19
-	f32.gt  	$2=, $pop2, $pop3
-.LBB6_2:                                # %lor.end
-	end_block                       # label0:
-	copy_local	$push6=, $2
-                                        # fallthrough-return: $pop6
+	f32.gt  	$push4=, $pop2, $pop3
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end6:
 	.size	fnear, .Lfunc_end6-fnear
-
+                                        # -- End function
 	.section	.text.dnear,"ax",@progbits
-	.hidden	dnear
+	.hidden	dnear                   # -- Begin function dnear
 	.globl	dnear
 	.type	dnear,@function
 dnear:                                  # @dnear
 	.param  	f64, f64
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 1
 	block   	
-	f64.sub 	$push5=, $0, $1
-	tee_local	$push4=, $1=, $pop5
+	f64.sub 	$push6=, $0, $1
+	tee_local	$push5=, $1=, $pop6
 	f64.const	$push0=, 0x0p0
-	f64.eq  	$push1=, $pop4, $pop0
+	f64.ne  	$push1=, $pop5, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %lor.rhs
+# BB#1:                                 # %lor.end
+	i32.const	$push7=, 1
+	return  	$pop7
+.LBB7_2:                                # %lor.rhs
+	end_block                       # label1:
 	f64.div 	$push2=, $0, $1
 	f64.const	$push3=, 0x1.6bcc41e9p46
-	f64.gt  	$2=, $pop2, $pop3
-.LBB7_2:                                # %lor.end
-	end_block                       # label1:
-	copy_local	$push6=, $2
-                                        # fallthrough-return: $pop6
+	f64.gt  	$push4=, $pop2, $pop3
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end7:
 	.size	dnear, .Lfunc_end7-dnear
-
+                                        # -- End function
 	.section	.text.ldnear,"ax",@progbits
-	.hidden	ldnear
+	.hidden	ldnear                  # -- Begin function ldnear
 	.globl	ldnear
 	.type	ldnear,@function
 ldnear:                                 # @ldnear
@@ -188,10 +186,10 @@ ldnear:                                 # @ldnear
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 32
-	i32.sub 	$push28=, $pop11, $pop12
+	i32.sub 	$push28=, $pop10, $pop12
 	tee_local	$push27=, $5=, $pop28
 	i32.store	__stack_pointer($pop13), $pop27
 	i32.const	$push17=, 16
@@ -234,23 +232,23 @@ ldnear:                                 # @ldnear
 	.endfunc
 .Lfunc_end8:
 	.size	ldnear, .Lfunc_end8-ldnear
-
+                                        # -- End function
 	.section	.text.test_integer_to_float,"ax",@progbits
-	.hidden	test_integer_to_float
+	.hidden	test_integer_to_float   # -- Begin function test_integer_to_float
 	.globl	test_integer_to_float
 	.type	test_integer_to_float,@function
 test_integer_to_float:                  # @test_integer_to_float
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %fnear.exit178
+# BB#0:                                 # %if.end103
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end9:
 	.size	test_integer_to_float, .Lfunc_end9-test_integer_to_float
-
+                                        # -- End function
 	.section	.text.ull2f,"ax",@progbits
-	.hidden	ull2f
+	.hidden	ull2f                   # -- Begin function ull2f
 	.globl	ull2f
 	.type	ull2f,@function
 ull2f:                                  # @ull2f
@@ -262,9 +260,9 @@ ull2f:                                  # @ull2f
 	.endfunc
 .Lfunc_end10:
 	.size	ull2f, .Lfunc_end10-ull2f
-
+                                        # -- End function
 	.section	.text.ull2d,"ax",@progbits
-	.hidden	ull2d
+	.hidden	ull2d                   # -- Begin function ull2d
 	.globl	ull2d
 	.type	ull2d,@function
 ull2d:                                  # @ull2d
@@ -276,9 +274,9 @@ ull2d:                                  # @ull2d
 	.endfunc
 .Lfunc_end11:
 	.size	ull2d, .Lfunc_end11-ull2d
-
+                                        # -- End function
 	.section	.text.ull2ld,"ax",@progbits
-	.hidden	ull2ld
+	.hidden	ull2ld                  # -- Begin function ull2ld
 	.globl	ull2ld
 	.type	ull2ld,@function
 ull2ld:                                 # @ull2ld
@@ -286,10 +284,10 @@ ull2ld:                                 # @ull2ld
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
+	i32.sub 	$push14=, $pop5, $pop7
 	tee_local	$push13=, $2=, $pop14
 	i32.store	__stack_pointer($pop8), $pop13
 	call    	__floatunditf@FUNCTION, $2, $1
@@ -309,9 +307,9 @@ ull2ld:                                 # @ull2ld
 	.endfunc
 .Lfunc_end12:
 	.size	ull2ld, .Lfunc_end12-ull2ld
-
+                                        # -- End function
 	.section	.text.sll2f,"ax",@progbits
-	.hidden	sll2f
+	.hidden	sll2f                   # -- Begin function sll2f
 	.globl	sll2f
 	.type	sll2f,@function
 sll2f:                                  # @sll2f
@@ -323,9 +321,9 @@ sll2f:                                  # @sll2f
 	.endfunc
 .Lfunc_end13:
 	.size	sll2f, .Lfunc_end13-sll2f
-
+                                        # -- End function
 	.section	.text.sll2d,"ax",@progbits
-	.hidden	sll2d
+	.hidden	sll2d                   # -- Begin function sll2d
 	.globl	sll2d
 	.type	sll2d,@function
 sll2d:                                  # @sll2d
@@ -337,9 +335,9 @@ sll2d:                                  # @sll2d
 	.endfunc
 .Lfunc_end14:
 	.size	sll2d, .Lfunc_end14-sll2d
-
+                                        # -- End function
 	.section	.text.sll2ld,"ax",@progbits
-	.hidden	sll2ld
+	.hidden	sll2ld                  # -- Begin function sll2ld
 	.globl	sll2ld
 	.type	sll2ld,@function
 sll2ld:                                 # @sll2ld
@@ -347,10 +345,10 @@ sll2ld:                                 # @sll2ld
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push14=, $pop6, $pop7
+	i32.sub 	$push14=, $pop5, $pop7
 	tee_local	$push13=, $2=, $pop14
 	i32.store	__stack_pointer($pop8), $pop13
 	call    	__floatditf@FUNCTION, $2, $1
@@ -370,23 +368,23 @@ sll2ld:                                 # @sll2ld
 	.endfunc
 .Lfunc_end15:
 	.size	sll2ld, .Lfunc_end15-sll2ld
-
+                                        # -- End function
 	.section	.text.test_longlong_integer_to_float,"ax",@progbits
-	.hidden	test_longlong_integer_to_float
+	.hidden	test_longlong_integer_to_float # -- Begin function test_longlong_integer_to_float
 	.globl	test_longlong_integer_to_float
 	.type	test_longlong_integer_to_float,@function
 test_longlong_integer_to_float:         # @test_longlong_integer_to_float
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %fnear.exit
+# BB#0:                                 # %if.end96
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end16:
 	.size	test_longlong_integer_to_float, .Lfunc_end16-test_longlong_integer_to_float
-
+                                        # -- End function
 	.section	.text.f2u,"ax",@progbits
-	.hidden	f2u
+	.hidden	f2u                     # -- Begin function f2u
 	.globl	f2u
 	.type	f2u,@function
 f2u:                                    # @f2u
@@ -398,9 +396,9 @@ f2u:                                    # @f2u
 	.endfunc
 .Lfunc_end17:
 	.size	f2u, .Lfunc_end17-f2u
-
+                                        # -- End function
 	.section	.text.d2u,"ax",@progbits
-	.hidden	d2u
+	.hidden	d2u                     # -- Begin function d2u
 	.globl	d2u
 	.type	d2u,@function
 d2u:                                    # @d2u
@@ -412,9 +410,9 @@ d2u:                                    # @d2u
 	.endfunc
 .Lfunc_end18:
 	.size	d2u, .Lfunc_end18-d2u
-
+                                        # -- End function
 	.section	.text.ld2u,"ax",@progbits
-	.hidden	ld2u
+	.hidden	ld2u                    # -- Begin function ld2u
 	.globl	ld2u
 	.type	ld2u,@function
 ld2u:                                   # @ld2u
@@ -426,9 +424,9 @@ ld2u:                                   # @ld2u
 	.endfunc
 .Lfunc_end19:
 	.size	ld2u, .Lfunc_end19-ld2u
-
+                                        # -- End function
 	.section	.text.f2s,"ax",@progbits
-	.hidden	f2s
+	.hidden	f2s                     # -- Begin function f2s
 	.globl	f2s
 	.type	f2s,@function
 f2s:                                    # @f2s
@@ -440,9 +438,9 @@ f2s:                                    # @f2s
 	.endfunc
 .Lfunc_end20:
 	.size	f2s, .Lfunc_end20-f2s
-
+                                        # -- End function
 	.section	.text.d2s,"ax",@progbits
-	.hidden	d2s
+	.hidden	d2s                     # -- Begin function d2s
 	.globl	d2s
 	.type	d2s,@function
 d2s:                                    # @d2s
@@ -454,9 +452,9 @@ d2s:                                    # @d2s
 	.endfunc
 .Lfunc_end21:
 	.size	d2s, .Lfunc_end21-d2s
-
+                                        # -- End function
 	.section	.text.ld2s,"ax",@progbits
-	.hidden	ld2s
+	.hidden	ld2s                    # -- Begin function ld2s
 	.globl	ld2s
 	.type	ld2s,@function
 ld2s:                                   # @ld2s
@@ -468,9 +466,9 @@ ld2s:                                   # @ld2s
 	.endfunc
 .Lfunc_end22:
 	.size	ld2s, .Lfunc_end22-ld2s
-
+                                        # -- End function
 	.section	.text.test_float_to_integer,"ax",@progbits
-	.hidden	test_float_to_integer
+	.hidden	test_float_to_integer   # -- Begin function test_float_to_integer
 	.globl	test_float_to_integer
 	.type	test_float_to_integer,@function
 test_float_to_integer:                  # @test_float_to_integer
@@ -482,9 +480,9 @@ test_float_to_integer:                  # @test_float_to_integer
 	.endfunc
 .Lfunc_end23:
 	.size	test_float_to_integer, .Lfunc_end23-test_float_to_integer
-
+                                        # -- End function
 	.section	.text.f2ull,"ax",@progbits
-	.hidden	f2ull
+	.hidden	f2ull                   # -- Begin function f2ull
 	.globl	f2ull
 	.type	f2ull,@function
 f2ull:                                  # @f2ull
@@ -496,9 +494,9 @@ f2ull:                                  # @f2ull
 	.endfunc
 .Lfunc_end24:
 	.size	f2ull, .Lfunc_end24-f2ull
-
+                                        # -- End function
 	.section	.text.d2ull,"ax",@progbits
-	.hidden	d2ull
+	.hidden	d2ull                   # -- Begin function d2ull
 	.globl	d2ull
 	.type	d2ull,@function
 d2ull:                                  # @d2ull
@@ -510,9 +508,9 @@ d2ull:                                  # @d2ull
 	.endfunc
 .Lfunc_end25:
 	.size	d2ull, .Lfunc_end25-d2ull
-
+                                        # -- End function
 	.section	.text.ld2ull,"ax",@progbits
-	.hidden	ld2ull
+	.hidden	ld2ull                  # -- Begin function ld2ull
 	.globl	ld2ull
 	.type	ld2ull,@function
 ld2ull:                                 # @ld2ull
@@ -524,9 +522,9 @@ ld2ull:                                 # @ld2ull
 	.endfunc
 .Lfunc_end26:
 	.size	ld2ull, .Lfunc_end26-ld2ull
-
+                                        # -- End function
 	.section	.text.f2sll,"ax",@progbits
-	.hidden	f2sll
+	.hidden	f2sll                   # -- Begin function f2sll
 	.globl	f2sll
 	.type	f2sll,@function
 f2sll:                                  # @f2sll
@@ -538,9 +536,9 @@ f2sll:                                  # @f2sll
 	.endfunc
 .Lfunc_end27:
 	.size	f2sll, .Lfunc_end27-f2sll
-
+                                        # -- End function
 	.section	.text.d2sll,"ax",@progbits
-	.hidden	d2sll
+	.hidden	d2sll                   # -- Begin function d2sll
 	.globl	d2sll
 	.type	d2sll,@function
 d2sll:                                  # @d2sll
@@ -552,9 +550,9 @@ d2sll:                                  # @d2sll
 	.endfunc
 .Lfunc_end28:
 	.size	d2sll, .Lfunc_end28-d2sll
-
+                                        # -- End function
 	.section	.text.ld2sll,"ax",@progbits
-	.hidden	ld2sll
+	.hidden	ld2sll                  # -- Begin function ld2sll
 	.globl	ld2sll
 	.type	ld2sll,@function
 ld2sll:                                 # @ld2sll
@@ -566,9 +564,9 @@ ld2sll:                                 # @ld2sll
 	.endfunc
 .Lfunc_end29:
 	.size	ld2sll, .Lfunc_end29-ld2sll
-
+                                        # -- End function
 	.section	.text.test_float_to_longlong_integer,"ax",@progbits
-	.hidden	test_float_to_longlong_integer
+	.hidden	test_float_to_longlong_integer # -- Begin function test_float_to_longlong_integer
 	.globl	test_float_to_longlong_integer
 	.type	test_float_to_longlong_integer,@function
 test_float_to_longlong_integer:         # @test_float_to_longlong_integer
@@ -580,9 +578,9 @@ test_float_to_longlong_integer:         # @test_float_to_longlong_integer
 	.endfunc
 .Lfunc_end30:
 	.size	test_float_to_longlong_integer, .Lfunc_end30-test_float_to_longlong_integer
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -594,7 +592,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end31:
 	.size	main, .Lfunc_end31-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cvt-1.c.s b/test/torture-s/cvt-1.c.s
index 029390645..cc55cd4e7 100644
--- a/test/torture-s/cvt-1.c.s
+++ b/test/torture-s/cvt-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/cvt-1.c"
+	.file	"cvt-1.c"
 	.section	.text.g2,"ax",@progbits
-	.hidden	g2
+	.hidden	g2                      # -- Begin function g2
 	.globl	g2
 	.type	g2,@function
 g2:                                     # @g2
@@ -13,9 +13,9 @@ g2:                                     # @g2
 	.endfunc
 .Lfunc_end0:
 	.size	g2, .Lfunc_end0-g2
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,9 +27,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/dbra-1.c.s b/test/torture-s/dbra-1.c.s
index a3aa00f01..c2acb0fe2 100644
--- a/test/torture-s/dbra-1.c.s
+++ b/test/torture-s/dbra-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/dbra-1.c"
+	.file	"dbra-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -16,9 +16,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -30,9 +30,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -50,9 +50,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -65,9 +65,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -89,9 +89,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -104,9 +104,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -118,7 +118,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divcmp-1.c.s b/test/torture-s/divcmp-1.c.s
index 99d8c7c3e..c33dfafd5 100644
--- a/test/torture-s/divcmp-1.c.s
+++ b/test/torture-s/divcmp-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divcmp-1.c"
+	.file	"divcmp-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -16,9 +16,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test1u,"ax",@progbits
-	.hidden	test1u
+	.hidden	test1u                  # -- Begin function test1u
 	.globl	test1u
 	.type	test1u,@function
 test1u:                                 # @test1u
@@ -33,9 +33,9 @@ test1u:                                 # @test1u
 	.endfunc
 .Lfunc_end1:
 	.size	test1u, .Lfunc_end1-test1u
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -50,9 +50,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test2u,"ax",@progbits
-	.hidden	test2u
+	.hidden	test2u                  # -- Begin function test2u
 	.globl	test2u
 	.type	test2u,@function
 test2u:                                 # @test2u
@@ -65,9 +65,9 @@ test2u:                                 # @test2u
 	.endfunc
 .Lfunc_end3:
 	.size	test2u, .Lfunc_end3-test2u
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -82,9 +82,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end4:
 	.size	test3, .Lfunc_end4-test3
-
+                                        # -- End function
 	.section	.text.test3u,"ax",@progbits
-	.hidden	test3u
+	.hidden	test3u                  # -- Begin function test3u
 	.globl	test3u
 	.type	test3u,@function
 test3u:                                 # @test3u
@@ -99,9 +99,9 @@ test3u:                                 # @test3u
 	.endfunc
 .Lfunc_end5:
 	.size	test3u, .Lfunc_end5-test3u
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -116,9 +116,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end6:
 	.size	test4, .Lfunc_end6-test4
-
+                                        # -- End function
 	.section	.text.test4u,"ax",@progbits
-	.hidden	test4u
+	.hidden	test4u                  # -- Begin function test4u
 	.globl	test4u
 	.type	test4u,@function
 test4u:                                 # @test4u
@@ -131,9 +131,9 @@ test4u:                                 # @test4u
 	.endfunc
 .Lfunc_end7:
 	.size	test4u, .Lfunc_end7-test4u
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -146,9 +146,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end8:
 	.size	test5, .Lfunc_end8-test5
-
+                                        # -- End function
 	.section	.text.test5u,"ax",@progbits
-	.hidden	test5u
+	.hidden	test5u                  # -- Begin function test5u
 	.globl	test5u
 	.type	test5u,@function
 test5u:                                 # @test5u
@@ -161,9 +161,9 @@ test5u:                                 # @test5u
 	.endfunc
 .Lfunc_end9:
 	.size	test5u, .Lfunc_end9-test5u
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -176,9 +176,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end10:
 	.size	test6, .Lfunc_end10-test6
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -191,9 +191,9 @@ test7:                                  # @test7
 	.endfunc
 .Lfunc_end11:
 	.size	test7, .Lfunc_end11-test7
-
+                                        # -- End function
 	.section	.text.test7u,"ax",@progbits
-	.hidden	test7u
+	.hidden	test7u                  # -- Begin function test7u
 	.globl	test7u
 	.type	test7u,@function
 test7u:                                 # @test7u
@@ -206,9 +206,9 @@ test7u:                                 # @test7u
 	.endfunc
 .Lfunc_end12:
 	.size	test7u, .Lfunc_end12-test7u
-
+                                        # -- End function
 	.section	.text.test8,"ax",@progbits
-	.hidden	test8
+	.hidden	test8                   # -- Begin function test8
 	.globl	test8
 	.type	test8,@function
 test8:                                  # @test8
@@ -221,9 +221,9 @@ test8:                                  # @test8
 	.endfunc
 .Lfunc_end13:
 	.size	test8, .Lfunc_end13-test8
-
+                                        # -- End function
 	.section	.text.test8u,"ax",@progbits
-	.hidden	test8u
+	.hidden	test8u                  # -- Begin function test8u
 	.globl	test8u
 	.type	test8u,@function
 test8u:                                 # @test8u
@@ -236,9 +236,9 @@ test8u:                                 # @test8u
 	.endfunc
 .Lfunc_end14:
 	.size	test8u, .Lfunc_end14-test8u
-
+                                        # -- End function
 	.section	.text.test9,"ax",@progbits
-	.hidden	test9
+	.hidden	test9                   # -- Begin function test9
 	.globl	test9
 	.type	test9,@function
 test9:                                  # @test9
@@ -251,9 +251,9 @@ test9:                                  # @test9
 	.endfunc
 .Lfunc_end15:
 	.size	test9, .Lfunc_end15-test9
-
+                                        # -- End function
 	.section	.text.test9u,"ax",@progbits
-	.hidden	test9u
+	.hidden	test9u                  # -- Begin function test9u
 	.globl	test9u
 	.type	test9u,@function
 test9u:                                 # @test9u
@@ -266,9 +266,9 @@ test9u:                                 # @test9u
 	.endfunc
 .Lfunc_end16:
 	.size	test9u, .Lfunc_end16-test9u
-
+                                        # -- End function
 	.section	.text.test10,"ax",@progbits
-	.hidden	test10
+	.hidden	test10                  # -- Begin function test10
 	.globl	test10
 	.type	test10,@function
 test10:                                 # @test10
@@ -281,9 +281,9 @@ test10:                                 # @test10
 	.endfunc
 .Lfunc_end17:
 	.size	test10, .Lfunc_end17-test10
-
+                                        # -- End function
 	.section	.text.test10u,"ax",@progbits
-	.hidden	test10u
+	.hidden	test10u                 # -- Begin function test10u
 	.globl	test10u
 	.type	test10u,@function
 test10u:                                # @test10u
@@ -296,9 +296,9 @@ test10u:                                # @test10u
 	.endfunc
 .Lfunc_end18:
 	.size	test10u, .Lfunc_end18-test10u
-
+                                        # -- End function
 	.section	.text.test11,"ax",@progbits
-	.hidden	test11
+	.hidden	test11                  # -- Begin function test11
 	.globl	test11
 	.type	test11,@function
 test11:                                 # @test11
@@ -311,9 +311,9 @@ test11:                                 # @test11
 	.endfunc
 .Lfunc_end19:
 	.size	test11, .Lfunc_end19-test11
-
+                                        # -- End function
 	.section	.text.test11u,"ax",@progbits
-	.hidden	test11u
+	.hidden	test11u                 # -- Begin function test11u
 	.globl	test11u
 	.type	test11u,@function
 test11u:                                # @test11u
@@ -326,9 +326,9 @@ test11u:                                # @test11u
 	.endfunc
 .Lfunc_end20:
 	.size	test11u, .Lfunc_end20-test11u
-
+                                        # -- End function
 	.section	.text.test12,"ax",@progbits
-	.hidden	test12
+	.hidden	test12                  # -- Begin function test12
 	.globl	test12
 	.type	test12,@function
 test12:                                 # @test12
@@ -341,9 +341,9 @@ test12:                                 # @test12
 	.endfunc
 .Lfunc_end21:
 	.size	test12, .Lfunc_end21-test12
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -354,6 +354,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end22:
 	.size	main, .Lfunc_end22-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/divcmp-2.c.s b/test/torture-s/divcmp-2.c.s
index 0fe6c11c5..47025a298 100644
--- a/test/torture-s/divcmp-2.c.s
+++ b/test/torture-s/divcmp-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divcmp-2.c"
+	.file	"divcmp-2.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -16,9 +16,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -33,9 +33,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -50,9 +50,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -67,9 +67,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -84,9 +84,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -101,9 +101,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -114,6 +114,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/divcmp-3.c.s b/test/torture-s/divcmp-3.c.s
index fb89beae9..4d3265ef2 100644
--- a/test/torture-s/divcmp-3.c.s
+++ b/test/torture-s/divcmp-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divcmp-3.c"
+	.file	"divcmp-3.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -13,9 +13,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test1u,"ax",@progbits
-	.hidden	test1u
+	.hidden	test1u                  # -- Begin function test1u
 	.globl	test1u
 	.type	test1u,@function
 test1u:                                 # @test1u
@@ -27,9 +27,9 @@ test1u:                                 # @test1u
 	.endfunc
 .Lfunc_end1:
 	.size	test1u, .Lfunc_end1-test1u
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -41,9 +41,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.test2u,"ax",@progbits
-	.hidden	test2u
+	.hidden	test2u                  # -- Begin function test2u
 	.globl	test2u
 	.type	test2u,@function
 test2u:                                 # @test2u
@@ -55,9 +55,9 @@ test2u:                                 # @test2u
 	.endfunc
 .Lfunc_end3:
 	.size	test2u, .Lfunc_end3-test2u
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -69,9 +69,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end4:
 	.size	test3, .Lfunc_end4-test3
-
+                                        # -- End function
 	.section	.text.test3u,"ax",@progbits
-	.hidden	test3u
+	.hidden	test3u                  # -- Begin function test3u
 	.globl	test3u
 	.type	test3u,@function
 test3u:                                 # @test3u
@@ -83,9 +83,9 @@ test3u:                                 # @test3u
 	.endfunc
 .Lfunc_end5:
 	.size	test3u, .Lfunc_end5-test3u
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -97,9 +97,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end6:
 	.size	test4, .Lfunc_end6-test4
-
+                                        # -- End function
 	.section	.text.test4u,"ax",@progbits
-	.hidden	test4u
+	.hidden	test4u                  # -- Begin function test4u
 	.globl	test4u
 	.type	test4u,@function
 test4u:                                 # @test4u
@@ -111,9 +111,9 @@ test4u:                                 # @test4u
 	.endfunc
 .Lfunc_end7:
 	.size	test4u, .Lfunc_end7-test4u
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -125,9 +125,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end8:
 	.size	test5, .Lfunc_end8-test5
-
+                                        # -- End function
 	.section	.text.test5u,"ax",@progbits
-	.hidden	test5u
+	.hidden	test5u                  # -- Begin function test5u
 	.globl	test5u
 	.type	test5u,@function
 test5u:                                 # @test5u
@@ -139,9 +139,9 @@ test5u:                                 # @test5u
 	.endfunc
 .Lfunc_end9:
 	.size	test5u, .Lfunc_end9-test5u
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -153,9 +153,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end10:
 	.size	test6, .Lfunc_end10-test6
-
+                                        # -- End function
 	.section	.text.test6u,"ax",@progbits
-	.hidden	test6u
+	.hidden	test6u                  # -- Begin function test6u
 	.globl	test6u
 	.type	test6u,@function
 test6u:                                 # @test6u
@@ -167,9 +167,9 @@ test6u:                                 # @test6u
 	.endfunc
 .Lfunc_end11:
 	.size	test6u, .Lfunc_end11-test6u
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -180,6 +180,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/divcmp-4.c.s b/test/torture-s/divcmp-4.c.s
index d956b2ff5..bb0c7cb4d 100644
--- a/test/torture-s/divcmp-4.c.s
+++ b/test/torture-s/divcmp-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divcmp-4.c"
+	.file	"divcmp-4.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -16,9 +16,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -33,9 +33,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -50,9 +50,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -67,9 +67,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -82,9 +82,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -97,9 +97,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -112,9 +112,9 @@ test7:                                  # @test7
 	.endfunc
 .Lfunc_end6:
 	.size	test7, .Lfunc_end6-test7
-
+                                        # -- End function
 	.section	.text.test8,"ax",@progbits
-	.hidden	test8
+	.hidden	test8                   # -- Begin function test8
 	.globl	test8
 	.type	test8,@function
 test8:                                  # @test8
@@ -127,9 +127,9 @@ test8:                                  # @test8
 	.endfunc
 .Lfunc_end7:
 	.size	test8, .Lfunc_end7-test8
-
+                                        # -- End function
 	.section	.text.test9,"ax",@progbits
-	.hidden	test9
+	.hidden	test9                   # -- Begin function test9
 	.globl	test9
 	.type	test9,@function
 test9:                                  # @test9
@@ -142,9 +142,9 @@ test9:                                  # @test9
 	.endfunc
 .Lfunc_end8:
 	.size	test9, .Lfunc_end8-test9
-
+                                        # -- End function
 	.section	.text.test10,"ax",@progbits
-	.hidden	test10
+	.hidden	test10                  # -- Begin function test10
 	.globl	test10
 	.type	test10,@function
 test10:                                 # @test10
@@ -157,9 +157,9 @@ test10:                                 # @test10
 	.endfunc
 .Lfunc_end9:
 	.size	test10, .Lfunc_end9-test10
-
+                                        # -- End function
 	.section	.text.test11,"ax",@progbits
-	.hidden	test11
+	.hidden	test11                  # -- Begin function test11
 	.globl	test11
 	.type	test11,@function
 test11:                                 # @test11
@@ -172,9 +172,9 @@ test11:                                 # @test11
 	.endfunc
 .Lfunc_end10:
 	.size	test11, .Lfunc_end10-test11
-
+                                        # -- End function
 	.section	.text.test12,"ax",@progbits
-	.hidden	test12
+	.hidden	test12                  # -- Begin function test12
 	.globl	test12
 	.type	test12,@function
 test12:                                 # @test12
@@ -187,9 +187,9 @@ test12:                                 # @test12
 	.endfunc
 .Lfunc_end11:
 	.size	test12, .Lfunc_end11-test12
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -200,6 +200,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/divcmp-5.c.s b/test/torture-s/divcmp-5.c.s
index 8802dca39..79a7acc23 100644
--- a/test/torture-s/divcmp-5.c.s
+++ b/test/torture-s/divcmp-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divcmp-5.c"
+	.file	"divcmp-5.c"
 	.section	.text.always_one_1,"ax",@progbits
-	.hidden	always_one_1
+	.hidden	always_one_1            # -- Begin function always_one_1
 	.globl	always_one_1
 	.type	always_one_1,@function
 always_one_1:                           # @always_one_1
@@ -13,9 +13,9 @@ always_one_1:                           # @always_one_1
 	.endfunc
 .Lfunc_end0:
 	.size	always_one_1, .Lfunc_end0-always_one_1
-
+                                        # -- End function
 	.section	.text.always_one_2,"ax",@progbits
-	.hidden	always_one_2
+	.hidden	always_one_2            # -- Begin function always_one_2
 	.globl	always_one_2
 	.type	always_one_2,@function
 always_one_2:                           # @always_one_2
@@ -27,9 +27,9 @@ always_one_2:                           # @always_one_2
 	.endfunc
 .Lfunc_end1:
 	.size	always_one_2, .Lfunc_end1-always_one_2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,6 +40,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/divconst-1.c.s b/test/torture-s/divconst-1.c.s
index e3a027377..cb3fecf04 100644
--- a/test/torture-s/divconst-1.c.s
+++ b/test/torture-s/divconst-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divconst-1.c"
+	.file	"divconst-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divconst-2.c.s b/test/torture-s/divconst-2.c.s
index e01a5f249..c15919c4e 100644
--- a/test/torture-s/divconst-2.c.s
+++ b/test/torture-s/divconst-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divconst-2.c"
+	.file	"divconst-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.r,"ax",@progbits
-	.hidden	r
+	.hidden	r                       # -- Begin function r
 	.globl	r
 	.type	r,@function
 r:                                      # @r
@@ -29,9 +29,9 @@ r:                                      # @r
 	.endfunc
 .Lfunc_end1:
 	.size	r, .Lfunc_end1-r
-
+                                        # -- End function
 	.section	.text.std_eqn,"ax",@progbits
-	.hidden	std_eqn
+	.hidden	std_eqn                 # -- Begin function std_eqn
 	.globl	std_eqn
 	.type	std_eqn,@function
 std_eqn:                                # @std_eqn
@@ -46,9 +46,9 @@ std_eqn:                                # @std_eqn
 	.endfunc
 .Lfunc_end2:
 	.size	std_eqn, .Lfunc_end2-std_eqn
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -105,7 +105,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	nums                    # @nums
 	.type	nums,@object
 	.section	.data.nums,"aw",@progbits
@@ -118,6 +118,6 @@ nums:
 	.size	nums, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/divconst-3.c.s b/test/torture-s/divconst-3.c.s
index 9fd0996a1..73ef6f687 100644
--- a/test/torture-s/divconst-3.c.s
+++ b/test/torture-s/divconst-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divconst-3.c"
+	.file	"divconst-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divmod-1.c.s b/test/torture-s/divmod-1.c.s
index 8c36e1c77..49add2306 100644
--- a/test/torture-s/divmod-1.c.s
+++ b/test/torture-s/divmod-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/divmod-1.c"
+	.file	"divmod-1.c"
 	.section	.text.div1,"ax",@progbits
-	.hidden	div1
+	.hidden	div1                    # -- Begin function div1
 	.globl	div1
 	.type	div1,@function
 div1:                                   # @div1
@@ -14,9 +14,9 @@ div1:                                   # @div1
 	.endfunc
 .Lfunc_end0:
 	.size	div1, .Lfunc_end0-div1
-
+                                        # -- End function
 	.section	.text.div2,"ax",@progbits
-	.hidden	div2
+	.hidden	div2                    # -- Begin function div2
 	.globl	div2
 	.type	div2,@function
 div2:                                   # @div2
@@ -29,9 +29,9 @@ div2:                                   # @div2
 	.endfunc
 .Lfunc_end1:
 	.size	div2, .Lfunc_end1-div2
-
+                                        # -- End function
 	.section	.text.div3,"ax",@progbits
-	.hidden	div3
+	.hidden	div3                    # -- Begin function div3
 	.globl	div3
 	.type	div3,@function
 div3:                                   # @div3
@@ -43,9 +43,9 @@ div3:                                   # @div3
 	.endfunc
 .Lfunc_end2:
 	.size	div3, .Lfunc_end2-div3
-
+                                        # -- End function
 	.section	.text.div4,"ax",@progbits
-	.hidden	div4
+	.hidden	div4                    # -- Begin function div4
 	.globl	div4
 	.type	div4,@function
 div4:                                   # @div4
@@ -57,9 +57,9 @@ div4:                                   # @div4
 	.endfunc
 .Lfunc_end3:
 	.size	div4, .Lfunc_end3-div4
-
+                                        # -- End function
 	.section	.text.mod1,"ax",@progbits
-	.hidden	mod1
+	.hidden	mod1                    # -- Begin function mod1
 	.globl	mod1
 	.type	mod1,@function
 mod1:                                   # @mod1
@@ -71,9 +71,9 @@ mod1:                                   # @mod1
 	.endfunc
 .Lfunc_end4:
 	.size	mod1, .Lfunc_end4-mod1
-
+                                        # -- End function
 	.section	.text.mod2,"ax",@progbits
-	.hidden	mod2
+	.hidden	mod2                    # -- Begin function mod2
 	.globl	mod2
 	.type	mod2,@function
 mod2:                                   # @mod2
@@ -85,9 +85,9 @@ mod2:                                   # @mod2
 	.endfunc
 .Lfunc_end5:
 	.size	mod2, .Lfunc_end5-mod2
-
+                                        # -- End function
 	.section	.text.mod3,"ax",@progbits
-	.hidden	mod3
+	.hidden	mod3                    # -- Begin function mod3
 	.globl	mod3
 	.type	mod3,@function
 mod3:                                   # @mod3
@@ -99,9 +99,9 @@ mod3:                                   # @mod3
 	.endfunc
 .Lfunc_end6:
 	.size	mod3, .Lfunc_end6-mod3
-
+                                        # -- End function
 	.section	.text.mod4,"ax",@progbits
-	.hidden	mod4
+	.hidden	mod4                    # -- Begin function mod4
 	.globl	mod4
 	.type	mod4,@function
 mod4:                                   # @mod4
@@ -113,9 +113,9 @@ mod4:                                   # @mod4
 	.endfunc
 .Lfunc_end7:
 	.size	mod4, .Lfunc_end7-mod4
-
+                                        # -- End function
 	.section	.text.mod5,"ax",@progbits
-	.hidden	mod5
+	.hidden	mod5                    # -- Begin function mod5
 	.globl	mod5
 	.type	mod5,@function
 mod5:                                   # @mod5
@@ -127,9 +127,9 @@ mod5:                                   # @mod5
 	.endfunc
 .Lfunc_end8:
 	.size	mod5, .Lfunc_end8-mod5
-
+                                        # -- End function
 	.section	.text.mod6,"ax",@progbits
-	.hidden	mod6
+	.hidden	mod6                    # -- Begin function mod6
 	.globl	mod6
 	.type	mod6,@function
 mod6:                                   # @mod6
@@ -141,9 +141,9 @@ mod6:                                   # @mod6
 	.endfunc
 .Lfunc_end9:
 	.size	mod6, .Lfunc_end9-mod6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -155,7 +155,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end10:
 	.size	main, .Lfunc_end10-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/doloop-1.c.s b/test/torture-s/doloop-1.c.s
index e79f26e64..a0ffe7cf9 100644
--- a/test/torture-s/doloop-1.c.s
+++ b/test/torture-s/doloop-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/doloop-1.c"
+	.file	"doloop-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -54,6 +54,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/doloop-2.c.s b/test/torture-s/doloop-2.c.s
index d9fa857ba..19b419b78 100644
--- a/test/torture-s/doloop-2.c.s
+++ b/test/torture-s/doloop-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/doloop-2.c"
+	.file	"doloop-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -54,6 +54,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/eeprof-1.c.s b/test/torture-s/eeprof-1.c.s
index 8e693aac5..ca51b4eed 100644
--- a/test/torture-s/eeprof-1.c.s
+++ b/test/torture-s/eeprof-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c"
+	.file	"eeprof-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,9 +21,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.nfoo,"ax",@progbits
-	.hidden	nfoo
+	.hidden	nfoo                    # -- Begin function nfoo
 	.globl	nfoo
 	.type	nfoo,@function
 nfoo:                                   # @nfoo
@@ -79,16 +79,16 @@ nfoo:                                   # @nfoo
 	br_if   	0, $pop17       # 0: down to label1
 # BB#8:                                 # %if.end18
 	return
-.LBB1_9:                                # %if.then17
+.LBB1_9:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	nfoo, .Lfunc_end1-nfoo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -148,16 +148,16 @@ main:                                   # @main
 # BB#8:                                 # %if.end20
 	i32.const	$push33=, 0
 	return  	$pop33
-.LBB2_9:                                # %if.then19
+.LBB2_9:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.section	.text.__cyg_profile_func_enter,"ax",@progbits
-	.hidden	__cyg_profile_func_enter
+	.hidden	__cyg_profile_func_enter # -- Begin function __cyg_profile_func_enter
 	.globl	__cyg_profile_func_enter
 	.type	__cyg_profile_func_enter,@function
 __cyg_profile_func_enter:               # @__cyg_profile_func_enter
@@ -175,9 +175,9 @@ __cyg_profile_func_enter:               # @__cyg_profile_func_enter
 	.endfunc
 .Lfunc_end3:
 	.size	__cyg_profile_func_enter, .Lfunc_end3-__cyg_profile_func_enter
-
+                                        # -- End function
 	.section	.text.__cyg_profile_func_exit,"ax",@progbits
-	.hidden	__cyg_profile_func_exit
+	.hidden	__cyg_profile_func_exit # -- Begin function __cyg_profile_func_exit
 	.globl	__cyg_profile_func_exit
 	.type	__cyg_profile_func_exit,@function
 __cyg_profile_func_exit:                # @__cyg_profile_func_exit
@@ -195,9 +195,9 @@ __cyg_profile_func_exit:                # @__cyg_profile_func_exit
 	.endfunc
 .Lfunc_end4:
 	.size	__cyg_profile_func_exit, .Lfunc_end4-__cyg_profile_func_exit
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.type	foo2,@function
+	.type	foo2,@function          # -- Begin function foo2
 foo2:                                   # @foo2
 # BB#0:                                 # %entry
 	block   	
@@ -243,14 +243,14 @@ foo2:                                   # @foo2
 	br_if   	0, $pop16       # 0: down to label3
 # BB#7:                                 # %if.end15
 	return
-.LBB5_8:                                # %if.then14
+.LBB5_8:                                # %if.then
 	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end5:
 	.size	foo2, .Lfunc_end5-foo2
-
+                                        # -- End function
 	.hidden	last_fn_entered         # @last_fn_entered
 	.type	last_fn_entered,@object
 	.section	.bss.last_fn_entered,"aw",@nobits
@@ -288,5 +288,5 @@ last_fn_exited:
 	.size	last_fn_exited, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/enum-1.c.s b/test/torture-s/enum-1.c.s
index 2339e36e4..0e351e0fa 100644
--- a/test/torture-s/enum-1.c.s
+++ b/test/torture-s/enum-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/enum-1.c"
+	.file	"enum-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/enum-2.c.s b/test/torture-s/enum-2.c.s
index ecdafa334..55a94da91 100644
--- a/test/torture-s/enum-2.c.s
+++ b/test/torture-s/enum-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/enum-2.c"
+	.file	"enum-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/enum-3.c.s b/test/torture-s/enum-3.c.s
index 6b58dca47..9a586926b 100644
--- a/test/torture-s/enum-3.c.s
+++ b/test/torture-s/enum-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/enum-3.c"
+	.file	"enum-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop3, $pop4
+	i32.sub 	$push10=, $pop2, $pop4
 	tee_local	$push9=, $0=, $pop10
 	i32.store	__stack_pointer($pop5), $pop9
 	i32.const	$push0=, 0
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	q                       # @q
 	.type	q,@object
 	.section	.bss.q,"aw",@nobits
@@ -47,5 +47,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/extzvsi.c.s b/test/torture-s/extzvsi.c.s
index d4fe764ba..8cb7ab717 100644
--- a/test/torture-s/extzvsi.c.s
+++ b/test/torture-s/extzvsi.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/extzvsi.c"
+	.file	"extzvsi.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,7 +47,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -58,4 +58,4 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/ffs-1.c.s b/test/torture-s/ffs-1.c.s
index a3fc6e676..160a04f2f 100644
--- a/test/torture-s/ffs-1.c.s
+++ b/test/torture-s/ffs-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ffs-1.c"
+	.file	"ffs-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -22,7 +22,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -33,6 +33,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/ffs-2.c.s b/test/torture-s/ffs-2.c.s
index db9f3c4d9..3918a4be8 100644
--- a/test/torture-s/ffs-2.c.s
+++ b/test/torture-s/ffs-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ffs-2.c"
+	.file	"ffs-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -123,7 +123,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	ffstesttab              # @ffstesttab
 	.type	ffstesttab,@object
 	.section	.data.ffstesttab,"aw",@progbits
@@ -149,6 +149,6 @@ ffstesttab:
 	.size	ffstesttab, 64
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/float-floor.c.s b/test/torture-s/float-floor.c.s
index 6e2a53bf6..9eb55e579 100644
--- a/test/torture-s/float-floor.c.s
+++ b/test/torture-s/float-floor.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/float-floor.c"
+	.file	"float-floor.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.data.d,"aw",@progbits
@@ -44,6 +44,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
-	.functype	floor, f64, f64
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/floatunsisf-1.c.s b/test/torture-s/floatunsisf-1.c.s
index 010978933..a2ce57726 100644
--- a/test/torture-s/floatunsisf-1.c.s
+++ b/test/torture-s/floatunsisf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/floatunsisf-1.c"
+	.file	"floatunsisf-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.data.u,"aw",@progbits
@@ -62,6 +62,6 @@ f2:
 	.size	f2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/fprintf-1.c.s b/test/torture-s/fprintf-1.c.s
index 11f350329..fff4b53fa 100644
--- a/test/torture-s/fprintf-1.c.s
+++ b/test/torture-s/fprintf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-1.c"
+	.file	"fprintf-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push47=, 0
-	i32.const	$push44=, 0
-	i32.load	$push45=, __stack_pointer($pop44)
+	i32.const	$push45=, 0
+	i32.load	$push44=, __stack_pointer($pop45)
 	i32.const	$push46=, 144
-	i32.sub 	$push75=, $pop45, $pop46
+	i32.sub 	$push75=, $pop44, $pop46
 	tee_local	$push74=, $1=, $pop75
 	i32.store	__stack_pointer($pop47), $pop74
 	i32.const	$push1=, .L.str
@@ -151,14 +151,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop50), $pop49
 	i32.const	$push98=, 0
 	return  	$pop98
-.LBB0_12:                               # %if.then50
+.LBB0_12:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -201,9 +201,10 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	fwrite, i32, i32, i32, i32, i32
 	.functype	fputc, i32, i32, i32
 	.import_global	stdout
+	.size	stdout, 4
diff --git a/test/torture-s/fprintf-chk-1.c.s b/test/torture-s/fprintf-chk-1.c.s
index 014cdb183..e1aaa68bc 100644
--- a/test/torture-s/fprintf-chk-1.c.s
+++ b/test/torture-s/fprintf-chk-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-chk-1.c"
+	.file	"fprintf-chk-1.c"
 	.section	.text.__fprintf_chk,"ax",@progbits
-	.hidden	__fprintf_chk
+	.hidden	__fprintf_chk           # -- Begin function __fprintf_chk
 	.globl	__fprintf_chk
 	.type	__fprintf_chk,@function
 __fprintf_chk:                          # @__fprintf_chk
@@ -10,10 +10,10 @@ __fprintf_chk:                          # @__fprintf_chk
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop3, $pop4
+	i32.sub 	$push11=, $pop2, $pop4
 	tee_local	$push10=, $4=, $pop11
 	i32.store	__stack_pointer($pop5), $pop10
 	block   	
@@ -38,9 +38,9 @@ __fprintf_chk:                          # @__fprintf_chk
 	.endfunc
 .Lfunc_end0:
 	.size	__fprintf_chk, .Lfunc_end0-__fprintf_chk
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,10 +48,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push57=, 0
-	i32.const	$push54=, 0
-	i32.load	$push55=, __stack_pointer($pop54)
+	i32.const	$push55=, 0
+	i32.load	$push54=, __stack_pointer($pop55)
 	i32.const	$push56=, 224
-	i32.sub 	$push95=, $pop55, $pop56
+	i32.sub 	$push95=, $pop54, $pop56
 	tee_local	$push94=, $1=, $pop95
 	i32.store	__stack_pointer($pop57), $pop94
 	i32.const	$push93=, 0
@@ -386,14 +386,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop60), $pop59
 	i32.const	$push199=, 0
 	return  	$pop199
-.LBB1_34:                               # %if.then115
+.LBB1_34:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	should_optimize         # @should_optimize
 	.type	should_optimize,@object
 	.section	.bss.should_optimize,"aw",@nobits
@@ -445,7 +445,8 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
 	.import_global	stdout
+	.size	stdout, 4
diff --git a/test/torture-s/frame-address.c.s b/test/torture-s/frame-address.c.s
index 78a66dc8a..33151d105 100644
--- a/test/torture-s/frame-address.c.s
+++ b/test/torture-s/frame-address.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/frame-address.c"
+	.file	"frame-address.c"
 	.section	.text.check_fa_work,"ax",@progbits
-	.hidden	check_fa_work
+	.hidden	check_fa_work           # -- Begin function check_fa_work
 	.globl	check_fa_work
 	.type	check_fa_work,@function
 check_fa_work:                          # @check_fa_work
@@ -9,10 +9,10 @@ check_fa_work:                          # @check_fa_work
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop9, $pop10
+	i32.sub 	$push18=, $pop8, $pop10
 	tee_local	$push17=, $2=, $pop18
 	i32.const	$push0=, 0
 	i32.store8	15($pop17), $pop0
@@ -39,9 +39,9 @@ check_fa_work:                          # @check_fa_work
 	.endfunc
 .Lfunc_end0:
 	.size	check_fa_work, .Lfunc_end0-check_fa_work
-
+                                        # -- End function
 	.section	.text.check_fa_mid,"ax",@progbits
-	.hidden	check_fa_mid
+	.hidden	check_fa_mid            # -- Begin function check_fa_mid
 	.globl	check_fa_mid
 	.type	check_fa_mid,@function
 check_fa_mid:                           # @check_fa_mid
@@ -62,9 +62,9 @@ check_fa_mid:                           # @check_fa_mid
 	.endfunc
 .Lfunc_end1:
 	.size	check_fa_mid, .Lfunc_end1-check_fa_mid
-
+                                        # -- End function
 	.section	.text.check_fa,"ax",@progbits
-	.hidden	check_fa
+	.hidden	check_fa                # -- Begin function check_fa
 	.globl	check_fa
 	.type	check_fa,@function
 check_fa:                               # @check_fa
@@ -73,10 +73,10 @@ check_fa:                               # @check_fa
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop3, $pop4
+	i32.sub 	$push12=, $pop2, $pop4
 	tee_local	$push11=, $2=, $pop12
 	i32.store	__stack_pointer($pop5), $pop11
 	i32.const	$push9=, 15
@@ -92,9 +92,9 @@ check_fa:                               # @check_fa
 	.endfunc
 .Lfunc_end2:
 	.size	check_fa, .Lfunc_end2-check_fa
-
+                                        # -- End function
 	.section	.text.how_much,"ax",@progbits
-	.hidden	how_much
+	.hidden	how_much                # -- Begin function how_much
 	.globl	how_much
 	.type	how_much,@function
 how_much:                               # @how_much
@@ -105,9 +105,9 @@ how_much:                               # @how_much
 	.endfunc
 .Lfunc_end3:
 	.size	how_much, .Lfunc_end3-how_much
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -128,7 +128,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/func-ptr-1.c.s b/test/torture-s/func-ptr-1.c.s
index 641ea8966..4b5f13aa8 100644
--- a/test/torture-s/func-ptr-1.c.s
+++ b/test/torture-s/func-ptr-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/func-ptr-1.c"
+	.file	"func-ptr-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/gofast.c.s b/test/torture-s/gofast.c.s
index fa181aafc..c8b941a29 100644
--- a/test/torture-s/gofast.c.s
+++ b/test/torture-s/gofast.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/gofast.c"
+	.file	"gofast.c"
 	.section	.text.fp_add,"ax",@progbits
-	.hidden	fp_add
+	.hidden	fp_add                  # -- Begin function fp_add
 	.globl	fp_add
 	.type	fp_add,@function
 fp_add:                                 # @fp_add
@@ -13,9 +13,9 @@ fp_add:                                 # @fp_add
 	.endfunc
 .Lfunc_end0:
 	.size	fp_add, .Lfunc_end0-fp_add
-
+                                        # -- End function
 	.section	.text.fp_sub,"ax",@progbits
-	.hidden	fp_sub
+	.hidden	fp_sub                  # -- Begin function fp_sub
 	.globl	fp_sub
 	.type	fp_sub,@function
 fp_sub:                                 # @fp_sub
@@ -27,9 +27,9 @@ fp_sub:                                 # @fp_sub
 	.endfunc
 .Lfunc_end1:
 	.size	fp_sub, .Lfunc_end1-fp_sub
-
+                                        # -- End function
 	.section	.text.fp_mul,"ax",@progbits
-	.hidden	fp_mul
+	.hidden	fp_mul                  # -- Begin function fp_mul
 	.globl	fp_mul
 	.type	fp_mul,@function
 fp_mul:                                 # @fp_mul
@@ -41,9 +41,9 @@ fp_mul:                                 # @fp_mul
 	.endfunc
 .Lfunc_end2:
 	.size	fp_mul, .Lfunc_end2-fp_mul
-
+                                        # -- End function
 	.section	.text.fp_div,"ax",@progbits
-	.hidden	fp_div
+	.hidden	fp_div                  # -- Begin function fp_div
 	.globl	fp_div
 	.type	fp_div,@function
 fp_div:                                 # @fp_div
@@ -55,9 +55,9 @@ fp_div:                                 # @fp_div
 	.endfunc
 .Lfunc_end3:
 	.size	fp_div, .Lfunc_end3-fp_div
-
+                                        # -- End function
 	.section	.text.fp_neg,"ax",@progbits
-	.hidden	fp_neg
+	.hidden	fp_neg                  # -- Begin function fp_neg
 	.globl	fp_neg
 	.type	fp_neg,@function
 fp_neg:                                 # @fp_neg
@@ -69,9 +69,9 @@ fp_neg:                                 # @fp_neg
 	.endfunc
 .Lfunc_end4:
 	.size	fp_neg, .Lfunc_end4-fp_neg
-
+                                        # -- End function
 	.section	.text.dp_add,"ax",@progbits
-	.hidden	dp_add
+	.hidden	dp_add                  # -- Begin function dp_add
 	.globl	dp_add
 	.type	dp_add,@function
 dp_add:                                 # @dp_add
@@ -83,9 +83,9 @@ dp_add:                                 # @dp_add
 	.endfunc
 .Lfunc_end5:
 	.size	dp_add, .Lfunc_end5-dp_add
-
+                                        # -- End function
 	.section	.text.dp_sub,"ax",@progbits
-	.hidden	dp_sub
+	.hidden	dp_sub                  # -- Begin function dp_sub
 	.globl	dp_sub
 	.type	dp_sub,@function
 dp_sub:                                 # @dp_sub
@@ -97,9 +97,9 @@ dp_sub:                                 # @dp_sub
 	.endfunc
 .Lfunc_end6:
 	.size	dp_sub, .Lfunc_end6-dp_sub
-
+                                        # -- End function
 	.section	.text.dp_mul,"ax",@progbits
-	.hidden	dp_mul
+	.hidden	dp_mul                  # -- Begin function dp_mul
 	.globl	dp_mul
 	.type	dp_mul,@function
 dp_mul:                                 # @dp_mul
@@ -111,9 +111,9 @@ dp_mul:                                 # @dp_mul
 	.endfunc
 .Lfunc_end7:
 	.size	dp_mul, .Lfunc_end7-dp_mul
-
+                                        # -- End function
 	.section	.text.dp_div,"ax",@progbits
-	.hidden	dp_div
+	.hidden	dp_div                  # -- Begin function dp_div
 	.globl	dp_div
 	.type	dp_div,@function
 dp_div:                                 # @dp_div
@@ -125,9 +125,9 @@ dp_div:                                 # @dp_div
 	.endfunc
 .Lfunc_end8:
 	.size	dp_div, .Lfunc_end8-dp_div
-
+                                        # -- End function
 	.section	.text.dp_neg,"ax",@progbits
-	.hidden	dp_neg
+	.hidden	dp_neg                  # -- Begin function dp_neg
 	.globl	dp_neg
 	.type	dp_neg,@function
 dp_neg:                                 # @dp_neg
@@ -139,9 +139,9 @@ dp_neg:                                 # @dp_neg
 	.endfunc
 .Lfunc_end9:
 	.size	dp_neg, .Lfunc_end9-dp_neg
-
+                                        # -- End function
 	.section	.text.fp_to_dp,"ax",@progbits
-	.hidden	fp_to_dp
+	.hidden	fp_to_dp                # -- Begin function fp_to_dp
 	.globl	fp_to_dp
 	.type	fp_to_dp,@function
 fp_to_dp:                               # @fp_to_dp
@@ -153,9 +153,9 @@ fp_to_dp:                               # @fp_to_dp
 	.endfunc
 .Lfunc_end10:
 	.size	fp_to_dp, .Lfunc_end10-fp_to_dp
-
+                                        # -- End function
 	.section	.text.dp_to_fp,"ax",@progbits
-	.hidden	dp_to_fp
+	.hidden	dp_to_fp                # -- Begin function dp_to_fp
 	.globl	dp_to_fp
 	.type	dp_to_fp,@function
 dp_to_fp:                               # @dp_to_fp
@@ -167,9 +167,9 @@ dp_to_fp:                               # @dp_to_fp
 	.endfunc
 .Lfunc_end11:
 	.size	dp_to_fp, .Lfunc_end11-dp_to_fp
-
+                                        # -- End function
 	.section	.text.eqsf2,"ax",@progbits
-	.hidden	eqsf2
+	.hidden	eqsf2                   # -- Begin function eqsf2
 	.globl	eqsf2
 	.type	eqsf2,@function
 eqsf2:                                  # @eqsf2
@@ -181,9 +181,9 @@ eqsf2:                                  # @eqsf2
 	.endfunc
 .Lfunc_end12:
 	.size	eqsf2, .Lfunc_end12-eqsf2
-
+                                        # -- End function
 	.section	.text.nesf2,"ax",@progbits
-	.hidden	nesf2
+	.hidden	nesf2                   # -- Begin function nesf2
 	.globl	nesf2
 	.type	nesf2,@function
 nesf2:                                  # @nesf2
@@ -195,9 +195,9 @@ nesf2:                                  # @nesf2
 	.endfunc
 .Lfunc_end13:
 	.size	nesf2, .Lfunc_end13-nesf2
-
+                                        # -- End function
 	.section	.text.gtsf2,"ax",@progbits
-	.hidden	gtsf2
+	.hidden	gtsf2                   # -- Begin function gtsf2
 	.globl	gtsf2
 	.type	gtsf2,@function
 gtsf2:                                  # @gtsf2
@@ -209,9 +209,9 @@ gtsf2:                                  # @gtsf2
 	.endfunc
 .Lfunc_end14:
 	.size	gtsf2, .Lfunc_end14-gtsf2
-
+                                        # -- End function
 	.section	.text.gesf2,"ax",@progbits
-	.hidden	gesf2
+	.hidden	gesf2                   # -- Begin function gesf2
 	.globl	gesf2
 	.type	gesf2,@function
 gesf2:                                  # @gesf2
@@ -223,9 +223,9 @@ gesf2:                                  # @gesf2
 	.endfunc
 .Lfunc_end15:
 	.size	gesf2, .Lfunc_end15-gesf2
-
+                                        # -- End function
 	.section	.text.ltsf2,"ax",@progbits
-	.hidden	ltsf2
+	.hidden	ltsf2                   # -- Begin function ltsf2
 	.globl	ltsf2
 	.type	ltsf2,@function
 ltsf2:                                  # @ltsf2
@@ -237,9 +237,9 @@ ltsf2:                                  # @ltsf2
 	.endfunc
 .Lfunc_end16:
 	.size	ltsf2, .Lfunc_end16-ltsf2
-
+                                        # -- End function
 	.section	.text.lesf2,"ax",@progbits
-	.hidden	lesf2
+	.hidden	lesf2                   # -- Begin function lesf2
 	.globl	lesf2
 	.type	lesf2,@function
 lesf2:                                  # @lesf2
@@ -251,9 +251,9 @@ lesf2:                                  # @lesf2
 	.endfunc
 .Lfunc_end17:
 	.size	lesf2, .Lfunc_end17-lesf2
-
+                                        # -- End function
 	.section	.text.eqdf2,"ax",@progbits
-	.hidden	eqdf2
+	.hidden	eqdf2                   # -- Begin function eqdf2
 	.globl	eqdf2
 	.type	eqdf2,@function
 eqdf2:                                  # @eqdf2
@@ -265,9 +265,9 @@ eqdf2:                                  # @eqdf2
 	.endfunc
 .Lfunc_end18:
 	.size	eqdf2, .Lfunc_end18-eqdf2
-
+                                        # -- End function
 	.section	.text.nedf2,"ax",@progbits
-	.hidden	nedf2
+	.hidden	nedf2                   # -- Begin function nedf2
 	.globl	nedf2
 	.type	nedf2,@function
 nedf2:                                  # @nedf2
@@ -279,9 +279,9 @@ nedf2:                                  # @nedf2
 	.endfunc
 .Lfunc_end19:
 	.size	nedf2, .Lfunc_end19-nedf2
-
+                                        # -- End function
 	.section	.text.gtdf2,"ax",@progbits
-	.hidden	gtdf2
+	.hidden	gtdf2                   # -- Begin function gtdf2
 	.globl	gtdf2
 	.type	gtdf2,@function
 gtdf2:                                  # @gtdf2
@@ -293,9 +293,9 @@ gtdf2:                                  # @gtdf2
 	.endfunc
 .Lfunc_end20:
 	.size	gtdf2, .Lfunc_end20-gtdf2
-
+                                        # -- End function
 	.section	.text.gedf2,"ax",@progbits
-	.hidden	gedf2
+	.hidden	gedf2                   # -- Begin function gedf2
 	.globl	gedf2
 	.type	gedf2,@function
 gedf2:                                  # @gedf2
@@ -307,9 +307,9 @@ gedf2:                                  # @gedf2
 	.endfunc
 .Lfunc_end21:
 	.size	gedf2, .Lfunc_end21-gedf2
-
+                                        # -- End function
 	.section	.text.ltdf2,"ax",@progbits
-	.hidden	ltdf2
+	.hidden	ltdf2                   # -- Begin function ltdf2
 	.globl	ltdf2
 	.type	ltdf2,@function
 ltdf2:                                  # @ltdf2
@@ -321,9 +321,9 @@ ltdf2:                                  # @ltdf2
 	.endfunc
 .Lfunc_end22:
 	.size	ltdf2, .Lfunc_end22-ltdf2
-
+                                        # -- End function
 	.section	.text.ledf2,"ax",@progbits
-	.hidden	ledf2
+	.hidden	ledf2                   # -- Begin function ledf2
 	.globl	ledf2
 	.type	ledf2,@function
 ledf2:                                  # @ledf2
@@ -335,9 +335,9 @@ ledf2:                                  # @ledf2
 	.endfunc
 .Lfunc_end23:
 	.size	ledf2, .Lfunc_end23-ledf2
-
+                                        # -- End function
 	.section	.text.floatsisf,"ax",@progbits
-	.hidden	floatsisf
+	.hidden	floatsisf               # -- Begin function floatsisf
 	.globl	floatsisf
 	.type	floatsisf,@function
 floatsisf:                              # @floatsisf
@@ -349,9 +349,9 @@ floatsisf:                              # @floatsisf
 	.endfunc
 .Lfunc_end24:
 	.size	floatsisf, .Lfunc_end24-floatsisf
-
+                                        # -- End function
 	.section	.text.floatsidf,"ax",@progbits
-	.hidden	floatsidf
+	.hidden	floatsidf               # -- Begin function floatsidf
 	.globl	floatsidf
 	.type	floatsidf,@function
 floatsidf:                              # @floatsidf
@@ -363,9 +363,9 @@ floatsidf:                              # @floatsidf
 	.endfunc
 .Lfunc_end25:
 	.size	floatsidf, .Lfunc_end25-floatsidf
-
+                                        # -- End function
 	.section	.text.fixsfsi,"ax",@progbits
-	.hidden	fixsfsi
+	.hidden	fixsfsi                 # -- Begin function fixsfsi
 	.globl	fixsfsi
 	.type	fixsfsi,@function
 fixsfsi:                                # @fixsfsi
@@ -377,9 +377,9 @@ fixsfsi:                                # @fixsfsi
 	.endfunc
 .Lfunc_end26:
 	.size	fixsfsi, .Lfunc_end26-fixsfsi
-
+                                        # -- End function
 	.section	.text.fixdfsi,"ax",@progbits
-	.hidden	fixdfsi
+	.hidden	fixdfsi                 # -- Begin function fixdfsi
 	.globl	fixdfsi
 	.type	fixdfsi,@function
 fixdfsi:                                # @fixdfsi
@@ -391,9 +391,9 @@ fixdfsi:                                # @fixdfsi
 	.endfunc
 .Lfunc_end27:
 	.size	fixdfsi, .Lfunc_end27-fixdfsi
-
+                                        # -- End function
 	.section	.text.fixunssfsi,"ax",@progbits
-	.hidden	fixunssfsi
+	.hidden	fixunssfsi              # -- Begin function fixunssfsi
 	.globl	fixunssfsi
 	.type	fixunssfsi,@function
 fixunssfsi:                             # @fixunssfsi
@@ -405,9 +405,9 @@ fixunssfsi:                             # @fixunssfsi
 	.endfunc
 .Lfunc_end28:
 	.size	fixunssfsi, .Lfunc_end28-fixunssfsi
-
+                                        # -- End function
 	.section	.text.fixunsdfsi,"ax",@progbits
-	.hidden	fixunsdfsi
+	.hidden	fixunsdfsi              # -- Begin function fixunsdfsi
 	.globl	fixunsdfsi
 	.type	fixunsdfsi,@function
 fixunsdfsi:                             # @fixunsdfsi
@@ -419,9 +419,9 @@ fixunsdfsi:                             # @fixunsdfsi
 	.endfunc
 .Lfunc_end29:
 	.size	fixunsdfsi, .Lfunc_end29-fixunsdfsi
-
+                                        # -- End function
 	.section	.text.fail,"ax",@progbits
-	.hidden	fail
+	.hidden	fail                    # -- Begin function fail
 	.globl	fail
 	.type	fail,@function
 fail:                                   # @fail
@@ -430,10 +430,10 @@ fail:                                   # @fail
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push16=, $pop7, $pop8
+	i32.sub 	$push16=, $pop6, $pop8
 	tee_local	$push15=, $1=, $pop16
 	i32.store	__stack_pointer($pop9), $pop15
 	i32.const	$push0=, 0
@@ -456,14 +456,14 @@ fail:                                   # @fail
 	.endfunc
 .Lfunc_end30:
 	.size	fail, .Lfunc_end30-fail
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end11
+# BB#0:                                 # %if.end198
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, fail_count($pop1)
@@ -479,7 +479,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end31:
 	.size	main, .Lfunc_end31-main
-
+                                        # -- End function
 	.hidden	fail_count              # @fail_count
 	.type	fail_count,@object
 	.section	.bss.fail_count,"aw",@nobits
@@ -496,8 +496,9 @@ fail_count:
 	.size	.L.str, 17
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
 	.import_global	stderr
+	.size	stderr, 4
diff --git a/test/torture-s/ifcvt-onecmpl-abs-1.c.s b/test/torture-s/ifcvt-onecmpl-abs-1.c.s
index 0c3f6680e..e0c3738ec 100644
--- a/test/torture-s/ifcvt-onecmpl-abs-1.c.s
+++ b/test/torture-s/ifcvt-onecmpl-abs-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ifcvt-onecmpl-abs-1.c"
+	.file	"ifcvt-onecmpl-abs-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/index-1.c.s b/test/torture-s/index-1.c.s
index 23adf8878..6138ec1dd 100644
--- a/test/torture-s/index-1.c.s
+++ b/test/torture-s/index-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/index-1.c"
+	.file	"index-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -17,9 +17,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -92,6 +92,6 @@ a:
 	.size	a, 160
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/inst-check.c.s b/test/torture-s/inst-check.c.s
index f34ec6c11..fdd89f227 100644
--- a/test/torture-s/inst-check.c.s
+++ b/test/torture-s/inst-check.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/inst-check.c"
+	.file	"inst-check.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push6=, $0, $pop5
 	i64.extend_u/i32	$push7=, $pop6
@@ -34,9 +34,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/int-compare.c.s b/test/torture-s/int-compare.c.s
index 6c57accb4..e0d03560a 100644
--- a/test/torture-s/int-compare.c.s
+++ b/test/torture-s/int-compare.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/int-compare.c"
+	.file	"int-compare.c"
 	.section	.text.gt,"ax",@progbits
-	.hidden	gt
+	.hidden	gt                      # -- Begin function gt
 	.globl	gt
 	.type	gt,@function
 gt:                                     # @gt
@@ -13,9 +13,9 @@ gt:                                     # @gt
 	.endfunc
 .Lfunc_end0:
 	.size	gt, .Lfunc_end0-gt
-
+                                        # -- End function
 	.section	.text.ge,"ax",@progbits
-	.hidden	ge
+	.hidden	ge                      # -- Begin function ge
 	.globl	ge
 	.type	ge,@function
 ge:                                     # @ge
@@ -27,9 +27,9 @@ ge:                                     # @ge
 	.endfunc
 .Lfunc_end1:
 	.size	ge, .Lfunc_end1-ge
-
+                                        # -- End function
 	.section	.text.lt,"ax",@progbits
-	.hidden	lt
+	.hidden	lt                      # -- Begin function lt
 	.globl	lt
 	.type	lt,@function
 lt:                                     # @lt
@@ -41,9 +41,9 @@ lt:                                     # @lt
 	.endfunc
 .Lfunc_end2:
 	.size	lt, .Lfunc_end2-lt
-
+                                        # -- End function
 	.section	.text.le,"ax",@progbits
-	.hidden	le
+	.hidden	le                      # -- Begin function le
 	.globl	le
 	.type	le,@function
 le:                                     # @le
@@ -55,9 +55,9 @@ le:                                     # @le
 	.endfunc
 .Lfunc_end3:
 	.size	le, .Lfunc_end3-le
-
+                                        # -- End function
 	.section	.text.true,"ax",@progbits
-	.hidden	true
+	.hidden	true                    # -- Begin function true
 	.globl	true
 	.type	true,@function
 true:                                   # @true
@@ -75,9 +75,9 @@ true:                                   # @true
 	.endfunc
 .Lfunc_end4:
 	.size	true, .Lfunc_end4-true
-
+                                        # -- End function
 	.section	.text.false,"ax",@progbits
-	.hidden	false
+	.hidden	false                   # -- Begin function false
 	.globl	false
 	.type	false,@function
 false:                                  # @false
@@ -94,9 +94,9 @@ false:                                  # @false
 	.endfunc
 .Lfunc_end5:
 	.size	false, .Lfunc_end5-false
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -108,9 +108,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end6:
 	.size	f, .Lfunc_end6-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -122,8 +122,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end7:
 	.size	main, .Lfunc_end7-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/ipa-sra-1.c.s b/test/torture-s/ipa-sra-1.c.s
index 86788be39..34ca4f0e5 100644
--- a/test/torture-s/ipa-sra-1.c.s
+++ b/test/torture-s/ipa-sra-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ipa-sra-1.c"
+	.file	"ipa-sra-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,6 +13,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/ipa-sra-2.c.s b/test/torture-s/ipa-sra-2.c.s
index e295333c4..4efebcd8c 100644
--- a/test/torture-s/ipa-sra-2.c.s
+++ b/test/torture-s/ipa-sra-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.c"
+	.file	"ipa-sra-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -22,26 +22,23 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, 999999
-	i32.const	$push0=, 0
-	i32.select	$push2=, $pop1, $pop0, $0
-	i32.const	$push3=, 2
-	i32.shl 	$push4=, $pop2, $pop3
-	i32.add 	$push5=, $1, $pop4
-	i32.load	$push6=, 0($pop5)
-                                        # fallthrough-return: $pop6
+	i32.const	$push0=, 3999996
+	i32.add 	$push1=, $1, $pop0
+	i32.select	$push2=, $pop1, $1, $0
+	i32.load	$push3=, 0($pop2)
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	calloc, i32, i32, i32
 	.functype	free, void, i32
diff --git a/test/torture-s/longlong.c.s b/test/torture-s/longlong.c.s
index f6e9340d9..a7f2573a3 100644
--- a/test/torture-s/longlong.c.s
+++ b/test/torture-s/longlong.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/longlong.c"
+	.file	"longlong.c"
 	.section	.text.alpha_ep_extbl_i_eq_0,"ax",@progbits
-	.hidden	alpha_ep_extbl_i_eq_0
+	.hidden	alpha_ep_extbl_i_eq_0   # -- Begin function alpha_ep_extbl_i_eq_0
 	.globl	alpha_ep_extbl_i_eq_0
 	.type	alpha_ep_extbl_i_eq_0,@function
 alpha_ep_extbl_i_eq_0:                  # @alpha_ep_extbl_i_eq_0
@@ -50,9 +50,9 @@ alpha_ep_extbl_i_eq_0:                  # @alpha_ep_extbl_i_eq_0
 	.endfunc
 .Lfunc_end0:
 	.size	alpha_ep_extbl_i_eq_0, .Lfunc_end0-alpha_ep_extbl_i_eq_0
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,21 +66,21 @@ main:                                   # @main
 	i64.const	$push1=, 6003104017374052362
 	i64.store	b+16($pop20), $pop1
 	i32.const	$push19=, 0
-	i32.const	$push2=, -2013265854
-	i32.store	pars($pop19), $pop2
-	i32.const	$push18=, 0
-	i32.load	$push17=, r($pop18)
-	tee_local	$push16=, $0=, $pop17
-	i64.load	$push8=, 16($0)
-	i64.load	$push3=, 136($0)
-	i64.const	$push4=, 3
-	i64.shl 	$push5=, $pop3, $pop4
-	i64.const	$push6=, 56
-	i64.and 	$push7=, $pop5, $pop6
-	i64.shr_u	$push9=, $pop8, $pop7
-	i64.const	$push10=, 255
-	i64.and 	$push11=, $pop9, $pop10
-	i64.store	16($pop16), $pop11
+	i32.load	$push18=, r($pop19)
+	tee_local	$push17=, $0=, $pop18
+	i64.load	$push7=, 16($0)
+	i64.load	$push2=, 136($0)
+	i64.const	$push3=, 3
+	i64.shl 	$push4=, $pop2, $pop3
+	i64.const	$push5=, 56
+	i64.and 	$push6=, $pop4, $pop5
+	i64.shr_u	$push8=, $pop7, $pop6
+	i64.const	$push9=, 255
+	i64.and 	$push10=, $pop8, $pop9
+	i64.store	16($pop17), $pop10
+	i32.const	$push16=, 0
+	i32.const	$push11=, -2013265854
+	i32.store	pars($pop16), $pop11
 	block   	
 	i32.const	$push15=, 0
 	i64.load	$push12=, b+16($pop15)
@@ -98,7 +98,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -127,6 +127,6 @@ pars:
 	.size	pars, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-1.c.s b/test/torture-s/loop-1.c.s
index 1e3de645c..255d553d2 100644
--- a/test/torture-s/loop-1.c.s
+++ b/test/torture-s/loop-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-1.c"
+	.file	"loop-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-10.c.s b/test/torture-s/loop-10.c.s
index f136d832c..69674abbc 100644
--- a/test/torture-s/loop-10.c.s
+++ b/test/torture-s/loop-10.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-10.c"
+	.file	"loop-10.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	count,@object           # @count
 	.section	.bss.count,"aw",@nobits
 	.p2align	2
@@ -36,5 +36,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-11.c.s b/test/torture-s/loop-11.c.s
index 630156d02..584c75d98 100644
--- a/test/torture-s/loop-11.c.s
+++ b/test/torture-s/loop-11.c.s
@@ -1,47 +1,47 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-11.c"
+	.file	"loop-11.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 199
+	i32.const	$1=, 198
 	i32.const	$0=, a+792
 .LBB0_1:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $1, $pop9
-	tee_local	$push7=, $1=, $pop8
-	i32.store	0($0), $pop7
-	i32.const	$push6=, -4
-	i32.add 	$0=, $0, $pop6
-	i32.const	$push5=, 0
-	i32.gt_s	$push0=, $1, $pop5
+	i32.store	0($0), $1
+	i32.const	$push9=, -4
+	i32.add 	$0=, $0, $pop9
+	i32.const	$push8=, -1
+	i32.add 	$push7=, $1, $pop8
+	tee_local	$push6=, $1=, $pop7
+	i32.const	$push5=, -1
+	i32.ne  	$push0=, $pop6, $pop5
 	br_if   	0, $pop0        # 0: up to label0
 # BB#2:                                 # %for.body.preheader
 	end_loop
-	i32.const	$1=, 0
+	i32.const	$1=, -1
 	i32.const	$0=, a
 .LBB0_3:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
+	i32.const	$push12=, 1
+	i32.add 	$push11=, $1, $pop12
+	tee_local	$push10=, $1=, $pop11
 	i32.load	$push1=, 0($0)
-	i32.ne  	$push2=, $1, $pop1
+	i32.ne  	$push2=, $pop10, $pop1
 	br_if   	1, $pop2        # 1: down to label1
 # BB#4:                                 # %for.cond
                                         #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$push14=, 4
 	i32.add 	$0=, $0, $pop14
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.const	$push10=, 198
-	i32.le_s	$push3=, $pop11, $pop10
+	i32.const	$push13=, 197
+	i32.le_u	$push3=, $1, $pop13
 	br_if   	0, $pop3        # 0: up to label2
 # BB#5:                                 # %for.end
 	end_loop
@@ -54,7 +54,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	a,@object               # @a
 	.section	.bss.a,"aw",@nobits
 	.p2align	4
@@ -63,5 +63,5 @@ a:
 	.size	a, 796
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-12.c.s b/test/torture-s/loop-12.c.s
index 16722d6f0..7464a450a 100644
--- a/test/torture-s/loop-12.c.s
+++ b/test/torture-s/loop-12.c.s
@@ -1,56 +1,51 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-12.c"
+	.file	"loop-12.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.load	$1=, p($pop7)
+	i32.const	$push3=, 0
+	i32.load	$1=, p($pop3)
 .LBB0_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	block   	
-	i32.load8_u	$push1=, 0($1)
-	i32.const	$push16=, -10
-	i32.add 	$push0=, $pop1, $pop16
-	i32.const	$push15=, 255
-	i32.and 	$push14=, $pop0, $pop15
-	tee_local	$push13=, $0=, $pop14
-	i32.const	$push12=, 49
-	i32.gt_u	$push2=, $pop13, $pop12
-	br_if   	0, $pop2        # 0: down to label2
-# BB#2:                                 # %is_end_of_statement.exit
+	i32.load8_u	$push10=, 0($1)
+	tee_local	$push9=, $0=, $pop10
+	i32.const	$push8=, 10
+	i32.eq  	$push0=, $pop9, $pop8
+	br_if   	1, $pop0        # 1: down to label0
+# BB#2:                                 # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i64.const	$push18=, 562949961809921
-	i64.extend_u/i32	$push3=, $0
-	i64.shr_u	$push4=, $pop18, $pop3
-	i64.const	$push17=, 1
-	i64.and 	$push5=, $pop4, $pop17
-	i32.wrap/i64	$push6=, $pop5
-	br_if   	2, $pop6        # 2: down to label0
-.LBB0_3:                                # %while.body
+	i32.const	$push11=, 33
+	i32.eq  	$push1=, $0, $pop11
+	br_if   	1, $pop1        # 1: down to label0
+# BB#3:                                 # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label2:
-	i32.const	$push11=, 0
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	i32.store	p($pop11), $pop8
+	i32.const	$push12=, 59
+	i32.eq  	$push2=, $0, $pop12
+	br_if   	1, $pop2        # 1: down to label0
+# BB#4:                                 # %while.body
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push7=, 0
+	i32.const	$push6=, 1
+	i32.add 	$push5=, $1, $pop6
+	tee_local	$push4=, $1=, $pop5
+	i32.store	p($pop7), $pop4
 	br      	0               # 0: up to label1
-.LBB0_4:                                # %while.end
+.LBB0_5:                                # %while.end
 	end_loop
 	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,43 +56,38 @@ main:                                   # @main
 .LBB1_1:                                # %while.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label4:
-	i32.const	$push14=, 0
-	i32.store	p($pop14), $1
-	block   	
-	i32.load8_u	$push1=, 0($1)
-	i32.const	$push13=, -10
-	i32.add 	$push0=, $pop1, $pop13
-	i32.const	$push12=, 255
-	i32.and 	$push11=, $pop0, $pop12
-	tee_local	$push10=, $0=, $pop11
-	i32.const	$push9=, 49
-	i32.gt_u	$push2=, $pop10, $pop9
-	br_if   	0, $pop2        # 0: down to label5
-# BB#2:                                 # %is_end_of_statement.exit.i
+	loop    	                # label3:
+	i32.const	$push8=, 0
+	i32.store	p($pop8), $1
+	i32.load8_u	$push7=, 0($1)
+	tee_local	$push6=, $0=, $pop7
+	i32.const	$push5=, 10
+	i32.eq  	$push0=, $pop6, $pop5
+	br_if   	1, $pop0        # 1: down to label2
+# BB#2:                                 # %while.cond.i
+                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push9=, 33
+	i32.eq  	$push1=, $0, $pop9
+	br_if   	1, $pop1        # 1: down to label2
+# BB#3:                                 # %while.cond.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i64.const	$push16=, 562949961809921
-	i64.extend_u/i32	$push3=, $0
-	i64.shr_u	$push4=, $pop16, $pop3
-	i64.const	$push15=, 1
-	i64.and 	$push5=, $pop4, $pop15
-	i32.wrap/i64	$push6=, $pop5
-	br_if   	2, $pop6        # 2: down to label3
-.LBB1_3:                                # %while.body.i
+	i32.const	$push10=, 59
+	i32.eq  	$push2=, $0, $pop10
+	br_if   	1, $pop2        # 1: down to label2
+# BB#4:                                 # %while.body.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label5:
-	i32.const	$push8=, 1
-	i32.add 	$1=, $1, $pop8
-	br      	0               # 0: up to label4
-.LBB1_4:                                # %foo.exit
+	i32.const	$push4=, 1
+	i32.add 	$1=, $1, $pop4
+	br      	0               # 0: up to label3
+.LBB1_5:                                # %foo.exit
 	end_loop
-	end_block                       # label3:
-	i32.const	$push7=, 0
-                                        # fallthrough-return: $pop7
+	end_block                       # label2:
+	i32.const	$push3=, 0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -114,4 +104,4 @@ p:
 	.size	.L.str, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/loop-13.c.s b/test/torture-s/loop-13.c.s
index cbc1cf335..21464b807 100644
--- a/test/torture-s/loop-13.c.s
+++ b/test/torture-s/loop-13.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-13.c"
+	.file	"loop-13.c"
 	.section	.text.scale,"ax",@progbits
-	.hidden	scale
+	.hidden	scale                   # -- Begin function scale
 	.globl	scale
 	.type	scale,@function
 scale:                                  # @scale
@@ -18,7 +18,7 @@ scale:                                  # @scale
 	i32.const	$push16=, 1
 	i32.lt_s	$push1=, $2, $pop16
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %for.body.preheader
+# BB#2:                                 # %for.body.lr.ph
 	i32.load	$push2=, 0($1)
 	i32.mul 	$push3=, $pop2, $3
 	i32.store	0($1), $pop3
@@ -60,9 +60,9 @@ scale:                                  # @scale
 	.endfunc
 .Lfunc_end0:
 	.size	scale, .Lfunc_end0-scale
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -73,6 +73,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/loop-14.c.s b/test/torture-s/loop-14.c.s
index a9af19cc3..d5084e128 100644
--- a/test/torture-s/loop-14.c.s
+++ b/test/torture-s/loop-14.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-14.c"
+	.file	"loop-14.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -13,14 +13,14 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 90194313258
 	i64.store	a3+4($pop1):p2align=2, $pop0
@@ -30,7 +30,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a3                      # @a3
 	.type	a3,@object
 	.section	.bss.a3,"aw",@nobits
@@ -41,5 +41,5 @@ a3:
 	.size	a3, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-15.c.s b/test/torture-s/loop-15.c.s
index 0b11d909b..01c8e3c7e 100644
--- a/test/torture-s/loop-15.c.s
+++ b/test/torture-s/loop-15.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-15.c"
+	.file	"loop-15.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -30,205 +30,195 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 32
-	i32.sub 	$push28=, $pop18, $pop19
-	tee_local	$push27=, $11=, $pop28
+	i32.sub 	$push28=, $pop17, $pop19
+	tee_local	$push27=, $10=, $pop28
 	i32.store	__stack_pointer($pop20), $pop27
-	i32.const	$3=, 0
-	i32.const	$2=, -1
-	i32.const	$push2=, 16
-	i32.add 	$7=, $11, $pop2
+	i32.const	$9=, 0
+	i32.const	$push1=, 16
+	i32.add 	$6=, $10, $pop1
 	i32.const	$push26=, 4
-	i32.or  	$push25=, $11, $pop26
+	i32.or  	$push25=, $10, $pop26
 	tee_local	$push24=, $0=, $pop25
 	copy_local	$1=, $pop24
-.LBB1_1:                                # %for.cond1.preheader
+.LBB1_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
                                         #       Child Loop BB1_4 Depth 3
                                         #       Child Loop BB1_6 Depth 3
                                         #       Child Loop BB1_9 Depth 3
-                                        #       Child Loop BB1_12 Depth 3
-	block   	
+                                        #       Child Loop BB1_13 Depth 3
 	block   	
-	block   	
-	loop    	                # label5:
+	loop    	                # label3:
+	copy_local	$push31=, $9
+	tee_local	$push30=, $2=, $pop31
 	i32.const	$push29=, 2
-	i32.shl 	$push1=, $3, $pop29
-	i32.add 	$4=, $11, $pop1
-	copy_local	$5=, $0
-	i32.const	$6=, 0
-.LBB1_2:                                # %for.cond4.preheader
+	i32.shl 	$push0=, $pop30, $pop29
+	i32.add 	$3=, $10, $pop0
+	copy_local	$4=, $0
+	i32.const	$5=, 0
+.LBB1_2:                                # %for.body3
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB1_4 Depth 3
                                         #       Child Loop BB1_6 Depth 3
                                         #       Child Loop BB1_9 Depth 3
-                                        #       Child Loop BB1_12 Depth 3
-	loop    	                # label6:
-	i32.const	$push32=, 4
-	i32.store	0($7), $pop32
-	i64.const	$push31=, 4294967296
-	i64.store	0($11), $pop31
-	i64.const	$push30=, 12884901890
-	i64.store	8($11), $pop30
+                                        #       Child Loop BB1_13 Depth 3
+	loop    	                # label4:
+	i32.const	$push36=, 4
+	i32.store	0($6), $pop36
+	i64.const	$push35=, 4294967296
+	i64.store	0($10), $pop35
+	i64.const	$push34=, 12884901890
+	i64.store	8($10), $pop34
 	block   	
-	i32.le_s	$push3=, $6, $3
-	br_if   	0, $pop3        # 0: down to label7
-# BB#3:                                 # %while.body.i.preheader
+	i32.le_u	$push33=, $5, $2
+	tee_local	$push32=, $7=, $pop33
+	br_if   	0, $pop32       # 0: down to label5
+# BB#3:                                 # %while.body.lr.ph.i
                                         #   in Loop: Header=BB1_2 Depth=2
-	i32.const	$push33=, 2
-	i32.shl 	$push4=, $6, $pop33
-	i32.add 	$10=, $11, $pop4
+	i32.const	$push37=, 2
+	i32.shl 	$push2=, $5, $pop37
+	i32.add 	$9=, $10, $pop2
 .LBB1_4:                                # %while.body.i
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label8:
-	i32.const	$push36=, -4
-	i32.add 	$push35=, $10, $pop36
-	tee_local	$push34=, $9=, $pop35
-	i32.load	$push5=, 0($pop34)
-	i32.store	0($10), $pop5
-	copy_local	$10=, $9
-	i32.gt_u	$push6=, $9, $4
-	br_if   	0, $pop6        # 0: up to label8
+	loop    	                # label6:
+	i32.const	$push40=, -4
+	i32.add 	$push39=, $9, $pop40
+	tee_local	$push38=, $8=, $pop39
+	i32.load	$push3=, 0($pop38)
+	i32.store	0($9), $pop3
+	copy_local	$9=, $8
+	i32.gt_u	$push4=, $8, $3
+	br_if   	0, $pop4        # 0: up to label6
 .LBB1_5:                                # %for.body11.preheader
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
-	end_block                       # label7:
-	i32.const	$10=, -1
-	copy_local	$9=, $11
+	end_block                       # label5:
+	i32.const	$9=, -1
+	copy_local	$8=, $10
 .LBB1_6:                                # %for.body11
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label9:
-	i32.const	$push39=, 1
-	i32.add 	$push38=, $10, $pop39
-	tee_local	$push37=, $10=, $pop38
-	i32.load	$push7=, 0($9)
-	i32.ne  	$push8=, $pop37, $pop7
-	br_if   	3, $pop8        # 3: down to label4
+	loop    	                # label7:
+	i32.const	$push43=, 1
+	i32.add 	$push42=, $9, $pop43
+	tee_local	$push41=, $9=, $pop42
+	i32.load	$push5=, 0($8)
+	i32.ne  	$push6=, $pop41, $pop5
+	br_if   	3, $pop6        # 3: down to label2
 # BB#7:                                 # %for.cond9
                                         #   in Loop: Header=BB1_6 Depth=3
-	i32.const	$push40=, 4
-	i32.add 	$9=, $9, $pop40
-	i32.lt_s	$push9=, $10, $3
-	br_if   	0, $pop9        # 0: up to label9
-# BB#8:                                 #   in Loop: Header=BB1_2 Depth=2
+	i32.const	$push44=, 4
+	i32.add 	$8=, $8, $pop44
+	i32.lt_u	$push7=, $9, $2
+	br_if   	0, $pop7        # 0: up to label7
+# BB#8:                                 # %for.end16
+                                        #   in Loop: Header=BB1_2 Depth=2
 	end_loop
 	copy_local	$9=, $1
-	copy_local	$10=, $2
-.LBB1_9:                                # %for.cond17
+	copy_local	$8=, $2
+	block   	
+	br_if   	0, $7           # 0: down to label8
+.LBB1_9:                                # %for.body19
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	block   	
-	loop    	                # label11:
-	i32.const	$push43=, 1
-	i32.add 	$push42=, $10, $pop43
-	tee_local	$push41=, $10=, $pop42
-	i32.ge_s	$push10=, $pop41, $6
-	br_if   	1, $pop10       # 1: down to label10
-# BB#10:                                # %for.body19
+	loop    	                # label9:
+	i32.load	$push8=, 0($9)
+	i32.ne  	$push9=, $8, $pop8
+	br_if   	4, $pop9        # 4: down to label2
+# BB#10:                                # %for.cond17
                                         #   in Loop: Header=BB1_9 Depth=3
-	i32.load	$8=, 0($9)
-	i32.const	$push44=, 4
-	i32.add 	$push0=, $9, $pop44
-	copy_local	$9=, $pop0
-	i32.eq  	$push16=, $10, $8
-	br_if   	0, $pop16       # 0: up to label11
-	br      	5               # 5: down to label3
+	i32.const	$push48=, 4
+	i32.add 	$9=, $9, $pop48
+	i32.const	$push47=, 1
+	i32.add 	$push46=, $8, $pop47
+	tee_local	$push45=, $8=, $pop46
+	i32.lt_u	$push10=, $pop45, $5
+	br_if   	0, $pop10       # 0: up to label9
 .LBB1_11:                               # %for.end26
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
-	end_block                       # label10:
+	end_block                       # label8:
 	block   	
-	copy_local	$10=, $5
+	i32.const	$push49=, 3
+	i32.gt_u	$push11=, $5, $pop49
+	br_if   	0, $pop11       # 0: down to label10
+# BB#12:                                #   in Loop: Header=BB1_2 Depth=2
 	i32.const	$push50=, 1
-	i32.add 	$push49=, $6, $pop50
-	tee_local	$push48=, $6=, $pop49
-	copy_local	$9=, $pop48
-	i32.const	$push47=, 4
-	i32.gt_s	$push46=, $6, $pop47
-	tee_local	$push45=, $8=, $pop46
-	br_if   	0, $pop45       # 0: down to label12
-.LBB1_12:                               # %for.body30
+	i32.add 	$7=, $5, $pop50
+	copy_local	$9=, $4
+	copy_local	$8=, $5
+.LBB1_13:                               # %for.body30
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label13:
-	i32.load	$push11=, 0($10)
-	i32.ne  	$push12=, $9, $pop11
-	br_if   	6, $pop12       # 6: down to label2
-# BB#13:                                # %for.cond28
-                                        #   in Loop: Header=BB1_12 Depth=3
+	loop    	                # label11:
+	i32.const	$push53=, 1
+	i32.add 	$push52=, $8, $pop53
+	tee_local	$push51=, $8=, $pop52
+	i32.load	$push12=, 0($9)
+	i32.ne  	$push13=, $pop51, $pop12
+	br_if   	4, $pop13       # 4: down to label2
+# BB#14:                                # %for.cond28
+                                        #   in Loop: Header=BB1_13 Depth=3
 	i32.const	$push55=, 4
-	i32.add 	$10=, $10, $pop55
-	i32.const	$push54=, 1
-	i32.add 	$push53=, $9, $pop54
-	tee_local	$push52=, $9=, $pop53
-	i32.const	$push51=, 4
-	i32.le_s	$push13=, $pop52, $pop51
-	br_if   	0, $pop13       # 0: up to label13
-# BB#14:                                # %for.cond1.loopexit
+	i32.add 	$9=, $9, $pop55
+	i32.const	$push54=, 3
+	i32.le_u	$push14=, $8, $pop54
+	br_if   	0, $pop14       # 0: up to label11
+# BB#15:                                # %for.inc38
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
+	i32.const	$push57=, 4
+	i32.add 	$4=, $4, $pop57
 	i32.const	$push56=, 4
-	i32.add 	$5=, $5, $pop56
-	i32.eqz 	$push63=, $8
-	br_if   	1, $pop63       # 1: up to label6
-.LBB1_15:                               # %for.inc41
+	i32.lt_u	$9=, $5, $pop56
+	copy_local	$5=, $7
+	br_if   	1, $9           # 1: up to label4
+.LBB1_16:                               # %for.inc41
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label12:
+	end_block                       # label10:
 	end_loop
-	i32.const	$push62=, 4
-	i32.add 	$1=, $1, $pop62
-	i32.const	$push61=, 1
-	i32.add 	$2=, $2, $pop61
-	i32.const	$push60=, 1
-	i32.add 	$push59=, $3, $pop60
-	tee_local	$push58=, $3=, $pop59
-	i32.const	$push57=, 5
-	i32.lt_s	$push14=, $pop58, $pop57
-	br_if   	0, $pop14       # 0: up to label5
-# BB#16:                                # %for.end43
+	i32.const	$push60=, 4
+	i32.add 	$1=, $1, $pop60
+	i32.const	$push59=, 1
+	i32.add 	$9=, $2, $pop59
+	i32.const	$push58=, 4
+	i32.lt_u	$push15=, $2, $pop58
+	br_if   	0, $pop15       # 0: up to label3
+# BB#17:                                # %for.end43
 	end_loop
 	i32.const	$push23=, 0
 	i32.const	$push21=, 32
-	i32.add 	$push22=, $11, $pop21
+	i32.add 	$push22=, $10, $pop21
 	i32.store	__stack_pointer($pop23), $pop22
-	i32.const	$push15=, 0
-	return  	$pop15
-.LBB1_17:                               # %if.then
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_18:                               # %if.then22
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_19:                               # %if.then33
+	i32.const	$push16=, 0
+	return  	$pop16
+.LBB1_18:                               # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-2.c.s b/test/torture-s/loop-2.c.s
index 566233733..005d0e1ed 100644
--- a/test/torture-s/loop-2.c.s
+++ b/test/torture-s/loop-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2.c"
+	.file	"loop-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -36,9 +36,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,7 +53,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -64,5 +64,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2b.c.s b/test/torture-s/loop-2b.c.s
index ffb3f21fe..389ac9db1 100644
--- a/test/torture-s/loop-2b.c.s
+++ b/test/torture-s/loop-2b.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2b.c"
+	.file	"loop-2b.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -45,9 +45,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -73,5 +73,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2c.c.s b/test/torture-s/loop-2c.c.s
index 5a1a1ea35..f5ea63535 100644
--- a/test/torture-s/loop-2c.c.s
+++ b/test/torture-s/loop-2c.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2c.c"
+	.file	"loop-2c.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	block   	
 	i32.eqz 	$push12=, $0
 	br_if   	0, $pop12       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -42,9 +42,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -55,7 +55,7 @@ g:                                      # @g
 	block   	
 	i32.eqz 	$push11=, $0
 	br_if   	0, $pop11       # 0: down to label2
-# BB#1:                                 # %for.body.preheader.i
+# BB#1:                                 # %for.body.lr.ph.i
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -84,9 +84,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -104,7 +104,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -115,5 +115,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2d.c.s b/test/torture-s/loop-2d.c.s
index 0aeb9e7ef..b2d36ef74 100644
--- a/test/torture-s/loop-2d.c.s
+++ b/test/torture-s/loop-2d.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2d.c"
+	.file	"loop-2d.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	block   	
 	i32.eqz 	$push11=, $0
 	br_if   	0, $pop11       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -41,9 +41,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -72,5 +72,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2e.c.s b/test/torture-s/loop-2e.c.s
index a673547e1..bf242f86b 100644
--- a/test/torture-s/loop-2e.c.s
+++ b/test/torture-s/loop-2e.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2e.c"
+	.file	"loop-2e.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -62,12 +62,12 @@ f:                                      # @f
 	i32.const	$push34=, 72
 	i32.add 	$push35=, $0, $pop34
 	i32.store	72($1), $pop35
-	i32.const	$push36=, 76
+	i32.const	$push36=, 80
 	i32.add 	$push37=, $0, $pop36
-	i32.store	76($1), $pop37
-	i32.const	$push38=, 80
+	i32.store	80($1), $pop37
+	i32.const	$push38=, 76
 	i32.add 	$push39=, $0, $pop38
-	i32.store	80($1), $pop39
+	i32.store	76($1), $pop39
 	i32.const	$push40=, 84
 	i32.add 	$push41=, $0, $pop40
 	i32.store	84($1), $pop41
@@ -119,29 +119,29 @@ f:                                      # @f
 	i32.const	$push72=, 148
 	i32.add 	$push73=, $0, $pop72
 	i32.store	148($1), $pop73
-	i32.const	$push74=, 152
+	i32.const	$push74=, 156
 	i32.add 	$push75=, $0, $pop74
-	i32.store	152($1), $pop75
-	i32.const	$push76=, 156
+	i32.store	156($1), $pop75
+	i32.const	$push76=, 152
 	i32.add 	$push77=, $0, $pop76
-	i32.store	156($1), $pop77
+	i32.store	152($1), $pop77
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/loop-2f.c.s b/test/torture-s/loop-2f.c.s
index 48758c0d9..34ff254ff 100644
--- a/test/torture-s/loop-2f.c.s
+++ b/test/torture-s/loop-2f.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2f.c"
+	.file	"loop-2f.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	i32.const	$push0=, 39
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.add 	$push4=, $1, $0
 	i32.const	$push5=, 254
 	i32.const	$push2=, 40
@@ -25,9 +25,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,32 +40,45 @@ main:                                   # @main
 	i32.const	$push4=, 3
 	i32.const	$push3=, 50
 	i32.const	$push0=, .L.str
-	i32.const	$push16=, 0
-	i32.const	$push15=, 0
-	i32.call	$push1=, open@FUNCTION, $pop0, $pop16, $pop15
+	i32.const	$push21=, 0
+	i32.const	$push20=, 0
+	i32.call	$push1=, open@FUNCTION, $pop0, $pop21, $pop20
 	i64.const	$push2=, 0
-	i32.call	$push14=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
-	tee_local	$push13=, $0=, $pop14
+	i32.call	$push19=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
+	tee_local	$push18=, $0=, $pop19
 	i32.const	$push7=, -1
-	i32.eq  	$push8=, $pop13, $pop7
+	i32.eq  	$push8=, $pop18, $pop7
 	br_if   	0, $pop8        # 0: down to label1
 # BB#1:                                 # %if.end
-	i32.const	$push9=, 32766
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push12=, 254
-	i32.const	$push11=, 39
-	i32.call	$drop=, memset@FUNCTION, $pop10, $pop12, $pop11
-	i32.const	$push17=, 0
-	i32.store8	32805($0), $pop17
+	i64.const	$push9=, -72340172838076674
+	i64.store	32766($0):p2align=0, $pop9
+	i32.const	$push26=, 0
+	i32.store8	32805($0), $pop26
+	i32.const	$push10=, 32797
+	i32.add 	$push11=, $0, $pop10
+	i64.const	$push25=, -72340172838076674
+	i64.store	0($pop11):p2align=0, $pop25
+	i32.const	$push12=, 32790
+	i32.add 	$push13=, $0, $pop12
+	i64.const	$push24=, -72340172838076674
+	i64.store	0($pop13):p2align=0, $pop24
+	i32.const	$push14=, 32782
+	i32.add 	$push15=, $0, $pop14
+	i64.const	$push23=, -72340172838076674
+	i64.store	0($pop15):p2align=0, $pop23
+	i32.const	$push16=, 32774
+	i32.add 	$push17=, $0, $pop16
+	i64.const	$push22=, -72340172838076674
+	i64.store	0($pop17):p2align=0, $pop22
 .LBB1_2:                                # %if.end15
 	end_block                       # label1:
-	i32.const	$push18=, 0
-	call    	exit@FUNCTION, $pop18
+	i32.const	$push27=, 0
+	call    	exit@FUNCTION, $pop27
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -73,7 +86,7 @@ main:                                   # @main
 	.size	.L.str, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	open, i32, i32, i32
 	.functype	mmap, i32, i32, i32, i32, i32, i32, i64
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2g.c.s b/test/torture-s/loop-2g.c.s
index 2c5fb246c..a7a1be8a5 100644
--- a/test/torture-s/loop-2g.c.s
+++ b/test/torture-s/loop-2g.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-2g.c"
+	.file	"loop-2g.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,7 +12,7 @@ f:                                      # @f
 	i32.const	$push0=, 39
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.add 	$push4=, $1, $0
 	i32.const	$push5=, 254
 	i32.const	$push2=, 40
@@ -25,9 +25,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,32 +40,45 @@ main:                                   # @main
 	i32.const	$push4=, 3
 	i32.const	$push3=, 50
 	i32.const	$push0=, .L.str
-	i32.const	$push16=, 0
-	i32.const	$push15=, 0
-	i32.call	$push1=, open@FUNCTION, $pop0, $pop16, $pop15
+	i32.const	$push21=, 0
+	i32.const	$push20=, 0
+	i32.call	$push1=, open@FUNCTION, $pop0, $pop21, $pop20
 	i64.const	$push2=, 0
-	i32.call	$push14=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
-	tee_local	$push13=, $0=, $pop14
+	i32.call	$push19=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
+	tee_local	$push18=, $0=, $pop19
 	i32.const	$push7=, -1
-	i32.eq  	$push8=, $pop13, $pop7
+	i32.eq  	$push8=, $pop18, $pop7
 	br_if   	0, $pop8        # 0: down to label1
 # BB#1:                                 # %if.end
-	i32.const	$push9=, 32766
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push12=, 254
-	i32.const	$push11=, 39
-	i32.call	$drop=, memset@FUNCTION, $pop10, $pop12, $pop11
-	i32.const	$push17=, 0
-	i32.store8	32805($0), $pop17
+	i64.const	$push9=, -72340172838076674
+	i64.store	32766($0):p2align=0, $pop9
+	i32.const	$push26=, 0
+	i32.store8	32805($0), $pop26
+	i32.const	$push10=, 32797
+	i32.add 	$push11=, $0, $pop10
+	i64.const	$push25=, -72340172838076674
+	i64.store	0($pop11):p2align=0, $pop25
+	i32.const	$push12=, 32790
+	i32.add 	$push13=, $0, $pop12
+	i64.const	$push24=, -72340172838076674
+	i64.store	0($pop13):p2align=0, $pop24
+	i32.const	$push14=, 32782
+	i32.add 	$push15=, $0, $pop14
+	i64.const	$push23=, -72340172838076674
+	i64.store	0($pop15):p2align=0, $pop23
+	i32.const	$push16=, 32774
+	i32.add 	$push17=, $0, $pop16
+	i64.const	$push22=, -72340172838076674
+	i64.store	0($pop17):p2align=0, $pop22
 .LBB1_2:                                # %if.end15
 	end_block                       # label1:
-	i32.const	$push18=, 0
-	call    	exit@FUNCTION, $pop18
+	i32.const	$push27=, 0
+	call    	exit@FUNCTION, $pop27
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -73,7 +86,7 @@ main:                                   # @main
 	.size	.L.str, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	open, i32, i32, i32
 	.functype	mmap, i32, i32, i32, i32, i32, i32, i64
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-3.c.s b/test/torture-s/loop-3.c.s
index 9458d7445..7341f795c 100644
--- a/test/torture-s/loop-3.c.s
+++ b/test/torture-s/loop-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-3.c"
+	.file	"loop-3.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -20,37 +20,38 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push1=, n($pop12)
-	i32.add 	$push2=, $pop1, $0
-	i32.const	$push3=, 1
-	i32.const	$push11=, 1
-	i32.lt_s	$push4=, $0, $pop11
-	i32.select	$push5=, $0, $pop3, $pop4
-	i32.const	$push6=, -1
-	i32.xor 	$push7=, $pop5, $pop6
-	i32.add 	$push8=, $pop2, $pop7
-	i32.const	$push9=, 2
-	i32.add 	$push10=, $pop8, $pop9
-	i32.store	n($pop0), $pop10
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	i32.const	$push4=, 0
+	i32.const	$push13=, 0
+	i32.load	$push5=, n($pop13)
+	i32.add 	$push6=, $pop5, $0
+	i32.const	$push0=, -1
+	i32.xor 	$push12=, $0, $pop0
+	tee_local	$push11=, $0=, $pop12
+	i32.const	$push1=, -2
+	i32.const	$push10=, -2
+	i32.gt_s	$push2=, $0, $pop10
+	i32.select	$push3=, $pop11, $pop1, $pop2
+	i32.add 	$push7=, $pop6, $pop3
+	i32.const	$push8=, 2
+	i32.add 	$push9=, $pop7, $pop8
+	i32.store	n($pop4), $pop9
+	copy_local	$push14=, $0
+                                        # fallthrough-return: $pop14
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +78,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.bss.n,"aw",@nobits
@@ -88,6 +89,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-3b.c.s b/test/torture-s/loop-3b.c.s
index 92f589eed..b55235f37 100644
--- a/test/torture-s/loop-3b.c.s
+++ b/test/torture-s/loop-3b.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-3b.c"
+	.file	"loop-3b.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -20,41 +20,43 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
 	.result 	i32
+	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push16=, 0
-	i32.load	$push9=, n($pop16)
-	i32.const	$push0=, 268435455
-	i32.const	$push15=, 268435455
-	i32.lt_s	$push1=, $0, $pop15
-	i32.select	$push2=, $0, $pop0, $pop1
-	i32.const	$push3=, -1
-	i32.xor 	$push4=, $pop2, $pop3
-	i32.add 	$push5=, $0, $pop4
-	i32.const	$push14=, 268435455
-	i32.add 	$push6=, $pop5, $pop14
+	i32.const	$push17=, 0
+	i32.load	$push9=, n($pop17)
+	i32.const	$push0=, -1
+	i32.xor 	$push16=, $0, $pop0
+	tee_local	$push15=, $1=, $pop16
+	i32.const	$push1=, -268435456
+	i32.const	$push14=, -268435456
+	i32.gt_s	$push2=, $1, $pop14
+	i32.select	$push3=, $pop15, $pop1, $pop2
+	i32.add 	$push4=, $pop3, $0
+	i32.const	$push5=, 268435455
+	i32.add 	$push6=, $pop4, $pop5
 	i32.const	$push13=, 268435455
 	i32.div_u	$push7=, $pop6, $pop13
 	i32.add 	$push10=, $pop9, $pop7
 	i32.const	$push11=, 1
 	i32.add 	$push12=, $pop10, $pop11
 	i32.store	n($pop8), $pop12
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	copy_local	$push18=, $0
+                                        # fallthrough-return: $pop18
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -81,7 +83,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.bss.n,"aw",@nobits
@@ -92,6 +94,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-3c.c.s b/test/torture-s/loop-3c.c.s
index 6d29747b9..cf556067a 100644
--- a/test/torture-s/loop-3c.c.s
+++ b/test/torture-s/loop-3c.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-3c.c"
+	.file	"loop-3c.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,40 +9,42 @@ f:                                      # @f
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 3
-	i32.shl 	$push1=, $0, $pop0
-	i32.const	$push5=, a
-	i32.add 	$1=, $pop1, $pop5
+	i32.const	$push0=, -4
+	i32.add 	$1=, $0, $pop0
+	i32.const	$push1=, 3
+	i32.shl 	$push2=, $0, $pop1
+	i32.const	$push6=, a
+	i32.add 	$0=, $pop2, $pop6
 	i32.const	$2=, 256
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push15=, 1
-	i32.shr_s	$push14=, $2, $pop15
-	tee_local	$push13=, $2=, $pop14
-	i32.const	$push12=, 2
-	i32.shl 	$push2=, $pop13, $pop12
-	i32.const	$push11=, a
-	i32.add 	$push3=, $pop2, $pop11
-	i32.store	0($pop3), $1
-	i32.const	$push10=, 32
-	i32.add 	$1=, $1, $pop10
-	i32.const	$push9=, 4
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
-	i32.const	$push6=, 1073741840
-	i32.lt_s	$push4=, $pop7, $pop6
-	br_if   	0, $pop4        # 0: up to label0
+	i32.const	$push16=, 1
+	i32.shr_s	$push15=, $2, $pop16
+	tee_local	$push14=, $2=, $pop15
+	i32.const	$push13=, 2
+	i32.shl 	$push3=, $pop14, $pop13
+	i32.const	$push12=, a
+	i32.add 	$push4=, $pop3, $pop12
+	i32.store	0($pop4), $0
+	i32.const	$push11=, 32
+	i32.add 	$0=, $0, $pop11
+	i32.const	$push10=, 4
+	i32.add 	$push9=, $1, $pop10
+	tee_local	$push8=, $1=, $pop9
+	i32.const	$push7=, 1073741836
+	i32.lt_s	$push5=, $pop8, $pop7
+	br_if   	0, $pop5        # 0: up to label0
 # BB#2:                                 # %do.end
 	end_loop
-	copy_local	$push16=, $1
-                                        # fallthrough-return: $pop16
+	copy_local	$push17=, $0
+                                        # fallthrough-return: $pop17
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,7 +71,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -80,5 +82,5 @@ a:
 	.size	a, 1020
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-4.c.s b/test/torture-s/loop-4.c.s
index 75ea2a51c..757653f41 100644
--- a/test/torture-s/loop-4.c.s
+++ b/test/torture-s/loop-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-4.c"
+	.file	"loop-4.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-4b.c.s b/test/torture-s/loop-4b.c.s
index 4fee8ecc3..1f23f3e46 100644
--- a/test/torture-s/loop-4b.c.s
+++ b/test/torture-s/loop-4b.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-4b.c"
+	.file	"loop-4b.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,7 +26,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-5.c.s b/test/torture-s/loop-5.c.s
index 17ec6be6c..48dc11606 100644
--- a/test/torture-s/loop-5.c.s
+++ b/test/torture-s/loop-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-5.c"
+	.file	"loop-5.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,101 +9,101 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push31=, 0
-	i32.load	$push30=, t($pop31)
-	tee_local	$push29=, $0=, $pop30
+	i32.const	$push29=, 0
+	i32.load	$push28=, t($pop29)
+	tee_local	$push27=, $0=, $pop28
 	i32.const	$push0=, 4
-	i32.ge_s	$push1=, $pop29, $pop0
+	i32.ge_s	$push1=, $pop27, $pop0
 	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %ap.exit.i
-	i32.const	$push38=, 0
-	i32.const	$push2=, 1
-	i32.add 	$push37=, $0, $pop2
-	tee_local	$push36=, $1=, $pop37
-	i32.store	t($pop38), $pop36
-	i32.const	$push35=, 2
-	i32.shl 	$push3=, $0, $pop35
-	i32.const	$push34=, a
-	i32.add 	$push4=, $pop3, $pop34
-	i32.const	$push33=, 0
-	i32.store	0($pop4), $pop33
-	i32.const	$push32=, 3
-	i32.eq  	$push5=, $0, $pop32
-	br_if   	0, $pop5        # 0: down to label0
+	i32.const	$push37=, 0
+	i32.const	$push36=, 1
+	i32.add 	$push35=, $0, $pop36
+	tee_local	$push34=, $1=, $pop35
+	i32.store	t($pop37), $pop34
+	i32.const	$push33=, 2
+	i32.shl 	$push2=, $0, $pop33
+	i32.const	$push32=, a
+	i32.add 	$push3=, $pop2, $pop32
+	i32.const	$push31=, 0
+	i32.store	0($pop3), $pop31
+	i32.const	$push30=, 3
+	i32.eq  	$push4=, $0, $pop30
+	br_if   	0, $pop4        # 0: down to label0
 # BB#2:                                 # %ap.exit.1.i
-	i32.const	$push46=, 0
-	i32.const	$push45=, 2
-	i32.add 	$push44=, $0, $pop45
-	tee_local	$push43=, $2=, $pop44
-	i32.store	t($pop46), $pop43
-	i32.const	$push42=, 2
-	i32.shl 	$push6=, $1, $pop42
-	i32.const	$push41=, a
-	i32.add 	$push7=, $pop6, $pop41
-	i32.const	$push40=, 3
-	i32.store	0($pop7), $pop40
+	i32.const	$push45=, 0
+	i32.const	$push44=, 2
+	i32.add 	$push43=, $0, $pop44
+	tee_local	$push42=, $2=, $pop43
+	i32.store	t($pop45), $pop42
+	i32.const	$push41=, 2
+	i32.shl 	$push5=, $1, $pop41
+	i32.const	$push40=, a
+	i32.add 	$push6=, $pop5, $pop40
 	i32.const	$push39=, 3
-	i32.gt_s	$push8=, $2, $pop39
-	br_if   	0, $pop8        # 0: down to label0
+	i32.store	0($pop6), $pop39
+	i32.const	$push38=, 1
+	i32.gt_s	$push7=, $0, $pop38
+	br_if   	0, $pop7        # 0: down to label0
 # BB#3:                                 # %ap.exit.2.i
-	i32.const	$push53=, 0
-	i32.const	$push9=, 3
-	i32.add 	$push52=, $0, $pop9
-	tee_local	$push51=, $1=, $pop52
-	i32.store	t($pop53), $pop51
-	i32.const	$push50=, 2
-	i32.shl 	$push10=, $2, $pop50
-	i32.const	$push49=, a
-	i32.add 	$push11=, $pop10, $pop49
-	i32.const	$push48=, 2
-	i32.store	0($pop11), $pop48
-	i32.const	$push47=, 0
-	i32.gt_s	$push12=, $0, $pop47
-	br_if   	0, $pop12       # 0: down to label0
+	i32.const	$push52=, 0
+	i32.const	$push8=, 3
+	i32.add 	$push51=, $0, $pop8
+	tee_local	$push50=, $1=, $pop51
+	i32.store	t($pop52), $pop50
+	i32.const	$push49=, 2
+	i32.shl 	$push9=, $2, $pop49
+	i32.const	$push48=, a
+	i32.add 	$push10=, $pop9, $pop48
+	i32.const	$push47=, 2
+	i32.store	0($pop10), $pop47
+	i32.const	$push46=, 1
+	i32.eq  	$push11=, $0, $pop46
+	br_if   	0, $pop11       # 0: down to label0
 # BB#4:                                 # %testit.exit
 	i32.const	$push57=, 2
-	i32.shl 	$push13=, $1, $pop57
+	i32.shl 	$push12=, $1, $pop57
 	i32.const	$push56=, a
-	i32.add 	$push14=, $pop13, $pop56
-	i32.const	$push15=, 1
-	i32.store	0($pop14), $pop15
-	i32.const	$push55=, 0
-	i32.const	$push16=, 4
-	i32.add 	$push17=, $0, $pop16
-	i32.store	t($pop55), $pop17
+	i32.add 	$push13=, $pop12, $pop56
+	i32.const	$push55=, 1
+	i32.store	0($pop13), $pop55
 	i32.const	$push54=, 0
-	i32.load	$push18=, a($pop54)
-	br_if   	0, $pop18       # 0: down to label0
+	i32.const	$push14=, 4
+	i32.add 	$push15=, $0, $pop14
+	i32.store	t($pop54), $pop15
+	i32.const	$push53=, 0
+	i32.load	$push16=, a($pop53)
+	br_if   	0, $pop16       # 0: down to label0
 # BB#5:                                 # %if.end
 	i32.const	$push58=, 0
-	i32.load	$push19=, a+4($pop58)
-	i32.const	$push20=, 3
-	i32.ne  	$push21=, $pop19, $pop20
-	br_if   	0, $pop21       # 0: down to label0
+	i32.load	$push17=, a+4($pop58)
+	i32.const	$push18=, 3
+	i32.ne  	$push19=, $pop17, $pop18
+	br_if   	0, $pop19       # 0: down to label0
 # BB#6:                                 # %if.end3
 	i32.const	$push59=, 0
-	i32.load	$push22=, a+8($pop59)
-	i32.const	$push23=, 2
-	i32.ne  	$push24=, $pop22, $pop23
-	br_if   	0, $pop24       # 0: down to label0
+	i32.load	$push20=, a+8($pop59)
+	i32.const	$push21=, 2
+	i32.ne  	$push22=, $pop20, $pop21
+	br_if   	0, $pop22       # 0: down to label0
 # BB#7:                                 # %if.end6
 	i32.const	$push60=, 0
-	i32.load	$push25=, a+12($pop60)
-	i32.const	$push26=, 1
-	i32.ne  	$push27=, $pop25, $pop26
-	br_if   	0, $pop27       # 0: down to label0
+	i32.load	$push23=, a+12($pop60)
+	i32.const	$push24=, 1
+	i32.ne  	$push25=, $pop23, $pop24
+	br_if   	0, $pop25       # 0: down to label0
 # BB#8:                                 # %if.end9
-	i32.const	$push28=, 0
-	call    	exit@FUNCTION, $pop28
+	i32.const	$push26=, 0
+	call    	exit@FUNCTION, $pop26
 	unreachable
-.LBB0_9:                                # %if.then8
+.LBB0_9:                                # %if.then.i.i
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	a,@object               # @a
 	.section	.bss.a,"aw",@nobits
 	.p2align	4
@@ -119,6 +119,6 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-6.c.s b/test/torture-s/loop-6.c.s
index b2dca3bef..87f0a5ca8 100644
--- a/test/torture-s/loop-6.c.s
+++ b/test/torture-s/loop-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-6.c"
+	.file	"loop-6.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-7.c.s b/test/torture-s/loop-7.c.s
index dcd179283..08b4b35b5 100644
--- a/test/torture-s/loop-7.c.s
+++ b/test/torture-s/loop-7.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-7.c"
+	.file	"loop-7.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,20 +14,19 @@ foo:                                    # @foo
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push10=, 1
-	i32.shl 	$push0=, $pop10, $2
+	i32.const	$push7=, 1
+	i32.shl 	$push0=, $pop7, $2
 	i32.eq  	$push1=, $pop0, $0
 	i32.select	$1=, $2, $1, $pop1
-	i32.const	$push9=, 1
-	i32.add 	$push8=, $2, $pop9
-	tee_local	$push7=, $2=, $pop8
-	i32.const	$push6=, 9
-	i32.gt_s	$push2=, $pop7, $pop6
+	i32.const	$push6=, 8
+	i32.gt_u	$push2=, $2, $pop6
 	br_if   	1, $pop2        # 1: down to label0
 # BB#2:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push11=, 0
-	i32.lt_s	$push3=, $1, $pop11
+	i32.const	$push9=, 1
+	i32.add 	$2=, $2, $pop9
+	i32.const	$push8=, 0
+	i32.lt_s	$push3=, $1, $pop8
 	br_if   	0, $pop3        # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
@@ -45,9 +44,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,8 +60,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-8.c.s b/test/torture-s/loop-8.c.s
index 71bce810f..03b4425da 100644
--- a/test/torture-s/loop-8.c.s
+++ b/test/torture-s/loop-8.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-8.c"
+	.file	"loop-8.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -23,72 +23,66 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
+	i32.const	$push10=, 0
 	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push21=, $pop9, $pop10
-	tee_local	$push20=, $1=, $pop21
-	i32.store	__stack_pointer($pop11), $pop20
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 16
+	i32.sub 	$push18=, $pop7, $pop9
+	tee_local	$push17=, $1=, $pop18
+	i32.store	__stack_pointer($pop10), $pop17
 	block   	
 	block   	
-	i32.const	$push19=, 0
-	f64.load	$push18=, a($pop19)
-	tee_local	$push17=, $0=, $pop18
-	f64.const	$push16=, 0x0p0
-	f64.gt  	$push0=, $pop17, $pop16
+	i32.const	$push16=, 0
+	f64.load	$push15=, a($pop16)
+	tee_local	$push14=, $0=, $pop15
+	f64.const	$push13=, 0x0p0
+	f64.gt  	$push0=, $pop14, $pop13
 	br_if   	0, $pop0        # 0: down to label2
 # BB#1:                                 # %for.cond
-	i32.const	$push25=, 0
-	f64.load	$push24=, a+8($pop25)
-	tee_local	$push23=, $0=, $pop24
-	f64.const	$push22=, 0x0p0
-	f64.le  	$push1=, $pop23, $pop22
+	i32.const	$push22=, 0
+	f64.load	$push21=, a+8($pop22)
+	tee_local	$push20=, $0=, $pop21
+	f64.const	$push19=, 0x0p0
+	f64.le  	$push1=, $pop20, $pop19
 	f64.ne  	$push2=, $0, $0
 	i32.or  	$push3=, $pop1, $pop2
-	i32.eqz 	$push31=, $pop3
-	br_if   	0, $pop31       # 0: down to label2
+	i32.eqz 	$push27=, $pop3
+	br_if   	0, $pop27       # 0: down to label2
 # BB#2:                                 # %for.cond.1
 	i32.const	$push4=, 0
-	f64.load	$push27=, a+16($pop4)
-	tee_local	$push26=, $0=, $pop27
+	f64.load	$push24=, a+16($pop4)
+	tee_local	$push23=, $0=, $pop24
 	f64.const	$push5=, 0x0p0
-	f64.gt  	$push6=, $pop26, $pop5
-	i32.eqz 	$push32=, $pop6
-	br_if   	1, $pop32       # 1: down to label1
+	f64.gt  	$push6=, $pop23, $pop5
+	i32.eqz 	$push28=, $pop6
+	br_if   	1, $pop28       # 1: down to label1
 .LBB1_3:                                # %e
 	end_block                       # label2:
 	f64.store	8($1), $0
-	i32.const	$push29=, 0
-	i32.const	$push12=, 8
-	i32.add 	$push13=, $1, $pop12
-	call    	bar@FUNCTION, $pop29, $pop13
-	i32.const	$push28=, 0
-	call    	exit@FUNCTION, $pop28
+	i32.const	$push26=, 0
+	i32.const	$push11=, 8
+	i32.add 	$push12=, $1, $pop11
+	call    	bar@FUNCTION, $pop26, $pop12
+	i32.const	$push25=, 0
+	call    	exit@FUNCTION, $pop25
 	unreachable
 .LBB1_4:                                # %for.cond.2
 	end_block                       # label1:
-	f64.store	8($1), $0
-	i32.const	$push7=, 1
-	i32.const	$push14=, 8
-	i32.add 	$push15=, $1, $pop14
-	call    	bar@FUNCTION, $pop7, $pop15
-	i32.const	$push30=, 1
-	call    	exit@FUNCTION, $pop30
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -101,6 +95,6 @@ a:
 	.size	a, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-9.c.s b/test/torture-s/loop-9.c.s
index 785ff1768..1c2e7ce5d 100644
--- a/test/torture-s/loop-9.c.s
+++ b/test/torture-s/loop-9.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-9.c"
+	.file	"loop-9.c"
 	.section	.text.false,"ax",@progbits
-	.hidden	false
+	.hidden	false                   # -- Begin function false
 	.globl	false
 	.type	false,@function
 false:                                  # @false
@@ -12,9 +12,9 @@ false:                                  # @false
 	.endfunc
 .Lfunc_end0:
 	.size	false, .Lfunc_end0-false
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,6 +26,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/loop-ivopts-1.c.s b/test/torture-s/loop-ivopts-1.c.s
index 68ecf0916..2151c0cce 100644
--- a/test/torture-s/loop-ivopts-1.c.s
+++ b/test/torture-s/loop-ivopts-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-ivopts-1.c"
+	.file	"loop-ivopts-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -18,25 +18,24 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 # BB#0:                                 # %for.inc9.3
 	i32.const	$push1=, 0
-	i32.const	$push0=, 1095761920
-	i32.store	foo.tmp($pop1), $pop0
-	i32.const	$push10=, 0
-	i64.const	$push2=, 4838273375797772288
-	i64.store	foo.tmp+4($pop10):p2align=2, $pop2
-	i32.const	$push9=, 1095761920
-	i32.store	0($0), $pop9
-	i32.const	$push8=, 0
-	i32.load	$push3=, foo.tmp+4($pop8)
+	i64.const	$push0=, 4838273375797772288
+	i64.store	foo.tmp+4($pop1):p2align=2, $pop0
+	i32.const	$push9=, 0
+	i32.const	$push2=, 1095761920
+	i32.store	foo.tmp($pop9), $pop2
+	i32.const	$push3=, 1118306304
 	i32.store	4($0), $pop3
+	i32.const	$push8=, 1095761920
+	i32.store	0($0), $pop8
 	i32.const	$push7=, 0
 	i32.load	$push4=, foo.tmp+8($pop7)
 	i32.store	8($0), $pop4
@@ -47,7 +46,7 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.type	foo.tmp,@object         # @foo.tmp
 	.section	.bss.foo.tmp,"aw",@nobits
 	.p2align	4
@@ -56,4 +55,4 @@ foo.tmp:
 	.size	foo.tmp, 16
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/loop-ivopts-2.c.s b/test/torture-s/loop-ivopts-2.c.s
index 25916b969..03fee6617 100644
--- a/test/torture-s/loop-ivopts-2.c.s
+++ b/test/torture-s/loop-ivopts-2.c.s
@@ -1,14 +1,14 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/loop-ivopts-2.c"
+	.file	"loop-ivopts-2.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 0
+	i32.const	$1=, -1
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -16,12 +16,12 @@ check:                                  # @check
 	i32.load	$push6=, 0($0)
 	i32.const	$push14=, 8
 	i32.const	$push13=, 7
-	i32.const	$push12=, -256
+	i32.const	$push12=, -255
 	i32.add 	$push0=, $1, $pop12
 	i32.const	$push11=, 23
 	i32.gt_u	$push1=, $pop0, $pop11
 	i32.select	$push2=, $pop14, $pop13, $pop1
-	i32.const	$push10=, -144
+	i32.const	$push10=, -143
 	i32.add 	$push3=, $1, $pop10
 	i32.const	$push9=, 112
 	i32.lt_u	$push4=, $pop3, $pop9
@@ -35,8 +35,8 @@ check:                                  # @check
 	i32.const	$push18=, 1
 	i32.add 	$push17=, $1, $pop18
 	tee_local	$push16=, $1=, $pop17
-	i32.const	$push15=, 287
-	i32.le_s	$push8=, $pop16, $pop15
+	i32.const	$push15=, 286
+	i32.le_u	$push8=, $pop16, $pop15
 	br_if   	0, $pop8        # 0: up to label1
 # BB#3:                                 # %for.end
 	end_loop
@@ -48,155 +48,158 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
-	i32.const	$push18=, 1152
-	i32.sub 	$push24=, $pop17, $pop18
-	tee_local	$push23=, $2=, $pop24
-	i32.store	__stack_pointer($pop19), $pop23
+	i32.const	$push26=, 0
+	i32.const	$push24=, 0
+	i32.load	$push23=, __stack_pointer($pop24)
+	i32.const	$push25=, 1152
+	i32.sub 	$push31=, $pop23, $pop25
+	tee_local	$push30=, $2=, $pop31
+	i32.store	__stack_pointer($pop26), $pop30
 	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	i32.add 	$push0=, $2, $1
-	i32.const	$push29=, 8
-	i32.store	0($pop0), $pop29
-	i32.const	$push28=, 4
-	i32.add 	$push27=, $1, $pop28
-	tee_local	$push26=, $1=, $pop27
-	i32.const	$push25=, 576
-	i32.ne  	$push1=, $pop26, $pop25
+	i32.const	$push36=, 8
+	i32.store	0($pop0), $pop36
+	i32.const	$push35=, 4
+	i32.add 	$push34=, $1, $pop35
+	tee_local	$push33=, $1=, $pop34
+	i32.const	$push32=, 576
+	i32.ne  	$push1=, $pop33, $pop32
 	br_if   	0, $pop1        # 0: up to label2
 # BB#2:                                 # %for.body3.preheader
 	end_loop
 	i32.const	$push2=, 576
-	i32.add 	$0=, $2, $pop2
-	i32.const	$1=, 0
+	i32.add 	$1=, $2, $pop2
+	i32.const	$0=, 143
 .LBB1_3:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.add 	$push3=, $0, $1
-	i32.const	$push34=, 9
-	i32.store	0($pop3), $pop34
-	i32.const	$push33=, 4
-	i32.add 	$push32=, $1, $pop33
-	tee_local	$push31=, $1=, $pop32
-	i32.const	$push30=, 448
-	i32.ne  	$push4=, $pop31, $pop30
-	br_if   	0, $pop4        # 0: up to label3
-# BB#4:                                 # %for.body17
+	i32.const	$push42=, 9
+	i32.store	0($1), $pop42
+	i32.const	$push41=, 4
+	i32.add 	$1=, $1, $pop41
+	i32.const	$push40=, 1
+	i32.add 	$push39=, $0, $pop40
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 255
+	i32.lt_s	$push3=, $pop38, $pop37
+	br_if   	0, $pop3        # 0: up to label3
+# BB#4:                                 # %for.end7
 	end_loop
-	i64.const	$push5=, 30064771079
-	i64.store	1024($2), $pop5
-	i64.const	$push60=, 30064771079
-	i64.store	1032($2), $pop60
-	i64.const	$push59=, 30064771079
-	i64.store	1040($2), $pop59
-	i64.const	$push58=, 30064771079
-	i64.store	1048($2), $pop58
-	i64.const	$push57=, 30064771079
-	i64.store	1056($2), $pop57
-	i32.const	$push56=, 7
-	i32.store	1064($2), $pop56
-	i32.const	$push55=, 7
-	i32.store	1068($2), $pop55
-	i32.const	$push54=, 7
-	i32.store	1072($2), $pop54
-	i32.const	$push53=, 7
-	i32.store	1076($2), $pop53
-	i32.const	$push52=, 7
-	i32.store	1080($2), $pop52
-	i32.const	$push51=, 7
-	i32.store	1084($2), $pop51
-	i32.const	$push50=, 7
-	i32.store	1088($2), $pop50
-	i32.const	$push49=, 7
-	i32.store	1092($2), $pop49
+	block   	
+	block   	
+	i32.const	$push4=, 278
+	i32.gt_s	$push5=, $0, $pop4
+	br_if   	0, $pop5        # 0: down to label5
+# BB#5:                                 # %for.body10.preheader
+.LBB1_6:                                # %for.body10
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label6:
 	i32.const	$push48=, 7
-	i32.store	1096($2), $pop48
-	i32.const	$push47=, 7
-	i32.store	1100($2), $pop47
-	i32.const	$push46=, 7
-	i32.store	1104($2), $pop46
-	i32.const	$push45=, 7
-	i32.store	1108($2), $pop45
-	i32.const	$push44=, 7
-	i32.store	1112($2), $pop44
-	i32.const	$push43=, 7
-	i32.store	1116($2), $pop43
-	i32.const	$push42=, 8
-	i32.store	1120($2), $pop42
-	i32.const	$push41=, 8
-	i32.store	1124($2), $pop41
-	i32.const	$push40=, 8
-	i32.store	1128($2), $pop40
-	i32.const	$push39=, 8
-	i32.store	1132($2), $pop39
-	i32.const	$push38=, 8
-	i32.store	1136($2), $pop38
-	i32.const	$push37=, 8
-	i32.store	1140($2), $pop37
-	i32.const	$push36=, 8
-	i32.store	1144($2), $pop36
-	i32.const	$push35=, 8
-	i32.store	1148($2), $pop35
-	i32.const	$1=, 0
+	i32.store	0($1), $pop48
+	i32.const	$push47=, 4
+	i32.add 	$1=, $1, $pop47
+	i32.const	$push46=, 1
+	i32.add 	$push45=, $0, $pop46
+	tee_local	$push44=, $0=, $pop45
+	i32.const	$push43=, 279
+	i32.lt_s	$push6=, $pop44, $pop43
+	br_if   	0, $pop6        # 0: up to label6
+# BB#7:                                 # %for.end14.loopexit
+	end_loop
+	i32.const	$push7=, 1
+	i32.add 	$1=, $0, $pop7
+	br      	1               # 1: down to label4
+.LBB1_8:
+	end_block                       # label5:
+	i32.const	$push49=, 1
+	i32.add 	$1=, $0, $pop49
+.LBB1_9:                                # %for.end14
+	end_block                       # label4:
+	block   	
+	i32.const	$push50=, 287
+	i32.gt_s	$push8=, $1, $pop50
+	br_if   	0, $pop8        # 0: down to label7
+# BB#10:                                # %for.body17.preheader
+	i32.const	$push9=, -1
+	i32.add 	$0=, $1, $pop9
+	i32.const	$push10=, 2
+	i32.shl 	$push11=, $1, $pop10
+	i32.add 	$1=, $2, $pop11
+.LBB1_11:                               # %for.body17
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label8:
+	i32.const	$push56=, 8
+	i32.store	0($1), $pop56
+	i32.const	$push55=, 4
+	i32.add 	$1=, $1, $pop55
+	i32.const	$push54=, 1
+	i32.add 	$push53=, $0, $pop54
+	tee_local	$push52=, $0=, $pop53
+	i32.const	$push51=, 287
+	i32.lt_s	$push12=, $pop52, $pop51
+	br_if   	0, $pop12       # 0: up to label8
+.LBB1_12:                               # %for.body.i.preheader
+	end_loop
+	end_block                       # label7:
 	copy_local	$0=, $2
-.LBB1_5:                                # %for.body.i
+	i32.const	$1=, -1
+.LBB1_13:                               # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label5:
-	i32.load	$push12=, 0($0)
-	i32.const	$push66=, 8
-	i32.const	$push65=, 7
-	i32.const	$push64=, -256
-	i32.add 	$push6=, $1, $pop64
-	i32.const	$push63=, 23
-	i32.gt_u	$push7=, $pop6, $pop63
-	i32.select	$push8=, $pop66, $pop65, $pop7
-	i32.const	$push62=, -144
-	i32.add 	$push9=, $1, $pop62
-	i32.const	$push61=, 112
-	i32.lt_u	$push10=, $pop9, $pop61
-	i32.add 	$push11=, $pop8, $pop10
-	i32.ne  	$push13=, $pop12, $pop11
-	br_if   	1, $pop13       # 1: down to label4
-# BB#6:                                 # %for.cond.i
-                                        #   in Loop: Header=BB1_5 Depth=1
-	i32.const	$push71=, 4
-	i32.add 	$0=, $0, $pop71
-	i32.const	$push70=, 1
-	i32.add 	$push69=, $1, $pop70
-	tee_local	$push68=, $1=, $pop69
-	i32.const	$push67=, 287
-	i32.le_s	$push14=, $pop68, $pop67
-	br_if   	0, $pop14       # 0: up to label5
-# BB#7:                                 # %check.exit
+	loop    	                # label10:
+	i32.load	$push19=, 0($0)
+	i32.const	$push62=, 8
+	i32.const	$push61=, 7
+	i32.const	$push60=, -255
+	i32.add 	$push13=, $1, $pop60
+	i32.const	$push59=, 23
+	i32.gt_u	$push14=, $pop13, $pop59
+	i32.select	$push15=, $pop62, $pop61, $pop14
+	i32.const	$push58=, -143
+	i32.add 	$push16=, $1, $pop58
+	i32.const	$push57=, 112
+	i32.lt_u	$push17=, $pop16, $pop57
+	i32.add 	$push18=, $pop15, $pop17
+	i32.ne  	$push20=, $pop19, $pop18
+	br_if   	1, $pop20       # 1: down to label9
+# BB#14:                                # %for.cond.i
+                                        #   in Loop: Header=BB1_13 Depth=1
+	i32.const	$push67=, 4
+	i32.add 	$0=, $0, $pop67
+	i32.const	$push66=, 1
+	i32.add 	$push65=, $1, $pop66
+	tee_local	$push64=, $1=, $pop65
+	i32.const	$push63=, 286
+	i32.le_u	$push21=, $pop64, $pop63
+	br_if   	0, $pop21       # 0: up to label10
+# BB#15:                                # %check.exit
 	end_loop
+	i32.const	$push29=, 0
+	i32.const	$push27=, 1152
+	i32.add 	$push28=, $2, $pop27
+	i32.store	__stack_pointer($pop29), $pop28
 	i32.const	$push22=, 0
-	i32.const	$push20=, 1152
-	i32.add 	$push21=, $2, $pop20
-	i32.store	__stack_pointer($pop22), $pop21
-	i32.const	$push15=, 0
-	return  	$pop15
-.LBB1_8:                                # %if.then.i
-	end_block                       # label4:
+	return  	$pop22
+.LBB1_16:                               # %if.then.i
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/lshrdi-1.c.s b/test/torture-s/lshrdi-1.c.s
index cfe5bc9af..c4f8b3c55 100644
--- a/test/torture-s/lshrdi-1.c.s
+++ b/test/torture-s/lshrdi-1.c.s
@@ -1,63 +1,64 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/lshrdi-1.c"
+	.file	"lshrdi-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i32
+	.local  	i32, i32, i32, i64
 # BB#0:                                 # %entry
-	i64.const	$0=, 0
-	i32.const	$2=, .Lswitch.table
+	i64.const	$3=, -1
+	i32.const	$1=, .Lswitch.table.main
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i64.const	$push6=, -8690466092652643696
-	i64.shr_u	$push0=, $pop6, $0
-	i64.load	$push1=, 0($2)
-	i64.ne  	$push2=, $pop0, $pop1
-	br_if   	1, $pop2        # 1: down to label0
+	i64.const	$push10=, -8690466092652643696
+	i64.const	$push9=, 1
+	i64.add 	$push8=, $3, $pop9
+	tee_local	$push7=, $3=, $pop8
+	i64.shr_u	$push1=, $pop10, $pop7
+	i64.load	$push2=, 0($1)
+	i64.ne  	$push3=, $pop1, $pop2
+	br_if   	1, $pop3        # 1: down to label0
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push11=, 8
-	i32.add 	$2=, $2, $pop11
-	i64.const	$push10=, 1
-	i64.add 	$push9=, $0, $pop10
-	tee_local	$push8=, $0=, $pop9
-	i64.const	$push7=, 64
-	i64.lt_s	$push3=, $pop8, $pop7
-	br_if   	0, $pop3        # 0: up to label1
-# BB#3:                                 # %constant_shift.exit.preheader
+	i32.const	$push12=, 8
+	i32.add 	$1=, $1, $pop12
+	i64.const	$push11=, 63
+	i64.lt_u	$push4=, $3, $pop11
+	br_if   	0, $pop4        # 0: up to label1
+# BB#3:                                 # %for.body4.preheader
 	end_loop
-	i32.const	$2=, 0
-	i32.const	$1=, .Lswitch.table
-.LBB0_4:                                # %constant_shift.exit
+	i32.const	$1=, 0
+	i32.const	$0=, .Lswitch.table.main
+.LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label3:
-	i32.const	$push12=, 1
-	i32.eqz 	$push18=, $pop12
-	br_if   	1, $pop18       # 1: down to label2
-# BB#5:                                 # %for.cond2
+	loop    	                # label2:
+	i32.const	$push13=, 64
+	i32.ge_u	$push5=, $1, $pop13
+	br_if   	1, $pop5        # 1: down to label0
+# BB#5:                                 # %switch.lookup
+                                        #   in Loop: Header=BB0_4 Depth=1
+	i32.const	$push14=, 1
+	i32.eqz 	$push18=, $pop14
+	br_if   	1, $pop18       # 1: down to label0
+# BB#6:                                 # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
 	i32.const	$push17=, 8
-	i32.add 	$1=, $1, $pop17
-	i32.const	$push16=, 1
-	i32.add 	$push15=, $2, $pop16
-	tee_local	$push14=, $2=, $pop15
-	i32.const	$push13=, 63
-	i32.le_s	$push4=, $pop14, $pop13
-	br_if   	0, $pop4        # 0: up to label3
-# BB#6:                                 # %for.end13
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, 62
+	i32.gt_u	$2=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$push0=, $1, $pop15
+	copy_local	$1=, $pop0
+	i32.eqz 	$push19=, $2
+	br_if   	0, $pop19       # 0: up to label2
+# BB#7:                                 # %for.end13
 	end_loop
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
-	unreachable
-.LBB0_7:                                # %if.then9
-	end_block                       # label2:
-	call    	abort@FUNCTION
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -66,11 +67,11 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+                                        # -- End function
+	.type	.Lswitch.table.main,@object # @switch.table.main
+	.section	.rodata..Lswitch.table.main,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.main:
 	.int64	-8690466092652643696    # 0x87654321fedcba90
 	.int64	4878138990528453960     # 0x43b2a190ff6e5d48
 	.int64	2439069495264226980     # 0x21d950c87fb72ea4
@@ -135,9 +136,9 @@ main:                                   # @main
 	.int64	4                       # 0x4
 	.int64	2                       # 0x2
 	.int64	1                       # 0x1
-	.size	.Lswitch.table, 512
+	.size	.Lswitch.table.main, 512
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/mayalias-1.c.s b/test/torture-s/mayalias-1.c.s
index 86518f49b..ce058b3c4 100644
--- a/test/torture-s/mayalias-1.c.s
+++ b/test/torture-s/mayalias-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/mayalias-1.c"
+	.file	"mayalias-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/mayalias-2.c.s b/test/torture-s/mayalias-2.c.s
index de9bb7684..5d2eac86e 100644
--- a/test/torture-s/mayalias-2.c.s
+++ b/test/torture-s/mayalias-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/mayalias-2.c"
+	.file	"mayalias-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/mayalias-3.c.s b/test/torture-s/mayalias-3.c.s
index 68460c357..8716a5467 100644
--- a/test/torture-s/mayalias-3.c.s
+++ b/test/torture-s/mayalias-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/mayalias-3.c"
+	.file	"mayalias-3.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -15,19 +15,19 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop5, $pop6
+	i32.sub 	$push10=, $pop4, $pop6
 	tee_local	$push9=, $0=, $pop10
 	i32.const	$push0=, 10
 	i32.store	12($pop9), $pop0
@@ -42,9 +42,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,10 +52,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i32.const	$push0=, 10
@@ -85,7 +85,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -96,5 +96,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/medce-1.c.s b/test/torture-s/medce-1.c.s
index 0ef073d48..dbbd29cea 100644
--- a/test/torture-s/medce-1.c.s
+++ b/test/torture-s/medce-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/medce-1.c"
+	.file	"medce-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -35,9 +35,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	ok,@object              # @ok
 	.section	.bss.ok,"aw",@nobits
 	.p2align	2
@@ -60,4 +60,4 @@ ok:
 	.size	ok, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/memcpy-1.c.s b/test/torture-s/memcpy-1.c.s
index ae4f44a43..b669dc161 100644
--- a/test/torture-s/memcpy-1.c.s
+++ b/test/torture-s/memcpy-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memcpy-1.c"
+	.file	"memcpy-1.c"
 	.section	.text.copy,"ax",@progbits
-	.hidden	copy
+	.hidden	copy                    # -- Begin function copy
 	.globl	copy
 	.type	copy,@function
 copy:                                   # @copy
@@ -13,9 +13,9 @@ copy:                                   # @copy
 	.endfunc
 .Lfunc_end0:
 	.size	copy, .Lfunc_end0-copy
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,10 +23,10 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push40=, 0
-	i32.const	$push37=, 0
-	i32.load	$push38=, __stack_pointer($pop37)
+	i32.const	$push38=, 0
+	i32.load	$push37=, __stack_pointer($pop38)
 	i32.const	$push39=, 696320
-	i32.sub 	$push54=, $pop38, $pop39
+	i32.sub 	$push54=, $pop37, $pop39
 	tee_local	$push53=, $1=, $pop54
 	i32.store	__stack_pointer($pop40), $pop53
 	i32.const	$2=, 0
@@ -56,15 +56,13 @@ main:                                   # @main
 .LBB1_3:                                # %for.body6
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	block   	
-	block   	
-	loop    	                # label4:
+	loop    	                # label2:
 	i32.add 	$push6=, $1, $2
 	i32.load8_u	$push7=, 0($pop6)
 	i32.const	$push59=, 255
 	i32.and 	$push5=, $2, $pop59
 	i32.ne  	$push8=, $pop7, $pop5
-	br_if   	1, $pop8        # 1: down to label3
+	br_if   	1, $pop8        # 1: down to label1
 # BB#4:                                 # %for.cond3
                                         #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$push63=, 1
@@ -72,7 +70,7 @@ main:                                   # @main
 	tee_local	$push61=, $2=, $pop62
 	i32.const	$push60=, 2719
 	i32.le_u	$push9=, $pop61, $pop60
-	br_if   	0, $pop9        # 0: up to label4
+	br_if   	0, $pop9        # 0: up to label2
 # BB#5:                                 # %for.end15
 	end_loop
 	i32.const	$push64=, 1
@@ -82,10 +80,10 @@ main:                                   # @main
 .LBB1_6:                                # %for.cond17
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label6:
+	loop    	                # label4:
 	i32.const	$push65=, 2719
 	i32.gt_u	$push11=, $2, $pop65
-	br_if   	1, $pop11       # 1: down to label5
+	br_if   	1, $pop11       # 1: down to label3
 # BB#7:                                 # %for.cond17.for.body20_crit_edge
                                         #   in Loop: Header=BB1_6 Depth=1
 	i32.add 	$1=, $0, $2
@@ -95,136 +93,119 @@ main:                                   # @main
 	i32.load8_u	$push35=, 0($1)
 	i32.const	$push66=, 1
 	i32.eq  	$push36=, $pop35, $pop66
-	br_if   	0, $pop36       # 0: up to label6
-# BB#8:                                 # %if.then25
+	br_if   	0, $pop36       # 0: up to label4
+	br      	2               # 2: down to label1
+.LBB1_8:                                # %for.end29
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_9:                                # %for.end29
-	end_block                       # label5:
+	end_block                       # label3:
 	i32.const	$push45=, 348160
 	i32.add 	$push46=, $0, $pop45
 	i32.const	$push12=, 348160
 	i32.call	$1=, memcpy@FUNCTION, $0, $pop46, $pop12
 	i32.const	$2=, 0
-.LBB1_10:                               # %for.body35
+.LBB1_9:                                # %for.body35
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label7:
+	loop    	                # label5:
 	i32.add 	$push14=, $1, $2
 	i32.load8_u	$push15=, 0($pop14)
 	i32.const	$push68=, 255
 	i32.and 	$push13=, $2, $pop68
 	i32.ne  	$push16=, $pop15, $pop13
-	br_if   	2, $pop16       # 2: down to label2
-# BB#11:                                # %for.cond32
-                                        #   in Loop: Header=BB1_10 Depth=1
+	br_if   	1, $pop16       # 1: down to label1
+# BB#10:                                # %for.cond32
+                                        #   in Loop: Header=BB1_9 Depth=1
 	i32.const	$push72=, 1
 	i32.add 	$push71=, $2, $pop72
 	tee_local	$push70=, $2=, $pop71
 	i32.const	$push69=, 348159
 	i32.le_u	$push17=, $pop70, $pop69
-	br_if   	0, $pop17       # 0: up to label7
-# BB#12:                                # %for.end46
+	br_if   	0, $pop17       # 0: up to label5
+# BB#11:                                # %for.end46
 	end_loop
 	i32.const	$push19=, 0
 	i32.const	$push18=, 348160
 	i32.call	$0=, memset@FUNCTION, $1, $pop19, $pop18
 	i32.const	$2=, 1
-.LBB1_13:                               # %for.cond48
+.LBB1_12:                               # %for.cond48
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label9:
+	loop    	                # label7:
 	i32.const	$push73=, 348159
 	i32.gt_u	$push20=, $2, $pop73
-	br_if   	1, $pop20       # 1: down to label8
-# BB#14:                                # %for.cond48.for.body51_crit_edge
-                                        #   in Loop: Header=BB1_13 Depth=1
+	br_if   	1, $pop20       # 1: down to label6
+# BB#13:                                # %for.cond48.for.body51_crit_edge
+                                        #   in Loop: Header=BB1_12 Depth=1
 	i32.add 	$1=, $0, $2
 	i32.const	$push74=, 1
 	i32.add 	$push1=, $2, $pop74
 	copy_local	$2=, $pop1
 	i32.load8_u	$push34=, 0($1)
 	i32.eqz 	$push85=, $pop34
-	br_if   	0, $pop85       # 0: up to label9
-# BB#15:                                # %if.then56
+	br_if   	0, $pop85       # 0: up to label7
+	br      	2               # 2: down to label1
+.LBB1_14:                               # %for.end60
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_16:                               # %for.end60
-	end_block                       # label8:
+	end_block                       # label6:
 	i32.const	$push47=, 348160
 	i32.add 	$push48=, $0, $pop47
 	i32.const	$push21=, 2720
 	i32.call	$1=, memcpy@FUNCTION, $0, $pop48, $pop21
 	i32.const	$2=, 0
-.LBB1_17:                               # %for.body66
+.LBB1_15:                               # %for.body66
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label10:
+	loop    	                # label8:
 	i32.add 	$push23=, $1, $2
 	i32.load8_u	$push24=, 0($pop23)
 	i32.const	$push75=, 255
 	i32.and 	$push22=, $2, $pop75
 	i32.ne  	$push25=, $pop24, $pop22
-	br_if   	3, $pop25       # 3: down to label1
-# BB#18:                                # %for.cond63
-                                        #   in Loop: Header=BB1_17 Depth=1
+	br_if   	1, $pop25       # 1: down to label1
+# BB#16:                                # %for.cond63
+                                        #   in Loop: Header=BB1_15 Depth=1
 	i32.const	$push79=, 1
 	i32.add 	$push78=, $2, $pop79
 	tee_local	$push77=, $2=, $pop78
 	i32.const	$push76=, 2719
 	i32.le_u	$push26=, $pop77, $pop76
-	br_if   	0, $pop26       # 0: up to label10
-# BB#19:                                # %for.end77
+	br_if   	0, $pop26       # 0: up to label8
+# BB#17:                                # %for.end77
 	end_loop
 	i32.const	$push49=, 348160
 	i32.add 	$push50=, $1, $pop49
 	i32.const	$push27=, 348160
 	i32.call	$drop=, memcpy@FUNCTION, $1, $pop50, $pop27
 	i32.const	$2=, 0
-.LBB1_20:                               # %for.body85
+.LBB1_18:                               # %for.body85
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label12:
+	loop    	                # label9:
 	i32.add 	$push29=, $1, $2
 	i32.load8_u	$push30=, 0($pop29)
 	i32.const	$push80=, 255
 	i32.and 	$push28=, $2, $pop80
 	i32.ne  	$push31=, $pop30, $pop28
-	br_if   	1, $pop31       # 1: down to label11
-# BB#21:                                # %for.cond82
-                                        #   in Loop: Header=BB1_20 Depth=1
+	br_if   	1, $pop31       # 1: down to label1
+# BB#19:                                # %for.cond82
+                                        #   in Loop: Header=BB1_18 Depth=1
 	i32.const	$push84=, 1
 	i32.add 	$push83=, $2, $pop84
 	tee_local	$push82=, $2=, $pop83
 	i32.const	$push81=, 348159
 	i32.le_u	$push32=, $pop82, $pop81
-	br_if   	0, $pop32       # 0: up to label12
-# BB#22:                                # %for.end96
+	br_if   	0, $pop32       # 0: up to label9
+# BB#20:                                # %for.end96
 	end_loop
 	i32.const	$push33=, 0
 	call    	exit@FUNCTION, $pop33
 	unreachable
-.LBB1_23:                               # %if.then92
-	end_block                       # label11:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_24:                               # %if.then
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_25:                               # %if.then42
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_26:                               # %if.then73
+.LBB1_21:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/memcpy-2.c.s b/test/torture-s/memcpy-2.c.s
index c2cdc85d7..6c49bce9f 100644
--- a/test/torture-s/memcpy-2.c.s
+++ b/test/torture-s/memcpy-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memcpy-2.c"
+	.file	"memcpy-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,7 +9,7 @@ main:                                   # @main
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
-.LBB0_1:                                # %for.cond1.preheader
+.LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
                                         #       Child Loop BB0_3 Depth 3
@@ -18,10 +18,10 @@ main:                                   # @main
                                         #         Child Loop BB0_12 Depth 4
 	block   	
 	loop    	                # label1:
-	i32.const	$push44=, u1
-	i32.add 	$1=, $0, $pop44
+	i32.const	$push43=, u1
+	i32.add 	$1=, $0, $pop43
 	i32.const	$2=, 0
-.LBB0_2:                                # %for.cond4.preheader
+.LBB0_2:                                # %for.body3
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB0_3 Depth 3
@@ -29,12 +29,12 @@ main:                                   # @main
                                         #         Child Loop BB0_7 Depth 4
                                         #         Child Loop BB0_12 Depth 4
 	loop    	                # label2:
-	i32.const	$push46=, 65
-	i32.add 	$4=, $2, $pop46
-	i32.const	$push45=, u2
-	i32.add 	$3=, $2, $pop45
+	i32.const	$push45=, 65
+	i32.add 	$4=, $2, $pop45
+	i32.const	$push44=, u2
+	i32.add 	$3=, $2, $pop44
 	i32.const	$5=, 1
-.LBB0_3:                                # %for.cond7.preheader
+.LBB0_3:                                # %for.body6
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Loop Header: Depth=3
@@ -42,10 +42,10 @@ main:                                   # @main
                                         #         Child Loop BB0_7 Depth 4
                                         #         Child Loop BB0_12 Depth 4
 	loop    	                # label3:
-	i32.const	$push49=, u1
-	i32.const	$push48=, 97
-	i32.const	$push47=, 96
-	i32.call	$7=, memset@FUNCTION, $pop49, $pop48, $pop47
+	i32.const	$push48=, u1
+	i32.const	$push47=, 97
+	i32.const	$push46=, 96
+	i32.call	$7=, memset@FUNCTION, $pop48, $pop47, $pop46
 	i32.const	$8=, 65
 	i32.const	$6=, -96
 .LBB0_4:                                # %for.body9
@@ -54,33 +54,32 @@ main:                                   # @main
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
 	loop    	                # label4:
-	i32.const	$push60=, u2+96
-	i32.add 	$push3=, $6, $pop60
-	i32.const	$push59=, 65
-	i32.const	$push58=, 24
-	i32.shl 	$push0=, $8, $pop58
+	i32.const	$push59=, u2+96
+	i32.add 	$push3=, $6, $pop59
+	i32.const	$push58=, 65
 	i32.const	$push57=, 24
-	i32.shr_s	$push1=, $pop0, $pop57
-	i32.const	$push56=, 95
-	i32.gt_s	$push2=, $pop1, $pop56
-	i32.select	$push55=, $pop59, $8, $pop2
-	tee_local	$push54=, $8=, $pop55
-	i32.store8	0($pop3), $pop54
-	i32.const	$push53=, 1
-	i32.add 	$8=, $8, $pop53
+	i32.shl 	$push0=, $8, $pop57
+	i32.const	$push56=, 24
+	i32.shr_s	$push1=, $pop0, $pop56
+	i32.const	$push55=, 95
+	i32.gt_s	$push2=, $pop1, $pop55
+	i32.select	$push54=, $pop58, $8, $pop2
+	tee_local	$push53=, $8=, $pop54
+	i32.store8	0($pop3), $pop53
 	i32.const	$push52=, 1
-	i32.add 	$push51=, $6, $pop52
-	tee_local	$push50=, $6=, $pop51
-	br_if   	0, $pop50       # 0: up to label4
+	i32.add 	$8=, $8, $pop52
+	i32.const	$push51=, 1
+	i32.add 	$push50=, $6, $pop51
+	tee_local	$push49=, $6=, $pop50
+	br_if   	0, $pop49       # 0: up to label4
 # BB#5:                                 # %for.end
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
 	i32.call	$drop=, memcpy@FUNCTION, $1, $3, $5
 	block   	
 	block   	
-	i32.const	$push61=, 1
-	i32.lt_s	$push4=, $0, $pop61
-	br_if   	0, $pop4        # 0: down to label6
+	i32.eqz 	$push104=, $0
+	br_if   	0, $pop104      # 0: down to label6
 # BB#6:                                 # %for.body23.preheader
                                         #   in Loop: Header=BB0_3 Depth=3
 	i32.const	$8=, 0
@@ -90,18 +89,18 @@ main:                                   # @main
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
 	loop    	                # label7:
-	i32.add 	$push5=, $8, $7
-	i32.load8_u	$push6=, 0($pop5)
-	i32.const	$push62=, 97
-	i32.ne  	$push7=, $pop6, $pop62
-	br_if   	6, $pop7        # 6: down to label0
+	i32.add 	$push4=, $8, $7
+	i32.load8_u	$push5=, 0($pop4)
+	i32.const	$push60=, 97
+	i32.ne  	$push6=, $pop5, $pop60
+	br_if   	6, $pop6        # 6: down to label0
 # BB#8:                                 # %for.inc29
                                         #   in Loop: Header=BB0_7 Depth=4
-	i32.const	$push65=, 1
-	i32.add 	$push64=, $8, $pop65
-	tee_local	$push63=, $8=, $pop64
-	i32.lt_s	$push8=, $pop63, $0
-	br_if   	0, $pop8        # 0: up to label7
+	i32.const	$push63=, 1
+	i32.add 	$push62=, $8, $pop63
+	tee_local	$push61=, $8=, $pop62
+	i32.lt_u	$push7=, $pop61, $0
+	br_if   	0, $pop7        # 0: up to label7
 # BB#9:                                 # %for.body36.preheader.loopexit
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
@@ -121,134 +120,134 @@ main:                                   # @main
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
 	loop    	                # label8:
-	i32.add 	$push13=, $7, $8
-	i32.load8_u	$push14=, 0($pop13)
-	i32.const	$push72=, 65
-	i32.const	$push71=, 24
-	i32.shl 	$push9=, $6, $pop71
-	i32.const	$push70=, 24
-	i32.shr_s	$push10=, $pop9, $pop70
-	i32.const	$push69=, 95
-	i32.gt_s	$push11=, $pop10, $pop69
-	i32.select	$push68=, $pop72, $6, $pop11
-	tee_local	$push67=, $6=, $pop68
-	i32.const	$push66=, 255
-	i32.and 	$push12=, $pop67, $pop66
-	i32.ne  	$push15=, $pop14, $pop12
-	br_if   	4, $pop15       # 4: down to label0
+	i32.add 	$push12=, $7, $8
+	i32.load8_u	$push13=, 0($pop12)
+	i32.const	$push70=, 65
+	i32.const	$push69=, 24
+	i32.shl 	$push8=, $6, $pop69
+	i32.const	$push68=, 24
+	i32.shr_s	$push9=, $pop8, $pop68
+	i32.const	$push67=, 95
+	i32.gt_s	$push10=, $pop9, $pop67
+	i32.select	$push66=, $pop70, $6, $pop10
+	tee_local	$push65=, $6=, $pop66
+	i32.const	$push64=, 255
+	i32.and 	$push11=, $pop65, $pop64
+	i32.ne  	$push14=, $pop13, $pop11
+	br_if   	4, $pop14       # 4: down to label0
 # BB#13:                                # %for.inc48
                                         #   in Loop: Header=BB0_12 Depth=4
-	i32.const	$push76=, 1
-	i32.add 	$6=, $6, $pop76
-	i32.const	$push75=, 1
-	i32.add 	$push74=, $8, $pop75
-	tee_local	$push73=, $8=, $pop74
-	i32.lt_s	$push16=, $pop73, $5
-	br_if   	0, $pop16       # 0: up to label8
-# BB#14:                                # %for.body56.preheader
+	i32.const	$push74=, 1
+	i32.add 	$6=, $6, $pop74
+	i32.const	$push73=, 1
+	i32.add 	$push72=, $8, $pop73
+	tee_local	$push71=, $8=, $pop72
+	i32.lt_u	$push15=, $pop71, $5
+	br_if   	0, $pop15       # 0: up to label8
+# BB#14:                                # %for.end52
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
-	i32.add 	$push79=, $7, $8
-	tee_local	$push78=, $8=, $pop79
-	i32.load8_u	$push17=, 0($pop78)
-	i32.const	$push77=, 97
-	i32.ne  	$push18=, $pop17, $pop77
-	br_if   	3, $pop18       # 3: down to label0
+	i32.add 	$push77=, $7, $8
+	tee_local	$push76=, $8=, $pop77
+	i32.load8_u	$push16=, 0($pop76)
+	i32.const	$push75=, 97
+	i32.ne  	$push17=, $pop16, $pop75
+	br_if   	3, $pop17       # 3: down to label0
 # BB#15:                                # %for.inc62
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push81=, 1
-	i32.add 	$push19=, $8, $pop81
-	i32.load8_u	$push20=, 0($pop19)
-	i32.const	$push80=, 97
-	i32.ne  	$push21=, $pop20, $pop80
-	br_if   	3, $pop21       # 3: down to label0
+	i32.const	$push79=, 1
+	i32.add 	$push18=, $8, $pop79
+	i32.load8_u	$push19=, 0($pop18)
+	i32.const	$push78=, 97
+	i32.ne  	$push20=, $pop19, $pop78
+	br_if   	3, $pop20       # 3: down to label0
 # BB#16:                                # %for.inc62.1
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push83=, 2
-	i32.add 	$push22=, $8, $pop83
-	i32.load8_u	$push23=, 0($pop22)
-	i32.const	$push82=, 97
-	i32.ne  	$push24=, $pop23, $pop82
-	br_if   	3, $pop24       # 3: down to label0
+	i32.const	$push81=, 2
+	i32.add 	$push21=, $8, $pop81
+	i32.load8_u	$push22=, 0($pop21)
+	i32.const	$push80=, 97
+	i32.ne  	$push23=, $pop22, $pop80
+	br_if   	3, $pop23       # 3: down to label0
 # BB#17:                                # %for.inc62.2
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push85=, 3
-	i32.add 	$push25=, $8, $pop85
-	i32.load8_u	$push26=, 0($pop25)
-	i32.const	$push84=, 97
-	i32.ne  	$push27=, $pop26, $pop84
-	br_if   	3, $pop27       # 3: down to label0
+	i32.const	$push83=, 3
+	i32.add 	$push24=, $8, $pop83
+	i32.load8_u	$push25=, 0($pop24)
+	i32.const	$push82=, 97
+	i32.ne  	$push26=, $pop25, $pop82
+	br_if   	3, $pop26       # 3: down to label0
 # BB#18:                                # %for.inc62.3
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push87=, 4
-	i32.add 	$push28=, $8, $pop87
-	i32.load8_u	$push29=, 0($pop28)
-	i32.const	$push86=, 97
-	i32.ne  	$push30=, $pop29, $pop86
-	br_if   	3, $pop30       # 3: down to label0
+	i32.const	$push85=, 4
+	i32.add 	$push27=, $8, $pop85
+	i32.load8_u	$push28=, 0($pop27)
+	i32.const	$push84=, 97
+	i32.ne  	$push29=, $pop28, $pop84
+	br_if   	3, $pop29       # 3: down to label0
 # BB#19:                                # %for.inc62.4
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push89=, 5
-	i32.add 	$push31=, $8, $pop89
-	i32.load8_u	$push32=, 0($pop31)
-	i32.const	$push88=, 97
-	i32.ne  	$push33=, $pop32, $pop88
-	br_if   	3, $pop33       # 3: down to label0
+	i32.const	$push87=, 5
+	i32.add 	$push30=, $8, $pop87
+	i32.load8_u	$push31=, 0($pop30)
+	i32.const	$push86=, 97
+	i32.ne  	$push32=, $pop31, $pop86
+	br_if   	3, $pop32       # 3: down to label0
 # BB#20:                                # %for.inc62.5
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push91=, 6
-	i32.add 	$push34=, $8, $pop91
-	i32.load8_u	$push35=, 0($pop34)
-	i32.const	$push90=, 97
-	i32.ne  	$push36=, $pop35, $pop90
-	br_if   	3, $pop36       # 3: down to label0
+	i32.const	$push89=, 6
+	i32.add 	$push33=, $8, $pop89
+	i32.load8_u	$push34=, 0($pop33)
+	i32.const	$push88=, 97
+	i32.ne  	$push35=, $pop34, $pop88
+	br_if   	3, $pop35       # 3: down to label0
 # BB#21:                                # %for.inc62.6
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push93=, 7
-	i32.add 	$push37=, $8, $pop93
-	i32.load8_u	$push38=, 0($pop37)
-	i32.const	$push92=, 97
-	i32.ne  	$push39=, $pop38, $pop92
-	br_if   	3, $pop39       # 3: down to label0
+	i32.const	$push91=, 7
+	i32.add 	$push36=, $8, $pop91
+	i32.load8_u	$push37=, 0($pop36)
+	i32.const	$push90=, 97
+	i32.ne  	$push38=, $pop37, $pop90
+	br_if   	3, $pop38       # 3: down to label0
 # BB#22:                                # %for.inc62.7
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push97=, 1
-	i32.add 	$push96=, $5, $pop97
-	tee_local	$push95=, $5=, $pop96
-	i32.const	$push94=, 80
-	i32.lt_u	$push40=, $pop95, $pop94
-	br_if   	0, $pop40       # 0: up to label3
+	i32.const	$push95=, 1
+	i32.add 	$push94=, $5, $pop95
+	tee_local	$push93=, $5=, $pop94
+	i32.const	$push92=, 80
+	i32.lt_u	$push39=, $pop93, $pop92
+	br_if   	0, $pop39       # 0: up to label3
 # BB#23:                                # %for.inc69
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push101=, 1
-	i32.add 	$push100=, $2, $pop101
-	tee_local	$push99=, $2=, $pop100
-	i32.const	$push98=, 8
-	i32.lt_u	$push41=, $pop99, $pop98
-	br_if   	0, $pop41       # 0: up to label2
+	i32.const	$push99=, 1
+	i32.add 	$push98=, $2, $pop99
+	tee_local	$push97=, $2=, $pop98
+	i32.const	$push96=, 8
+	i32.lt_u	$push40=, $pop97, $pop96
+	br_if   	0, $pop40       # 0: up to label2
 # BB#24:                                # %for.inc72
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push105=, 1
-	i32.add 	$push104=, $0, $pop105
-	tee_local	$push103=, $0=, $pop104
-	i32.const	$push102=, 8
-	i32.lt_u	$push42=, $pop103, $pop102
-	br_if   	0, $pop42       # 0: up to label1
+	i32.const	$push103=, 1
+	i32.add 	$push102=, $0, $pop103
+	tee_local	$push101=, $0=, $pop102
+	i32.const	$push100=, 8
+	i32.lt_u	$push41=, $pop101, $pop100
+	br_if   	0, $pop41       # 0: up to label1
 # BB#25:                                # %for.end74
 	end_loop
-	i32.const	$push43=, 0
-	call    	exit@FUNCTION, $pop43
+	i32.const	$push42=, 0
+	call    	exit@FUNCTION, $pop42
 	unreachable
-.LBB0_26:                               # %if.then60
+.LBB0_26:                               # %if.then27
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	u1,@object              # @u1
 	.section	.bss.u1,"aw",@nobits
 	.p2align	4
@@ -264,6 +263,6 @@ u2:
 	.size	u2, 96
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/memcpy-bi.c.s b/test/torture-s/memcpy-bi.c.s
index 1c9ac4474..3aa82b306 100644
--- a/test/torture-s/memcpy-bi.c.s
+++ b/test/torture-s/memcpy-bi.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memcpy-bi.c"
+	.file	"memcpy-bi.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -19,9 +19,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,994 +32,1686 @@ main:                                   # @main
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push304=, src
-	i32.add 	$push24=, $0, $pop304
-	i32.const	$push303=, 26
-	i32.rem_u	$push25=, $0, $pop303
-	i32.const	$push302=, 97
-	i32.add 	$push26=, $pop25, $pop302
-	i32.store8	0($pop24), $pop26
-	i32.const	$push301=, 1
-	i32.add 	$push300=, $0, $pop301
-	tee_local	$push299=, $0=, $pop300
-	i32.const	$push298=, 80
-	i32.ne  	$push27=, $pop299, $pop298
-	br_if   	0, $pop27       # 0: up to label1
+	i32.const	$push469=, src
+	i32.add 	$push8=, $0, $pop469
+	i32.const	$push468=, 26
+	i32.rem_u	$push9=, $0, $pop468
+	i32.const	$push467=, 97
+	i32.add 	$push10=, $pop9, $pop467
+	i32.store8	0($pop8), $pop10
+	i32.const	$push466=, 1
+	i32.add 	$push465=, $0, $pop466
+	tee_local	$push464=, $0=, $pop465
+	i32.const	$push463=, 80
+	i32.ne  	$push11=, $pop464, $pop463
+	br_if   	0, $pop11       # 0: up to label1
 # BB#2:                                 # %check.exit
 	end_loop
-	i32.const	$push308=, 0
-	i32.const	$push307=, 0
-	i32.load16_u	$push306=, src($pop307)
-	tee_local	$push305=, $0=, $pop306
-	i32.store16	dst($pop308), $pop305
+	i32.const	$push473=, 0
+	i32.const	$push472=, 0
+	i32.load16_u	$push471=, src($pop472)
+	tee_local	$push470=, $0=, $pop471
+	i32.store16	dst($pop473), $pop470
 	block   	
-	i32.ne  	$push28=, $0, $0
-	br_if   	0, $pop28       # 0: down to label2
+	i32.ne  	$push12=, $0, $0
+	br_if   	0, $pop12       # 0: down to label2
 # BB#3:                                 # %check.exit13
-	i32.const	$push314=, 0
-	i32.const	$push313=, 0
-	i32.load8_u	$push29=, src+2($pop313)
-	i32.store8	dst+2($pop314), $pop29
-	i32.const	$push312=, 0
-	i32.const	$push311=, 0
-	i32.load16_u	$push30=, src($pop311)
-	i32.store16	dst($pop312), $pop30
-	i32.const	$push310=, dst
-	i32.const	$push309=, src
-	i32.const	$push31=, 3
-	i32.call	$push32=, memcmp@FUNCTION, $pop310, $pop309, $pop31
-	br_if   	0, $pop32       # 0: down to label2
-# BB#4:                                 # %check.exit17
-	i32.const	$push320=, 0
-	i32.const	$push319=, 0
-	i32.load8_u	$push33=, src+4($pop319)
-	i32.store8	dst+4($pop320), $pop33
-	i32.const	$push318=, 0
-	i32.const	$push317=, 0
-	i32.load	$push34=, src($pop317)
-	i32.store	dst($pop318), $pop34
-	i32.const	$push316=, dst
-	i32.const	$push315=, src
-	i32.const	$push35=, 5
-	i32.call	$push36=, memcmp@FUNCTION, $pop316, $pop315, $pop35
-	br_if   	0, $pop36       # 0: down to label2
-# BB#5:                                 # %check.exit25
-	i32.const	$push326=, 0
-	i32.const	$push325=, 0
-	i32.load16_u	$push37=, src+4($pop325)
-	i32.store16	dst+4($pop326), $pop37
-	i32.const	$push324=, 0
-	i32.const	$push323=, 0
-	i32.load	$push38=, src($pop323)
-	i32.store	dst($pop324), $pop38
-	i32.const	$push322=, dst
-	i32.const	$push321=, src
-	i32.const	$push39=, 6
-	i32.call	$push40=, memcmp@FUNCTION, $pop322, $pop321, $pop39
-	br_if   	0, $pop40       # 0: down to label2
-# BB#6:                                 # %check.exit29
-	i32.const	$push334=, 0
-	i32.const	$push333=, 0
-	i32.load8_u	$push41=, src+6($pop333)
-	i32.store8	dst+6($pop334), $pop41
-	i32.const	$push332=, 0
-	i32.const	$push331=, 0
-	i32.load16_u	$push42=, src+4($pop331)
-	i32.store16	dst+4($pop332), $pop42
-	i32.const	$push330=, 0
-	i32.const	$push329=, 0
-	i32.load	$push43=, src($pop329)
-	i32.store	dst($pop330), $pop43
-	i32.const	$push328=, dst
-	i32.const	$push327=, src
-	i32.const	$push44=, 7
-	i32.call	$push45=, memcmp@FUNCTION, $pop328, $pop327, $pop44
-	br_if   	0, $pop45       # 0: down to label2
-# BB#7:                                 # %check.exit33
-	i32.const	$push340=, 0
-	i32.const	$push339=, 0
-	i32.load8_u	$push46=, src+8($pop339)
-	i32.store8	dst+8($pop340), $pop46
-	i32.const	$push338=, 0
-	i32.const	$push337=, 0
-	i64.load	$push47=, src($pop337)
-	i64.store	dst($pop338), $pop47
-	i32.const	$push336=, dst
-	i32.const	$push335=, src
-	i32.const	$push48=, 9
-	i32.call	$push49=, memcmp@FUNCTION, $pop336, $pop335, $pop48
-	br_if   	0, $pop49       # 0: down to label2
-# BB#8:                                 # %check.exit41
-	i32.const	$push346=, 0
-	i32.const	$push345=, 0
-	i32.load16_u	$push50=, src+8($pop345)
-	i32.store16	dst+8($pop346), $pop50
-	i32.const	$push344=, 0
-	i32.const	$push343=, 0
-	i64.load	$push51=, src($pop343)
-	i64.store	dst($pop344), $pop51
-	i32.const	$push342=, dst
-	i32.const	$push341=, src
-	i32.const	$push52=, 10
-	i32.call	$push53=, memcmp@FUNCTION, $pop342, $pop341, $pop52
-	br_if   	0, $pop53       # 0: down to label2
-# BB#9:                                 # %check.exit45
-	i32.const	$push354=, 0
-	i32.const	$push353=, 0
-	i32.load8_u	$push54=, src+10($pop353)
-	i32.store8	dst+10($pop354), $pop54
-	i32.const	$push352=, 0
-	i32.const	$push351=, 0
-	i32.load16_u	$push55=, src+8($pop351)
-	i32.store16	dst+8($pop352), $pop55
-	i32.const	$push350=, 0
-	i32.const	$push349=, 0
-	i64.load	$push56=, src($pop349)
-	i64.store	dst($pop350), $pop56
-	i32.const	$push348=, dst
-	i32.const	$push347=, src
-	i32.const	$push57=, 11
-	i32.call	$push58=, memcmp@FUNCTION, $pop348, $pop347, $pop57
-	br_if   	0, $pop58       # 0: down to label2
-# BB#10:                                # %check.exit49
-	i32.const	$push360=, 0
-	i32.const	$push359=, 0
-	i32.load	$push59=, src+8($pop359)
-	i32.store	dst+8($pop360), $pop59
-	i32.const	$push358=, 0
-	i32.const	$push357=, 0
-	i64.load	$push60=, src($pop357)
-	i64.store	dst($pop358), $pop60
-	i32.const	$push356=, dst
-	i32.const	$push355=, src
-	i32.const	$push61=, 12
-	i32.call	$push62=, memcmp@FUNCTION, $pop356, $pop355, $pop61
-	br_if   	0, $pop62       # 0: down to label2
-# BB#11:                                # %check.exit53
-	i32.const	$push368=, 0
-	i32.const	$push367=, 0
-	i32.load8_u	$push63=, src+12($pop367)
-	i32.store8	dst+12($pop368), $pop63
-	i32.const	$push366=, 0
-	i32.const	$push365=, 0
-	i32.load	$push64=, src+8($pop365)
-	i32.store	dst+8($pop366), $pop64
-	i32.const	$push364=, 0
-	i32.const	$push363=, 0
-	i64.load	$push65=, src($pop363)
-	i64.store	dst($pop364), $pop65
-	i32.const	$push362=, dst
-	i32.const	$push361=, src
-	i32.const	$push66=, 13
-	i32.call	$push67=, memcmp@FUNCTION, $pop362, $pop361, $pop66
-	br_if   	0, $pop67       # 0: down to label2
-# BB#12:                                # %check.exit57
-	i32.const	$push376=, 0
-	i32.const	$push375=, 0
-	i32.load16_u	$push68=, src+12($pop375)
-	i32.store16	dst+12($pop376), $pop68
-	i32.const	$push374=, 0
-	i32.const	$push373=, 0
-	i32.load	$push69=, src+8($pop373)
-	i32.store	dst+8($pop374), $pop69
-	i32.const	$push372=, 0
-	i32.const	$push371=, 0
-	i64.load	$push70=, src($pop371)
-	i64.store	dst($pop372), $pop70
-	i32.const	$push370=, dst
-	i32.const	$push369=, src
-	i32.const	$push71=, 14
-	i32.call	$push72=, memcmp@FUNCTION, $pop370, $pop369, $pop71
-	br_if   	0, $pop72       # 0: down to label2
-# BB#13:                                # %check.exit61
-	i32.const	$push386=, 0
-	i32.const	$push385=, 0
-	i32.load8_u	$push73=, src+14($pop385)
-	i32.store8	dst+14($pop386), $pop73
-	i32.const	$push384=, 0
-	i32.const	$push383=, 0
-	i32.load16_u	$push74=, src+12($pop383)
-	i32.store16	dst+12($pop384), $pop74
-	i32.const	$push382=, 0
-	i32.const	$push381=, 0
-	i32.load	$push75=, src+8($pop381)
-	i32.store	dst+8($pop382), $pop75
-	i32.const	$push380=, 0
-	i32.const	$push379=, 0
-	i64.load	$push76=, src($pop379)
-	i64.store	dst($pop380), $pop76
-	i32.const	$push378=, dst
-	i32.const	$push377=, src
-	i32.const	$push77=, 15
-	i32.call	$push78=, memcmp@FUNCTION, $pop378, $pop377, $pop77
-	br_if   	0, $pop78       # 0: down to label2
-# BB#14:                                # %check.exit65
-	i32.const	$push392=, 0
-	i32.const	$push391=, 0
-	i64.load	$push79=, src+8($pop391)
-	i64.store	dst+8($pop392), $pop79
-	i32.const	$push390=, 0
-	i32.const	$push389=, 0
-	i64.load	$push80=, src($pop389)
-	i64.store	dst($pop390), $pop80
-	i32.const	$push388=, dst
-	i32.const	$push387=, src
-	i32.const	$push81=, 16
-	i32.call	$push82=, memcmp@FUNCTION, $pop388, $pop387, $pop81
-	br_if   	0, $pop82       # 0: down to label2
-# BB#15:                                # %check.exit69
-	i32.const	$push400=, 0
-	i32.const	$push399=, 0
-	i32.load8_u	$push83=, src+16($pop399)
-	i32.store8	dst+16($pop400), $pop83
-	i32.const	$push398=, 0
-	i32.const	$push397=, 0
-	i64.load	$push84=, src+8($pop397)
-	i64.store	dst+8($pop398), $pop84
-	i32.const	$push396=, 0
-	i32.const	$push395=, 0
-	i64.load	$push85=, src($pop395)
-	i64.store	dst($pop396), $pop85
-	i32.const	$push394=, dst
-	i32.const	$push393=, src
-	i32.const	$push86=, 17
-	i32.call	$push87=, memcmp@FUNCTION, $pop394, $pop393, $pop86
-	br_if   	0, $pop87       # 0: down to label2
-# BB#16:                                # %check.exit73
-	i32.const	$push408=, 0
-	i32.const	$push407=, 0
-	i32.load16_u	$push88=, src+16($pop407)
-	i32.store16	dst+16($pop408), $pop88
-	i32.const	$push406=, 0
-	i32.const	$push405=, 0
-	i64.load	$push89=, src+8($pop405)
-	i64.store	dst+8($pop406), $pop89
-	i32.const	$push404=, 0
-	i32.const	$push403=, 0
-	i64.load	$push90=, src($pop403)
-	i64.store	dst($pop404), $pop90
-	i32.const	$push402=, dst
-	i32.const	$push401=, src
-	i32.const	$push91=, 18
-	i32.call	$push92=, memcmp@FUNCTION, $pop402, $pop401, $pop91
-	br_if   	0, $pop92       # 0: down to label2
-# BB#17:                                # %check.exit77
-	i32.const	$push418=, 0
-	i32.const	$push417=, 0
-	i32.load8_u	$push93=, src+18($pop417)
-	i32.store8	dst+18($pop418), $pop93
-	i32.const	$push416=, 0
-	i32.const	$push415=, 0
-	i32.load16_u	$push94=, src+16($pop415)
-	i32.store16	dst+16($pop416), $pop94
-	i32.const	$push414=, 0
-	i32.const	$push413=, 0
-	i64.load	$push95=, src+8($pop413)
-	i64.store	dst+8($pop414), $pop95
-	i32.const	$push412=, 0
-	i32.const	$push411=, 0
-	i64.load	$push96=, src($pop411)
-	i64.store	dst($pop412), $pop96
-	i32.const	$push410=, dst
-	i32.const	$push409=, src
-	i32.const	$push97=, 19
-	i32.call	$push98=, memcmp@FUNCTION, $pop410, $pop409, $pop97
-	br_if   	0, $pop98       # 0: down to label2
-# BB#18:                                # %check.exit81
-	i32.const	$push426=, 0
-	i32.const	$push425=, 0
-	i32.load	$push99=, src+16($pop425)
-	i32.store	dst+16($pop426), $pop99
-	i32.const	$push424=, 0
-	i32.const	$push423=, 0
-	i64.load	$push100=, src+8($pop423)
-	i64.store	dst+8($pop424), $pop100
-	i32.const	$push422=, 0
-	i32.const	$push421=, 0
-	i64.load	$push101=, src($pop421)
-	i64.store	dst($pop422), $pop101
-	i32.const	$push420=, dst
-	i32.const	$push419=, src
-	i32.const	$push102=, 20
-	i32.call	$push103=, memcmp@FUNCTION, $pop420, $pop419, $pop102
-	br_if   	0, $pop103      # 0: down to label2
-# BB#19:                                # %check.exit85
-	i32.const	$push436=, 0
-	i32.const	$push435=, 0
-	i32.load8_u	$push104=, src+20($pop435)
-	i32.store8	dst+20($pop436), $pop104
-	i32.const	$push434=, 0
-	i32.const	$push433=, 0
-	i32.load	$push105=, src+16($pop433)
-	i32.store	dst+16($pop434), $pop105
-	i32.const	$push432=, 0
-	i32.const	$push431=, 0
-	i64.load	$push106=, src+8($pop431)
-	i64.store	dst+8($pop432), $pop106
-	i32.const	$push430=, 0
-	i32.const	$push429=, 0
-	i64.load	$push107=, src($pop429)
-	i64.store	dst($pop430), $pop107
-	i32.const	$push428=, dst
-	i32.const	$push427=, src
-	i32.const	$push108=, 21
-	i32.call	$push109=, memcmp@FUNCTION, $pop428, $pop427, $pop108
-	br_if   	0, $pop109      # 0: down to label2
-# BB#20:                                # %check.exit89
-	i32.const	$push446=, 0
-	i32.const	$push445=, 0
-	i32.load16_u	$push110=, src+20($pop445)
-	i32.store16	dst+20($pop446), $pop110
-	i32.const	$push444=, 0
-	i32.const	$push443=, 0
-	i32.load	$push111=, src+16($pop443)
-	i32.store	dst+16($pop444), $pop111
-	i32.const	$push442=, 0
-	i32.const	$push441=, 0
-	i64.load	$push112=, src+8($pop441)
-	i64.store	dst+8($pop442), $pop112
-	i32.const	$push440=, 0
-	i32.const	$push439=, 0
-	i64.load	$push113=, src($pop439)
-	i64.store	dst($pop440), $pop113
-	i32.const	$push438=, dst
-	i32.const	$push437=, src
-	i32.const	$push114=, 22
-	i32.call	$push115=, memcmp@FUNCTION, $pop438, $pop437, $pop114
-	br_if   	0, $pop115      # 0: down to label2
-# BB#21:                                # %check.exit93
-	i32.const	$push458=, 0
-	i32.const	$push457=, 0
-	i32.load8_u	$push116=, src+22($pop457)
-	i32.store8	dst+22($pop458), $pop116
-	i32.const	$push456=, 0
-	i32.const	$push455=, 0
-	i32.load16_u	$push117=, src+20($pop455)
-	i32.store16	dst+20($pop456), $pop117
-	i32.const	$push454=, 0
-	i32.const	$push453=, 0
-	i32.load	$push118=, src+16($pop453)
-	i32.store	dst+16($pop454), $pop118
-	i32.const	$push452=, 0
-	i32.const	$push451=, 0
-	i64.load	$push119=, src+8($pop451)
-	i64.store	dst+8($pop452), $pop119
-	i32.const	$push450=, 0
-	i32.const	$push449=, 0
-	i64.load	$push120=, src($pop449)
-	i64.store	dst($pop450), $pop120
-	i32.const	$push448=, dst
-	i32.const	$push447=, src
-	i32.const	$push121=, 23
-	i32.call	$push122=, memcmp@FUNCTION, $pop448, $pop447, $pop121
-	br_if   	0, $pop122      # 0: down to label2
-# BB#22:                                # %check.exit97
-	i32.const	$push466=, 0
-	i32.const	$push465=, 0
-	i64.load	$push123=, src+16($pop465)
-	i64.store	dst+16($pop466), $pop123
-	i32.const	$push464=, 0
-	i32.const	$push463=, 0
-	i64.load	$push124=, src+8($pop463)
-	i64.store	dst+8($pop464), $pop124
-	i32.const	$push462=, 0
-	i32.const	$push461=, 0
-	i64.load	$push125=, src($pop461)
-	i64.store	dst($pop462), $pop125
-	i32.const	$push460=, dst
-	i32.const	$push459=, src
-	i32.const	$push126=, 24
-	i32.call	$push127=, memcmp@FUNCTION, $pop460, $pop459, $pop126
-	br_if   	0, $pop127      # 0: down to label2
-# BB#23:                                # %check.exit101
+	i32.const	$push479=, 0
+	i32.const	$push478=, 0
+	i32.load8_u	$push13=, src+2($pop478)
+	i32.store8	dst+2($pop479), $pop13
+	i32.const	$push477=, 0
 	i32.const	$push476=, 0
-	i32.const	$push475=, 0
-	i32.load8_u	$push128=, src+24($pop475)
-	i32.store8	dst+24($pop476), $pop128
-	i32.const	$push474=, 0
-	i32.const	$push473=, 0
-	i64.load	$push129=, src+16($pop473)
-	i64.store	dst+16($pop474), $pop129
-	i32.const	$push472=, 0
-	i32.const	$push471=, 0
-	i64.load	$push130=, src+8($pop471)
-	i64.store	dst+8($pop472), $pop130
-	i32.const	$push470=, 0
-	i32.const	$push469=, 0
-	i64.load	$push131=, src($pop469)
-	i64.store	dst($pop470), $pop131
-	i32.const	$push468=, dst
-	i32.const	$push467=, src
-	i32.const	$push132=, 25
-	i32.call	$push133=, memcmp@FUNCTION, $pop468, $pop467, $pop132
-	br_if   	0, $pop133      # 0: down to label2
-# BB#24:                                # %check.exit105
-	i32.const	$push486=, 0
+	i32.load16_u	$push14=, src($pop476)
+	i32.store16	dst($pop477), $pop14
+	i32.const	$push475=, dst
+	i32.const	$push474=, src
+	i32.const	$push15=, 3
+	i32.call	$push16=, memcmp@FUNCTION, $pop475, $pop474, $pop15
+	br_if   	0, $pop16       # 0: down to label2
+# BB#4:                                 # %check.exit17
 	i32.const	$push485=, 0
-	i32.load16_u	$push134=, src+24($pop485)
-	i32.store16	dst+24($pop486), $pop134
 	i32.const	$push484=, 0
+	i32.load8_u	$push17=, src+4($pop484)
+	i32.store8	dst+4($pop485), $pop17
 	i32.const	$push483=, 0
-	i64.load	$push135=, src+16($pop483)
-	i64.store	dst+16($pop484), $pop135
 	i32.const	$push482=, 0
-	i32.const	$push481=, 0
-	i64.load	$push136=, src+8($pop481)
-	i64.store	dst+8($pop482), $pop136
-	i32.const	$push480=, 0
-	i32.const	$push479=, 0
-	i64.load	$push137=, src($pop479)
-	i64.store	dst($pop480), $pop137
-	i32.const	$push478=, dst
-	i32.const	$push477=, src
-	i32.const	$push138=, 26
-	i32.call	$push139=, memcmp@FUNCTION, $pop478, $pop477, $pop138
-	br_if   	0, $pop139      # 0: down to label2
-# BB#25:                                # %check.exit109
+	i32.load	$push18=, src($pop482)
+	i32.store	dst($pop483), $pop18
+	i32.const	$push481=, dst
+	i32.const	$push480=, src
+	i32.const	$push19=, 5
+	i32.call	$push20=, memcmp@FUNCTION, $pop481, $pop480, $pop19
+	br_if   	0, $pop20       # 0: down to label2
+# BB#5:                                 # %check.exit25
+	i32.const	$push491=, 0
+	i32.const	$push490=, 0
+	i32.load16_u	$push21=, src+4($pop490)
+	i32.store16	dst+4($pop491), $pop21
+	i32.const	$push489=, 0
+	i32.const	$push488=, 0
+	i32.load	$push22=, src($pop488)
+	i32.store	dst($pop489), $pop22
+	i32.const	$push487=, dst
+	i32.const	$push486=, src
+	i32.const	$push23=, 6
+	i32.call	$push24=, memcmp@FUNCTION, $pop487, $pop486, $pop23
+	br_if   	0, $pop24       # 0: down to label2
+# BB#6:                                 # %check.exit29
+	i32.const	$push499=, 0
 	i32.const	$push498=, 0
+	i32.load8_u	$push25=, src+6($pop498)
+	i32.store8	dst+6($pop499), $pop25
 	i32.const	$push497=, 0
-	i32.load8_u	$push140=, src+26($pop497)
-	i32.store8	dst+26($pop498), $pop140
 	i32.const	$push496=, 0
+	i32.load16_u	$push26=, src+4($pop496)
+	i32.store16	dst+4($pop497), $pop26
 	i32.const	$push495=, 0
-	i32.load16_u	$push141=, src+24($pop495)
-	i32.store16	dst+24($pop496), $pop141
 	i32.const	$push494=, 0
-	i32.const	$push493=, 0
-	i64.load	$push142=, src+16($pop493)
-	i64.store	dst+16($pop494), $pop142
-	i32.const	$push492=, 0
-	i32.const	$push491=, 0
-	i64.load	$push143=, src+8($pop491)
-	i64.store	dst+8($pop492), $pop143
-	i32.const	$push490=, 0
-	i32.const	$push489=, 0
-	i64.load	$push144=, src($pop489)
-	i64.store	dst($pop490), $pop144
-	i32.const	$push488=, dst
-	i32.const	$push487=, src
-	i32.const	$push145=, 27
-	i32.call	$push146=, memcmp@FUNCTION, $pop488, $pop487, $pop145
-	br_if   	0, $pop146      # 0: down to label2
-# BB#26:                                # %check.exit113
-	i32.const	$push508=, 0
-	i32.const	$push507=, 0
-	i32.load	$push147=, src+24($pop507)
-	i32.store	dst+24($pop508), $pop147
-	i32.const	$push506=, 0
+	i32.load	$push27=, src($pop494)
+	i32.store	dst($pop495), $pop27
+	i32.const	$push493=, dst
+	i32.const	$push492=, src
+	i32.const	$push28=, 7
+	i32.call	$push29=, memcmp@FUNCTION, $pop493, $pop492, $pop28
+	br_if   	0, $pop29       # 0: down to label2
+# BB#7:                                 # %check.exit33
 	i32.const	$push505=, 0
-	i64.load	$push148=, src+16($pop505)
-	i64.store	dst+16($pop506), $pop148
 	i32.const	$push504=, 0
+	i32.load8_u	$push30=, src+8($pop504)
+	i32.store8	dst+8($pop505), $pop30
 	i32.const	$push503=, 0
-	i64.load	$push149=, src+8($pop503)
-	i64.store	dst+8($pop504), $pop149
 	i32.const	$push502=, 0
-	i32.const	$push501=, 0
-	i64.load	$push150=, src($pop501)
-	i64.store	dst($pop502), $pop150
-	i32.const	$push500=, dst
-	i32.const	$push499=, src
-	i32.const	$push151=, 28
-	i32.call	$push152=, memcmp@FUNCTION, $pop500, $pop499, $pop151
-	br_if   	0, $pop152      # 0: down to label2
-# BB#27:                                # %check.exit117
-	i32.const	$push520=, 0
+	i64.load	$push31=, src($pop502)
+	i64.store	dst($pop503), $pop31
+	i32.const	$push501=, dst
+	i32.const	$push500=, src
+	i32.const	$push32=, 9
+	i32.call	$push33=, memcmp@FUNCTION, $pop501, $pop500, $pop32
+	br_if   	0, $pop33       # 0: down to label2
+# BB#8:                                 # %check.exit41
+	i32.const	$push511=, 0
+	i32.const	$push510=, 0
+	i32.load16_u	$push34=, src+8($pop510)
+	i32.store16	dst+8($pop511), $pop34
+	i32.const	$push509=, 0
+	i32.const	$push508=, 0
+	i64.load	$push35=, src($pop508)
+	i64.store	dst($pop509), $pop35
+	i32.const	$push507=, dst
+	i32.const	$push506=, src
+	i32.const	$push36=, 10
+	i32.call	$push37=, memcmp@FUNCTION, $pop507, $pop506, $pop36
+	br_if   	0, $pop37       # 0: down to label2
+# BB#9:                                 # %check.exit45
 	i32.const	$push519=, 0
-	i32.load8_u	$push153=, src+28($pop519)
-	i32.store8	dst+28($pop520), $pop153
 	i32.const	$push518=, 0
+	i32.load8_u	$push38=, src+10($pop518)
+	i32.store8	dst+10($pop519), $pop38
 	i32.const	$push517=, 0
-	i32.load	$push154=, src+24($pop517)
-	i32.store	dst+24($pop518), $pop154
 	i32.const	$push516=, 0
+	i32.load16_u	$push39=, src+8($pop516)
+	i32.store16	dst+8($pop517), $pop39
 	i32.const	$push515=, 0
-	i64.load	$push155=, src+16($pop515)
-	i64.store	dst+16($pop516), $pop155
 	i32.const	$push514=, 0
-	i32.const	$push513=, 0
-	i64.load	$push156=, src+8($pop513)
-	i64.store	dst+8($pop514), $pop156
-	i32.const	$push512=, 0
-	i32.const	$push511=, 0
-	i64.load	$push157=, src($pop511)
-	i64.store	dst($pop512), $pop157
-	i32.const	$push510=, dst
-	i32.const	$push509=, src
-	i32.const	$push158=, 29
-	i32.call	$push159=, memcmp@FUNCTION, $pop510, $pop509, $pop158
-	br_if   	0, $pop159      # 0: down to label2
-# BB#28:                                # %check.exit121
-	i32.const	$push160=, 0
+	i64.load	$push40=, src($pop514)
+	i64.store	dst($pop515), $pop40
+	i32.const	$push513=, dst
+	i32.const	$push512=, src
+	i32.const	$push41=, 11
+	i32.call	$push42=, memcmp@FUNCTION, $pop513, $pop512, $pop41
+	br_if   	0, $pop42       # 0: down to label2
+# BB#10:                                # %check.exit49
+	i32.const	$push525=, 0
+	i32.const	$push524=, 0
+	i32.load	$push43=, src+8($pop524)
+	i32.store	dst+8($pop525), $pop43
+	i32.const	$push523=, 0
+	i32.const	$push522=, 0
+	i64.load	$push44=, src($pop522)
+	i64.store	dst($pop523), $pop44
+	i32.const	$push521=, dst
+	i32.const	$push520=, src
+	i32.const	$push45=, 12
+	i32.call	$push46=, memcmp@FUNCTION, $pop521, $pop520, $pop45
+	br_if   	0, $pop46       # 0: down to label2
+# BB#11:                                # %check.exit53
 	i32.const	$push531=, 0
-	i32.load16_u	$push161=, src+28($pop531)
-	i32.store16	dst+28($pop160), $pop161
 	i32.const	$push530=, 0
+	i64.load	$push47=, src+5($pop530):p2align=0
+	i64.store	dst+5($pop531):p2align=0, $pop47
 	i32.const	$push529=, 0
-	i32.load	$push162=, src+24($pop529)
-	i32.store	dst+24($pop530), $pop162
 	i32.const	$push528=, 0
-	i32.const	$push527=, 0
-	i64.load	$push163=, src+16($pop527)
-	i64.store	dst+16($pop528), $pop163
-	i32.const	$push526=, 0
-	i32.const	$push525=, 0
-	i64.load	$push164=, src+8($pop525)
-	i64.store	dst+8($pop526), $pop164
-	i32.const	$push524=, 0
-	i32.const	$push523=, 0
-	i64.load	$push165=, src($pop523)
-	i64.store	dst($pop524), $pop165
-	i32.const	$push522=, dst
-	i32.const	$push521=, src
-	i32.const	$push166=, 30
-	i32.call	$push167=, memcmp@FUNCTION, $pop522, $pop521, $pop166
-	br_if   	0, $pop167      # 0: down to label2
-# BB#29:                                # %check.exit125
-	i32.const	$push169=, dst
-	i32.const	$push536=, src
-	i32.const	$push168=, 31
-	i32.call	$push535=, memcpy@FUNCTION, $pop169, $pop536, $pop168
-	tee_local	$push534=, $0=, $pop535
-	i32.const	$push533=, src
-	i32.const	$push532=, 31
-	i32.call	$push170=, memcmp@FUNCTION, $pop534, $pop533, $pop532
-	br_if   	0, $pop170      # 0: down to label2
-# BB#30:                                # %check.exit129
-	i32.const	$push171=, 0
-	i32.const	$push544=, 0
-	i64.load	$push172=, src+24($pop544)
-	i64.store	dst+24($pop171), $pop172
+	i64.load	$push48=, src($pop528)
+	i64.store	dst($pop529), $pop48
+	i32.const	$push527=, dst
+	i32.const	$push526=, src
+	i32.const	$push49=, 13
+	i32.call	$push50=, memcmp@FUNCTION, $pop527, $pop526, $pop49
+	br_if   	0, $pop50       # 0: down to label2
+# BB#12:                                # %check.exit57
+	i32.const	$push537=, 0
+	i32.const	$push536=, 0
+	i64.load	$push51=, src+6($pop536):p2align=1
+	i64.store	dst+6($pop537):p2align=1, $pop51
+	i32.const	$push535=, 0
+	i32.const	$push534=, 0
+	i64.load	$push52=, src($pop534)
+	i64.store	dst($pop535), $pop52
+	i32.const	$push533=, dst
+	i32.const	$push532=, src
+	i32.const	$push53=, 14
+	i32.call	$push54=, memcmp@FUNCTION, $pop533, $pop532, $pop53
+	br_if   	0, $pop54       # 0: down to label2
+# BB#13:                                # %check.exit61
 	i32.const	$push543=, 0
 	i32.const	$push542=, 0
-	i64.load	$push173=, src+16($pop542)
-	i64.store	dst+16($pop543), $pop173
+	i64.load	$push55=, src+7($pop542):p2align=0
+	i64.store	dst+7($pop543):p2align=0, $pop55
 	i32.const	$push541=, 0
 	i32.const	$push540=, 0
-	i64.load	$push174=, src+8($pop540)
-	i64.store	dst+8($pop541), $pop174
-	i32.const	$push539=, 0
-	i32.const	$push538=, 0
-	i64.load	$push175=, src($pop538)
-	i64.store	dst($pop539), $pop175
-	i32.const	$push537=, src
-	i32.const	$push176=, 32
-	i32.call	$push177=, memcmp@FUNCTION, $0, $pop537, $pop176
-	br_if   	0, $pop177      # 0: down to label2
+	i64.load	$push56=, src($pop540)
+	i64.store	dst($pop541), $pop56
+	i32.const	$push539=, dst
+	i32.const	$push538=, src
+	i32.const	$push57=, 15
+	i32.call	$push58=, memcmp@FUNCTION, $pop539, $pop538, $pop57
+	br_if   	0, $pop58       # 0: down to label2
+# BB#14:                                # %check.exit65
+	i32.const	$push549=, 0
+	i32.const	$push548=, 0
+	i64.load	$push59=, src+8($pop548)
+	i64.store	dst+8($pop549), $pop59
+	i32.const	$push547=, 0
+	i32.const	$push546=, 0
+	i64.load	$push60=, src($pop546)
+	i64.store	dst($pop547), $pop60
+	i32.const	$push545=, dst
+	i32.const	$push544=, src
+	i32.const	$push61=, 16
+	i32.call	$push62=, memcmp@FUNCTION, $pop545, $pop544, $pop61
+	br_if   	0, $pop62       # 0: down to label2
+# BB#15:                                # %check.exit69
+	i32.const	$push557=, 0
+	i32.const	$push556=, 0
+	i32.load8_u	$push63=, src+16($pop556)
+	i32.store8	dst+16($pop557), $pop63
+	i32.const	$push555=, 0
+	i32.const	$push554=, 0
+	i64.load	$push64=, src+8($pop554)
+	i64.store	dst+8($pop555), $pop64
+	i32.const	$push553=, 0
+	i32.const	$push552=, 0
+	i64.load	$push65=, src($pop552)
+	i64.store	dst($pop553), $pop65
+	i32.const	$push551=, dst
+	i32.const	$push550=, src
+	i32.const	$push66=, 17
+	i32.call	$push67=, memcmp@FUNCTION, $pop551, $pop550, $pop66
+	br_if   	0, $pop67       # 0: down to label2
+# BB#16:                                # %check.exit73
+	i32.const	$push565=, 0
+	i32.const	$push564=, 0
+	i32.load16_u	$push68=, src+16($pop564)
+	i32.store16	dst+16($pop565), $pop68
+	i32.const	$push563=, 0
+	i32.const	$push562=, 0
+	i64.load	$push69=, src+8($pop562)
+	i64.store	dst+8($pop563), $pop69
+	i32.const	$push561=, 0
+	i32.const	$push560=, 0
+	i64.load	$push70=, src($pop560)
+	i64.store	dst($pop561), $pop70
+	i32.const	$push559=, dst
+	i32.const	$push558=, src
+	i32.const	$push71=, 18
+	i32.call	$push72=, memcmp@FUNCTION, $pop559, $pop558, $pop71
+	br_if   	0, $pop72       # 0: down to label2
+# BB#17:                                # %check.exit77
+	i32.const	$push575=, 0
+	i32.const	$push574=, 0
+	i32.load8_u	$push73=, src+18($pop574)
+	i32.store8	dst+18($pop575), $pop73
+	i32.const	$push573=, 0
+	i32.const	$push572=, 0
+	i32.load16_u	$push74=, src+16($pop572)
+	i32.store16	dst+16($pop573), $pop74
+	i32.const	$push571=, 0
+	i32.const	$push570=, 0
+	i64.load	$push75=, src+8($pop570)
+	i64.store	dst+8($pop571), $pop75
+	i32.const	$push569=, 0
+	i32.const	$push568=, 0
+	i64.load	$push76=, src($pop568)
+	i64.store	dst($pop569), $pop76
+	i32.const	$push567=, dst
+	i32.const	$push566=, src
+	i32.const	$push77=, 19
+	i32.call	$push78=, memcmp@FUNCTION, $pop567, $pop566, $pop77
+	br_if   	0, $pop78       # 0: down to label2
+# BB#18:                                # %check.exit81
+	i32.const	$push583=, 0
+	i32.const	$push582=, 0
+	i32.load	$push79=, src+16($pop582)
+	i32.store	dst+16($pop583), $pop79
+	i32.const	$push581=, 0
+	i32.const	$push580=, 0
+	i64.load	$push80=, src+8($pop580)
+	i64.store	dst+8($pop581), $pop80
+	i32.const	$push579=, 0
+	i32.const	$push578=, 0
+	i64.load	$push81=, src($pop578)
+	i64.store	dst($pop579), $pop81
+	i32.const	$push577=, dst
+	i32.const	$push576=, src
+	i32.const	$push82=, 20
+	i32.call	$push83=, memcmp@FUNCTION, $pop577, $pop576, $pop82
+	br_if   	0, $pop83       # 0: down to label2
+# BB#19:                                # %check.exit85
+	i32.const	$push591=, 0
+	i32.const	$push590=, 0
+	i64.load	$push84=, src+13($pop590):p2align=0
+	i64.store	dst+13($pop591):p2align=0, $pop84
+	i32.const	$push589=, 0
+	i32.const	$push588=, 0
+	i64.load	$push85=, src+8($pop588)
+	i64.store	dst+8($pop589), $pop85
+	i32.const	$push587=, 0
+	i32.const	$push586=, 0
+	i64.load	$push86=, src($pop586)
+	i64.store	dst($pop587), $pop86
+	i32.const	$push585=, dst
+	i32.const	$push584=, src
+	i32.const	$push87=, 21
+	i32.call	$push88=, memcmp@FUNCTION, $pop585, $pop584, $pop87
+	br_if   	0, $pop88       # 0: down to label2
+# BB#20:                                # %check.exit89
+	i32.const	$push599=, 0
+	i32.const	$push598=, 0
+	i64.load	$push89=, src+14($pop598):p2align=1
+	i64.store	dst+14($pop599):p2align=1, $pop89
+	i32.const	$push597=, 0
+	i32.const	$push596=, 0
+	i64.load	$push90=, src+8($pop596)
+	i64.store	dst+8($pop597), $pop90
+	i32.const	$push595=, 0
+	i32.const	$push594=, 0
+	i64.load	$push91=, src($pop594)
+	i64.store	dst($pop595), $pop91
+	i32.const	$push593=, dst
+	i32.const	$push592=, src
+	i32.const	$push92=, 22
+	i32.call	$push93=, memcmp@FUNCTION, $pop593, $pop592, $pop92
+	br_if   	0, $pop93       # 0: down to label2
+# BB#21:                                # %check.exit93
+	i32.const	$push607=, 0
+	i32.const	$push606=, 0
+	i64.load	$push94=, src+15($pop606):p2align=0
+	i64.store	dst+15($pop607):p2align=0, $pop94
+	i32.const	$push605=, 0
+	i32.const	$push604=, 0
+	i64.load	$push95=, src+8($pop604)
+	i64.store	dst+8($pop605), $pop95
+	i32.const	$push603=, 0
+	i32.const	$push602=, 0
+	i64.load	$push96=, src($pop602)
+	i64.store	dst($pop603), $pop96
+	i32.const	$push601=, dst
+	i32.const	$push600=, src
+	i32.const	$push97=, 23
+	i32.call	$push98=, memcmp@FUNCTION, $pop601, $pop600, $pop97
+	br_if   	0, $pop98       # 0: down to label2
+# BB#22:                                # %check.exit97
+	i32.const	$push615=, 0
+	i32.const	$push614=, 0
+	i64.load	$push99=, src+16($pop614)
+	i64.store	dst+16($pop615), $pop99
+	i32.const	$push613=, 0
+	i32.const	$push612=, 0
+	i64.load	$push100=, src+8($pop612)
+	i64.store	dst+8($pop613), $pop100
+	i32.const	$push611=, 0
+	i32.const	$push610=, 0
+	i64.load	$push101=, src($pop610)
+	i64.store	dst($pop611), $pop101
+	i32.const	$push609=, dst
+	i32.const	$push608=, src
+	i32.const	$push102=, 24
+	i32.call	$push103=, memcmp@FUNCTION, $pop609, $pop608, $pop102
+	br_if   	0, $pop103      # 0: down to label2
+# BB#23:                                # %check.exit101
+	i32.const	$push625=, 0
+	i32.const	$push624=, 0
+	i32.load8_u	$push104=, src+24($pop624)
+	i32.store8	dst+24($pop625), $pop104
+	i32.const	$push623=, 0
+	i32.const	$push622=, 0
+	i64.load	$push105=, src+16($pop622)
+	i64.store	dst+16($pop623), $pop105
+	i32.const	$push621=, 0
+	i32.const	$push620=, 0
+	i64.load	$push106=, src+8($pop620)
+	i64.store	dst+8($pop621), $pop106
+	i32.const	$push619=, 0
+	i32.const	$push618=, 0
+	i64.load	$push107=, src($pop618)
+	i64.store	dst($pop619), $pop107
+	i32.const	$push617=, dst
+	i32.const	$push616=, src
+	i32.const	$push108=, 25
+	i32.call	$push109=, memcmp@FUNCTION, $pop617, $pop616, $pop108
+	br_if   	0, $pop109      # 0: down to label2
+# BB#24:                                # %check.exit105
+	i32.const	$push635=, 0
+	i32.const	$push634=, 0
+	i32.load16_u	$push110=, src+24($pop634)
+	i32.store16	dst+24($pop635), $pop110
+	i32.const	$push633=, 0
+	i32.const	$push632=, 0
+	i64.load	$push111=, src+16($pop632)
+	i64.store	dst+16($pop633), $pop111
+	i32.const	$push631=, 0
+	i32.const	$push630=, 0
+	i64.load	$push112=, src+8($pop630)
+	i64.store	dst+8($pop631), $pop112
+	i32.const	$push629=, 0
+	i32.const	$push628=, 0
+	i64.load	$push113=, src($pop628)
+	i64.store	dst($pop629), $pop113
+	i32.const	$push627=, dst
+	i32.const	$push626=, src
+	i32.const	$push114=, 26
+	i32.call	$push115=, memcmp@FUNCTION, $pop627, $pop626, $pop114
+	br_if   	0, $pop115      # 0: down to label2
+# BB#25:                                # %check.exit109
+	i32.const	$push647=, 0
+	i32.const	$push646=, 0
+	i32.load8_u	$push116=, src+26($pop646)
+	i32.store8	dst+26($pop647), $pop116
+	i32.const	$push645=, 0
+	i32.const	$push644=, 0
+	i32.load16_u	$push117=, src+24($pop644)
+	i32.store16	dst+24($pop645), $pop117
+	i32.const	$push643=, 0
+	i32.const	$push642=, 0
+	i64.load	$push118=, src+16($pop642)
+	i64.store	dst+16($pop643), $pop118
+	i32.const	$push641=, 0
+	i32.const	$push640=, 0
+	i64.load	$push119=, src+8($pop640)
+	i64.store	dst+8($pop641), $pop119
+	i32.const	$push639=, 0
+	i32.const	$push638=, 0
+	i64.load	$push120=, src($pop638)
+	i64.store	dst($pop639), $pop120
+	i32.const	$push637=, dst
+	i32.const	$push636=, src
+	i32.const	$push121=, 27
+	i32.call	$push122=, memcmp@FUNCTION, $pop637, $pop636, $pop121
+	br_if   	0, $pop122      # 0: down to label2
+# BB#26:                                # %check.exit113
+	i32.const	$push657=, 0
+	i32.const	$push656=, 0
+	i32.load	$push123=, src+24($pop656)
+	i32.store	dst+24($pop657), $pop123
+	i32.const	$push655=, 0
+	i32.const	$push654=, 0
+	i64.load	$push124=, src+16($pop654)
+	i64.store	dst+16($pop655), $pop124
+	i32.const	$push653=, 0
+	i32.const	$push652=, 0
+	i64.load	$push125=, src+8($pop652)
+	i64.store	dst+8($pop653), $pop125
+	i32.const	$push651=, 0
+	i32.const	$push650=, 0
+	i64.load	$push126=, src($pop650)
+	i64.store	dst($pop651), $pop126
+	i32.const	$push649=, dst
+	i32.const	$push648=, src
+	i32.const	$push127=, 28
+	i32.call	$push128=, memcmp@FUNCTION, $pop649, $pop648, $pop127
+	br_if   	0, $pop128      # 0: down to label2
+# BB#27:                                # %check.exit117
+	i32.const	$push667=, 0
+	i32.const	$push666=, 0
+	i64.load	$push129=, src+21($pop666):p2align=0
+	i64.store	dst+21($pop667):p2align=0, $pop129
+	i32.const	$push665=, 0
+	i32.const	$push664=, 0
+	i64.load	$push130=, src+16($pop664)
+	i64.store	dst+16($pop665), $pop130
+	i32.const	$push663=, 0
+	i32.const	$push662=, 0
+	i64.load	$push131=, src+8($pop662)
+	i64.store	dst+8($pop663), $pop131
+	i32.const	$push661=, 0
+	i32.const	$push660=, 0
+	i64.load	$push132=, src($pop660)
+	i64.store	dst($pop661), $pop132
+	i32.const	$push659=, dst
+	i32.const	$push658=, src
+	i32.const	$push133=, 29
+	i32.call	$push134=, memcmp@FUNCTION, $pop659, $pop658, $pop133
+	br_if   	0, $pop134      # 0: down to label2
+# BB#28:                                # %check.exit121
+	i32.const	$push677=, 0
+	i32.const	$push676=, 0
+	i64.load	$push135=, src+22($pop676):p2align=1
+	i64.store	dst+22($pop677):p2align=1, $pop135
+	i32.const	$push675=, 0
+	i32.const	$push674=, 0
+	i64.load	$push136=, src+16($pop674)
+	i64.store	dst+16($pop675), $pop136
+	i32.const	$push673=, 0
+	i32.const	$push672=, 0
+	i64.load	$push137=, src+8($pop672)
+	i64.store	dst+8($pop673), $pop137
+	i32.const	$push671=, 0
+	i32.const	$push670=, 0
+	i64.load	$push138=, src($pop670)
+	i64.store	dst($pop671), $pop138
+	i32.const	$push669=, dst
+	i32.const	$push668=, src
+	i32.const	$push139=, 30
+	i32.call	$push140=, memcmp@FUNCTION, $pop669, $pop668, $pop139
+	br_if   	0, $pop140      # 0: down to label2
+# BB#29:                                # %check.exit125
+	i32.const	$push687=, 0
+	i32.const	$push686=, 0
+	i64.load	$push141=, src+23($pop686):p2align=0
+	i64.store	dst+23($pop687):p2align=0, $pop141
+	i32.const	$push685=, 0
+	i32.const	$push684=, 0
+	i64.load	$push142=, src+16($pop684)
+	i64.store	dst+16($pop685), $pop142
+	i32.const	$push683=, 0
+	i32.const	$push682=, 0
+	i64.load	$push143=, src+8($pop682)
+	i64.store	dst+8($pop683), $pop143
+	i32.const	$push681=, 0
+	i32.const	$push680=, 0
+	i64.load	$push144=, src($pop680)
+	i64.store	dst($pop681), $pop144
+	i32.const	$push679=, dst
+	i32.const	$push678=, src
+	i32.const	$push145=, 31
+	i32.call	$push146=, memcmp@FUNCTION, $pop679, $pop678, $pop145
+	br_if   	0, $pop146      # 0: down to label2
+# BB#30:                                # %check.exit129
+	i32.const	$push697=, 0
+	i32.const	$push696=, 0
+	i64.load	$push147=, src+24($pop696)
+	i64.store	dst+24($pop697), $pop147
+	i32.const	$push695=, 0
+	i32.const	$push694=, 0
+	i64.load	$push148=, src+16($pop694)
+	i64.store	dst+16($pop695), $pop148
+	i32.const	$push693=, 0
+	i32.const	$push692=, 0
+	i64.load	$push149=, src+8($pop692)
+	i64.store	dst+8($pop693), $pop149
+	i32.const	$push691=, 0
+	i32.const	$push690=, 0
+	i64.load	$push150=, src($pop690)
+	i64.store	dst($pop691), $pop150
+	i32.const	$push689=, dst
+	i32.const	$push688=, src
+	i32.const	$push151=, 32
+	i32.call	$push152=, memcmp@FUNCTION, $pop689, $pop688, $pop151
+	br_if   	0, $pop152      # 0: down to label2
 # BB#31:                                # %check.exit133
-	i32.const	$push179=, dst
-	i32.const	$push549=, src
-	i32.const	$push178=, 33
-	i32.call	$push548=, memcpy@FUNCTION, $pop179, $pop549, $pop178
-	tee_local	$push547=, $0=, $pop548
-	i32.const	$push546=, src
-	i32.const	$push545=, 33
-	i32.call	$push180=, memcmp@FUNCTION, $pop547, $pop546, $pop545
-	br_if   	0, $pop180      # 0: down to label2
+	i32.const	$push709=, 0
+	i32.const	$push708=, 0
+	i32.load8_u	$push153=, src+32($pop708)
+	i32.store8	dst+32($pop709), $pop153
+	i32.const	$push707=, 0
+	i32.const	$push706=, 0
+	i64.load	$push154=, src+24($pop706)
+	i64.store	dst+24($pop707), $pop154
+	i32.const	$push705=, 0
+	i32.const	$push704=, 0
+	i64.load	$push155=, src+16($pop704)
+	i64.store	dst+16($pop705), $pop155
+	i32.const	$push703=, 0
+	i32.const	$push702=, 0
+	i64.load	$push156=, src+8($pop702)
+	i64.store	dst+8($pop703), $pop156
+	i32.const	$push701=, 0
+	i32.const	$push700=, 0
+	i64.load	$push157=, src($pop700)
+	i64.store	dst($pop701), $pop157
+	i32.const	$push699=, dst
+	i32.const	$push698=, src
+	i32.const	$push158=, 33
+	i32.call	$push159=, memcmp@FUNCTION, $pop699, $pop698, $pop158
+	br_if   	0, $pop159      # 0: down to label2
 # BB#32:                                # %check.exit137
-	i32.const	$push552=, src
-	i32.const	$push181=, 34
-	i32.call	$push0=, memcpy@FUNCTION, $0, $pop552, $pop181
-	i32.const	$push551=, src
-	i32.const	$push550=, 34
-	i32.call	$push182=, memcmp@FUNCTION, $pop0, $pop551, $pop550
-	br_if   	0, $pop182      # 0: down to label2
+	i32.const	$push721=, 0
+	i32.const	$push720=, 0
+	i32.load16_u	$push160=, src+32($pop720)
+	i32.store16	dst+32($pop721), $pop160
+	i32.const	$push719=, 0
+	i32.const	$push718=, 0
+	i64.load	$push161=, src+24($pop718)
+	i64.store	dst+24($pop719), $pop161
+	i32.const	$push717=, 0
+	i32.const	$push716=, 0
+	i64.load	$push162=, src+16($pop716)
+	i64.store	dst+16($pop717), $pop162
+	i32.const	$push715=, 0
+	i32.const	$push714=, 0
+	i64.load	$push163=, src+8($pop714)
+	i64.store	dst+8($pop715), $pop163
+	i32.const	$push713=, 0
+	i32.const	$push712=, 0
+	i64.load	$push164=, src($pop712)
+	i64.store	dst($pop713), $pop164
+	i32.const	$push711=, dst
+	i32.const	$push710=, src
+	i32.const	$push165=, 34
+	i32.call	$push166=, memcmp@FUNCTION, $pop711, $pop710, $pop165
+	br_if   	0, $pop166      # 0: down to label2
 # BB#33:                                # %check.exit141
-	i32.const	$push184=, dst
-	i32.const	$push557=, src
-	i32.const	$push183=, 35
-	i32.call	$push556=, memcpy@FUNCTION, $pop184, $pop557, $pop183
-	tee_local	$push555=, $0=, $pop556
-	i32.const	$push554=, src
-	i32.const	$push553=, 35
-	i32.call	$push185=, memcmp@FUNCTION, $pop555, $pop554, $pop553
-	br_if   	0, $pop185      # 0: down to label2
+	i32.const	$push735=, 0
+	i32.const	$push734=, 0
+	i32.load8_u	$push167=, src+34($pop734)
+	i32.store8	dst+34($pop735), $pop167
+	i32.const	$push733=, 0
+	i32.const	$push732=, 0
+	i32.load16_u	$push168=, src+32($pop732)
+	i32.store16	dst+32($pop733), $pop168
+	i32.const	$push731=, 0
+	i32.const	$push730=, 0
+	i64.load	$push169=, src+24($pop730)
+	i64.store	dst+24($pop731), $pop169
+	i32.const	$push729=, 0
+	i32.const	$push728=, 0
+	i64.load	$push170=, src+16($pop728)
+	i64.store	dst+16($pop729), $pop170
+	i32.const	$push727=, 0
+	i32.const	$push726=, 0
+	i64.load	$push171=, src+8($pop726)
+	i64.store	dst+8($pop727), $pop171
+	i32.const	$push725=, 0
+	i32.const	$push724=, 0
+	i64.load	$push172=, src($pop724)
+	i64.store	dst($pop725), $pop172
+	i32.const	$push723=, dst
+	i32.const	$push722=, src
+	i32.const	$push173=, 35
+	i32.call	$push174=, memcmp@FUNCTION, $pop723, $pop722, $pop173
+	br_if   	0, $pop174      # 0: down to label2
 # BB#34:                                # %check.exit145
-	i32.const	$push560=, src
-	i32.const	$push186=, 36
-	i32.call	$push1=, memcpy@FUNCTION, $0, $pop560, $pop186
-	i32.const	$push559=, src
-	i32.const	$push558=, 36
-	i32.call	$push187=, memcmp@FUNCTION, $pop1, $pop559, $pop558
-	br_if   	0, $pop187      # 0: down to label2
+	i32.const	$push747=, 0
+	i32.const	$push746=, 0
+	i32.load	$push175=, src+32($pop746)
+	i32.store	dst+32($pop747), $pop175
+	i32.const	$push745=, 0
+	i32.const	$push744=, 0
+	i64.load	$push176=, src+24($pop744)
+	i64.store	dst+24($pop745), $pop176
+	i32.const	$push743=, 0
+	i32.const	$push742=, 0
+	i64.load	$push177=, src+16($pop742)
+	i64.store	dst+16($pop743), $pop177
+	i32.const	$push741=, 0
+	i32.const	$push740=, 0
+	i64.load	$push178=, src+8($pop740)
+	i64.store	dst+8($pop741), $pop178
+	i32.const	$push739=, 0
+	i32.const	$push738=, 0
+	i64.load	$push179=, src($pop738)
+	i64.store	dst($pop739), $pop179
+	i32.const	$push737=, dst
+	i32.const	$push736=, src
+	i32.const	$push180=, 36
+	i32.call	$push181=, memcmp@FUNCTION, $pop737, $pop736, $pop180
+	br_if   	0, $pop181      # 0: down to label2
 # BB#35:                                # %check.exit149
-	i32.const	$push189=, dst
-	i32.const	$push565=, src
-	i32.const	$push188=, 37
-	i32.call	$push564=, memcpy@FUNCTION, $pop189, $pop565, $pop188
-	tee_local	$push563=, $0=, $pop564
-	i32.const	$push562=, src
-	i32.const	$push561=, 37
-	i32.call	$push190=, memcmp@FUNCTION, $pop563, $pop562, $pop561
-	br_if   	0, $pop190      # 0: down to label2
+	i32.const	$push759=, 0
+	i32.const	$push758=, 0
+	i64.load	$push182=, src+29($pop758):p2align=0
+	i64.store	dst+29($pop759):p2align=0, $pop182
+	i32.const	$push757=, 0
+	i32.const	$push756=, 0
+	i64.load	$push183=, src+24($pop756)
+	i64.store	dst+24($pop757), $pop183
+	i32.const	$push755=, 0
+	i32.const	$push754=, 0
+	i64.load	$push184=, src+16($pop754)
+	i64.store	dst+16($pop755), $pop184
+	i32.const	$push753=, 0
+	i32.const	$push752=, 0
+	i64.load	$push185=, src+8($pop752)
+	i64.store	dst+8($pop753), $pop185
+	i32.const	$push751=, 0
+	i32.const	$push750=, 0
+	i64.load	$push186=, src($pop750)
+	i64.store	dst($pop751), $pop186
+	i32.const	$push749=, dst
+	i32.const	$push748=, src
+	i32.const	$push187=, 37
+	i32.call	$push188=, memcmp@FUNCTION, $pop749, $pop748, $pop187
+	br_if   	0, $pop188      # 0: down to label2
 # BB#36:                                # %check.exit153
-	i32.const	$push568=, src
-	i32.const	$push191=, 38
-	i32.call	$push2=, memcpy@FUNCTION, $0, $pop568, $pop191
-	i32.const	$push567=, src
-	i32.const	$push566=, 38
-	i32.call	$push192=, memcmp@FUNCTION, $pop2, $pop567, $pop566
-	br_if   	0, $pop192      # 0: down to label2
-# BB#37:                                # %check.exit157
-	i32.const	$push194=, dst
-	i32.const	$push573=, src
-	i32.const	$push193=, 39
-	i32.call	$push572=, memcpy@FUNCTION, $pop194, $pop573, $pop193
-	tee_local	$push571=, $0=, $pop572
-	i32.const	$push570=, src
-	i32.const	$push569=, 39
-	i32.call	$push195=, memcmp@FUNCTION, $pop571, $pop570, $pop569
+	i32.const	$push771=, 0
+	i32.const	$push770=, 0
+	i64.load	$push189=, src+30($pop770):p2align=1
+	i64.store	dst+30($pop771):p2align=1, $pop189
+	i32.const	$push769=, 0
+	i32.const	$push768=, 0
+	i64.load	$push190=, src+24($pop768)
+	i64.store	dst+24($pop769), $pop190
+	i32.const	$push767=, 0
+	i32.const	$push766=, 0
+	i64.load	$push191=, src+16($pop766)
+	i64.store	dst+16($pop767), $pop191
+	i32.const	$push765=, 0
+	i32.const	$push764=, 0
+	i64.load	$push192=, src+8($pop764)
+	i64.store	dst+8($pop765), $pop192
+	i32.const	$push763=, 0
+	i32.const	$push762=, 0
+	i64.load	$push193=, src($pop762)
+	i64.store	dst($pop763), $pop193
+	i32.const	$push761=, dst
+	i32.const	$push760=, src
+	i32.const	$push194=, 38
+	i32.call	$push195=, memcmp@FUNCTION, $pop761, $pop760, $pop194
 	br_if   	0, $pop195      # 0: down to label2
+# BB#37:                                # %check.exit157
+	i32.const	$push783=, 0
+	i32.const	$push782=, 0
+	i64.load	$push196=, src+31($pop782):p2align=0
+	i64.store	dst+31($pop783):p2align=0, $pop196
+	i32.const	$push781=, 0
+	i32.const	$push780=, 0
+	i64.load	$push197=, src+24($pop780)
+	i64.store	dst+24($pop781), $pop197
+	i32.const	$push779=, 0
+	i32.const	$push778=, 0
+	i64.load	$push198=, src+16($pop778)
+	i64.store	dst+16($pop779), $pop198
+	i32.const	$push777=, 0
+	i32.const	$push776=, 0
+	i64.load	$push199=, src+8($pop776)
+	i64.store	dst+8($pop777), $pop199
+	i32.const	$push775=, 0
+	i32.const	$push774=, 0
+	i64.load	$push200=, src($pop774)
+	i64.store	dst($pop775), $pop200
+	i32.const	$push773=, dst
+	i32.const	$push772=, src
+	i32.const	$push201=, 39
+	i32.call	$push202=, memcmp@FUNCTION, $pop773, $pop772, $pop201
+	br_if   	0, $pop202      # 0: down to label2
 # BB#38:                                # %check.exit161
-	i32.const	$push576=, src
-	i32.const	$push196=, 40
-	i32.call	$push3=, memcpy@FUNCTION, $0, $pop576, $pop196
-	i32.const	$push575=, src
-	i32.const	$push574=, 40
-	i32.call	$push197=, memcmp@FUNCTION, $pop3, $pop575, $pop574
-	br_if   	0, $pop197      # 0: down to label2
+	i32.const	$push795=, 0
+	i32.const	$push794=, 0
+	i64.load	$push203=, src+32($pop794)
+	i64.store	dst+32($pop795), $pop203
+	i32.const	$push793=, 0
+	i32.const	$push792=, 0
+	i64.load	$push204=, src+24($pop792)
+	i64.store	dst+24($pop793), $pop204
+	i32.const	$push791=, 0
+	i32.const	$push790=, 0
+	i64.load	$push205=, src+16($pop790)
+	i64.store	dst+16($pop791), $pop205
+	i32.const	$push789=, 0
+	i32.const	$push788=, 0
+	i64.load	$push206=, src+8($pop788)
+	i64.store	dst+8($pop789), $pop206
+	i32.const	$push787=, 0
+	i32.const	$push786=, 0
+	i64.load	$push207=, src($pop786)
+	i64.store	dst($pop787), $pop207
+	i32.const	$push785=, dst
+	i32.const	$push784=, src
+	i32.const	$push208=, 40
+	i32.call	$push209=, memcmp@FUNCTION, $pop785, $pop784, $pop208
+	br_if   	0, $pop209      # 0: down to label2
 # BB#39:                                # %check.exit165
-	i32.const	$push199=, dst
-	i32.const	$push581=, src
-	i32.const	$push198=, 41
-	i32.call	$push580=, memcpy@FUNCTION, $pop199, $pop581, $pop198
-	tee_local	$push579=, $0=, $pop580
-	i32.const	$push578=, src
-	i32.const	$push577=, 41
-	i32.call	$push200=, memcmp@FUNCTION, $pop579, $pop578, $pop577
-	br_if   	0, $pop200      # 0: down to label2
+	i32.const	$push809=, 0
+	i32.const	$push808=, 0
+	i32.load8_u	$push210=, src+40($pop808)
+	i32.store8	dst+40($pop809), $pop210
+	i32.const	$push807=, 0
+	i32.const	$push806=, 0
+	i64.load	$push211=, src+32($pop806)
+	i64.store	dst+32($pop807), $pop211
+	i32.const	$push805=, 0
+	i32.const	$push804=, 0
+	i64.load	$push212=, src+24($pop804)
+	i64.store	dst+24($pop805), $pop212
+	i32.const	$push803=, 0
+	i32.const	$push802=, 0
+	i64.load	$push213=, src+16($pop802)
+	i64.store	dst+16($pop803), $pop213
+	i32.const	$push801=, 0
+	i32.const	$push800=, 0
+	i64.load	$push214=, src+8($pop800)
+	i64.store	dst+8($pop801), $pop214
+	i32.const	$push799=, 0
+	i32.const	$push798=, 0
+	i64.load	$push215=, src($pop798)
+	i64.store	dst($pop799), $pop215
+	i32.const	$push797=, dst
+	i32.const	$push796=, src
+	i32.const	$push216=, 41
+	i32.call	$push217=, memcmp@FUNCTION, $pop797, $pop796, $pop216
+	br_if   	0, $pop217      # 0: down to label2
 # BB#40:                                # %check.exit169
-	i32.const	$push584=, src
-	i32.const	$push201=, 42
-	i32.call	$push4=, memcpy@FUNCTION, $0, $pop584, $pop201
-	i32.const	$push583=, src
-	i32.const	$push582=, 42
-	i32.call	$push202=, memcmp@FUNCTION, $pop4, $pop583, $pop582
-	br_if   	0, $pop202      # 0: down to label2
+	i32.const	$push823=, 0
+	i32.const	$push822=, 0
+	i32.load16_u	$push218=, src+40($pop822)
+	i32.store16	dst+40($pop823), $pop218
+	i32.const	$push821=, 0
+	i32.const	$push820=, 0
+	i64.load	$push219=, src+32($pop820)
+	i64.store	dst+32($pop821), $pop219
+	i32.const	$push819=, 0
+	i32.const	$push818=, 0
+	i64.load	$push220=, src+24($pop818)
+	i64.store	dst+24($pop819), $pop220
+	i32.const	$push817=, 0
+	i32.const	$push816=, 0
+	i64.load	$push221=, src+16($pop816)
+	i64.store	dst+16($pop817), $pop221
+	i32.const	$push815=, 0
+	i32.const	$push814=, 0
+	i64.load	$push222=, src+8($pop814)
+	i64.store	dst+8($pop815), $pop222
+	i32.const	$push813=, 0
+	i32.const	$push812=, 0
+	i64.load	$push223=, src($pop812)
+	i64.store	dst($pop813), $pop223
+	i32.const	$push811=, dst
+	i32.const	$push810=, src
+	i32.const	$push224=, 42
+	i32.call	$push225=, memcmp@FUNCTION, $pop811, $pop810, $pop224
+	br_if   	0, $pop225      # 0: down to label2
 # BB#41:                                # %check.exit173
-	i32.const	$push204=, dst
-	i32.const	$push589=, src
-	i32.const	$push203=, 43
-	i32.call	$push588=, memcpy@FUNCTION, $pop204, $pop589, $pop203
-	tee_local	$push587=, $0=, $pop588
-	i32.const	$push586=, src
-	i32.const	$push585=, 43
-	i32.call	$push205=, memcmp@FUNCTION, $pop587, $pop586, $pop585
-	br_if   	0, $pop205      # 0: down to label2
+	i32.const	$push839=, 0
+	i32.const	$push838=, 0
+	i32.load8_u	$push226=, src+42($pop838)
+	i32.store8	dst+42($pop839), $pop226
+	i32.const	$push837=, 0
+	i32.const	$push836=, 0
+	i32.load16_u	$push227=, src+40($pop836)
+	i32.store16	dst+40($pop837), $pop227
+	i32.const	$push835=, 0
+	i32.const	$push834=, 0
+	i64.load	$push228=, src+32($pop834)
+	i64.store	dst+32($pop835), $pop228
+	i32.const	$push833=, 0
+	i32.const	$push832=, 0
+	i64.load	$push229=, src+24($pop832)
+	i64.store	dst+24($pop833), $pop229
+	i32.const	$push831=, 0
+	i32.const	$push830=, 0
+	i64.load	$push230=, src+16($pop830)
+	i64.store	dst+16($pop831), $pop230
+	i32.const	$push829=, 0
+	i32.const	$push828=, 0
+	i64.load	$push231=, src+8($pop828)
+	i64.store	dst+8($pop829), $pop231
+	i32.const	$push827=, 0
+	i32.const	$push826=, 0
+	i64.load	$push232=, src($pop826)
+	i64.store	dst($pop827), $pop232
+	i32.const	$push825=, dst
+	i32.const	$push824=, src
+	i32.const	$push233=, 43
+	i32.call	$push234=, memcmp@FUNCTION, $pop825, $pop824, $pop233
+	br_if   	0, $pop234      # 0: down to label2
 # BB#42:                                # %check.exit177
-	i32.const	$push592=, src
-	i32.const	$push206=, 44
-	i32.call	$push5=, memcpy@FUNCTION, $0, $pop592, $pop206
-	i32.const	$push591=, src
-	i32.const	$push590=, 44
-	i32.call	$push207=, memcmp@FUNCTION, $pop5, $pop591, $pop590
-	br_if   	0, $pop207      # 0: down to label2
+	i32.const	$push853=, 0
+	i32.const	$push852=, 0
+	i32.load	$push235=, src+40($pop852)
+	i32.store	dst+40($pop853), $pop235
+	i32.const	$push851=, 0
+	i32.const	$push850=, 0
+	i64.load	$push236=, src+32($pop850)
+	i64.store	dst+32($pop851), $pop236
+	i32.const	$push849=, 0
+	i32.const	$push848=, 0
+	i64.load	$push237=, src+24($pop848)
+	i64.store	dst+24($pop849), $pop237
+	i32.const	$push847=, 0
+	i32.const	$push846=, 0
+	i64.load	$push238=, src+16($pop846)
+	i64.store	dst+16($pop847), $pop238
+	i32.const	$push845=, 0
+	i32.const	$push844=, 0
+	i64.load	$push239=, src+8($pop844)
+	i64.store	dst+8($pop845), $pop239
+	i32.const	$push843=, 0
+	i32.const	$push842=, 0
+	i64.load	$push240=, src($pop842)
+	i64.store	dst($pop843), $pop240
+	i32.const	$push841=, dst
+	i32.const	$push840=, src
+	i32.const	$push241=, 44
+	i32.call	$push242=, memcmp@FUNCTION, $pop841, $pop840, $pop241
+	br_if   	0, $pop242      # 0: down to label2
 # BB#43:                                # %check.exit181
-	i32.const	$push209=, dst
-	i32.const	$push597=, src
-	i32.const	$push208=, 45
-	i32.call	$push596=, memcpy@FUNCTION, $pop209, $pop597, $pop208
-	tee_local	$push595=, $0=, $pop596
-	i32.const	$push594=, src
-	i32.const	$push593=, 45
-	i32.call	$push210=, memcmp@FUNCTION, $pop595, $pop594, $pop593
-	br_if   	0, $pop210      # 0: down to label2
+	i32.const	$push867=, 0
+	i32.const	$push866=, 0
+	i64.load	$push243=, src+37($pop866):p2align=0
+	i64.store	dst+37($pop867):p2align=0, $pop243
+	i32.const	$push865=, 0
+	i32.const	$push864=, 0
+	i64.load	$push244=, src+32($pop864)
+	i64.store	dst+32($pop865), $pop244
+	i32.const	$push863=, 0
+	i32.const	$push862=, 0
+	i64.load	$push245=, src+24($pop862)
+	i64.store	dst+24($pop863), $pop245
+	i32.const	$push861=, 0
+	i32.const	$push860=, 0
+	i64.load	$push246=, src+16($pop860)
+	i64.store	dst+16($pop861), $pop246
+	i32.const	$push859=, 0
+	i32.const	$push858=, 0
+	i64.load	$push247=, src+8($pop858)
+	i64.store	dst+8($pop859), $pop247
+	i32.const	$push857=, 0
+	i32.const	$push856=, 0
+	i64.load	$push248=, src($pop856)
+	i64.store	dst($pop857), $pop248
+	i32.const	$push855=, dst
+	i32.const	$push854=, src
+	i32.const	$push249=, 45
+	i32.call	$push250=, memcmp@FUNCTION, $pop855, $pop854, $pop249
+	br_if   	0, $pop250      # 0: down to label2
 # BB#44:                                # %check.exit185
-	i32.const	$push600=, src
-	i32.const	$push211=, 46
-	i32.call	$push6=, memcpy@FUNCTION, $0, $pop600, $pop211
-	i32.const	$push599=, src
-	i32.const	$push598=, 46
-	i32.call	$push212=, memcmp@FUNCTION, $pop6, $pop599, $pop598
-	br_if   	0, $pop212      # 0: down to label2
+	i32.const	$push881=, 0
+	i32.const	$push880=, 0
+	i64.load	$push251=, src+38($pop880):p2align=1
+	i64.store	dst+38($pop881):p2align=1, $pop251
+	i32.const	$push879=, 0
+	i32.const	$push878=, 0
+	i64.load	$push252=, src+32($pop878)
+	i64.store	dst+32($pop879), $pop252
+	i32.const	$push877=, 0
+	i32.const	$push876=, 0
+	i64.load	$push253=, src+24($pop876)
+	i64.store	dst+24($pop877), $pop253
+	i32.const	$push875=, 0
+	i32.const	$push874=, 0
+	i64.load	$push254=, src+16($pop874)
+	i64.store	dst+16($pop875), $pop254
+	i32.const	$push873=, 0
+	i32.const	$push872=, 0
+	i64.load	$push255=, src+8($pop872)
+	i64.store	dst+8($pop873), $pop255
+	i32.const	$push871=, 0
+	i32.const	$push870=, 0
+	i64.load	$push256=, src($pop870)
+	i64.store	dst($pop871), $pop256
+	i32.const	$push869=, dst
+	i32.const	$push868=, src
+	i32.const	$push257=, 46
+	i32.call	$push258=, memcmp@FUNCTION, $pop869, $pop868, $pop257
+	br_if   	0, $pop258      # 0: down to label2
 # BB#45:                                # %check.exit189
-	i32.const	$push214=, dst
-	i32.const	$push605=, src
-	i32.const	$push213=, 47
-	i32.call	$push604=, memcpy@FUNCTION, $pop214, $pop605, $pop213
-	tee_local	$push603=, $0=, $pop604
-	i32.const	$push602=, src
-	i32.const	$push601=, 47
-	i32.call	$push215=, memcmp@FUNCTION, $pop603, $pop602, $pop601
-	br_if   	0, $pop215      # 0: down to label2
+	i32.const	$push895=, 0
+	i32.const	$push894=, 0
+	i64.load	$push259=, src+39($pop894):p2align=0
+	i64.store	dst+39($pop895):p2align=0, $pop259
+	i32.const	$push893=, 0
+	i32.const	$push892=, 0
+	i64.load	$push260=, src+32($pop892)
+	i64.store	dst+32($pop893), $pop260
+	i32.const	$push891=, 0
+	i32.const	$push890=, 0
+	i64.load	$push261=, src+24($pop890)
+	i64.store	dst+24($pop891), $pop261
+	i32.const	$push889=, 0
+	i32.const	$push888=, 0
+	i64.load	$push262=, src+16($pop888)
+	i64.store	dst+16($pop889), $pop262
+	i32.const	$push887=, 0
+	i32.const	$push886=, 0
+	i64.load	$push263=, src+8($pop886)
+	i64.store	dst+8($pop887), $pop263
+	i32.const	$push885=, 0
+	i32.const	$push884=, 0
+	i64.load	$push264=, src($pop884)
+	i64.store	dst($pop885), $pop264
+	i32.const	$push883=, dst
+	i32.const	$push882=, src
+	i32.const	$push265=, 47
+	i32.call	$push266=, memcmp@FUNCTION, $pop883, $pop882, $pop265
+	br_if   	0, $pop266      # 0: down to label2
 # BB#46:                                # %check.exit193
-	i32.const	$push608=, src
-	i32.const	$push216=, 48
-	i32.call	$push7=, memcpy@FUNCTION, $0, $pop608, $pop216
-	i32.const	$push607=, src
-	i32.const	$push606=, 48
-	i32.call	$push217=, memcmp@FUNCTION, $pop7, $pop607, $pop606
-	br_if   	0, $pop217      # 0: down to label2
+	i32.const	$push909=, 0
+	i32.const	$push908=, 0
+	i64.load	$push267=, src+40($pop908)
+	i64.store	dst+40($pop909), $pop267
+	i32.const	$push907=, 0
+	i32.const	$push906=, 0
+	i64.load	$push268=, src+32($pop906)
+	i64.store	dst+32($pop907), $pop268
+	i32.const	$push905=, 0
+	i32.const	$push904=, 0
+	i64.load	$push269=, src+24($pop904)
+	i64.store	dst+24($pop905), $pop269
+	i32.const	$push903=, 0
+	i32.const	$push902=, 0
+	i64.load	$push270=, src+16($pop902)
+	i64.store	dst+16($pop903), $pop270
+	i32.const	$push901=, 0
+	i32.const	$push900=, 0
+	i64.load	$push271=, src+8($pop900)
+	i64.store	dst+8($pop901), $pop271
+	i32.const	$push899=, 0
+	i32.const	$push898=, 0
+	i64.load	$push272=, src($pop898)
+	i64.store	dst($pop899), $pop272
+	i32.const	$push897=, dst
+	i32.const	$push896=, src
+	i32.const	$push273=, 48
+	i32.call	$push274=, memcmp@FUNCTION, $pop897, $pop896, $pop273
+	br_if   	0, $pop274      # 0: down to label2
 # BB#47:                                # %check.exit197
-	i32.const	$push219=, dst
-	i32.const	$push613=, src
-	i32.const	$push218=, 49
-	i32.call	$push612=, memcpy@FUNCTION, $pop219, $pop613, $pop218
-	tee_local	$push611=, $0=, $pop612
-	i32.const	$push610=, src
-	i32.const	$push609=, 49
-	i32.call	$push220=, memcmp@FUNCTION, $pop611, $pop610, $pop609
-	br_if   	0, $pop220      # 0: down to label2
+	i32.const	$push925=, 0
+	i32.const	$push924=, 0
+	i32.load8_u	$push275=, src+48($pop924)
+	i32.store8	dst+48($pop925), $pop275
+	i32.const	$push923=, 0
+	i32.const	$push922=, 0
+	i64.load	$push276=, src+40($pop922)
+	i64.store	dst+40($pop923), $pop276
+	i32.const	$push921=, 0
+	i32.const	$push920=, 0
+	i64.load	$push277=, src+32($pop920)
+	i64.store	dst+32($pop921), $pop277
+	i32.const	$push919=, 0
+	i32.const	$push918=, 0
+	i64.load	$push278=, src+24($pop918)
+	i64.store	dst+24($pop919), $pop278
+	i32.const	$push917=, 0
+	i32.const	$push916=, 0
+	i64.load	$push279=, src+16($pop916)
+	i64.store	dst+16($pop917), $pop279
+	i32.const	$push915=, 0
+	i32.const	$push914=, 0
+	i64.load	$push280=, src+8($pop914)
+	i64.store	dst+8($pop915), $pop280
+	i32.const	$push913=, 0
+	i32.const	$push912=, 0
+	i64.load	$push281=, src($pop912)
+	i64.store	dst($pop913), $pop281
+	i32.const	$push911=, dst
+	i32.const	$push910=, src
+	i32.const	$push282=, 49
+	i32.call	$push283=, memcmp@FUNCTION, $pop911, $pop910, $pop282
+	br_if   	0, $pop283      # 0: down to label2
 # BB#48:                                # %check.exit201
-	i32.const	$push616=, src
-	i32.const	$push221=, 50
-	i32.call	$push8=, memcpy@FUNCTION, $0, $pop616, $pop221
-	i32.const	$push615=, src
-	i32.const	$push614=, 50
-	i32.call	$push222=, memcmp@FUNCTION, $pop8, $pop615, $pop614
-	br_if   	0, $pop222      # 0: down to label2
+	i32.const	$push941=, 0
+	i32.const	$push940=, 0
+	i32.load16_u	$push284=, src+48($pop940)
+	i32.store16	dst+48($pop941), $pop284
+	i32.const	$push939=, 0
+	i32.const	$push938=, 0
+	i64.load	$push285=, src+40($pop938)
+	i64.store	dst+40($pop939), $pop285
+	i32.const	$push937=, 0
+	i32.const	$push936=, 0
+	i64.load	$push286=, src+32($pop936)
+	i64.store	dst+32($pop937), $pop286
+	i32.const	$push935=, 0
+	i32.const	$push934=, 0
+	i64.load	$push287=, src+24($pop934)
+	i64.store	dst+24($pop935), $pop287
+	i32.const	$push933=, 0
+	i32.const	$push932=, 0
+	i64.load	$push288=, src+16($pop932)
+	i64.store	dst+16($pop933), $pop288
+	i32.const	$push931=, 0
+	i32.const	$push930=, 0
+	i64.load	$push289=, src+8($pop930)
+	i64.store	dst+8($pop931), $pop289
+	i32.const	$push929=, 0
+	i32.const	$push928=, 0
+	i64.load	$push290=, src($pop928)
+	i64.store	dst($pop929), $pop290
+	i32.const	$push927=, dst
+	i32.const	$push926=, src
+	i32.const	$push291=, 50
+	i32.call	$push292=, memcmp@FUNCTION, $pop927, $pop926, $pop291
+	br_if   	0, $pop292      # 0: down to label2
 # BB#49:                                # %check.exit205
-	i32.const	$push224=, dst
-	i32.const	$push621=, src
-	i32.const	$push223=, 51
-	i32.call	$push620=, memcpy@FUNCTION, $pop224, $pop621, $pop223
-	tee_local	$push619=, $0=, $pop620
-	i32.const	$push618=, src
-	i32.const	$push617=, 51
-	i32.call	$push225=, memcmp@FUNCTION, $pop619, $pop618, $pop617
-	br_if   	0, $pop225      # 0: down to label2
+	i32.const	$push959=, 0
+	i32.const	$push958=, 0
+	i32.load8_u	$push293=, src+50($pop958)
+	i32.store8	dst+50($pop959), $pop293
+	i32.const	$push957=, 0
+	i32.const	$push956=, 0
+	i32.load16_u	$push294=, src+48($pop956)
+	i32.store16	dst+48($pop957), $pop294
+	i32.const	$push955=, 0
+	i32.const	$push954=, 0
+	i64.load	$push295=, src+40($pop954)
+	i64.store	dst+40($pop955), $pop295
+	i32.const	$push953=, 0
+	i32.const	$push952=, 0
+	i64.load	$push296=, src+32($pop952)
+	i64.store	dst+32($pop953), $pop296
+	i32.const	$push951=, 0
+	i32.const	$push950=, 0
+	i64.load	$push297=, src+24($pop950)
+	i64.store	dst+24($pop951), $pop297
+	i32.const	$push949=, 0
+	i32.const	$push948=, 0
+	i64.load	$push298=, src+16($pop948)
+	i64.store	dst+16($pop949), $pop298
+	i32.const	$push947=, 0
+	i32.const	$push946=, 0
+	i64.load	$push299=, src+8($pop946)
+	i64.store	dst+8($pop947), $pop299
+	i32.const	$push945=, 0
+	i32.const	$push944=, 0
+	i64.load	$push300=, src($pop944)
+	i64.store	dst($pop945), $pop300
+	i32.const	$push943=, dst
+	i32.const	$push942=, src
+	i32.const	$push301=, 51
+	i32.call	$push302=, memcmp@FUNCTION, $pop943, $pop942, $pop301
+	br_if   	0, $pop302      # 0: down to label2
 # BB#50:                                # %check.exit209
-	i32.const	$push624=, src
-	i32.const	$push226=, 52
-	i32.call	$push9=, memcpy@FUNCTION, $0, $pop624, $pop226
-	i32.const	$push623=, src
-	i32.const	$push622=, 52
-	i32.call	$push227=, memcmp@FUNCTION, $pop9, $pop623, $pop622
-	br_if   	0, $pop227      # 0: down to label2
+	i32.const	$push975=, 0
+	i32.const	$push974=, 0
+	i32.load	$push303=, src+48($pop974)
+	i32.store	dst+48($pop975), $pop303
+	i32.const	$push973=, 0
+	i32.const	$push972=, 0
+	i64.load	$push304=, src+40($pop972)
+	i64.store	dst+40($pop973), $pop304
+	i32.const	$push971=, 0
+	i32.const	$push970=, 0
+	i64.load	$push305=, src+32($pop970)
+	i64.store	dst+32($pop971), $pop305
+	i32.const	$push969=, 0
+	i32.const	$push968=, 0
+	i64.load	$push306=, src+24($pop968)
+	i64.store	dst+24($pop969), $pop306
+	i32.const	$push967=, 0
+	i32.const	$push966=, 0
+	i64.load	$push307=, src+16($pop966)
+	i64.store	dst+16($pop967), $pop307
+	i32.const	$push965=, 0
+	i32.const	$push964=, 0
+	i64.load	$push308=, src+8($pop964)
+	i64.store	dst+8($pop965), $pop308
+	i32.const	$push963=, 0
+	i32.const	$push962=, 0
+	i64.load	$push309=, src($pop962)
+	i64.store	dst($pop963), $pop309
+	i32.const	$push961=, dst
+	i32.const	$push960=, src
+	i32.const	$push310=, 52
+	i32.call	$push311=, memcmp@FUNCTION, $pop961, $pop960, $pop310
+	br_if   	0, $pop311      # 0: down to label2
 # BB#51:                                # %check.exit213
-	i32.const	$push229=, dst
-	i32.const	$push629=, src
-	i32.const	$push228=, 53
-	i32.call	$push628=, memcpy@FUNCTION, $pop229, $pop629, $pop228
-	tee_local	$push627=, $0=, $pop628
-	i32.const	$push626=, src
-	i32.const	$push625=, 53
-	i32.call	$push230=, memcmp@FUNCTION, $pop627, $pop626, $pop625
-	br_if   	0, $pop230      # 0: down to label2
+	i32.const	$push991=, 0
+	i32.const	$push990=, 0
+	i64.load	$push312=, src+45($pop990):p2align=0
+	i64.store	dst+45($pop991):p2align=0, $pop312
+	i32.const	$push989=, 0
+	i32.const	$push988=, 0
+	i64.load	$push313=, src+40($pop988)
+	i64.store	dst+40($pop989), $pop313
+	i32.const	$push987=, 0
+	i32.const	$push986=, 0
+	i64.load	$push314=, src+32($pop986)
+	i64.store	dst+32($pop987), $pop314
+	i32.const	$push985=, 0
+	i32.const	$push984=, 0
+	i64.load	$push315=, src+24($pop984)
+	i64.store	dst+24($pop985), $pop315
+	i32.const	$push983=, 0
+	i32.const	$push982=, 0
+	i64.load	$push316=, src+16($pop982)
+	i64.store	dst+16($pop983), $pop316
+	i32.const	$push981=, 0
+	i32.const	$push980=, 0
+	i64.load	$push317=, src+8($pop980)
+	i64.store	dst+8($pop981), $pop317
+	i32.const	$push979=, 0
+	i32.const	$push978=, 0
+	i64.load	$push318=, src($pop978)
+	i64.store	dst($pop979), $pop318
+	i32.const	$push977=, dst
+	i32.const	$push976=, src
+	i32.const	$push319=, 53
+	i32.call	$push320=, memcmp@FUNCTION, $pop977, $pop976, $pop319
+	br_if   	0, $pop320      # 0: down to label2
 # BB#52:                                # %check.exit217
-	i32.const	$push632=, src
-	i32.const	$push231=, 54
-	i32.call	$push10=, memcpy@FUNCTION, $0, $pop632, $pop231
-	i32.const	$push631=, src
-	i32.const	$push630=, 54
-	i32.call	$push232=, memcmp@FUNCTION, $pop10, $pop631, $pop630
-	br_if   	0, $pop232      # 0: down to label2
+	i32.const	$push1007=, 0
+	i32.const	$push1006=, 0
+	i64.load	$push321=, src+46($pop1006):p2align=1
+	i64.store	dst+46($pop1007):p2align=1, $pop321
+	i32.const	$push1005=, 0
+	i32.const	$push1004=, 0
+	i64.load	$push322=, src+40($pop1004)
+	i64.store	dst+40($pop1005), $pop322
+	i32.const	$push1003=, 0
+	i32.const	$push1002=, 0
+	i64.load	$push323=, src+32($pop1002)
+	i64.store	dst+32($pop1003), $pop323
+	i32.const	$push1001=, 0
+	i32.const	$push1000=, 0
+	i64.load	$push324=, src+24($pop1000)
+	i64.store	dst+24($pop1001), $pop324
+	i32.const	$push999=, 0
+	i32.const	$push998=, 0
+	i64.load	$push325=, src+16($pop998)
+	i64.store	dst+16($pop999), $pop325
+	i32.const	$push997=, 0
+	i32.const	$push996=, 0
+	i64.load	$push326=, src+8($pop996)
+	i64.store	dst+8($pop997), $pop326
+	i32.const	$push995=, 0
+	i32.const	$push994=, 0
+	i64.load	$push327=, src($pop994)
+	i64.store	dst($pop995), $pop327
+	i32.const	$push993=, dst
+	i32.const	$push992=, src
+	i32.const	$push328=, 54
+	i32.call	$push329=, memcmp@FUNCTION, $pop993, $pop992, $pop328
+	br_if   	0, $pop329      # 0: down to label2
 # BB#53:                                # %check.exit221
-	i32.const	$push234=, dst
-	i32.const	$push637=, src
-	i32.const	$push233=, 55
-	i32.call	$push636=, memcpy@FUNCTION, $pop234, $pop637, $pop233
-	tee_local	$push635=, $0=, $pop636
-	i32.const	$push634=, src
-	i32.const	$push633=, 55
-	i32.call	$push235=, memcmp@FUNCTION, $pop635, $pop634, $pop633
-	br_if   	0, $pop235      # 0: down to label2
+	i32.const	$push1023=, 0
+	i32.const	$push1022=, 0
+	i64.load	$push330=, src+47($pop1022):p2align=0
+	i64.store	dst+47($pop1023):p2align=0, $pop330
+	i32.const	$push1021=, 0
+	i32.const	$push1020=, 0
+	i64.load	$push331=, src+40($pop1020)
+	i64.store	dst+40($pop1021), $pop331
+	i32.const	$push1019=, 0
+	i32.const	$push1018=, 0
+	i64.load	$push332=, src+32($pop1018)
+	i64.store	dst+32($pop1019), $pop332
+	i32.const	$push1017=, 0
+	i32.const	$push1016=, 0
+	i64.load	$push333=, src+24($pop1016)
+	i64.store	dst+24($pop1017), $pop333
+	i32.const	$push1015=, 0
+	i32.const	$push1014=, 0
+	i64.load	$push334=, src+16($pop1014)
+	i64.store	dst+16($pop1015), $pop334
+	i32.const	$push1013=, 0
+	i32.const	$push1012=, 0
+	i64.load	$push335=, src+8($pop1012)
+	i64.store	dst+8($pop1013), $pop335
+	i32.const	$push1011=, 0
+	i32.const	$push1010=, 0
+	i64.load	$push336=, src($pop1010)
+	i64.store	dst($pop1011), $pop336
+	i32.const	$push1009=, dst
+	i32.const	$push1008=, src
+	i32.const	$push337=, 55
+	i32.call	$push338=, memcmp@FUNCTION, $pop1009, $pop1008, $pop337
+	br_if   	0, $pop338      # 0: down to label2
 # BB#54:                                # %check.exit225
-	i32.const	$push640=, src
-	i32.const	$push236=, 56
-	i32.call	$push11=, memcpy@FUNCTION, $0, $pop640, $pop236
-	i32.const	$push639=, src
-	i32.const	$push638=, 56
-	i32.call	$push237=, memcmp@FUNCTION, $pop11, $pop639, $pop638
-	br_if   	0, $pop237      # 0: down to label2
+	i32.const	$push1039=, 0
+	i32.const	$push1038=, 0
+	i64.load	$push339=, src+48($pop1038)
+	i64.store	dst+48($pop1039), $pop339
+	i32.const	$push1037=, 0
+	i32.const	$push1036=, 0
+	i64.load	$push340=, src+40($pop1036)
+	i64.store	dst+40($pop1037), $pop340
+	i32.const	$push1035=, 0
+	i32.const	$push1034=, 0
+	i64.load	$push341=, src+32($pop1034)
+	i64.store	dst+32($pop1035), $pop341
+	i32.const	$push1033=, 0
+	i32.const	$push1032=, 0
+	i64.load	$push342=, src+24($pop1032)
+	i64.store	dst+24($pop1033), $pop342
+	i32.const	$push1031=, 0
+	i32.const	$push1030=, 0
+	i64.load	$push343=, src+16($pop1030)
+	i64.store	dst+16($pop1031), $pop343
+	i32.const	$push1029=, 0
+	i32.const	$push1028=, 0
+	i64.load	$push344=, src+8($pop1028)
+	i64.store	dst+8($pop1029), $pop344
+	i32.const	$push1027=, 0
+	i32.const	$push1026=, 0
+	i64.load	$push345=, src($pop1026)
+	i64.store	dst($pop1027), $pop345
+	i32.const	$push1025=, dst
+	i32.const	$push1024=, src
+	i32.const	$push346=, 56
+	i32.call	$push347=, memcmp@FUNCTION, $pop1025, $pop1024, $pop346
+	br_if   	0, $pop347      # 0: down to label2
 # BB#55:                                # %check.exit229
-	i32.const	$push239=, dst
-	i32.const	$push645=, src
-	i32.const	$push238=, 57
-	i32.call	$push644=, memcpy@FUNCTION, $pop239, $pop645, $pop238
-	tee_local	$push643=, $0=, $pop644
-	i32.const	$push642=, src
-	i32.const	$push641=, 57
-	i32.call	$push240=, memcmp@FUNCTION, $pop643, $pop642, $pop641
-	br_if   	0, $pop240      # 0: down to label2
+	i32.const	$push1057=, 0
+	i32.const	$push1056=, 0
+	i32.load8_u	$push348=, src+56($pop1056)
+	i32.store8	dst+56($pop1057), $pop348
+	i32.const	$push1055=, 0
+	i32.const	$push1054=, 0
+	i64.load	$push349=, src+48($pop1054)
+	i64.store	dst+48($pop1055), $pop349
+	i32.const	$push1053=, 0
+	i32.const	$push1052=, 0
+	i64.load	$push350=, src+40($pop1052)
+	i64.store	dst+40($pop1053), $pop350
+	i32.const	$push1051=, 0
+	i32.const	$push1050=, 0
+	i64.load	$push351=, src+32($pop1050)
+	i64.store	dst+32($pop1051), $pop351
+	i32.const	$push1049=, 0
+	i32.const	$push1048=, 0
+	i64.load	$push352=, src+24($pop1048)
+	i64.store	dst+24($pop1049), $pop352
+	i32.const	$push1047=, 0
+	i32.const	$push1046=, 0
+	i64.load	$push353=, src+16($pop1046)
+	i64.store	dst+16($pop1047), $pop353
+	i32.const	$push1045=, 0
+	i32.const	$push1044=, 0
+	i64.load	$push354=, src+8($pop1044)
+	i64.store	dst+8($pop1045), $pop354
+	i32.const	$push1043=, 0
+	i32.const	$push1042=, 0
+	i64.load	$push355=, src($pop1042)
+	i64.store	dst($pop1043), $pop355
+	i32.const	$push1041=, dst
+	i32.const	$push1040=, src
+	i32.const	$push356=, 57
+	i32.call	$push357=, memcmp@FUNCTION, $pop1041, $pop1040, $pop356
+	br_if   	0, $pop357      # 0: down to label2
 # BB#56:                                # %check.exit233
-	i32.const	$push648=, src
-	i32.const	$push241=, 58
-	i32.call	$push12=, memcpy@FUNCTION, $0, $pop648, $pop241
-	i32.const	$push647=, src
-	i32.const	$push646=, 58
-	i32.call	$push242=, memcmp@FUNCTION, $pop12, $pop647, $pop646
-	br_if   	0, $pop242      # 0: down to label2
+	i32.const	$push358=, 0
+	i32.const	$push1074=, 0
+	i32.load16_u	$push359=, src+56($pop1074)
+	i32.store16	dst+56($pop358), $pop359
+	i32.const	$push1073=, 0
+	i32.const	$push1072=, 0
+	i64.load	$push360=, src+48($pop1072)
+	i64.store	dst+48($pop1073), $pop360
+	i32.const	$push1071=, 0
+	i32.const	$push1070=, 0
+	i64.load	$push361=, src+40($pop1070)
+	i64.store	dst+40($pop1071), $pop361
+	i32.const	$push1069=, 0
+	i32.const	$push1068=, 0
+	i64.load	$push362=, src+32($pop1068)
+	i64.store	dst+32($pop1069), $pop362
+	i32.const	$push1067=, 0
+	i32.const	$push1066=, 0
+	i64.load	$push363=, src+24($pop1066)
+	i64.store	dst+24($pop1067), $pop363
+	i32.const	$push1065=, 0
+	i32.const	$push1064=, 0
+	i64.load	$push364=, src+16($pop1064)
+	i64.store	dst+16($pop1065), $pop364
+	i32.const	$push1063=, 0
+	i32.const	$push1062=, 0
+	i64.load	$push365=, src+8($pop1062)
+	i64.store	dst+8($pop1063), $pop365
+	i32.const	$push1061=, 0
+	i32.const	$push1060=, 0
+	i64.load	$push366=, src($pop1060)
+	i64.store	dst($pop1061), $pop366
+	i32.const	$push1059=, dst
+	i32.const	$push1058=, src
+	i32.const	$push367=, 58
+	i32.call	$push368=, memcmp@FUNCTION, $pop1059, $pop1058, $pop367
+	br_if   	0, $pop368      # 0: down to label2
 # BB#57:                                # %check.exit237
-	i32.const	$push244=, dst
-	i32.const	$push653=, src
-	i32.const	$push243=, 59
-	i32.call	$push652=, memcpy@FUNCTION, $pop244, $pop653, $pop243
-	tee_local	$push651=, $0=, $pop652
-	i32.const	$push650=, src
-	i32.const	$push649=, 59
-	i32.call	$push245=, memcmp@FUNCTION, $pop651, $pop650, $pop649
-	br_if   	0, $pop245      # 0: down to label2
+	i32.const	$push370=, dst
+	i32.const	$push1079=, src
+	i32.const	$push369=, 59
+	i32.call	$push1078=, memcpy@FUNCTION, $pop370, $pop1079, $pop369
+	tee_local	$push1077=, $0=, $pop1078
+	i32.const	$push1076=, src
+	i32.const	$push1075=, 59
+	i32.call	$push371=, memcmp@FUNCTION, $pop1077, $pop1076, $pop1075
+	br_if   	0, $pop371      # 0: down to label2
 # BB#58:                                # %check.exit241
-	i32.const	$push656=, src
-	i32.const	$push246=, 60
-	i32.call	$push13=, memcpy@FUNCTION, $0, $pop656, $pop246
-	i32.const	$push655=, src
-	i32.const	$push654=, 60
-	i32.call	$push247=, memcmp@FUNCTION, $pop13, $pop655, $pop654
-	br_if   	0, $pop247      # 0: down to label2
+	i32.const	$push1096=, 0
+	i32.const	$push1095=, 0
+	i32.load	$push372=, src+56($pop1095)
+	i32.store	dst+56($pop1096), $pop372
+	i32.const	$push1094=, 0
+	i32.const	$push1093=, 0
+	i64.load	$push373=, src+48($pop1093)
+	i64.store	dst+48($pop1094), $pop373
+	i32.const	$push1092=, 0
+	i32.const	$push1091=, 0
+	i64.load	$push374=, src+40($pop1091)
+	i64.store	dst+40($pop1092), $pop374
+	i32.const	$push1090=, 0
+	i32.const	$push1089=, 0
+	i64.load	$push375=, src+32($pop1089)
+	i64.store	dst+32($pop1090), $pop375
+	i32.const	$push1088=, 0
+	i32.const	$push1087=, 0
+	i64.load	$push376=, src+24($pop1087)
+	i64.store	dst+24($pop1088), $pop376
+	i32.const	$push1086=, 0
+	i32.const	$push1085=, 0
+	i64.load	$push377=, src+16($pop1085)
+	i64.store	dst+16($pop1086), $pop377
+	i32.const	$push1084=, 0
+	i32.const	$push1083=, 0
+	i64.load	$push378=, src+8($pop1083)
+	i64.store	dst+8($pop1084), $pop378
+	i32.const	$push1082=, 0
+	i32.const	$push1081=, 0
+	i64.load	$push379=, src($pop1081)
+	i64.store	dst($pop1082), $pop379
+	i32.const	$push1080=, src
+	i32.const	$push380=, 60
+	i32.call	$push381=, memcmp@FUNCTION, $0, $pop1080, $pop380
+	br_if   	0, $pop381      # 0: down to label2
 # BB#59:                                # %check.exit245
-	i32.const	$push249=, dst
-	i32.const	$push661=, src
-	i32.const	$push248=, 61
-	i32.call	$push660=, memcpy@FUNCTION, $pop249, $pop661, $pop248
-	tee_local	$push659=, $0=, $pop660
-	i32.const	$push658=, src
-	i32.const	$push657=, 61
-	i32.call	$push250=, memcmp@FUNCTION, $pop659, $pop658, $pop657
-	br_if   	0, $pop250      # 0: down to label2
+	i32.const	$push1114=, 0
+	i32.const	$push1113=, 0
+	i64.load	$push382=, src+53($pop1113):p2align=0
+	i64.store	dst+53($pop1114):p2align=0, $pop382
+	i32.const	$push1112=, 0
+	i32.const	$push1111=, 0
+	i64.load	$push383=, src+48($pop1111)
+	i64.store	dst+48($pop1112), $pop383
+	i32.const	$push1110=, 0
+	i32.const	$push1109=, 0
+	i64.load	$push384=, src+40($pop1109)
+	i64.store	dst+40($pop1110), $pop384
+	i32.const	$push1108=, 0
+	i32.const	$push1107=, 0
+	i64.load	$push385=, src+32($pop1107)
+	i64.store	dst+32($pop1108), $pop385
+	i32.const	$push1106=, 0
+	i32.const	$push1105=, 0
+	i64.load	$push386=, src+24($pop1105)
+	i64.store	dst+24($pop1106), $pop386
+	i32.const	$push1104=, 0
+	i32.const	$push1103=, 0
+	i64.load	$push387=, src+16($pop1103)
+	i64.store	dst+16($pop1104), $pop387
+	i32.const	$push1102=, 0
+	i32.const	$push1101=, 0
+	i64.load	$push388=, src+8($pop1101)
+	i64.store	dst+8($pop1102), $pop388
+	i32.const	$push1100=, 0
+	i32.const	$push1099=, 0
+	i64.load	$push389=, src($pop1099)
+	i64.store	dst($pop1100), $pop389
+	i32.const	$push1098=, dst
+	i32.const	$push1097=, src
+	i32.const	$push390=, 61
+	i32.call	$push391=, memcmp@FUNCTION, $pop1098, $pop1097, $pop390
+	br_if   	0, $pop391      # 0: down to label2
 # BB#60:                                # %check.exit249
-	i32.const	$push664=, src
-	i32.const	$push251=, 62
-	i32.call	$push14=, memcpy@FUNCTION, $0, $pop664, $pop251
-	i32.const	$push663=, src
-	i32.const	$push662=, 62
-	i32.call	$push252=, memcmp@FUNCTION, $pop14, $pop663, $pop662
-	br_if   	0, $pop252      # 0: down to label2
+	i32.const	$push1132=, 0
+	i32.const	$push1131=, 0
+	i64.load	$push392=, src+54($pop1131):p2align=1
+	i64.store	dst+54($pop1132):p2align=1, $pop392
+	i32.const	$push1130=, 0
+	i32.const	$push1129=, 0
+	i64.load	$push393=, src+48($pop1129)
+	i64.store	dst+48($pop1130), $pop393
+	i32.const	$push1128=, 0
+	i32.const	$push1127=, 0
+	i64.load	$push394=, src+40($pop1127)
+	i64.store	dst+40($pop1128), $pop394
+	i32.const	$push1126=, 0
+	i32.const	$push1125=, 0
+	i64.load	$push395=, src+32($pop1125)
+	i64.store	dst+32($pop1126), $pop395
+	i32.const	$push1124=, 0
+	i32.const	$push1123=, 0
+	i64.load	$push396=, src+24($pop1123)
+	i64.store	dst+24($pop1124), $pop396
+	i32.const	$push1122=, 0
+	i32.const	$push1121=, 0
+	i64.load	$push397=, src+16($pop1121)
+	i64.store	dst+16($pop1122), $pop397
+	i32.const	$push1120=, 0
+	i32.const	$push1119=, 0
+	i64.load	$push398=, src+8($pop1119)
+	i64.store	dst+8($pop1120), $pop398
+	i32.const	$push1118=, 0
+	i32.const	$push1117=, 0
+	i64.load	$push399=, src($pop1117)
+	i64.store	dst($pop1118), $pop399
+	i32.const	$push1116=, dst
+	i32.const	$push1115=, src
+	i32.const	$push400=, 62
+	i32.call	$push401=, memcmp@FUNCTION, $pop1116, $pop1115, $pop400
+	br_if   	0, $pop401      # 0: down to label2
 # BB#61:                                # %check.exit253
-	i32.const	$push254=, dst
-	i32.const	$push669=, src
-	i32.const	$push253=, 63
-	i32.call	$push668=, memcpy@FUNCTION, $pop254, $pop669, $pop253
-	tee_local	$push667=, $0=, $pop668
-	i32.const	$push666=, src
-	i32.const	$push665=, 63
-	i32.call	$push255=, memcmp@FUNCTION, $pop667, $pop666, $pop665
-	br_if   	0, $pop255      # 0: down to label2
+	i32.const	$push1150=, 0
+	i32.const	$push1149=, 0
+	i64.load	$push402=, src+55($pop1149):p2align=0
+	i64.store	dst+55($pop1150):p2align=0, $pop402
+	i32.const	$push1148=, 0
+	i32.const	$push1147=, 0
+	i64.load	$push403=, src+48($pop1147)
+	i64.store	dst+48($pop1148), $pop403
+	i32.const	$push1146=, 0
+	i32.const	$push1145=, 0
+	i64.load	$push404=, src+40($pop1145)
+	i64.store	dst+40($pop1146), $pop404
+	i32.const	$push1144=, 0
+	i32.const	$push1143=, 0
+	i64.load	$push405=, src+32($pop1143)
+	i64.store	dst+32($pop1144), $pop405
+	i32.const	$push1142=, 0
+	i32.const	$push1141=, 0
+	i64.load	$push406=, src+24($pop1141)
+	i64.store	dst+24($pop1142), $pop406
+	i32.const	$push1140=, 0
+	i32.const	$push1139=, 0
+	i64.load	$push407=, src+16($pop1139)
+	i64.store	dst+16($pop1140), $pop407
+	i32.const	$push1138=, 0
+	i32.const	$push1137=, 0
+	i64.load	$push408=, src+8($pop1137)
+	i64.store	dst+8($pop1138), $pop408
+	i32.const	$push1136=, 0
+	i32.const	$push1135=, 0
+	i64.load	$push409=, src($pop1135)
+	i64.store	dst($pop1136), $pop409
+	i32.const	$push1134=, dst
+	i32.const	$push1133=, src
+	i32.const	$push410=, 63
+	i32.call	$push411=, memcmp@FUNCTION, $pop1134, $pop1133, $pop410
+	br_if   	0, $pop411      # 0: down to label2
 # BB#62:                                # %check.exit257
-	i32.const	$push672=, src
-	i32.const	$push256=, 64
-	i32.call	$push15=, memcpy@FUNCTION, $0, $pop672, $pop256
-	i32.const	$push671=, src
-	i32.const	$push670=, 64
-	i32.call	$push257=, memcmp@FUNCTION, $pop15, $pop671, $pop670
-	br_if   	0, $pop257      # 0: down to label2
+	i32.const	$push412=, 0
+	i32.const	$push1167=, 0
+	i64.load	$push413=, src+56($pop1167)
+	i64.store	dst+56($pop412), $pop413
+	i32.const	$push1166=, 0
+	i32.const	$push1165=, 0
+	i64.load	$push414=, src+48($pop1165)
+	i64.store	dst+48($pop1166), $pop414
+	i32.const	$push1164=, 0
+	i32.const	$push1163=, 0
+	i64.load	$push415=, src+40($pop1163)
+	i64.store	dst+40($pop1164), $pop415
+	i32.const	$push1162=, 0
+	i32.const	$push1161=, 0
+	i64.load	$push416=, src+32($pop1161)
+	i64.store	dst+32($pop1162), $pop416
+	i32.const	$push1160=, 0
+	i32.const	$push1159=, 0
+	i64.load	$push417=, src+24($pop1159)
+	i64.store	dst+24($pop1160), $pop417
+	i32.const	$push1158=, 0
+	i32.const	$push1157=, 0
+	i64.load	$push418=, src+16($pop1157)
+	i64.store	dst+16($pop1158), $pop418
+	i32.const	$push1156=, 0
+	i32.const	$push1155=, 0
+	i64.load	$push419=, src+8($pop1155)
+	i64.store	dst+8($pop1156), $pop419
+	i32.const	$push1154=, 0
+	i32.const	$push1153=, 0
+	i64.load	$push420=, src($pop1153)
+	i64.store	dst($pop1154), $pop420
+	i32.const	$push1152=, dst
+	i32.const	$push1151=, src
+	i32.const	$push421=, 64
+	i32.call	$push422=, memcmp@FUNCTION, $pop1152, $pop1151, $pop421
+	br_if   	0, $pop422      # 0: down to label2
 # BB#63:                                # %check.exit261
-	i32.const	$push259=, dst
-	i32.const	$push677=, src
-	i32.const	$push258=, 65
-	i32.call	$push676=, memcpy@FUNCTION, $pop259, $pop677, $pop258
-	tee_local	$push675=, $0=, $pop676
-	i32.const	$push674=, src
-	i32.const	$push673=, 65
-	i32.call	$push260=, memcmp@FUNCTION, $pop675, $pop674, $pop673
-	br_if   	0, $pop260      # 0: down to label2
+	i32.const	$push424=, dst
+	i32.const	$push1172=, src
+	i32.const	$push423=, 65
+	i32.call	$push1171=, memcpy@FUNCTION, $pop424, $pop1172, $pop423
+	tee_local	$push1170=, $0=, $pop1171
+	i32.const	$push1169=, src
+	i32.const	$push1168=, 65
+	i32.call	$push425=, memcmp@FUNCTION, $pop1170, $pop1169, $pop1168
+	br_if   	0, $pop425      # 0: down to label2
 # BB#64:                                # %check.exit265
-	i32.const	$push680=, src
-	i32.const	$push261=, 66
-	i32.call	$push16=, memcpy@FUNCTION, $0, $pop680, $pop261
-	i32.const	$push679=, src
-	i32.const	$push678=, 66
-	i32.call	$push262=, memcmp@FUNCTION, $pop16, $pop679, $pop678
-	br_if   	0, $pop262      # 0: down to label2
+	i32.const	$push1175=, src
+	i32.const	$push426=, 66
+	i32.call	$push0=, memcpy@FUNCTION, $0, $pop1175, $pop426
+	i32.const	$push1174=, src
+	i32.const	$push1173=, 66
+	i32.call	$push427=, memcmp@FUNCTION, $pop0, $pop1174, $pop1173
+	br_if   	0, $pop427      # 0: down to label2
 # BB#65:                                # %check.exit269
-	i32.const	$push264=, dst
-	i32.const	$push685=, src
-	i32.const	$push263=, 67
-	i32.call	$push684=, memcpy@FUNCTION, $pop264, $pop685, $pop263
-	tee_local	$push683=, $0=, $pop684
-	i32.const	$push682=, src
-	i32.const	$push681=, 67
-	i32.call	$push265=, memcmp@FUNCTION, $pop683, $pop682, $pop681
-	br_if   	0, $pop265      # 0: down to label2
+	i32.const	$push429=, dst
+	i32.const	$push1180=, src
+	i32.const	$push428=, 67
+	i32.call	$push1179=, memcpy@FUNCTION, $pop429, $pop1180, $pop428
+	tee_local	$push1178=, $0=, $pop1179
+	i32.const	$push1177=, src
+	i32.const	$push1176=, 67
+	i32.call	$push430=, memcmp@FUNCTION, $pop1178, $pop1177, $pop1176
+	br_if   	0, $pop430      # 0: down to label2
 # BB#66:                                # %check.exit273
-	i32.const	$push688=, src
-	i32.const	$push266=, 68
-	i32.call	$push17=, memcpy@FUNCTION, $0, $pop688, $pop266
-	i32.const	$push687=, src
-	i32.const	$push686=, 68
-	i32.call	$push267=, memcmp@FUNCTION, $pop17, $pop687, $pop686
-	br_if   	0, $pop267      # 0: down to label2
+	i32.const	$push1183=, src
+	i32.const	$push431=, 68
+	i32.call	$push1=, memcpy@FUNCTION, $0, $pop1183, $pop431
+	i32.const	$push1182=, src
+	i32.const	$push1181=, 68
+	i32.call	$push432=, memcmp@FUNCTION, $pop1, $pop1182, $pop1181
+	br_if   	0, $pop432      # 0: down to label2
 # BB#67:                                # %check.exit277
-	i32.const	$push269=, dst
-	i32.const	$push693=, src
-	i32.const	$push268=, 69
-	i32.call	$push692=, memcpy@FUNCTION, $pop269, $pop693, $pop268
-	tee_local	$push691=, $0=, $pop692
-	i32.const	$push690=, src
-	i32.const	$push689=, 69
-	i32.call	$push270=, memcmp@FUNCTION, $pop691, $pop690, $pop689
-	br_if   	0, $pop270      # 0: down to label2
+	i32.const	$push434=, dst
+	i32.const	$push1188=, src
+	i32.const	$push433=, 69
+	i32.call	$push1187=, memcpy@FUNCTION, $pop434, $pop1188, $pop433
+	tee_local	$push1186=, $0=, $pop1187
+	i32.const	$push1185=, src
+	i32.const	$push1184=, 69
+	i32.call	$push435=, memcmp@FUNCTION, $pop1186, $pop1185, $pop1184
+	br_if   	0, $pop435      # 0: down to label2
 # BB#68:                                # %check.exit281
-	i32.const	$push696=, src
-	i32.const	$push271=, 70
-	i32.call	$push18=, memcpy@FUNCTION, $0, $pop696, $pop271
-	i32.const	$push695=, src
-	i32.const	$push694=, 70
-	i32.call	$push272=, memcmp@FUNCTION, $pop18, $pop695, $pop694
-	br_if   	0, $pop272      # 0: down to label2
+	i32.const	$push1191=, src
+	i32.const	$push436=, 70
+	i32.call	$push2=, memcpy@FUNCTION, $0, $pop1191, $pop436
+	i32.const	$push1190=, src
+	i32.const	$push1189=, 70
+	i32.call	$push437=, memcmp@FUNCTION, $pop2, $pop1190, $pop1189
+	br_if   	0, $pop437      # 0: down to label2
 # BB#69:                                # %check.exit285
-	i32.const	$push274=, dst
-	i32.const	$push701=, src
-	i32.const	$push273=, 71
-	i32.call	$push700=, memcpy@FUNCTION, $pop274, $pop701, $pop273
-	tee_local	$push699=, $0=, $pop700
-	i32.const	$push698=, src
-	i32.const	$push697=, 71
-	i32.call	$push275=, memcmp@FUNCTION, $pop699, $pop698, $pop697
-	br_if   	0, $pop275      # 0: down to label2
+	i32.const	$push439=, dst
+	i32.const	$push1196=, src
+	i32.const	$push438=, 71
+	i32.call	$push1195=, memcpy@FUNCTION, $pop439, $pop1196, $pop438
+	tee_local	$push1194=, $0=, $pop1195
+	i32.const	$push1193=, src
+	i32.const	$push1192=, 71
+	i32.call	$push440=, memcmp@FUNCTION, $pop1194, $pop1193, $pop1192
+	br_if   	0, $pop440      # 0: down to label2
 # BB#70:                                # %check.exit289
-	i32.const	$push704=, src
-	i32.const	$push276=, 72
-	i32.call	$push19=, memcpy@FUNCTION, $0, $pop704, $pop276
-	i32.const	$push703=, src
-	i32.const	$push702=, 72
-	i32.call	$push277=, memcmp@FUNCTION, $pop19, $pop703, $pop702
-	br_if   	0, $pop277      # 0: down to label2
+	i32.const	$push1199=, src
+	i32.const	$push441=, 72
+	i32.call	$push3=, memcpy@FUNCTION, $0, $pop1199, $pop441
+	i32.const	$push1198=, src
+	i32.const	$push1197=, 72
+	i32.call	$push442=, memcmp@FUNCTION, $pop3, $pop1198, $pop1197
+	br_if   	0, $pop442      # 0: down to label2
 # BB#71:                                # %check.exit293
-	i32.const	$push279=, dst
-	i32.const	$push709=, src
-	i32.const	$push278=, 73
-	i32.call	$push708=, memcpy@FUNCTION, $pop279, $pop709, $pop278
-	tee_local	$push707=, $0=, $pop708
-	i32.const	$push706=, src
-	i32.const	$push705=, 73
-	i32.call	$push280=, memcmp@FUNCTION, $pop707, $pop706, $pop705
-	br_if   	0, $pop280      # 0: down to label2
+	i32.const	$push444=, dst
+	i32.const	$push1204=, src
+	i32.const	$push443=, 73
+	i32.call	$push1203=, memcpy@FUNCTION, $pop444, $pop1204, $pop443
+	tee_local	$push1202=, $0=, $pop1203
+	i32.const	$push1201=, src
+	i32.const	$push1200=, 73
+	i32.call	$push445=, memcmp@FUNCTION, $pop1202, $pop1201, $pop1200
+	br_if   	0, $pop445      # 0: down to label2
 # BB#72:                                # %check.exit297
-	i32.const	$push712=, src
-	i32.const	$push281=, 74
-	i32.call	$push20=, memcpy@FUNCTION, $0, $pop712, $pop281
-	i32.const	$push711=, src
-	i32.const	$push710=, 74
-	i32.call	$push282=, memcmp@FUNCTION, $pop20, $pop711, $pop710
-	br_if   	0, $pop282      # 0: down to label2
+	i32.const	$push1207=, src
+	i32.const	$push446=, 74
+	i32.call	$push4=, memcpy@FUNCTION, $0, $pop1207, $pop446
+	i32.const	$push1206=, src
+	i32.const	$push1205=, 74
+	i32.call	$push447=, memcmp@FUNCTION, $pop4, $pop1206, $pop1205
+	br_if   	0, $pop447      # 0: down to label2
 # BB#73:                                # %check.exit301
-	i32.const	$push284=, dst
-	i32.const	$push717=, src
-	i32.const	$push283=, 75
-	i32.call	$push716=, memcpy@FUNCTION, $pop284, $pop717, $pop283
-	tee_local	$push715=, $0=, $pop716
-	i32.const	$push714=, src
-	i32.const	$push713=, 75
-	i32.call	$push285=, memcmp@FUNCTION, $pop715, $pop714, $pop713
-	br_if   	0, $pop285      # 0: down to label2
+	i32.const	$push449=, dst
+	i32.const	$push1212=, src
+	i32.const	$push448=, 75
+	i32.call	$push1211=, memcpy@FUNCTION, $pop449, $pop1212, $pop448
+	tee_local	$push1210=, $0=, $pop1211
+	i32.const	$push1209=, src
+	i32.const	$push1208=, 75
+	i32.call	$push450=, memcmp@FUNCTION, $pop1210, $pop1209, $pop1208
+	br_if   	0, $pop450      # 0: down to label2
 # BB#74:                                # %check.exit305
-	i32.const	$push720=, src
-	i32.const	$push286=, 76
-	i32.call	$push21=, memcpy@FUNCTION, $0, $pop720, $pop286
-	i32.const	$push719=, src
-	i32.const	$push718=, 76
-	i32.call	$push287=, memcmp@FUNCTION, $pop21, $pop719, $pop718
-	br_if   	0, $pop287      # 0: down to label2
+	i32.const	$push1215=, src
+	i32.const	$push451=, 76
+	i32.call	$push5=, memcpy@FUNCTION, $0, $pop1215, $pop451
+	i32.const	$push1214=, src
+	i32.const	$push1213=, 76
+	i32.call	$push452=, memcmp@FUNCTION, $pop5, $pop1214, $pop1213
+	br_if   	0, $pop452      # 0: down to label2
 # BB#75:                                # %check.exit309
-	i32.const	$push289=, dst
-	i32.const	$push725=, src
-	i32.const	$push288=, 77
-	i32.call	$push724=, memcpy@FUNCTION, $pop289, $pop725, $pop288
-	tee_local	$push723=, $0=, $pop724
-	i32.const	$push722=, src
-	i32.const	$push721=, 77
-	i32.call	$push290=, memcmp@FUNCTION, $pop723, $pop722, $pop721
-	br_if   	0, $pop290      # 0: down to label2
+	i32.const	$push454=, dst
+	i32.const	$push1220=, src
+	i32.const	$push453=, 77
+	i32.call	$push1219=, memcpy@FUNCTION, $pop454, $pop1220, $pop453
+	tee_local	$push1218=, $0=, $pop1219
+	i32.const	$push1217=, src
+	i32.const	$push1216=, 77
+	i32.call	$push455=, memcmp@FUNCTION, $pop1218, $pop1217, $pop1216
+	br_if   	0, $pop455      # 0: down to label2
 # BB#76:                                # %check.exit313
-	i32.const	$push728=, src
-	i32.const	$push291=, 78
-	i32.call	$push22=, memcpy@FUNCTION, $0, $pop728, $pop291
-	i32.const	$push727=, src
-	i32.const	$push726=, 78
-	i32.call	$push292=, memcmp@FUNCTION, $pop22, $pop727, $pop726
-	br_if   	0, $pop292      # 0: down to label2
+	i32.const	$push1223=, src
+	i32.const	$push456=, 78
+	i32.call	$push6=, memcpy@FUNCTION, $0, $pop1223, $pop456
+	i32.const	$push1222=, src
+	i32.const	$push1221=, 78
+	i32.call	$push457=, memcmp@FUNCTION, $pop6, $pop1222, $pop1221
+	br_if   	0, $pop457      # 0: down to label2
 # BB#77:                                # %check.exit317
-	i32.const	$push295=, dst
-	i32.const	$push294=, src
-	i32.const	$push293=, 79
-	i32.call	$push23=, memcpy@FUNCTION, $pop295, $pop294, $pop293
-	i32.const	$push730=, src
-	i32.const	$push729=, 79
-	i32.call	$push296=, memcmp@FUNCTION, $pop23, $pop730, $pop729
-	br_if   	0, $pop296      # 0: down to label2
+	i32.const	$push460=, dst
+	i32.const	$push459=, src
+	i32.const	$push458=, 79
+	i32.call	$push7=, memcpy@FUNCTION, $pop460, $pop459, $pop458
+	i32.const	$push1225=, src
+	i32.const	$push1224=, 79
+	i32.call	$push461=, memcmp@FUNCTION, $pop7, $pop1225, $pop1224
+	br_if   	0, $pop461      # 0: down to label2
 # BB#78:                                # %check.exit321
-	i32.const	$push297=, 0
-	return  	$pop297
-.LBB1_79:                               # %if.then.i320
+	i32.const	$push462=, 0
+	return  	$pop462
+.LBB1_79:                               # %if.then.i12
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	src                     # @src
 	.type	src,@object
 	.section	.bss.src,"aw",@nobits
@@ -1039,6 +1731,6 @@ dst:
 	.size	dst, 80
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/memset-1.c.s b/test/torture-s/memset-1.c.s
index 394addc20..a992f7eb7 100644
--- a/test/torture-s/memset-1.c.s
+++ b/test/torture-s/memset-1.c.s
@@ -1,15 +1,15 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memset-1.c"
+	.file	"memset-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$1=, 0
-.LBB0_1:                                # %for.cond1.preheader
+.LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
                                         #       Child Loop BB0_4 Depth 3
@@ -23,7 +23,7 @@ main:                                   # @main
 	i32.const	$push96=, u
 	i32.add 	$2=, $1, $pop96
 	i32.const	$3=, 1
-.LBB0_2:                                # %for.cond4.preheader
+.LBB0_2:                                # %for.body3
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB0_4 Depth 3
@@ -33,405 +33,405 @@ main:                                   # @main
                                         #       Child Loop BB0_37 Depth 3
                                         #       Child Loop BB0_42 Depth 3
 	loop    	                # label2:
-	i32.const	$5=, u
-	i32.const	$push103=, u
-	i32.const	$push102=, 97
-	i32.const	$push101=, 96
-	i32.call	$drop=, memset@FUNCTION, $pop103, $pop102, $pop101
-	i32.const	$push100=, 0
-	i32.call	$0=, memset@FUNCTION, $2, $pop100, $3
+	i32.const	$4=, u
+	i32.const	$push100=, u
+	i32.const	$push99=, 97
+	i32.const	$push98=, 96
+	i32.call	$drop=, memset@FUNCTION, $pop100, $pop99, $pop98
+	i32.const	$push97=, 0
+	i32.call	$0=, memset@FUNCTION, $2, $pop97, $3
 	block   	
-	i32.const	$push99=, 1
-	i32.lt_s	$push98=, $1, $pop99
-	tee_local	$push97=, $4=, $pop98
-	br_if   	0, $pop97       # 0: down to label3
+	i32.eqz 	$push191=, $1
+	br_if   	0, $pop191      # 0: down to label3
 # BB#3:                                 # %for.body11.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_4:                                # %for.body11
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label4:
-	i32.const	$push105=, u
-	i32.add 	$push0=, $6, $pop105
+	i32.const	$push102=, u
+	i32.add 	$push0=, $5, $pop102
 	i32.load8_u	$push1=, 0($pop0)
-	i32.const	$push104=, 97
-	i32.ne  	$push2=, $pop1, $pop104
+	i32.const	$push101=, 97
+	i32.ne  	$push2=, $pop1, $pop101
 	br_if   	4, $pop2        # 4: down to label0
 # BB#5:                                 # %for.inc16
                                         #   in Loop: Header=BB0_4 Depth=3
-	i32.const	$push108=, 1
-	i32.add 	$push107=, $6, $pop108
-	tee_local	$push106=, $6=, $pop107
-	i32.lt_s	$push3=, $pop106, $1
+	i32.const	$push105=, 1
+	i32.add 	$push104=, $5, $pop105
+	tee_local	$push103=, $5=, $pop104
+	i32.lt_u	$push3=, $pop103, $1
 	br_if   	0, $pop3        # 0: up to label4
 # BB#6:                                 # %for.body22.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push109=, u
-	i32.add 	$5=, $6, $pop109
+	i32.const	$push106=, u
+	i32.add 	$4=, $5, $pop106
 .LBB0_7:                                # %for.body22.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label3:
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_8:                                # %for.body22
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label5:
-	i32.add 	$push4=, $5, $6
+	i32.add 	$push4=, $4, $5
 	i32.load8_u	$push5=, 0($pop4)
 	br_if   	3, $pop5        # 3: down to label0
 # BB#9:                                 # %for.inc28
                                         #   in Loop: Header=BB0_8 Depth=3
-	i32.const	$push112=, 1
-	i32.add 	$push111=, $6, $pop112
-	tee_local	$push110=, $6=, $pop111
-	i32.lt_s	$push6=, $pop110, $3
+	i32.const	$push109=, 1
+	i32.add 	$push108=, $5, $pop109
+	tee_local	$push107=, $5=, $pop108
+	i32.lt_u	$push6=, $pop107, $3
 	br_if   	0, $pop6        # 0: up to label5
-# BB#10:                                # %for.body35.preheader
+# BB#10:                                # %for.end31
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.add 	$push115=, $5, $6
-	tee_local	$push114=, $6=, $pop115
-	i32.load8_u	$push7=, 0($pop114)
-	i32.const	$push113=, 97
-	i32.ne  	$push8=, $pop7, $pop113
+	i32.add 	$push112=, $4, $5
+	tee_local	$push111=, $5=, $pop112
+	i32.load8_u	$push7=, 0($pop111)
+	i32.const	$push110=, 97
+	i32.ne  	$push8=, $pop7, $pop110
 	br_if   	2, $pop8        # 2: down to label0
 # BB#11:                                # %for.inc41
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push117=, 1
-	i32.add 	$push9=, $6, $pop117
+	i32.const	$push114=, 1
+	i32.add 	$push9=, $5, $pop114
 	i32.load8_u	$push10=, 0($pop9)
-	i32.const	$push116=, 97
-	i32.ne  	$push11=, $pop10, $pop116
+	i32.const	$push113=, 97
+	i32.ne  	$push11=, $pop10, $pop113
 	br_if   	2, $pop11       # 2: down to label0
 # BB#12:                                # %for.inc41.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push119=, 2
-	i32.add 	$push12=, $6, $pop119
+	i32.const	$push116=, 2
+	i32.add 	$push12=, $5, $pop116
 	i32.load8_u	$push13=, 0($pop12)
-	i32.const	$push118=, 97
-	i32.ne  	$push14=, $pop13, $pop118
+	i32.const	$push115=, 97
+	i32.ne  	$push14=, $pop13, $pop115
 	br_if   	2, $pop14       # 2: down to label0
 # BB#13:                                # %for.inc41.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push121=, 3
-	i32.add 	$push15=, $6, $pop121
+	i32.const	$push118=, 3
+	i32.add 	$push15=, $5, $pop118
 	i32.load8_u	$push16=, 0($pop15)
-	i32.const	$push120=, 97
-	i32.ne  	$push17=, $pop16, $pop120
+	i32.const	$push117=, 97
+	i32.ne  	$push17=, $pop16, $pop117
 	br_if   	2, $pop17       # 2: down to label0
 # BB#14:                                # %for.inc41.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push123=, 4
-	i32.add 	$push18=, $6, $pop123
+	i32.const	$push120=, 4
+	i32.add 	$push18=, $5, $pop120
 	i32.load8_u	$push19=, 0($pop18)
-	i32.const	$push122=, 97
-	i32.ne  	$push20=, $pop19, $pop122
+	i32.const	$push119=, 97
+	i32.ne  	$push20=, $pop19, $pop119
 	br_if   	2, $pop20       # 2: down to label0
 # BB#15:                                # %for.inc41.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push125=, 5
-	i32.add 	$push21=, $6, $pop125
+	i32.const	$push122=, 5
+	i32.add 	$push21=, $5, $pop122
 	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push124=, 97
-	i32.ne  	$push23=, $pop22, $pop124
+	i32.const	$push121=, 97
+	i32.ne  	$push23=, $pop22, $pop121
 	br_if   	2, $pop23       # 2: down to label0
 # BB#16:                                # %for.inc41.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push127=, 6
-	i32.add 	$push24=, $6, $pop127
+	i32.const	$push124=, 6
+	i32.add 	$push24=, $5, $pop124
 	i32.load8_u	$push25=, 0($pop24)
-	i32.const	$push126=, 97
-	i32.ne  	$push26=, $pop25, $pop126
+	i32.const	$push123=, 97
+	i32.ne  	$push26=, $pop25, $pop123
 	br_if   	2, $pop26       # 2: down to label0
 # BB#17:                                # %for.inc41.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push129=, 7
-	i32.add 	$push27=, $6, $pop129
+	i32.const	$push126=, 7
+	i32.add 	$push27=, $5, $pop126
 	i32.load8_u	$push28=, 0($pop27)
-	i32.const	$push128=, 97
-	i32.ne  	$push29=, $pop28, $pop128
+	i32.const	$push125=, 97
+	i32.ne  	$push29=, $pop28, $pop125
 	br_if   	2, $pop29       # 2: down to label0
 # BB#18:                                # %for.inc41.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push130=, 0
-	i32.load8_u	$push30=, A($pop130)
+	i32.const	$push127=, 0
+	i32.load8_u	$push30=, A($pop127)
 	i32.call	$drop=, memset@FUNCTION, $0, $pop30, $3
 	block   	
 	block   	
-	br_if   	0, $4           # 0: down to label7
+	i32.eqz 	$push192=, $1
+	br_if   	0, $pop192      # 0: down to label7
 # BB#19:                                # %for.body55.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_20:                               # %for.body55
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label8:
-	i32.const	$push132=, u
-	i32.add 	$push31=, $6, $pop132
+	i32.const	$push129=, u
+	i32.add 	$push31=, $5, $pop129
 	i32.load8_u	$push32=, 0($pop31)
-	i32.const	$push131=, 97
-	i32.ne  	$push33=, $pop32, $pop131
+	i32.const	$push128=, 97
+	i32.ne  	$push33=, $pop32, $pop128
 	br_if   	5, $pop33       # 5: down to label0
 # BB#21:                                # %for.inc61
                                         #   in Loop: Header=BB0_20 Depth=3
-	i32.const	$push135=, 1
-	i32.add 	$push134=, $6, $pop135
-	tee_local	$push133=, $6=, $pop134
-	i32.lt_s	$push34=, $pop133, $1
+	i32.const	$push132=, 1
+	i32.add 	$push131=, $5, $pop132
+	tee_local	$push130=, $5=, $pop131
+	i32.lt_u	$push34=, $pop130, $1
 	br_if   	0, $pop34       # 0: up to label8
 # BB#22:                                # %for.body68.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push136=, u
-	i32.add 	$5=, $6, $pop136
+	i32.const	$push133=, u
+	i32.add 	$4=, $5, $pop133
 	br      	1               # 1: down to label6
 .LBB0_23:                               #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label7:
-	i32.const	$5=, u
+	i32.const	$4=, u
 .LBB0_24:                               # %for.body68.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label6:
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_25:                               # %for.body68
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label9:
-	i32.add 	$push35=, $5, $6
+	i32.add 	$push35=, $4, $5
 	i32.load8_u	$push36=, 0($pop35)
-	i32.const	$push137=, 65
-	i32.ne  	$push37=, $pop36, $pop137
+	i32.const	$push134=, 65
+	i32.ne  	$push37=, $pop36, $pop134
 	br_if   	3, $pop37       # 3: down to label0
 # BB#26:                                # %for.inc74
                                         #   in Loop: Header=BB0_25 Depth=3
-	i32.const	$push140=, 1
-	i32.add 	$push139=, $6, $pop140
-	tee_local	$push138=, $6=, $pop139
-	i32.lt_s	$push38=, $pop138, $3
+	i32.const	$push137=, 1
+	i32.add 	$push136=, $5, $pop137
+	tee_local	$push135=, $5=, $pop136
+	i32.lt_u	$push38=, $pop135, $3
 	br_if   	0, $pop38       # 0: up to label9
-# BB#27:                                # %for.body81.preheader
+# BB#27:                                # %for.end77
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.add 	$push143=, $5, $6
-	tee_local	$push142=, $6=, $pop143
-	i32.load8_u	$push39=, 0($pop142)
-	i32.const	$push141=, 97
-	i32.ne  	$push40=, $pop39, $pop141
+	i32.add 	$push140=, $4, $5
+	tee_local	$push139=, $5=, $pop140
+	i32.load8_u	$push39=, 0($pop139)
+	i32.const	$push138=, 97
+	i32.ne  	$push40=, $pop39, $pop138
 	br_if   	2, $pop40       # 2: down to label0
 # BB#28:                                # %for.inc87
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push145=, 1
-	i32.add 	$push41=, $6, $pop145
+	i32.const	$push142=, 1
+	i32.add 	$push41=, $5, $pop142
 	i32.load8_u	$push42=, 0($pop41)
-	i32.const	$push144=, 97
-	i32.ne  	$push43=, $pop42, $pop144
+	i32.const	$push141=, 97
+	i32.ne  	$push43=, $pop42, $pop141
 	br_if   	2, $pop43       # 2: down to label0
 # BB#29:                                # %for.inc87.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push147=, 2
-	i32.add 	$push44=, $6, $pop147
+	i32.const	$push144=, 2
+	i32.add 	$push44=, $5, $pop144
 	i32.load8_u	$push45=, 0($pop44)
-	i32.const	$push146=, 97
-	i32.ne  	$push46=, $pop45, $pop146
+	i32.const	$push143=, 97
+	i32.ne  	$push46=, $pop45, $pop143
 	br_if   	2, $pop46       # 2: down to label0
 # BB#30:                                # %for.inc87.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push149=, 3
-	i32.add 	$push47=, $6, $pop149
+	i32.const	$push146=, 3
+	i32.add 	$push47=, $5, $pop146
 	i32.load8_u	$push48=, 0($pop47)
-	i32.const	$push148=, 97
-	i32.ne  	$push49=, $pop48, $pop148
+	i32.const	$push145=, 97
+	i32.ne  	$push49=, $pop48, $pop145
 	br_if   	2, $pop49       # 2: down to label0
 # BB#31:                                # %for.inc87.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push151=, 4
-	i32.add 	$push50=, $6, $pop151
+	i32.const	$push148=, 4
+	i32.add 	$push50=, $5, $pop148
 	i32.load8_u	$push51=, 0($pop50)
-	i32.const	$push150=, 97
-	i32.ne  	$push52=, $pop51, $pop150
+	i32.const	$push147=, 97
+	i32.ne  	$push52=, $pop51, $pop147
 	br_if   	2, $pop52       # 2: down to label0
 # BB#32:                                # %for.inc87.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push153=, 5
-	i32.add 	$push53=, $6, $pop153
+	i32.const	$push150=, 5
+	i32.add 	$push53=, $5, $pop150
 	i32.load8_u	$push54=, 0($pop53)
-	i32.const	$push152=, 97
-	i32.ne  	$push55=, $pop54, $pop152
+	i32.const	$push149=, 97
+	i32.ne  	$push55=, $pop54, $pop149
 	br_if   	2, $pop55       # 2: down to label0
 # BB#33:                                # %for.inc87.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push155=, 6
-	i32.add 	$push56=, $6, $pop155
+	i32.const	$push152=, 6
+	i32.add 	$push56=, $5, $pop152
 	i32.load8_u	$push57=, 0($pop56)
-	i32.const	$push154=, 97
-	i32.ne  	$push58=, $pop57, $pop154
+	i32.const	$push151=, 97
+	i32.ne  	$push58=, $pop57, $pop151
 	br_if   	2, $pop58       # 2: down to label0
 # BB#34:                                # %for.inc87.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push157=, 7
-	i32.add 	$push59=, $6, $pop157
+	i32.const	$push154=, 7
+	i32.add 	$push59=, $5, $pop154
 	i32.load8_u	$push60=, 0($pop59)
-	i32.const	$push156=, 97
-	i32.ne  	$push61=, $pop60, $pop156
+	i32.const	$push153=, 97
+	i32.ne  	$push61=, $pop60, $pop153
 	br_if   	2, $pop61       # 2: down to label0
 # BB#35:                                # %for.inc87.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push158=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop158, $3
+	i32.const	$push155=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop155, $3
 	block   	
 	block   	
-	br_if   	0, $4           # 0: down to label11
+	i32.eqz 	$push193=, $1
+	br_if   	0, $pop193      # 0: down to label11
 # BB#36:                                # %for.body100.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_37:                               # %for.body100
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label12:
-	i32.const	$push160=, u
-	i32.add 	$push62=, $6, $pop160
+	i32.const	$push157=, u
+	i32.add 	$push62=, $5, $pop157
 	i32.load8_u	$push63=, 0($pop62)
-	i32.const	$push159=, 97
-	i32.ne  	$push64=, $pop63, $pop159
+	i32.const	$push156=, 97
+	i32.ne  	$push64=, $pop63, $pop156
 	br_if   	5, $pop64       # 5: down to label0
 # BB#38:                                # %for.inc106
                                         #   in Loop: Header=BB0_37 Depth=3
-	i32.const	$push163=, 1
-	i32.add 	$push162=, $6, $pop163
-	tee_local	$push161=, $6=, $pop162
-	i32.lt_s	$push65=, $pop161, $1
+	i32.const	$push160=, 1
+	i32.add 	$push159=, $5, $pop160
+	tee_local	$push158=, $5=, $pop159
+	i32.lt_u	$push65=, $pop158, $1
 	br_if   	0, $pop65       # 0: up to label12
 # BB#39:                                # %for.body113.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push164=, u
-	i32.add 	$5=, $6, $pop164
+	i32.const	$push161=, u
+	i32.add 	$4=, $5, $pop161
 	br      	1               # 1: down to label10
 .LBB0_40:                               #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label11:
-	i32.const	$5=, u
+	i32.const	$4=, u
 .LBB0_41:                               # %for.body113.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label10:
-	i32.const	$6=, 0
+	i32.const	$5=, 0
 .LBB0_42:                               # %for.body113
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label13:
-	i32.add 	$push66=, $5, $6
+	i32.add 	$push66=, $4, $5
 	i32.load8_u	$push67=, 0($pop66)
-	i32.const	$push165=, 66
-	i32.ne  	$push68=, $pop67, $pop165
+	i32.const	$push162=, 66
+	i32.ne  	$push68=, $pop67, $pop162
 	br_if   	3, $pop68       # 3: down to label0
 # BB#43:                                # %for.inc119
                                         #   in Loop: Header=BB0_42 Depth=3
-	i32.const	$push168=, 1
-	i32.add 	$push167=, $6, $pop168
-	tee_local	$push166=, $6=, $pop167
-	i32.lt_s	$push69=, $pop166, $3
+	i32.const	$push165=, 1
+	i32.add 	$push164=, $5, $pop165
+	tee_local	$push163=, $5=, $pop164
+	i32.lt_u	$push69=, $pop163, $3
 	br_if   	0, $pop69       # 0: up to label13
-# BB#44:                                # %for.body126.preheader
+# BB#44:                                # %for.end122
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.add 	$push171=, $5, $6
-	tee_local	$push170=, $6=, $pop171
-	i32.load8_u	$push70=, 0($pop170)
-	i32.const	$push169=, 97
-	i32.ne  	$push71=, $pop70, $pop169
+	i32.add 	$push168=, $4, $5
+	tee_local	$push167=, $5=, $pop168
+	i32.load8_u	$push70=, 0($pop167)
+	i32.const	$push166=, 97
+	i32.ne  	$push71=, $pop70, $pop166
 	br_if   	2, $pop71       # 2: down to label0
 # BB#45:                                # %for.inc132
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push173=, 1
-	i32.add 	$push72=, $6, $pop173
+	i32.const	$push170=, 1
+	i32.add 	$push72=, $5, $pop170
 	i32.load8_u	$push73=, 0($pop72)
-	i32.const	$push172=, 97
-	i32.ne  	$push74=, $pop73, $pop172
+	i32.const	$push169=, 97
+	i32.ne  	$push74=, $pop73, $pop169
 	br_if   	2, $pop74       # 2: down to label0
 # BB#46:                                # %for.inc132.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push175=, 2
-	i32.add 	$push75=, $6, $pop175
+	i32.const	$push172=, 2
+	i32.add 	$push75=, $5, $pop172
 	i32.load8_u	$push76=, 0($pop75)
-	i32.const	$push174=, 97
-	i32.ne  	$push77=, $pop76, $pop174
+	i32.const	$push171=, 97
+	i32.ne  	$push77=, $pop76, $pop171
 	br_if   	2, $pop77       # 2: down to label0
 # BB#47:                                # %for.inc132.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push177=, 3
-	i32.add 	$push78=, $6, $pop177
+	i32.const	$push174=, 3
+	i32.add 	$push78=, $5, $pop174
 	i32.load8_u	$push79=, 0($pop78)
-	i32.const	$push176=, 97
-	i32.ne  	$push80=, $pop79, $pop176
+	i32.const	$push173=, 97
+	i32.ne  	$push80=, $pop79, $pop173
 	br_if   	2, $pop80       # 2: down to label0
 # BB#48:                                # %for.inc132.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push179=, 4
-	i32.add 	$push81=, $6, $pop179
+	i32.const	$push176=, 4
+	i32.add 	$push81=, $5, $pop176
 	i32.load8_u	$push82=, 0($pop81)
-	i32.const	$push178=, 97
-	i32.ne  	$push83=, $pop82, $pop178
+	i32.const	$push175=, 97
+	i32.ne  	$push83=, $pop82, $pop175
 	br_if   	2, $pop83       # 2: down to label0
 # BB#49:                                # %for.inc132.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push181=, 5
-	i32.add 	$push84=, $6, $pop181
+	i32.const	$push178=, 5
+	i32.add 	$push84=, $5, $pop178
 	i32.load8_u	$push85=, 0($pop84)
-	i32.const	$push180=, 97
-	i32.ne  	$push86=, $pop85, $pop180
+	i32.const	$push177=, 97
+	i32.ne  	$push86=, $pop85, $pop177
 	br_if   	2, $pop86       # 2: down to label0
 # BB#50:                                # %for.inc132.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push183=, 6
-	i32.add 	$push87=, $6, $pop183
+	i32.const	$push180=, 6
+	i32.add 	$push87=, $5, $pop180
 	i32.load8_u	$push88=, 0($pop87)
-	i32.const	$push182=, 97
-	i32.ne  	$push89=, $pop88, $pop182
+	i32.const	$push179=, 97
+	i32.ne  	$push89=, $pop88, $pop179
 	br_if   	2, $pop89       # 2: down to label0
 # BB#51:                                # %for.inc132.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push185=, 7
-	i32.add 	$push90=, $6, $pop185
+	i32.const	$push182=, 7
+	i32.add 	$push90=, $5, $pop182
 	i32.load8_u	$push91=, 0($pop90)
-	i32.const	$push184=, 97
-	i32.ne  	$push92=, $pop91, $pop184
+	i32.const	$push181=, 97
+	i32.ne  	$push92=, $pop91, $pop181
 	br_if   	2, $pop92       # 2: down to label0
 # BB#52:                                # %for.inc132.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push189=, 1
-	i32.add 	$push188=, $3, $pop189
-	tee_local	$push187=, $3=, $pop188
-	i32.const	$push186=, 80
-	i32.lt_u	$push93=, $pop187, $pop186
+	i32.const	$push186=, 1
+	i32.add 	$push185=, $3, $pop186
+	tee_local	$push184=, $3=, $pop185
+	i32.const	$push183=, 80
+	i32.lt_u	$push93=, $pop184, $pop183
 	br_if   	0, $pop93       # 0: up to label2
 # BB#53:                                # %for.inc139
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push193=, 1
-	i32.add 	$push192=, $1, $pop193
-	tee_local	$push191=, $1=, $pop192
-	i32.const	$push190=, 8
-	i32.lt_u	$push94=, $pop191, $pop190
+	i32.const	$push190=, 1
+	i32.add 	$push189=, $1, $pop190
+	tee_local	$push188=, $1=, $pop189
+	i32.const	$push187=, 8
+	i32.lt_u	$push94=, $pop188, $pop187
 	br_if   	0, $pop94       # 0: up to label1
 # BB#54:                                # %for.end141
 	end_loop
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
 	unreachable
-.LBB0_55:                               # %if.then130
+.LBB0_55:                               # %if.then14
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	A                       # @A
 	.type	A,@object
 	.section	.data.A,"aw",@progbits
@@ -448,6 +448,6 @@ u:
 	.size	u, 96
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/memset-2.c.s b/test/torture-s/memset-2.c.s
index e7cdd0a56..0814883c2 100644
--- a/test/torture-s/memset-2.c.s
+++ b/test/torture-s/memset-2.c.s
@@ -1,22 +1,30 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memset-2.c"
+	.file	"memset-2.c"
 	.section	.text.reset,"ax",@progbits
-	.hidden	reset
+	.hidden	reset                   # -- Begin function reset
 	.globl	reset
 	.type	reset,@function
 reset:                                  # @reset
 # BB#0:                                 # %entry
-	i32.const	$push2=, u
-	i32.const	$push1=, 97
-	i32.const	$push0=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop2, $pop1, $pop0
+	i32.const	$push1=, 0
+	i64.const	$push0=, 7016996765293437281
+	i64.store	u+23($pop1):p2align=0, $pop0
+	i32.const	$push7=, 0
+	i64.const	$push6=, 7016996765293437281
+	i64.store	u+16($pop7), $pop6
+	i32.const	$push5=, 0
+	i64.const	$push4=, 7016996765293437281
+	i64.store	u+8($pop5), $pop4
+	i32.const	$push3=, 0
+	i64.const	$push2=, 7016996765293437281
+	i64.store	u($pop3), $pop2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	reset, .Lfunc_end0-reset
-
+                                        # -- End function
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -48,20 +56,20 @@ check:                                  # @check
 	tee_local	$push31=, $3=, $pop32
 	i32.lt_s	$push4=, $pop31, $0
 	br_if   	0, $pop4        # 0: up to label4
-# BB#4:                                 # %for.cond3.preheader.loopexit
+# BB#4:                                 # %for.end.loopexit
 	end_loop
 	i32.const	$push5=, u
 	i32.add 	$0=, $3, $pop5
 	i32.const	$push34=, 1
-	i32.ge_s	$push6=, $1, $pop34
-	br_if   	1, $pop6        # 1: down to label2
+	i32.ge_s	$push7=, $1, $pop34
+	br_if   	1, $pop7        # 1: down to label2
 	br      	2               # 2: down to label1
 .LBB1_5:
 	end_block                       # label3:
 	i32.const	$0=, u
 	i32.const	$push35=, 1
-	i32.lt_s	$push7=, $1, $pop35
-	br_if   	1, $pop7        # 1: down to label1
+	i32.lt_s	$push6=, $1, $pop35
+	br_if   	1, $pop6        # 1: down to label1
 .LBB1_6:                                # %for.body6.preheader
 	end_block                       # label2:
 	i32.const	$3=, 0
@@ -79,10 +87,10 @@ check:                                  # @check
 	tee_local	$push36=, $3=, $pop37
 	i32.lt_s	$push11=, $pop36, $1
 	br_if   	0, $pop11       # 0: up to label5
-# BB#9:                                 # %for.body19.preheader.loopexit
+# BB#9:                                 # %for.end15.loopexit
 	end_loop
 	i32.add 	$0=, $0, $3
-.LBB1_10:                               # %for.body19.preheader
+.LBB1_10:                               # %for.end15
 	end_block                       # label1:
 	i32.load8_u	$push12=, 0($0)
 	i32.const	$push39=, 97
@@ -125,772 +133,833 @@ check:                                  # @check
 	br_if   	0, $pop27       # 0: down to label0
 # BB#18:                                # %for.inc25.7
 	return
-.LBB1_19:                               # %if.then23
+.LBB1_19:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	check, .Lfunc_end1-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$5=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
+	i32.const	$push67=, 0
+	i64.const	$push66=, 7016996765293437281
+	i64.store	u+23($pop67):p2align=0, $pop66
+	i32.const	$push65=, 0
+	i64.const	$push64=, 7016996765293437281
+	i64.store	u+16($pop65), $pop64
+	i32.const	$push63=, 0
+	i64.const	$push62=, 7016996765293437281
+	i64.store	u+8($pop63), $pop62
+	i32.const	$push61=, 0
+	i64.const	$push60=, 7016996765293437281
+	i64.store	u($pop61), $pop60
 	i32.const	$push59=, u
-	i32.const	$push58=, 97
-	i32.const	$push57=, 31
-	i32.call	$push0=, memset@FUNCTION, $pop59, $pop58, $pop57
-	i32.add 	$push56=, $5, $pop0
-	tee_local	$push55=, $0=, $pop56
+	i32.add 	$push58=, $5, $pop59
+	tee_local	$push57=, $2=, $pop58
+	i32.const	$push56=, 0
+	i32.store8	0($pop57), $pop56
+	i32.const	$push55=, 1
 	i32.const	$push54=, 0
-	i32.store8	0($pop55), $pop54
-	i32.const	$push53=, 1
-	i32.const	$push52=, 0
-	call    	check@FUNCTION, $5, $pop53, $pop52
-	i32.const	$push51=, 0
-	i32.load8_u	$push4=, A($pop51)
-	i32.store8	0($0), $pop4
-	i32.const	$push50=, 1
-	i32.const	$push49=, 65
-	call    	check@FUNCTION, $5, $pop50, $pop49
+	call    	check@FUNCTION, $5, $pop55, $pop54
+	i32.const	$push53=, 0
+	i32.load8_u	$push0=, A($pop53)
+	i32.store8	0($2), $pop0
+	i32.const	$push52=, 1
+	i32.const	$push51=, 65
+	call    	check@FUNCTION, $5, $pop52, $pop51
+	i32.const	$push50=, 66
+	i32.store8	0($2), $pop50
+	i32.const	$push49=, 1
 	i32.const	$push48=, 66
-	i32.store8	0($0), $pop48
+	call    	check@FUNCTION, $5, $pop49, $pop48
 	i32.const	$push47=, 1
-	i32.const	$push46=, 66
-	call    	check@FUNCTION, $5, $pop47, $pop46
-	i32.const	$push45=, 1
-	i32.add 	$push44=, $5, $pop45
-	tee_local	$push43=, $5=, $pop44
-	i32.const	$push42=, 8
-	i32.ne  	$push5=, $pop43, $pop42
-	br_if   	0, $pop5        # 0: up to label6
+	i32.add 	$push46=, $5, $pop47
+	tee_local	$push45=, $5=, $pop46
+	i32.const	$push44=, 8
+	i32.ne  	$push1=, $pop45, $pop44
+	br_if   	0, $pop1        # 0: up to label6
 # BB#2:                                 # %for.body18.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_3:                                # %for.body18
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.const	$push78=, u
-	i32.const	$push77=, 97
-	i32.const	$push76=, 31
-	i32.call	$push1=, memset@FUNCTION, $pop78, $pop77, $pop76
-	i32.add 	$push75=, $5, $pop1
-	tee_local	$push74=, $0=, $pop75
-	i32.const	$push73=, 0
-	i32.store16	0($pop74):p2align=0, $pop73
-	i32.const	$push72=, 2
-	i32.const	$push71=, 0
-	call    	check@FUNCTION, $5, $pop72, $pop71
-	i32.const	$push70=, 0
-	i32.load8_u	$push6=, A($pop70)
-	i32.const	$push69=, 257
-	i32.mul 	$push7=, $pop6, $pop69
-	i32.store16	0($0):p2align=0, $pop7
-	i32.const	$push68=, 2
-	i32.const	$push67=, 65
-	call    	check@FUNCTION, $5, $pop68, $pop67
-	i32.const	$push66=, 16962
-	i32.store16	0($0):p2align=0, $pop66
-	i32.const	$push65=, 2
-	i32.const	$push64=, 66
-	call    	check@FUNCTION, $5, $pop65, $pop64
-	i32.const	$push63=, 1
-	i32.add 	$push62=, $5, $pop63
-	tee_local	$push61=, $5=, $pop62
-	i32.const	$push60=, 8
-	i32.ne  	$push8=, $pop61, $pop60
-	br_if   	0, $pop8        # 0: up to label7
+	i32.const	$push92=, 0
+	i64.const	$push91=, 7016996765293437281
+	i64.store	u+23($pop92):p2align=0, $pop91
+	i32.const	$push90=, 0
+	i64.const	$push89=, 7016996765293437281
+	i64.store	u+16($pop90), $pop89
+	i32.const	$push88=, 0
+	i64.const	$push87=, 7016996765293437281
+	i64.store	u+8($pop88), $pop87
+	i32.const	$push86=, 0
+	i64.const	$push85=, 7016996765293437281
+	i64.store	u($pop86), $pop85
+	i32.const	$push84=, u
+	i32.add 	$push83=, $5, $pop84
+	tee_local	$push82=, $2=, $pop83
+	i32.const	$push81=, 0
+	i32.store16	0($pop82):p2align=0, $pop81
+	i32.const	$push80=, 2
+	i32.const	$push79=, 0
+	call    	check@FUNCTION, $5, $pop80, $pop79
+	i32.const	$push78=, 0
+	i32.load8_u	$push2=, A($pop78)
+	i32.const	$push77=, 257
+	i32.mul 	$push3=, $pop2, $pop77
+	i32.store16	0($2):p2align=0, $pop3
+	i32.const	$push76=, 2
+	i32.const	$push75=, 65
+	call    	check@FUNCTION, $5, $pop76, $pop75
+	i32.const	$push74=, 16962
+	i32.store16	0($2):p2align=0, $pop74
+	i32.const	$push73=, 2
+	i32.const	$push72=, 66
+	call    	check@FUNCTION, $5, $pop73, $pop72
+	i32.const	$push71=, 1
+	i32.add 	$push70=, $5, $pop71
+	tee_local	$push69=, $5=, $pop70
+	i32.const	$push68=, 8
+	i32.ne  	$push4=, $pop69, $pop68
+	br_if   	0, $pop4        # 0: up to label7
 # BB#4:                                 # %for.body44.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_5:                                # %for.body44
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$push104=, u
-	i32.const	$push103=, 97
-	i32.const	$push102=, 31
-	i32.call	$1=, memset@FUNCTION, $pop104, $pop103, $pop102
-	i32.const	$push101=, u+2
-	i32.add 	$push100=, $5, $pop101
-	tee_local	$push99=, $0=, $pop100
-	i32.const	$push98=, 0
-	i32.store8	0($pop99), $pop98
-	i32.add 	$push97=, $5, $1
-	tee_local	$push96=, $1=, $pop97
-	i32.const	$push95=, 0
-	i32.store16	0($pop96):p2align=0, $pop95
-	i32.const	$push94=, 3
-	i32.const	$push93=, 0
-	call    	check@FUNCTION, $5, $pop94, $pop93
-	i32.const	$push92=, 0
-	i32.load8_u	$push91=, A($pop92)
-	tee_local	$push90=, $2=, $pop91
-	i32.store8	0($0), $pop90
-	i32.const	$push89=, 257
-	i32.mul 	$push9=, $2, $pop89
-	i32.store16	0($1):p2align=0, $pop9
-	i32.const	$push88=, 3
-	i32.const	$push87=, 65
-	call    	check@FUNCTION, $5, $pop88, $pop87
-	i32.const	$push86=, 66
-	i32.store8	0($0), $pop86
-	i32.const	$push85=, 16962
-	i32.store16	0($1):p2align=0, $pop85
-	i32.const	$push84=, 3
-	i32.const	$push83=, 66
-	call    	check@FUNCTION, $5, $pop84, $pop83
-	i32.const	$push82=, 1
-	i32.add 	$push81=, $5, $pop82
-	tee_local	$push80=, $5=, $pop81
-	i32.const	$push79=, 8
-	i32.ne  	$push10=, $pop80, $pop79
-	br_if   	0, $pop10       # 0: up to label8
+	i32.const	$push124=, 0
+	i64.const	$push123=, 7016996765293437281
+	i64.store	u+23($pop124):p2align=0, $pop123
+	i32.const	$push122=, 0
+	i64.const	$push121=, 7016996765293437281
+	i64.store	u+16($pop122), $pop121
+	i32.const	$push120=, 0
+	i64.const	$push119=, 7016996765293437281
+	i64.store	u+8($pop120), $pop119
+	i32.const	$push118=, 0
+	i64.const	$push117=, 7016996765293437281
+	i64.store	u($pop118), $pop117
+	i32.const	$push116=, u+2
+	i32.add 	$push115=, $5, $pop116
+	tee_local	$push114=, $2=, $pop115
+	i32.const	$push113=, 0
+	i32.store8	0($pop114), $pop113
+	i32.const	$push112=, u
+	i32.add 	$push111=, $5, $pop112
+	tee_local	$push110=, $3=, $pop111
+	i32.const	$push109=, 0
+	i32.store16	0($pop110):p2align=0, $pop109
+	i32.const	$push108=, 3
+	i32.const	$push107=, 0
+	call    	check@FUNCTION, $5, $pop108, $pop107
+	i32.const	$push106=, 0
+	i32.load8_u	$push105=, A($pop106)
+	tee_local	$push104=, $0=, $pop105
+	i32.store8	0($2), $pop104
+	i32.const	$push103=, 257
+	i32.mul 	$push5=, $0, $pop103
+	i32.store16	0($3):p2align=0, $pop5
+	i32.const	$push102=, 3
+	i32.const	$push101=, 65
+	call    	check@FUNCTION, $5, $pop102, $pop101
+	i32.const	$push100=, 66
+	i32.store8	0($2), $pop100
+	i32.const	$push99=, 16962
+	i32.store16	0($3):p2align=0, $pop99
+	i32.const	$push98=, 3
+	i32.const	$push97=, 66
+	call    	check@FUNCTION, $5, $pop98, $pop97
+	i32.const	$push96=, 1
+	i32.add 	$push95=, $5, $pop96
+	tee_local	$push94=, $5=, $pop95
+	i32.const	$push93=, 8
+	i32.ne  	$push6=, $pop94, $pop93
+	br_if   	0, $pop6        # 0: up to label8
 # BB#6:                                 # %for.body70.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_7:                                # %for.body70
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.const	$push123=, u
-	i32.const	$push122=, 97
-	i32.const	$push121=, 31
-	i32.call	$push2=, memset@FUNCTION, $pop123, $pop122, $pop121
-	i32.add 	$push120=, $5, $pop2
-	tee_local	$push119=, $0=, $pop120
-	i32.const	$push118=, 0
-	i32.store	0($pop119):p2align=0, $pop118
-	i32.const	$push117=, 4
-	i32.const	$push116=, 0
-	call    	check@FUNCTION, $5, $pop117, $pop116
-	i32.const	$push115=, 0
-	i32.load8_u	$push11=, A($pop115)
-	i32.const	$push114=, 16843009
-	i32.mul 	$push12=, $pop11, $pop114
-	i32.store	0($0):p2align=0, $pop12
-	i32.const	$push113=, 4
-	i32.const	$push112=, 65
-	call    	check@FUNCTION, $5, $pop113, $pop112
-	i32.const	$push111=, 1111638594
-	i32.store	0($0):p2align=0, $pop111
-	i32.const	$push110=, 4
-	i32.const	$push109=, 66
-	call    	check@FUNCTION, $5, $pop110, $pop109
-	i32.const	$push108=, 1
-	i32.add 	$push107=, $5, $pop108
-	tee_local	$push106=, $5=, $pop107
-	i32.const	$push105=, 8
-	i32.ne  	$push13=, $pop106, $pop105
-	br_if   	0, $pop13       # 0: up to label9
-# BB#8:                                 # %for.body96.preheader
-	end_loop
-	i32.const	$5=, 0
-.LBB2_9:                                # %for.body96
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label10:
-	i32.const	$push149=, u
-	i32.const	$push148=, 97
-	i32.const	$push147=, 31
-	i32.call	$1=, memset@FUNCTION, $pop149, $pop148, $pop147
-	i32.const	$push146=, u+4
-	i32.add 	$push145=, $5, $pop146
-	tee_local	$push144=, $0=, $pop145
+	i32.const	$push149=, 0
+	i64.const	$push148=, 7016996765293437281
+	i64.store	u+23($pop149):p2align=0, $pop148
+	i32.const	$push147=, 0
+	i64.const	$push146=, 7016996765293437281
+	i64.store	u+16($pop147), $pop146
+	i32.const	$push145=, 0
+	i64.const	$push144=, 7016996765293437281
+	i64.store	u+8($pop145), $pop144
 	i32.const	$push143=, 0
-	i32.store8	0($pop144), $pop143
-	i32.add 	$push142=, $5, $1
-	tee_local	$push141=, $1=, $pop142
-	i32.const	$push140=, 0
-	i32.store	0($pop141):p2align=0, $pop140
-	i32.const	$push139=, 5
+	i64.const	$push142=, 7016996765293437281
+	i64.store	u($pop143), $pop142
+	i32.const	$push141=, u
+	i32.add 	$push140=, $5, $pop141
+	tee_local	$push139=, $2=, $pop140
 	i32.const	$push138=, 0
-	call    	check@FUNCTION, $5, $pop139, $pop138
-	i32.const	$push137=, 0
-	i32.load8_u	$push136=, A($pop137)
-	tee_local	$push135=, $2=, $pop136
-	i32.store8	0($0), $pop135
+	i32.store	0($pop139):p2align=0, $pop138
+	i32.const	$push137=, 4
+	i32.const	$push136=, 0
+	call    	check@FUNCTION, $5, $pop137, $pop136
+	i32.const	$push135=, 0
+	i32.load8_u	$push7=, A($pop135)
 	i32.const	$push134=, 16843009
-	i32.mul 	$push14=, $2, $pop134
-	i32.store	0($1):p2align=0, $pop14
-	i32.const	$push133=, 5
+	i32.mul 	$push8=, $pop7, $pop134
+	i32.store	0($2):p2align=0, $pop8
+	i32.const	$push133=, 4
 	i32.const	$push132=, 65
 	call    	check@FUNCTION, $5, $pop133, $pop132
-	i32.const	$push131=, 66
-	i32.store8	0($0), $pop131
-	i32.const	$push130=, 1111638594
-	i32.store	0($1):p2align=0, $pop130
-	i32.const	$push129=, 5
-	i32.const	$push128=, 66
-	call    	check@FUNCTION, $5, $pop129, $pop128
-	i32.const	$push127=, 1
-	i32.add 	$push126=, $5, $pop127
-	tee_local	$push125=, $5=, $pop126
-	i32.const	$push124=, 8
-	i32.ne  	$push15=, $pop125, $pop124
-	br_if   	0, $pop15       # 0: up to label10
-# BB#10:                                # %for.body122.preheader
+	i32.const	$push131=, 1111638594
+	i32.store	0($2):p2align=0, $pop131
+	i32.const	$push130=, 4
+	i32.const	$push129=, 66
+	call    	check@FUNCTION, $5, $pop130, $pop129
+	i32.const	$push128=, 1
+	i32.add 	$push127=, $5, $pop128
+	tee_local	$push126=, $5=, $pop127
+	i32.const	$push125=, 8
+	i32.ne  	$push9=, $pop126, $pop125
+	br_if   	0, $pop9        # 0: up to label9
+# BB#8:                                 # %for.body96.preheader
 	end_loop
 	i32.const	$5=, 0
-.LBB2_11:                               # %for.body122
+.LBB2_9:                                # %for.body96
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label11:
-	i32.const	$push176=, u
-	i32.const	$push175=, 97
-	i32.const	$push174=, 31
-	i32.call	$1=, memset@FUNCTION, $pop176, $pop175, $pop174
+	loop    	                # label10:
+	i32.const	$push181=, 0
+	i64.const	$push180=, 7016996765293437281
+	i64.store	u+23($pop181):p2align=0, $pop180
+	i32.const	$push179=, 0
+	i64.const	$push178=, 7016996765293437281
+	i64.store	u+16($pop179), $pop178
+	i32.const	$push177=, 0
+	i64.const	$push176=, 7016996765293437281
+	i64.store	u+8($pop177), $pop176
+	i32.const	$push175=, 0
+	i64.const	$push174=, 7016996765293437281
+	i64.store	u($pop175), $pop174
 	i32.const	$push173=, u+4
 	i32.add 	$push172=, $5, $pop173
-	tee_local	$push171=, $0=, $pop172
+	tee_local	$push171=, $2=, $pop172
 	i32.const	$push170=, 0
-	i32.store16	0($pop171):p2align=0, $pop170
-	i32.add 	$push169=, $5, $1
-	tee_local	$push168=, $1=, $pop169
-	i32.const	$push167=, 0
-	i32.store	0($pop168):p2align=0, $pop167
-	i32.const	$push166=, 6
-	i32.const	$push165=, 0
-	call    	check@FUNCTION, $5, $pop166, $pop165
+	i32.store8	0($pop171), $pop170
+	i32.const	$push169=, u
+	i32.add 	$push168=, $5, $pop169
+	tee_local	$push167=, $3=, $pop168
+	i32.const	$push166=, 0
+	i32.store	0($pop167):p2align=0, $pop166
+	i32.const	$push165=, 5
 	i32.const	$push164=, 0
-	i32.load8_u	$push163=, A($pop164)
-	tee_local	$push162=, $2=, $pop163
-	i32.const	$push161=, 257
-	i32.mul 	$push16=, $pop162, $pop161
-	i32.store16	0($0):p2align=0, $pop16
+	call    	check@FUNCTION, $5, $pop165, $pop164
+	i32.const	$push163=, 0
+	i32.load8_u	$push162=, A($pop163)
+	tee_local	$push161=, $0=, $pop162
+	i32.store8	0($2), $pop161
 	i32.const	$push160=, 16843009
-	i32.mul 	$push17=, $2, $pop160
-	i32.store	0($1):p2align=0, $pop17
-	i32.const	$push159=, 6
+	i32.mul 	$push10=, $0, $pop160
+	i32.store	0($3):p2align=0, $pop10
+	i32.const	$push159=, 5
 	i32.const	$push158=, 65
 	call    	check@FUNCTION, $5, $pop159, $pop158
-	i32.const	$push157=, 16962
-	i32.store16	0($0):p2align=0, $pop157
+	i32.const	$push157=, 66
+	i32.store8	0($2), $pop157
 	i32.const	$push156=, 1111638594
-	i32.store	0($1):p2align=0, $pop156
-	i32.const	$push155=, 6
+	i32.store	0($3):p2align=0, $pop156
+	i32.const	$push155=, 5
 	i32.const	$push154=, 66
 	call    	check@FUNCTION, $5, $pop155, $pop154
 	i32.const	$push153=, 1
 	i32.add 	$push152=, $5, $pop153
 	tee_local	$push151=, $5=, $pop152
 	i32.const	$push150=, 8
-	i32.ne  	$push18=, $pop151, $pop150
-	br_if   	0, $pop18       # 0: up to label11
+	i32.ne  	$push11=, $pop151, $pop150
+	br_if   	0, $pop11       # 0: up to label10
+# BB#10:                                # %for.body122.preheader
+	end_loop
+	i32.const	$5=, 0
+.LBB2_11:                               # %for.body122
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label11:
+	i32.const	$push214=, 0
+	i64.const	$push213=, 7016996765293437281
+	i64.store	u+23($pop214):p2align=0, $pop213
+	i32.const	$push212=, 0
+	i64.const	$push211=, 7016996765293437281
+	i64.store	u+16($pop212), $pop211
+	i32.const	$push210=, 0
+	i64.const	$push209=, 7016996765293437281
+	i64.store	u+8($pop210), $pop209
+	i32.const	$push208=, 0
+	i64.const	$push207=, 7016996765293437281
+	i64.store	u($pop208), $pop207
+	i32.const	$push206=, u+4
+	i32.add 	$push205=, $5, $pop206
+	tee_local	$push204=, $2=, $pop205
+	i32.const	$push203=, 0
+	i32.store16	0($pop204):p2align=0, $pop203
+	i32.const	$push202=, u
+	i32.add 	$push201=, $5, $pop202
+	tee_local	$push200=, $3=, $pop201
+	i32.const	$push199=, 0
+	i32.store	0($pop200):p2align=0, $pop199
+	i32.const	$push198=, 6
+	i32.const	$push197=, 0
+	call    	check@FUNCTION, $5, $pop198, $pop197
+	i32.const	$push196=, 0
+	i32.load8_u	$push195=, A($pop196)
+	tee_local	$push194=, $0=, $pop195
+	i32.const	$push193=, 257
+	i32.mul 	$push12=, $pop194, $pop193
+	i32.store16	0($2):p2align=0, $pop12
+	i32.const	$push192=, 16843009
+	i32.mul 	$push13=, $0, $pop192
+	i32.store	0($3):p2align=0, $pop13
+	i32.const	$push191=, 6
+	i32.const	$push190=, 65
+	call    	check@FUNCTION, $5, $pop191, $pop190
+	i32.const	$push189=, 16962
+	i32.store16	0($2):p2align=0, $pop189
+	i32.const	$push188=, 1111638594
+	i32.store	0($3):p2align=0, $pop188
+	i32.const	$push187=, 6
+	i32.const	$push186=, 66
+	call    	check@FUNCTION, $5, $pop187, $pop186
+	i32.const	$push185=, 1
+	i32.add 	$push184=, $5, $pop185
+	tee_local	$push183=, $5=, $pop184
+	i32.const	$push182=, 8
+	i32.ne  	$push14=, $pop183, $pop182
+	br_if   	0, $pop14       # 0: up to label11
 # BB#12:                                # %for.body148.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_13:                               # %for.body148
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	i32.const	$push208=, u
-	i32.const	$push207=, 97
-	i32.const	$push206=, 31
-	i32.call	$2=, memset@FUNCTION, $pop208, $pop207, $pop206
-	i32.const	$push205=, u+6
-	i32.add 	$push204=, $5, $pop205
-	tee_local	$push203=, $0=, $pop204
-	i32.const	$push202=, 0
-	i32.store8	0($pop203), $pop202
-	i32.const	$push201=, u+4
-	i32.add 	$push200=, $5, $pop201
-	tee_local	$push199=, $1=, $pop200
-	i32.const	$push198=, 0
-	i32.store16	0($pop199):p2align=0, $pop198
-	i32.add 	$push197=, $5, $2
-	tee_local	$push196=, $2=, $pop197
-	i32.const	$push195=, 0
-	i32.store	0($pop196):p2align=0, $pop195
-	i32.const	$push194=, 7
-	i32.const	$push193=, 0
-	call    	check@FUNCTION, $5, $pop194, $pop193
-	i32.const	$push192=, 0
-	i32.load8_u	$push191=, A($pop192)
-	tee_local	$push190=, $3=, $pop191
-	i32.store8	0($0), $pop190
-	i32.const	$push189=, 257
-	i32.mul 	$push19=, $3, $pop189
-	i32.store16	0($1):p2align=0, $pop19
-	i32.const	$push188=, 16843009
-	i32.mul 	$push20=, $3, $pop188
-	i32.store	0($2):p2align=0, $pop20
-	i32.const	$push187=, 7
-	i32.const	$push186=, 65
-	call    	check@FUNCTION, $5, $pop187, $pop186
-	i32.const	$push185=, 66
-	i32.store8	0($0), $pop185
-	i32.const	$push184=, 16962
-	i32.store16	0($1):p2align=0, $pop184
-	i32.const	$push183=, 1111638594
-	i32.store	0($2):p2align=0, $pop183
-	i32.const	$push182=, 7
-	i32.const	$push181=, 66
-	call    	check@FUNCTION, $5, $pop182, $pop181
-	i32.const	$push180=, 1
-	i32.add 	$push179=, $5, $pop180
-	tee_local	$push178=, $5=, $pop179
-	i32.const	$push177=, 8
-	i32.ne  	$push21=, $pop178, $pop177
-	br_if   	0, $pop21       # 0: up to label12
+	i32.const	$push252=, 0
+	i64.const	$push251=, 7016996765293437281
+	i64.store	u+23($pop252):p2align=0, $pop251
+	i32.const	$push250=, 0
+	i64.const	$push249=, 7016996765293437281
+	i64.store	u+16($pop250), $pop249
+	i32.const	$push248=, 0
+	i64.const	$push247=, 7016996765293437281
+	i64.store	u+8($pop248), $pop247
+	i32.const	$push246=, 0
+	i64.const	$push245=, 7016996765293437281
+	i64.store	u($pop246), $pop245
+	i32.const	$push244=, u+6
+	i32.add 	$push243=, $5, $pop244
+	tee_local	$push242=, $2=, $pop243
+	i32.const	$push241=, 0
+	i32.store8	0($pop242), $pop241
+	i32.const	$push240=, u+4
+	i32.add 	$push239=, $5, $pop240
+	tee_local	$push238=, $3=, $pop239
+	i32.const	$push237=, 0
+	i32.store16	0($pop238):p2align=0, $pop237
+	i32.const	$push236=, u
+	i32.add 	$push235=, $5, $pop236
+	tee_local	$push234=, $0=, $pop235
+	i32.const	$push233=, 0
+	i32.store	0($pop234):p2align=0, $pop233
+	i32.const	$push232=, 7
+	i32.const	$push231=, 0
+	call    	check@FUNCTION, $5, $pop232, $pop231
+	i32.const	$push230=, 0
+	i32.load8_u	$push229=, A($pop230)
+	tee_local	$push228=, $1=, $pop229
+	i32.store8	0($2), $pop228
+	i32.const	$push227=, 257
+	i32.mul 	$push15=, $1, $pop227
+	i32.store16	0($3):p2align=0, $pop15
+	i32.const	$push226=, 16843009
+	i32.mul 	$push16=, $1, $pop226
+	i32.store	0($0):p2align=0, $pop16
+	i32.const	$push225=, 7
+	i32.const	$push224=, 65
+	call    	check@FUNCTION, $5, $pop225, $pop224
+	i32.const	$push223=, 66
+	i32.store8	0($2), $pop223
+	i32.const	$push222=, 16962
+	i32.store16	0($3):p2align=0, $pop222
+	i32.const	$push221=, 1111638594
+	i32.store	0($0):p2align=0, $pop221
+	i32.const	$push220=, 7
+	i32.const	$push219=, 66
+	call    	check@FUNCTION, $5, $pop220, $pop219
+	i32.const	$push218=, 1
+	i32.add 	$push217=, $5, $pop218
+	tee_local	$push216=, $5=, $pop217
+	i32.const	$push215=, 8
+	i32.ne  	$push17=, $pop216, $pop215
+	br_if   	0, $pop17       # 0: up to label12
 # BB#14:                                # %for.body174.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_15:                               # %for.body174
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	i32.const	$push230=, u
-	i32.const	$push229=, 97
-	i32.const	$push228=, 31
-	i32.call	$push3=, memset@FUNCTION, $pop230, $pop229, $pop228
-	i32.add 	$push227=, $5, $pop3
-	tee_local	$push226=, $0=, $pop227
-	i64.const	$push225=, 0
-	i64.store	0($pop226):p2align=0, $pop225
-	i32.const	$push224=, 8
-	i32.const	$push223=, 0
-	call    	check@FUNCTION, $5, $pop224, $pop223
-	i32.const	$push222=, u+4
-	i32.add 	$push22=, $5, $pop222
-	i32.const	$push221=, 0
-	i32.load8_u	$push23=, A($pop221)
-	i32.const	$push220=, 16843009
-	i32.mul 	$push219=, $pop23, $pop220
-	tee_local	$push218=, $1=, $pop219
-	i32.store	0($pop22):p2align=0, $pop218
-	i32.store	0($0):p2align=0, $1
-	i32.const	$push217=, 8
-	i32.const	$push216=, 65
-	call    	check@FUNCTION, $5, $pop217, $pop216
-	i64.const	$push215=, 4774451407313060418
-	i64.store	0($0):p2align=0, $pop215
-	i32.const	$push214=, 8
-	i32.const	$push213=, 66
-	call    	check@FUNCTION, $5, $pop214, $pop213
-	i32.const	$push212=, 1
-	i32.add 	$push211=, $5, $pop212
-	tee_local	$push210=, $5=, $pop211
-	i32.const	$push209=, 8
-	i32.ne  	$push24=, $pop210, $pop209
-	br_if   	0, $pop24       # 0: up to label13
+	i32.const	$push277=, 0
+	i64.const	$push276=, 7016996765293437281
+	i64.store	u+23($pop277):p2align=0, $pop276
+	i32.const	$push275=, 0
+	i64.const	$push274=, 7016996765293437281
+	i64.store	u+16($pop275), $pop274
+	i32.const	$push273=, 0
+	i64.const	$push272=, 7016996765293437281
+	i64.store	u+8($pop273), $pop272
+	i32.const	$push271=, 0
+	i64.const	$push270=, 7016996765293437281
+	i64.store	u($pop271), $pop270
+	i32.const	$push269=, u
+	i32.add 	$push268=, $5, $pop269
+	tee_local	$push267=, $2=, $pop268
+	i64.const	$push266=, 0
+	i64.store	0($pop267):p2align=0, $pop266
+	i32.const	$push265=, 8
+	i32.const	$push264=, 0
+	call    	check@FUNCTION, $5, $pop265, $pop264
+	i32.const	$push263=, 0
+	i64.load8_u	$push18=, A($pop263)
+	i64.const	$push262=, 72340172838076673
+	i64.mul 	$push19=, $pop18, $pop262
+	i64.store	0($2):p2align=0, $pop19
+	i32.const	$push261=, 8
+	i32.const	$push260=, 65
+	call    	check@FUNCTION, $5, $pop261, $pop260
+	i64.const	$push259=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop259
+	i32.const	$push258=, 8
+	i32.const	$push257=, 66
+	call    	check@FUNCTION, $5, $pop258, $pop257
+	i32.const	$push256=, 1
+	i32.add 	$push255=, $5, $pop256
+	tee_local	$push254=, $5=, $pop255
+	i32.const	$push253=, 8
+	i32.ne  	$push20=, $pop254, $pop253
+	br_if   	0, $pop20       # 0: up to label13
 # BB#16:                                # %for.body200.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_17:                               # %for.body200
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label14:
-	i32.const	$push263=, u
-	i32.const	$push262=, 97
-	i32.const	$push261=, 31
-	i32.call	$2=, memset@FUNCTION, $pop263, $pop262, $pop261
-	i32.const	$push260=, u+8
-	i32.add 	$push259=, $5, $pop260
-	tee_local	$push258=, $0=, $pop259
-	i32.const	$push257=, 0
-	i32.store8	0($pop258), $pop257
-	i32.const	$push256=, u+4
-	i32.add 	$push255=, $5, $pop256
-	tee_local	$push254=, $1=, $pop255
-	i32.const	$push253=, 0
-	i32.store	0($pop254):p2align=0, $pop253
-	i32.add 	$push252=, $5, $2
-	tee_local	$push251=, $2=, $pop252
-	i32.const	$push250=, 0
-	i32.store	0($pop251):p2align=0, $pop250
-	i32.const	$push249=, 9
-	i32.const	$push248=, 0
-	call    	check@FUNCTION, $5, $pop249, $pop248
-	i32.const	$push247=, 0
-	i32.load8_u	$push246=, A($pop247)
-	tee_local	$push245=, $3=, $pop246
-	i32.store8	0($0), $pop245
-	i32.const	$push244=, 16843009
-	i32.mul 	$push243=, $3, $pop244
-	tee_local	$push242=, $3=, $pop243
-	i32.store	0($1):p2align=0, $pop242
-	i32.store	0($2):p2align=0, $3
-	i32.const	$push241=, 9
-	i32.const	$push240=, 65
-	call    	check@FUNCTION, $5, $pop241, $pop240
-	i32.const	$push239=, 66
-	i32.store8	0($0), $pop239
-	i32.const	$push238=, 1111638594
-	i32.store	0($1):p2align=0, $pop238
-	i32.const	$push237=, 1111638594
-	i32.store	0($2):p2align=0, $pop237
-	i32.const	$push236=, 9
-	i32.const	$push235=, 66
-	call    	check@FUNCTION, $5, $pop236, $pop235
-	i32.const	$push234=, 1
-	i32.add 	$push233=, $5, $pop234
-	tee_local	$push232=, $5=, $pop233
-	i32.const	$push231=, 8
-	i32.ne  	$push25=, $pop232, $pop231
-	br_if   	0, $pop25       # 0: up to label14
+	i32.const	$push310=, 0
+	i64.const	$push309=, 7016996765293437281
+	i64.store	u+23($pop310):p2align=0, $pop309
+	i32.const	$push308=, 0
+	i64.const	$push307=, 7016996765293437281
+	i64.store	u+16($pop308), $pop307
+	i32.const	$push306=, 0
+	i64.const	$push305=, 7016996765293437281
+	i64.store	u+8($pop306), $pop305
+	i32.const	$push304=, 0
+	i64.const	$push303=, 7016996765293437281
+	i64.store	u($pop304), $pop303
+	i32.const	$push302=, u+8
+	i32.add 	$push301=, $5, $pop302
+	tee_local	$push300=, $2=, $pop301
+	i32.const	$push299=, 0
+	i32.store8	0($pop300), $pop299
+	i32.const	$push298=, u
+	i32.add 	$push297=, $5, $pop298
+	tee_local	$push296=, $3=, $pop297
+	i64.const	$push295=, 0
+	i64.store	0($pop296):p2align=0, $pop295
+	i32.const	$push294=, 9
+	i32.const	$push293=, 0
+	call    	check@FUNCTION, $5, $pop294, $pop293
+	i32.const	$push292=, 0
+	i32.load8_u	$push291=, A($pop292)
+	tee_local	$push290=, $0=, $pop291
+	i32.store8	0($2), $pop290
+	i64.extend_u/i32	$push21=, $0
+	i64.const	$push289=, 255
+	i64.and 	$push22=, $pop21, $pop289
+	i64.const	$push288=, 72340172838076673
+	i64.mul 	$push23=, $pop22, $pop288
+	i64.store	0($3):p2align=0, $pop23
+	i32.const	$push287=, 9
+	i32.const	$push286=, 65
+	call    	check@FUNCTION, $5, $pop287, $pop286
+	i32.const	$push285=, 66
+	i32.store8	0($2), $pop285
+	i64.const	$push284=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop284
+	i32.const	$push283=, 9
+	i32.const	$push282=, 66
+	call    	check@FUNCTION, $5, $pop283, $pop282
+	i32.const	$push281=, 1
+	i32.add 	$push280=, $5, $pop281
+	tee_local	$push279=, $5=, $pop280
+	i32.const	$push278=, 8
+	i32.ne  	$push24=, $pop279, $pop278
+	br_if   	0, $pop24       # 0: up to label14
 # BB#18:                                # %for.body226.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_19:                               # %for.body226
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.const	$push297=, u
-	i32.const	$push296=, 97
-	i32.const	$push295=, 31
-	i32.call	$2=, memset@FUNCTION, $pop297, $pop296, $pop295
-	i32.const	$push294=, u+8
-	i32.add 	$push293=, $5, $pop294
-	tee_local	$push292=, $0=, $pop293
-	i32.const	$push291=, 0
-	i32.store16	0($pop292):p2align=0, $pop291
-	i32.const	$push290=, u+4
-	i32.add 	$push289=, $5, $pop290
-	tee_local	$push288=, $1=, $pop289
-	i32.const	$push287=, 0
-	i32.store	0($pop288):p2align=0, $pop287
-	i32.add 	$push286=, $5, $2
-	tee_local	$push285=, $2=, $pop286
-	i32.const	$push284=, 0
-	i32.store	0($pop285):p2align=0, $pop284
-	i32.const	$push283=, 10
-	i32.const	$push282=, 0
-	call    	check@FUNCTION, $5, $pop283, $pop282
-	i32.const	$push281=, 0
-	i32.load8_u	$push280=, A($pop281)
-	tee_local	$push279=, $3=, $pop280
-	i32.const	$push278=, 257
-	i32.mul 	$push26=, $pop279, $pop278
-	i32.store16	0($0):p2align=0, $pop26
-	i32.const	$push277=, 16843009
-	i32.mul 	$push276=, $3, $pop277
-	tee_local	$push275=, $3=, $pop276
-	i32.store	0($1):p2align=0, $pop275
-	i32.store	0($2):p2align=0, $3
-	i32.const	$push274=, 10
-	i32.const	$push273=, 65
-	call    	check@FUNCTION, $5, $pop274, $pop273
-	i32.const	$push272=, 16962
-	i32.store16	0($0):p2align=0, $pop272
-	i32.const	$push271=, 1111638594
-	i32.store	0($1):p2align=0, $pop271
-	i32.const	$push270=, 1111638594
-	i32.store	0($2):p2align=0, $pop270
-	i32.const	$push269=, 10
-	i32.const	$push268=, 66
-	call    	check@FUNCTION, $5, $pop269, $pop268
-	i32.const	$push267=, 1
-	i32.add 	$push266=, $5, $pop267
-	tee_local	$push265=, $5=, $pop266
-	i32.const	$push264=, 8
-	i32.ne  	$push27=, $pop265, $pop264
-	br_if   	0, $pop27       # 0: up to label15
+	i32.const	$push343=, 0
+	i64.const	$push342=, 7016996765293437281
+	i64.store	u+23($pop343):p2align=0, $pop342
+	i32.const	$push341=, 0
+	i64.const	$push340=, 7016996765293437281
+	i64.store	u+16($pop341), $pop340
+	i32.const	$push339=, 0
+	i64.const	$push338=, 7016996765293437281
+	i64.store	u+8($pop339), $pop338
+	i32.const	$push337=, 0
+	i64.const	$push336=, 7016996765293437281
+	i64.store	u($pop337), $pop336
+	i32.const	$push335=, u+8
+	i32.add 	$push334=, $5, $pop335
+	tee_local	$push333=, $2=, $pop334
+	i32.const	$push332=, 0
+	i32.store16	0($pop333):p2align=0, $pop332
+	i32.const	$push331=, u
+	i32.add 	$push330=, $5, $pop331
+	tee_local	$push329=, $3=, $pop330
+	i64.const	$push328=, 0
+	i64.store	0($pop329):p2align=0, $pop328
+	i32.const	$push327=, 10
+	i32.const	$push326=, 0
+	call    	check@FUNCTION, $5, $pop327, $pop326
+	i32.const	$push325=, 0
+	i32.load8_u	$push324=, A($pop325)
+	tee_local	$push323=, $0=, $pop324
+	i32.const	$push322=, 257
+	i32.mul 	$push25=, $pop323, $pop322
+	i32.store16	0($2):p2align=0, $pop25
+	i64.extend_u/i32	$push26=, $0
+	i64.const	$push321=, 72340172838076673
+	i64.mul 	$push27=, $pop26, $pop321
+	i64.store	0($3):p2align=0, $pop27
+	i32.const	$push320=, 10
+	i32.const	$push319=, 65
+	call    	check@FUNCTION, $5, $pop320, $pop319
+	i32.const	$push318=, 16962
+	i32.store16	0($2):p2align=0, $pop318
+	i64.const	$push317=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop317
+	i32.const	$push316=, 10
+	i32.const	$push315=, 66
+	call    	check@FUNCTION, $5, $pop316, $pop315
+	i32.const	$push314=, 1
+	i32.add 	$push313=, $5, $pop314
+	tee_local	$push312=, $5=, $pop313
+	i32.const	$push311=, 8
+	i32.ne  	$push28=, $pop312, $pop311
+	br_if   	0, $pop28       # 0: up to label15
 # BB#20:                                # %for.body252.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_21:                               # %for.body252
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label16:
-	i32.const	$push336=, u
-	i32.const	$push335=, 97
-	i32.const	$push334=, 31
-	i32.call	$3=, memset@FUNCTION, $pop336, $pop335, $pop334
-	i32.const	$push333=, u+10
-	i32.add 	$push332=, $5, $pop333
-	tee_local	$push331=, $0=, $pop332
-	i32.const	$push330=, 0
-	i32.store8	0($pop331), $pop330
-	i32.const	$push329=, u+8
-	i32.add 	$push328=, $5, $pop329
-	tee_local	$push327=, $1=, $pop328
-	i32.const	$push326=, 0
-	i32.store16	0($pop327):p2align=0, $pop326
-	i32.const	$push325=, u+4
-	i32.add 	$push324=, $5, $pop325
-	tee_local	$push323=, $2=, $pop324
-	i32.const	$push322=, 0
-	i32.store	0($pop323):p2align=0, $pop322
-	i32.add 	$push321=, $5, $3
-	tee_local	$push320=, $3=, $pop321
-	i32.const	$push319=, 0
-	i32.store	0($pop320):p2align=0, $pop319
-	i32.const	$push318=, 11
-	i32.const	$push317=, 0
-	call    	check@FUNCTION, $5, $pop318, $pop317
-	i32.const	$push316=, 0
-	i32.load8_u	$push315=, A($pop316)
-	tee_local	$push314=, $4=, $pop315
-	i32.store8	0($0), $pop314
-	i32.const	$push313=, 257
-	i32.mul 	$push28=, $4, $pop313
-	i32.store16	0($1):p2align=0, $pop28
-	i32.const	$push312=, 16843009
-	i32.mul 	$push311=, $4, $pop312
-	tee_local	$push310=, $4=, $pop311
-	i32.store	0($2):p2align=0, $pop310
-	i32.store	0($3):p2align=0, $4
-	i32.const	$push309=, 11
-	i32.const	$push308=, 65
-	call    	check@FUNCTION, $5, $pop309, $pop308
-	i32.const	$push307=, 66
-	i32.store8	0($0), $pop307
-	i32.const	$push306=, 16962
-	i32.store16	0($1):p2align=0, $pop306
-	i32.const	$push305=, 1111638594
-	i32.store	0($2):p2align=0, $pop305
-	i32.const	$push304=, 1111638594
-	i32.store	0($3):p2align=0, $pop304
-	i32.const	$push303=, 11
-	i32.const	$push302=, 66
-	call    	check@FUNCTION, $5, $pop303, $pop302
-	i32.const	$push301=, 1
-	i32.add 	$push300=, $5, $pop301
-	tee_local	$push299=, $5=, $pop300
-	i32.const	$push298=, 8
-	i32.ne  	$push29=, $pop299, $pop298
-	br_if   	0, $pop29       # 0: up to label16
+	i32.const	$push381=, 0
+	i64.const	$push380=, 7016996765293437281
+	i64.store	u+23($pop381):p2align=0, $pop380
+	i32.const	$push379=, 0
+	i64.const	$push378=, 7016996765293437281
+	i64.store	u+16($pop379), $pop378
+	i32.const	$push377=, 0
+	i64.const	$push376=, 7016996765293437281
+	i64.store	u+8($pop377), $pop376
+	i32.const	$push375=, 0
+	i64.const	$push374=, 7016996765293437281
+	i64.store	u($pop375), $pop374
+	i32.const	$push373=, u+10
+	i32.add 	$push372=, $5, $pop373
+	tee_local	$push371=, $2=, $pop372
+	i32.const	$push370=, 0
+	i32.store8	0($pop371), $pop370
+	i32.const	$push369=, u+8
+	i32.add 	$push368=, $5, $pop369
+	tee_local	$push367=, $3=, $pop368
+	i32.const	$push366=, 0
+	i32.store16	0($pop367):p2align=0, $pop366
+	i32.const	$push365=, u
+	i32.add 	$push364=, $5, $pop365
+	tee_local	$push363=, $0=, $pop364
+	i64.const	$push362=, 0
+	i64.store	0($pop363):p2align=0, $pop362
+	i32.const	$push361=, 11
+	i32.const	$push360=, 0
+	call    	check@FUNCTION, $5, $pop361, $pop360
+	i32.const	$push359=, 0
+	i32.load8_u	$push358=, A($pop359)
+	tee_local	$push357=, $1=, $pop358
+	i32.store8	0($2), $pop357
+	i32.const	$push356=, 257
+	i32.mul 	$push29=, $1, $pop356
+	i32.store16	0($3):p2align=0, $pop29
+	i64.extend_u/i32	$push30=, $1
+	i64.const	$push355=, 72340172838076673
+	i64.mul 	$push31=, $pop30, $pop355
+	i64.store	0($0):p2align=0, $pop31
+	i32.const	$push354=, 11
+	i32.const	$push353=, 65
+	call    	check@FUNCTION, $5, $pop354, $pop353
+	i32.const	$push352=, 66
+	i32.store8	0($2), $pop352
+	i32.const	$push351=, 16962
+	i32.store16	0($3):p2align=0, $pop351
+	i64.const	$push350=, 4774451407313060418
+	i64.store	0($0):p2align=0, $pop350
+	i32.const	$push349=, 11
+	i32.const	$push348=, 66
+	call    	check@FUNCTION, $5, $pop349, $pop348
+	i32.const	$push347=, 1
+	i32.add 	$push346=, $5, $pop347
+	tee_local	$push345=, $5=, $pop346
+	i32.const	$push344=, 8
+	i32.ne  	$push32=, $pop345, $pop344
+	br_if   	0, $pop32       # 0: up to label16
 # BB#22:                                # %for.body278.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_23:                               # %for.body278
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label17:
-	i32.const	$push363=, u
-	i32.const	$push362=, 97
-	i32.const	$push361=, 31
-	i32.call	$1=, memset@FUNCTION, $pop363, $pop362, $pop361
-	i32.const	$push360=, u+4
-	i32.add 	$push359=, $5, $pop360
-	tee_local	$push358=, $0=, $pop359
-	i64.const	$push357=, 0
-	i64.store	0($pop358):p2align=0, $pop357
-	i32.add 	$push356=, $5, $1
-	tee_local	$push355=, $1=, $pop356
-	i32.const	$push354=, 0
-	i32.store	0($pop355):p2align=0, $pop354
-	i32.const	$push353=, 12
-	i32.const	$push352=, 0
-	call    	check@FUNCTION, $5, $pop353, $pop352
-	i32.const	$push351=, u+8
-	i32.add 	$push30=, $5, $pop351
-	i32.const	$push350=, 0
-	i32.load8_u	$push31=, A($pop350)
-	i32.const	$push349=, 16843009
-	i32.mul 	$push348=, $pop31, $pop349
-	tee_local	$push347=, $2=, $pop348
-	i32.store	0($pop30):p2align=0, $pop347
-	i32.store	0($0):p2align=0, $2
-	i32.store	0($1):p2align=0, $2
-	i32.const	$push346=, 12
-	i32.const	$push345=, 65
-	call    	check@FUNCTION, $5, $pop346, $pop345
-	i64.const	$push344=, 4774451407313060418
-	i64.store	0($0):p2align=0, $pop344
-	i32.const	$push343=, 1111638594
-	i32.store	0($1):p2align=0, $pop343
-	i32.const	$push342=, 12
-	i32.const	$push341=, 66
-	call    	check@FUNCTION, $5, $pop342, $pop341
-	i32.const	$push340=, 1
-	i32.add 	$push339=, $5, $pop340
-	tee_local	$push338=, $5=, $pop339
-	i32.const	$push337=, 8
-	i32.ne  	$push32=, $pop338, $pop337
-	br_if   	0, $pop32       # 0: up to label17
+	i32.const	$push414=, 0
+	i64.const	$push413=, 7016996765293437281
+	i64.store	u+23($pop414):p2align=0, $pop413
+	i32.const	$push412=, 0
+	i64.const	$push411=, 7016996765293437281
+	i64.store	u+16($pop412), $pop411
+	i32.const	$push410=, 0
+	i64.const	$push409=, 7016996765293437281
+	i64.store	u+8($pop410), $pop409
+	i32.const	$push408=, 0
+	i64.const	$push407=, 7016996765293437281
+	i64.store	u($pop408), $pop407
+	i32.const	$push406=, u+8
+	i32.add 	$push405=, $5, $pop406
+	tee_local	$push404=, $2=, $pop405
+	i32.const	$push403=, 0
+	i32.store	0($pop404):p2align=0, $pop403
+	i32.const	$push402=, u
+	i32.add 	$push401=, $5, $pop402
+	tee_local	$push400=, $3=, $pop401
+	i64.const	$push399=, 0
+	i64.store	0($pop400):p2align=0, $pop399
+	i32.const	$push398=, 12
+	i32.const	$push397=, 0
+	call    	check@FUNCTION, $5, $pop398, $pop397
+	i32.const	$push396=, 0
+	i32.load8_u	$push395=, A($pop396)
+	tee_local	$push394=, $0=, $pop395
+	i32.const	$push393=, 16843009
+	i32.mul 	$push33=, $pop394, $pop393
+	i32.store	0($2):p2align=0, $pop33
+	i64.extend_u/i32	$push34=, $0
+	i64.const	$push392=, 72340172838076673
+	i64.mul 	$push35=, $pop34, $pop392
+	i64.store	0($3):p2align=0, $pop35
+	i32.const	$push391=, 12
+	i32.const	$push390=, 65
+	call    	check@FUNCTION, $5, $pop391, $pop390
+	i32.const	$push389=, 1111638594
+	i32.store	0($2):p2align=0, $pop389
+	i64.const	$push388=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop388
+	i32.const	$push387=, 12
+	i32.const	$push386=, 66
+	call    	check@FUNCTION, $5, $pop387, $pop386
+	i32.const	$push385=, 1
+	i32.add 	$push384=, $5, $pop385
+	tee_local	$push383=, $5=, $pop384
+	i32.const	$push382=, 8
+	i32.ne  	$push36=, $pop383, $pop382
+	br_if   	0, $pop36       # 0: up to label17
 # BB#24:                                # %for.body304.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_25:                               # %for.body304
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.const	$push397=, u
-	i32.const	$push396=, 97
-	i32.const	$push395=, 31
-	i32.call	$2=, memset@FUNCTION, $pop397, $pop396, $pop395
-	i32.const	$push394=, u+12
-	i32.add 	$push393=, $5, $pop394
-	tee_local	$push392=, $0=, $pop393
-	i32.const	$push391=, 0
-	i32.store8	0($pop392), $pop391
-	i32.const	$push390=, u+4
-	i32.add 	$push389=, $5, $pop390
-	tee_local	$push388=, $1=, $pop389
-	i64.const	$push387=, 0
-	i64.store	0($pop388):p2align=0, $pop387
-	i32.add 	$push386=, $5, $2
-	tee_local	$push385=, $2=, $pop386
-	i32.const	$push384=, 0
-	i32.store	0($pop385):p2align=0, $pop384
-	i32.const	$push383=, 13
-	i32.const	$push382=, 0
-	call    	check@FUNCTION, $5, $pop383, $pop382
-	i32.const	$push381=, 0
-	i32.load8_u	$push380=, A($pop381)
-	tee_local	$push379=, $3=, $pop380
-	i32.store8	0($0), $pop379
-	i32.const	$push378=, u+8
-	i32.add 	$push33=, $5, $pop378
-	i32.const	$push377=, 16843009
-	i32.mul 	$push376=, $3, $pop377
-	tee_local	$push375=, $3=, $pop376
-	i32.store	0($pop33):p2align=0, $pop375
-	i32.store	0($1):p2align=0, $3
-	i32.store	0($2):p2align=0, $3
-	i32.const	$push374=, 13
-	i32.const	$push373=, 65
-	call    	check@FUNCTION, $5, $pop374, $pop373
-	i32.const	$push372=, 66
-	i32.store8	0($0), $pop372
-	i64.const	$push371=, 4774451407313060418
-	i64.store	0($1):p2align=0, $pop371
-	i32.const	$push370=, 1111638594
-	i32.store	0($2):p2align=0, $pop370
-	i32.const	$push369=, 13
-	i32.const	$push368=, 66
-	call    	check@FUNCTION, $5, $pop369, $pop368
-	i32.const	$push367=, 1
-	i32.add 	$push366=, $5, $pop367
-	tee_local	$push365=, $5=, $pop366
-	i32.const	$push364=, 8
-	i32.ne  	$push34=, $pop365, $pop364
-	br_if   	0, $pop34       # 0: up to label18
+	i32.const	$push446=, 0
+	i64.const	$push445=, 7016996765293437281
+	i64.store	u+23($pop446):p2align=0, $pop445
+	i32.const	$push444=, 0
+	i64.const	$push443=, 7016996765293437281
+	i64.store	u+16($pop444), $pop443
+	i32.const	$push442=, 0
+	i64.const	$push441=, 7016996765293437281
+	i64.store	u+8($pop442), $pop441
+	i32.const	$push440=, 0
+	i64.const	$push439=, 7016996765293437281
+	i64.store	u($pop440), $pop439
+	i32.const	$push438=, u+5
+	i32.add 	$push437=, $5, $pop438
+	tee_local	$push436=, $2=, $pop437
+	i64.const	$push435=, 0
+	i64.store	0($pop436):p2align=0, $pop435
+	i32.const	$push434=, u
+	i32.add 	$push433=, $5, $pop434
+	tee_local	$push432=, $3=, $pop433
+	i64.const	$push431=, 0
+	i64.store	0($pop432):p2align=0, $pop431
+	i32.const	$push430=, 13
+	i32.const	$push429=, 0
+	call    	check@FUNCTION, $5, $pop430, $pop429
+	i32.const	$push428=, 0
+	i64.load8_u	$push37=, A($pop428)
+	i64.const	$push427=, 72340172838076673
+	i64.mul 	$push426=, $pop37, $pop427
+	tee_local	$push425=, $4=, $pop426
+	i64.store	0($2):p2align=0, $pop425
+	i64.store	0($3):p2align=0, $4
+	i32.const	$push424=, 13
+	i32.const	$push423=, 65
+	call    	check@FUNCTION, $5, $pop424, $pop423
+	i64.const	$push422=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop422
+	i64.const	$push421=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop421
+	i32.const	$push420=, 13
+	i32.const	$push419=, 66
+	call    	check@FUNCTION, $5, $pop420, $pop419
+	i32.const	$push418=, 1
+	i32.add 	$push417=, $5, $pop418
+	tee_local	$push416=, $5=, $pop417
+	i32.const	$push415=, 8
+	i32.ne  	$push38=, $pop416, $pop415
+	br_if   	0, $pop38       # 0: up to label18
 # BB#26:                                # %for.body330.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_27:                               # %for.body330
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label19:
-	i32.const	$push432=, u
-	i32.const	$push431=, 97
-	i32.const	$push430=, 31
-	i32.call	$2=, memset@FUNCTION, $pop432, $pop431, $pop430
-	i32.const	$push429=, u+12
-	i32.add 	$push428=, $5, $pop429
-	tee_local	$push427=, $0=, $pop428
-	i32.const	$push426=, 0
-	i32.store16	0($pop427):p2align=0, $pop426
-	i32.const	$push425=, u+4
-	i32.add 	$push424=, $5, $pop425
-	tee_local	$push423=, $1=, $pop424
-	i64.const	$push422=, 0
-	i64.store	0($pop423):p2align=0, $pop422
-	i32.add 	$push421=, $5, $2
-	tee_local	$push420=, $2=, $pop421
-	i32.const	$push419=, 0
-	i32.store	0($pop420):p2align=0, $pop419
-	i32.const	$push418=, 14
-	i32.const	$push417=, 0
-	call    	check@FUNCTION, $5, $pop418, $pop417
-	i32.const	$push416=, 0
-	i32.load8_u	$push415=, A($pop416)
-	tee_local	$push414=, $3=, $pop415
-	i32.const	$push413=, 257
-	i32.mul 	$push35=, $pop414, $pop413
-	i32.store16	0($0):p2align=0, $pop35
-	i32.const	$push412=, u+8
-	i32.add 	$push36=, $5, $pop412
-	i32.const	$push411=, 16843009
-	i32.mul 	$push410=, $3, $pop411
-	tee_local	$push409=, $3=, $pop410
-	i32.store	0($pop36):p2align=0, $pop409
-	i32.store	0($1):p2align=0, $3
-	i32.store	0($2):p2align=0, $3
-	i32.const	$push408=, 14
-	i32.const	$push407=, 65
-	call    	check@FUNCTION, $5, $pop408, $pop407
-	i32.const	$push406=, 16962
-	i32.store16	0($0):p2align=0, $pop406
-	i64.const	$push405=, 4774451407313060418
-	i64.store	0($1):p2align=0, $pop405
-	i32.const	$push404=, 1111638594
-	i32.store	0($2):p2align=0, $pop404
-	i32.const	$push403=, 14
-	i32.const	$push402=, 66
-	call    	check@FUNCTION, $5, $pop403, $pop402
-	i32.const	$push401=, 1
-	i32.add 	$push400=, $5, $pop401
-	tee_local	$push399=, $5=, $pop400
-	i32.const	$push398=, 8
-	i32.ne  	$push37=, $pop399, $pop398
-	br_if   	0, $pop37       # 0: up to label19
+	i32.const	$push478=, 0
+	i64.const	$push477=, 7016996765293437281
+	i64.store	u+23($pop478):p2align=0, $pop477
+	i32.const	$push476=, 0
+	i64.const	$push475=, 7016996765293437281
+	i64.store	u+16($pop476), $pop475
+	i32.const	$push474=, 0
+	i64.const	$push473=, 7016996765293437281
+	i64.store	u+8($pop474), $pop473
+	i32.const	$push472=, 0
+	i64.const	$push471=, 7016996765293437281
+	i64.store	u($pop472), $pop471
+	i32.const	$push470=, u+6
+	i32.add 	$push469=, $5, $pop470
+	tee_local	$push468=, $2=, $pop469
+	i64.const	$push467=, 0
+	i64.store	0($pop468):p2align=0, $pop467
+	i32.const	$push466=, u
+	i32.add 	$push465=, $5, $pop466
+	tee_local	$push464=, $3=, $pop465
+	i64.const	$push463=, 0
+	i64.store	0($pop464):p2align=0, $pop463
+	i32.const	$push462=, 14
+	i32.const	$push461=, 0
+	call    	check@FUNCTION, $5, $pop462, $pop461
+	i32.const	$push460=, 0
+	i64.load8_u	$push39=, A($pop460)
+	i64.const	$push459=, 72340172838076673
+	i64.mul 	$push458=, $pop39, $pop459
+	tee_local	$push457=, $4=, $pop458
+	i64.store	0($2):p2align=0, $pop457
+	i64.store	0($3):p2align=0, $4
+	i32.const	$push456=, 14
+	i32.const	$push455=, 65
+	call    	check@FUNCTION, $5, $pop456, $pop455
+	i64.const	$push454=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop454
+	i64.const	$push453=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop453
+	i32.const	$push452=, 14
+	i32.const	$push451=, 66
+	call    	check@FUNCTION, $5, $pop452, $pop451
+	i32.const	$push450=, 1
+	i32.add 	$push449=, $5, $pop450
+	tee_local	$push448=, $5=, $pop449
+	i32.const	$push447=, 8
+	i32.ne  	$push40=, $pop448, $pop447
+	br_if   	0, $pop40       # 0: up to label19
 # BB#28:                                # %for.body356.preheader
 	end_loop
 	i32.const	$5=, 0
 .LBB2_29:                               # %for.body356
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label20:
-	i32.const	$push472=, u
-	i32.const	$push471=, 97
-	i32.const	$push470=, 31
-	i32.call	$3=, memset@FUNCTION, $pop472, $pop471, $pop470
-	i32.const	$push469=, u+14
-	i32.add 	$push468=, $5, $pop469
-	tee_local	$push467=, $0=, $pop468
-	i32.const	$push466=, 0
-	i32.store8	0($pop467), $pop466
-	i32.const	$push465=, u+12
-	i32.add 	$push464=, $5, $pop465
-	tee_local	$push463=, $1=, $pop464
-	i32.const	$push462=, 0
-	i32.store16	0($pop463):p2align=0, $pop462
-	i32.const	$push461=, u+4
-	i32.add 	$push460=, $5, $pop461
-	tee_local	$push459=, $2=, $pop460
-	i64.const	$push458=, 0
-	i64.store	0($pop459):p2align=0, $pop458
-	i32.add 	$push457=, $5, $3
-	tee_local	$push456=, $3=, $pop457
-	i32.const	$push455=, 0
-	i32.store	0($pop456):p2align=0, $pop455
-	i32.const	$push454=, 15
-	i32.const	$push453=, 0
-	call    	check@FUNCTION, $5, $pop454, $pop453
-	i32.const	$push452=, 0
-	i32.load8_u	$push451=, A($pop452)
-	tee_local	$push450=, $4=, $pop451
-	i32.store8	0($0), $pop450
-	i32.const	$push449=, 257
-	i32.mul 	$push38=, $4, $pop449
-	i32.store16	0($1):p2align=0, $pop38
-	i32.const	$push448=, u+8
-	i32.add 	$push39=, $5, $pop448
-	i32.const	$push447=, 16843009
-	i32.mul 	$push446=, $4, $pop447
-	tee_local	$push445=, $4=, $pop446
-	i32.store	0($pop39):p2align=0, $pop445
-	i32.store	0($2):p2align=0, $4
-	i32.store	0($3):p2align=0, $4
-	i32.const	$push444=, 15
-	i32.const	$push443=, 65
-	call    	check@FUNCTION, $5, $pop444, $pop443
-	i32.const	$push442=, 66
-	i32.store8	0($0), $pop442
-	i32.const	$push441=, 16962
-	i32.store16	0($1):p2align=0, $pop441
-	i64.const	$push440=, 4774451407313060418
-	i64.store	0($2):p2align=0, $pop440
-	i32.const	$push439=, 1111638594
-	i32.store	0($3):p2align=0, $pop439
-	i32.const	$push438=, 15
-	i32.const	$push437=, 66
-	call    	check@FUNCTION, $5, $pop438, $pop437
-	i32.const	$push436=, 1
-	i32.add 	$push435=, $5, $pop436
-	tee_local	$push434=, $5=, $pop435
-	i32.const	$push433=, 8
-	i32.ne  	$push40=, $pop434, $pop433
-	br_if   	0, $pop40       # 0: up to label20
+	i32.const	$push510=, 0
+	i64.const	$push509=, 7016996765293437281
+	i64.store	u+23($pop510):p2align=0, $pop509
+	i32.const	$push508=, 0
+	i64.const	$push507=, 7016996765293437281
+	i64.store	u+16($pop508), $pop507
+	i32.const	$push506=, 0
+	i64.const	$push505=, 7016996765293437281
+	i64.store	u+8($pop506), $pop505
+	i32.const	$push504=, 0
+	i64.const	$push503=, 7016996765293437281
+	i64.store	u($pop504), $pop503
+	i32.const	$push502=, u+7
+	i32.add 	$push501=, $5, $pop502
+	tee_local	$push500=, $2=, $pop501
+	i64.const	$push499=, 0
+	i64.store	0($pop500):p2align=0, $pop499
+	i32.const	$push498=, u
+	i32.add 	$push497=, $5, $pop498
+	tee_local	$push496=, $3=, $pop497
+	i64.const	$push495=, 0
+	i64.store	0($pop496):p2align=0, $pop495
+	i32.const	$push494=, 15
+	i32.const	$push493=, 0
+	call    	check@FUNCTION, $5, $pop494, $pop493
+	i32.const	$push492=, 0
+	i64.load8_u	$push41=, A($pop492)
+	i64.const	$push491=, 72340172838076673
+	i64.mul 	$push490=, $pop41, $pop491
+	tee_local	$push489=, $4=, $pop490
+	i64.store	0($2):p2align=0, $pop489
+	i64.store	0($3):p2align=0, $4
+	i32.const	$push488=, 15
+	i32.const	$push487=, 65
+	call    	check@FUNCTION, $5, $pop488, $pop487
+	i64.const	$push486=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop486
+	i64.const	$push485=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop485
+	i32.const	$push484=, 15
+	i32.const	$push483=, 66
+	call    	check@FUNCTION, $5, $pop484, $pop483
+	i32.const	$push482=, 1
+	i32.add 	$push481=, $5, $pop482
+	tee_local	$push480=, $5=, $pop481
+	i32.const	$push479=, 8
+	i32.ne  	$push42=, $pop480, $pop479
+	br_if   	0, $pop42       # 0: up to label20
 # BB#30:                                # %for.end378
 	end_loop
-	i32.const	$push41=, 0
-	call    	exit@FUNCTION, $pop41
+	i32.const	$push43=, 0
+	call    	exit@FUNCTION, $pop43
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	A                       # @A
 	.type	A,@object
 	.section	.data.A,"aw",@progbits
@@ -907,6 +976,6 @@ u:
 	.size	u, 32
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/memset-3.c.s b/test/torture-s/memset-3.c.s
index 1319b1aa6..57e8166af 100644
--- a/test/torture-s/memset-3.c.s
+++ b/test/torture-s/memset-3.c.s
@@ -1,22 +1,30 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/memset-3.c"
+	.file	"memset-3.c"
 	.section	.text.reset,"ax",@progbits
-	.hidden	reset
+	.hidden	reset                   # -- Begin function reset
 	.globl	reset
 	.type	reset,@function
 reset:                                  # @reset
 # BB#0:                                 # %entry
-	i32.const	$push2=, u
-	i32.const	$push1=, 97
-	i32.const	$push0=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop2, $pop1, $pop0
+	i32.const	$push1=, 0
+	i64.const	$push0=, 7016996765293437281
+	i64.store	u+23($pop1):p2align=0, $pop0
+	i32.const	$push7=, 0
+	i64.const	$push6=, 7016996765293437281
+	i64.store	u+16($pop7), $pop6
+	i32.const	$push5=, 0
+	i64.const	$push4=, 7016996765293437281
+	i64.store	u+8($pop5), $pop4
+	i32.const	$push3=, 0
+	i64.const	$push2=, 7016996765293437281
+	i64.store	u($pop3), $pop2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	reset, .Lfunc_end0-reset
-
+                                        # -- End function
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -48,20 +56,20 @@ check:                                  # @check
 	tee_local	$push31=, $3=, $pop32
 	i32.lt_s	$push4=, $pop31, $0
 	br_if   	0, $pop4        # 0: up to label4
-# BB#4:                                 # %for.cond3.preheader.loopexit
+# BB#4:                                 # %for.end.loopexit
 	end_loop
 	i32.const	$push5=, u
 	i32.add 	$0=, $3, $pop5
 	i32.const	$push34=, 1
-	i32.ge_s	$push6=, $1, $pop34
-	br_if   	1, $pop6        # 1: down to label2
+	i32.ge_s	$push7=, $1, $pop34
+	br_if   	1, $pop7        # 1: down to label2
 	br      	2               # 2: down to label1
 .LBB1_5:
 	end_block                       # label3:
 	i32.const	$0=, u
 	i32.const	$push35=, 1
-	i32.lt_s	$push7=, $1, $pop35
-	br_if   	1, $pop7        # 1: down to label1
+	i32.lt_s	$push6=, $1, $pop35
+	br_if   	1, $pop6        # 1: down to label1
 .LBB1_6:                                # %for.body6.preheader
 	end_block                       # label2:
 	i32.const	$3=, 0
@@ -79,10 +87,10 @@ check:                                  # @check
 	tee_local	$push36=, $3=, $pop37
 	i32.lt_s	$push11=, $pop36, $1
 	br_if   	0, $pop11       # 0: up to label5
-# BB#9:                                 # %for.body19.preheader.loopexit
+# BB#9:                                 # %for.end15.loopexit
 	end_loop
 	i32.add 	$0=, $0, $3
-.LBB1_10:                               # %for.body19.preheader
+.LBB1_10:                               # %for.end15
 	end_block                       # label1:
 	i32.load8_u	$push12=, 0($0)
 	i32.const	$push39=, 97
@@ -125,23 +133,23 @@ check:                                  # @check
 	br_if   	0, $pop27       # 0: down to label0
 # BB#18:                                # %for.inc25.7
 	return
-.LBB1_19:                               # %if.then23
+.LBB1_19:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	check, .Lfunc_end1-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
@@ -149,501 +157,566 @@ main:                                   # @main
                                         #     Child Loop BB2_29 Depth 2
 	block   	
 	loop    	                # label7:
-	i32.const	$push83=, u
-	i32.const	$push82=, 97
-	i32.const	$push81=, 31
-	i32.call	$push0=, memset@FUNCTION, $pop83, $pop82, $pop81
-	i32.const	$push80=, 0
-	i32.call	$0=, memset@FUNCTION, $pop0, $pop80, $3
-	i32.const	$2=, u
+	i32.const	$push85=, 0
+	i64.const	$push84=, 7016996765293437281
+	i64.store	u+23($pop85):p2align=0, $pop84
+	i32.const	$push83=, 0
+	i64.const	$push82=, 7016996765293437281
+	i64.store	u+16($pop83), $pop82
+	i32.const	$push81=, 0
+	i64.const	$push80=, 7016996765293437281
+	i64.store	u+8($pop81), $pop80
+	i32.const	$push79=, 0
+	i64.const	$push78=, 7016996765293437281
+	i64.store	u($pop79), $pop78
+	i32.const	$push77=, u
+	i32.const	$push76=, 0
+	i32.call	$0=, memset@FUNCTION, $pop77, $pop76, $2
+	i32.const	$1=, u
 	block   	
-	i32.const	$push79=, 1
-	i32.lt_s	$push78=, $3, $pop79
-	tee_local	$push77=, $1=, $pop78
-	br_if   	0, $pop77       # 0: down to label8
+	i32.eqz 	$push281=, $2
+	br_if   	0, $pop281      # 0: down to label8
 # BB#2:                                 # %for.body6.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, 0
+	i32.const	$1=, 0
 .LBB2_3:                                # %for.body6.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label9:
-	i32.add 	$push1=, $2, $0
+	i32.add 	$push1=, $1, $0
 	i32.load8_u	$push2=, 0($pop1)
 	br_if   	3, $pop2        # 3: down to label6
 # BB#4:                                 # %for.inc12.i
                                         #   in Loop: Header=BB2_3 Depth=2
-	i32.const	$push86=, 1
-	i32.add 	$push85=, $2, $pop86
-	tee_local	$push84=, $2=, $pop85
-	i32.lt_s	$push3=, $pop84, $3
+	i32.const	$push88=, 1
+	i32.add 	$push87=, $1, $pop88
+	tee_local	$push86=, $1=, $pop87
+	i32.lt_u	$push3=, $pop86, $2
 	br_if   	0, $pop3        # 0: up to label9
-# BB#5:                                 # %for.body19.preheader.i.loopexit
+# BB#5:                                 # %for.end15.i.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$2=, $2, $0
-.LBB2_6:                                # %for.body19.preheader.i
+	i32.add 	$1=, $1, $0
+.LBB2_6:                                # %for.end15.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label8:
-	i32.load8_u	$push4=, 0($2)
-	i32.const	$push87=, 97
-	i32.ne  	$push5=, $pop4, $pop87
+	i32.load8_u	$push4=, 0($1)
+	i32.const	$push89=, 97
+	i32.ne  	$push5=, $pop4, $pop89
 	br_if   	1, $pop5        # 1: down to label6
 # BB#7:                                 # %for.inc25.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push6=, 1($2)
-	i32.const	$push88=, 97
-	i32.ne  	$push7=, $pop6, $pop88
+	i32.load8_u	$push6=, 1($1)
+	i32.const	$push90=, 97
+	i32.ne  	$push7=, $pop6, $pop90
 	br_if   	1, $pop7        # 1: down to label6
 # BB#8:                                 # %for.inc25.1.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push8=, 2($2)
-	i32.const	$push89=, 97
-	i32.ne  	$push9=, $pop8, $pop89
+	i32.load8_u	$push8=, 2($1)
+	i32.const	$push91=, 97
+	i32.ne  	$push9=, $pop8, $pop91
 	br_if   	1, $pop9        # 1: down to label6
 # BB#9:                                 # %for.inc25.2.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push10=, 3($2)
-	i32.const	$push90=, 97
-	i32.ne  	$push11=, $pop10, $pop90
+	i32.load8_u	$push10=, 3($1)
+	i32.const	$push92=, 97
+	i32.ne  	$push11=, $pop10, $pop92
 	br_if   	1, $pop11       # 1: down to label6
 # BB#10:                                # %for.inc25.3.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push12=, 4($2)
-	i32.const	$push91=, 97
-	i32.ne  	$push13=, $pop12, $pop91
+	i32.load8_u	$push12=, 4($1)
+	i32.const	$push93=, 97
+	i32.ne  	$push13=, $pop12, $pop93
 	br_if   	1, $pop13       # 1: down to label6
 # BB#11:                                # %for.inc25.4.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push14=, 5($2)
-	i32.const	$push92=, 97
-	i32.ne  	$push15=, $pop14, $pop92
+	i32.load8_u	$push14=, 5($1)
+	i32.const	$push94=, 97
+	i32.ne  	$push15=, $pop14, $pop94
 	br_if   	1, $pop15       # 1: down to label6
 # BB#12:                                # %for.inc25.5.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push16=, 6($2)
-	i32.const	$push93=, 97
-	i32.ne  	$push17=, $pop16, $pop93
+	i32.load8_u	$push16=, 6($1)
+	i32.const	$push95=, 97
+	i32.ne  	$push17=, $pop16, $pop95
 	br_if   	1, $pop17       # 1: down to label6
 # BB#13:                                # %for.inc25.6.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push18=, 7($2)
-	i32.const	$push94=, 97
-	i32.ne  	$push19=, $pop18, $pop94
+	i32.load8_u	$push18=, 7($1)
+	i32.const	$push96=, 97
+	i32.ne  	$push19=, $pop18, $pop96
 	br_if   	1, $pop19       # 1: down to label6
 # BB#14:                                # %check.exit
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, u
-	i32.const	$push96=, u
-	i32.const	$push95=, 0
-	i32.load8_u	$push20=, A($pop95)
-	i32.call	$drop=, memset@FUNCTION, $pop96, $pop20, $3
+	i32.const	$1=, u
+	i32.const	$push98=, u
+	i32.const	$push97=, 0
+	i32.load8_u	$push20=, A($pop97)
+	i32.call	$drop=, memset@FUNCTION, $pop98, $pop20, $2
 	block   	
-	br_if   	0, $1           # 0: down to label10
-# BB#15:                                # %for.body6.i241.preheader
+	i32.eqz 	$push282=, $2
+	br_if   	0, $pop282      # 0: down to label10
+# BB#15:                                # %for.body6.i242.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, 0
-.LBB2_16:                               # %for.body6.i241
+	i32.const	$1=, 0
+.LBB2_16:                               # %for.body6.i242
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label11:
-	i32.add 	$push21=, $2, $0
+	i32.add 	$push21=, $1, $0
 	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push97=, 65
-	i32.ne  	$push23=, $pop22, $pop97
+	i32.const	$push99=, 65
+	i32.ne  	$push23=, $pop22, $pop99
 	br_if   	3, $pop23       # 3: down to label6
-# BB#17:                                # %for.inc12.i246
+# BB#17:                                # %for.inc12.i247
                                         #   in Loop: Header=BB2_16 Depth=2
-	i32.const	$push100=, 1
-	i32.add 	$push99=, $2, $pop100
-	tee_local	$push98=, $2=, $pop99
-	i32.lt_s	$push24=, $pop98, $3
+	i32.const	$push102=, 1
+	i32.add 	$push101=, $1, $pop102
+	tee_local	$push100=, $1=, $pop101
+	i32.lt_u	$push24=, $pop100, $2
 	br_if   	0, $pop24       # 0: up to label11
-# BB#18:                                # %for.body19.preheader.i249.loopexit
+# BB#18:                                # %for.end15.i250.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$2=, $2, $0
-.LBB2_19:                               # %for.body19.preheader.i249
+	i32.add 	$1=, $1, $0
+.LBB2_19:                               # %for.end15.i250
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label10:
-	i32.load8_u	$push25=, 0($2)
-	i32.const	$push101=, 97
-	i32.ne  	$push26=, $pop25, $pop101
+	i32.load8_u	$push25=, 0($1)
+	i32.const	$push103=, 97
+	i32.ne  	$push26=, $pop25, $pop103
 	br_if   	1, $pop26       # 1: down to label6
-# BB#20:                                # %for.inc25.i253
+# BB#20:                                # %for.inc25.i254
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push27=, 1($2)
-	i32.const	$push102=, 97
-	i32.ne  	$push28=, $pop27, $pop102
+	i32.load8_u	$push27=, 1($1)
+	i32.const	$push104=, 97
+	i32.ne  	$push28=, $pop27, $pop104
 	br_if   	1, $pop28       # 1: down to label6
-# BB#21:                                # %for.inc25.1.i256
+# BB#21:                                # %for.inc25.1.i257
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push29=, 2($2)
-	i32.const	$push103=, 97
-	i32.ne  	$push30=, $pop29, $pop103
+	i32.load8_u	$push29=, 2($1)
+	i32.const	$push105=, 97
+	i32.ne  	$push30=, $pop29, $pop105
 	br_if   	1, $pop30       # 1: down to label6
-# BB#22:                                # %for.inc25.2.i259
+# BB#22:                                # %for.inc25.2.i260
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push31=, 3($2)
-	i32.const	$push104=, 97
-	i32.ne  	$push32=, $pop31, $pop104
+	i32.load8_u	$push31=, 3($1)
+	i32.const	$push106=, 97
+	i32.ne  	$push32=, $pop31, $pop106
 	br_if   	1, $pop32       # 1: down to label6
-# BB#23:                                # %for.inc25.3.i262
+# BB#23:                                # %for.inc25.3.i263
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push33=, 4($2)
-	i32.const	$push105=, 97
-	i32.ne  	$push34=, $pop33, $pop105
+	i32.load8_u	$push33=, 4($1)
+	i32.const	$push107=, 97
+	i32.ne  	$push34=, $pop33, $pop107
 	br_if   	1, $pop34       # 1: down to label6
-# BB#24:                                # %for.inc25.4.i265
+# BB#24:                                # %for.inc25.4.i266
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push35=, 5($2)
-	i32.const	$push106=, 97
-	i32.ne  	$push36=, $pop35, $pop106
+	i32.load8_u	$push35=, 5($1)
+	i32.const	$push108=, 97
+	i32.ne  	$push36=, $pop35, $pop108
 	br_if   	1, $pop36       # 1: down to label6
-# BB#25:                                # %for.inc25.5.i268
+# BB#25:                                # %for.inc25.5.i269
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push37=, 6($2)
-	i32.const	$push107=, 97
-	i32.ne  	$push38=, $pop37, $pop107
+	i32.load8_u	$push37=, 6($1)
+	i32.const	$push109=, 97
+	i32.ne  	$push38=, $pop37, $pop109
 	br_if   	1, $pop38       # 1: down to label6
-# BB#26:                                # %for.inc25.6.i271
+# BB#26:                                # %for.inc25.6.i272
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push39=, 7($2)
-	i32.const	$push108=, 97
-	i32.ne  	$push40=, $pop39, $pop108
+	i32.load8_u	$push39=, 7($1)
+	i32.const	$push110=, 97
+	i32.ne  	$push40=, $pop39, $pop110
 	br_if   	1, $pop40       # 1: down to label6
-# BB#27:                                # %check.exit272
+# BB#27:                                # %check.exit273
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, u
-	i32.const	$push110=, u
-	i32.const	$push109=, 66
-	i32.call	$drop=, memset@FUNCTION, $pop110, $pop109, $3
+	i32.const	$1=, u
+	i32.const	$push112=, u
+	i32.const	$push111=, 66
+	i32.call	$drop=, memset@FUNCTION, $pop112, $pop111, $2
 	block   	
-	br_if   	0, $1           # 0: down to label12
-# BB#28:                                # %for.body6.i278.preheader
+	i32.eqz 	$push283=, $2
+	br_if   	0, $pop283      # 0: down to label12
+# BB#28:                                # %for.body6.i280.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, 0
-.LBB2_29:                               # %for.body6.i278
+	i32.const	$1=, 0
+.LBB2_29:                               # %for.body6.i280
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label13:
-	i32.add 	$push41=, $2, $0
+	i32.add 	$push41=, $1, $0
 	i32.load8_u	$push42=, 0($pop41)
-	i32.const	$push111=, 66
-	i32.ne  	$push43=, $pop42, $pop111
+	i32.const	$push113=, 66
+	i32.ne  	$push43=, $pop42, $pop113
 	br_if   	3, $pop43       # 3: down to label6
-# BB#30:                                # %for.inc12.i283
+# BB#30:                                # %for.inc12.i285
                                         #   in Loop: Header=BB2_29 Depth=2
-	i32.const	$push114=, 1
-	i32.add 	$push113=, $2, $pop114
-	tee_local	$push112=, $2=, $pop113
-	i32.lt_s	$push44=, $pop112, $3
+	i32.const	$push116=, 1
+	i32.add 	$push115=, $1, $pop116
+	tee_local	$push114=, $1=, $pop115
+	i32.lt_u	$push44=, $pop114, $2
 	br_if   	0, $pop44       # 0: up to label13
-# BB#31:                                # %for.body19.preheader.i286.loopexit
+# BB#31:                                # %for.end15.i288.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$2=, $2, $0
-.LBB2_32:                               # %for.body19.preheader.i286
+	i32.add 	$1=, $1, $0
+.LBB2_32:                               # %for.end15.i288
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label12:
-	i32.load8_u	$push45=, 0($2)
-	i32.const	$push115=, 97
-	i32.ne  	$push46=, $pop45, $pop115
+	i32.load8_u	$push45=, 0($1)
+	i32.const	$push117=, 97
+	i32.ne  	$push46=, $pop45, $pop117
 	br_if   	1, $pop46       # 1: down to label6
-# BB#33:                                # %for.inc25.i290
+# BB#33:                                # %for.inc25.i292
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push47=, 1($2)
-	i32.const	$push116=, 97
-	i32.ne  	$push48=, $pop47, $pop116
+	i32.load8_u	$push47=, 1($1)
+	i32.const	$push118=, 97
+	i32.ne  	$push48=, $pop47, $pop118
 	br_if   	1, $pop48       # 1: down to label6
-# BB#34:                                # %for.inc25.1.i293
+# BB#34:                                # %for.inc25.1.i295
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push49=, 2($2)
-	i32.const	$push117=, 97
-	i32.ne  	$push50=, $pop49, $pop117
+	i32.load8_u	$push49=, 2($1)
+	i32.const	$push119=, 97
+	i32.ne  	$push50=, $pop49, $pop119
 	br_if   	1, $pop50       # 1: down to label6
-# BB#35:                                # %for.inc25.2.i296
+# BB#35:                                # %for.inc25.2.i298
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push51=, 3($2)
-	i32.const	$push118=, 97
-	i32.ne  	$push52=, $pop51, $pop118
+	i32.load8_u	$push51=, 3($1)
+	i32.const	$push120=, 97
+	i32.ne  	$push52=, $pop51, $pop120
 	br_if   	1, $pop52       # 1: down to label6
-# BB#36:                                # %for.inc25.3.i299
+# BB#36:                                # %for.inc25.3.i301
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push53=, 4($2)
-	i32.const	$push119=, 97
-	i32.ne  	$push54=, $pop53, $pop119
+	i32.load8_u	$push53=, 4($1)
+	i32.const	$push121=, 97
+	i32.ne  	$push54=, $pop53, $pop121
 	br_if   	1, $pop54       # 1: down to label6
-# BB#37:                                # %for.inc25.4.i302
+# BB#37:                                # %for.inc25.4.i304
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push55=, 5($2)
-	i32.const	$push120=, 97
-	i32.ne  	$push56=, $pop55, $pop120
+	i32.load8_u	$push55=, 5($1)
+	i32.const	$push122=, 97
+	i32.ne  	$push56=, $pop55, $pop122
 	br_if   	1, $pop56       # 1: down to label6
-# BB#38:                                # %for.inc25.5.i305
+# BB#38:                                # %for.inc25.5.i307
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push57=, 6($2)
-	i32.const	$push121=, 97
-	i32.ne  	$push58=, $pop57, $pop121
+	i32.load8_u	$push57=, 6($1)
+	i32.const	$push123=, 97
+	i32.ne  	$push58=, $pop57, $pop123
 	br_if   	1, $pop58       # 1: down to label6
-# BB#39:                                # %for.inc25.6.i308
+# BB#39:                                # %for.inc25.6.i310
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push59=, 7($2)
-	i32.const	$push122=, 97
-	i32.ne  	$push60=, $pop59, $pop122
+	i32.load8_u	$push59=, 7($1)
+	i32.const	$push124=, 97
+	i32.ne  	$push60=, $pop59, $pop124
 	br_if   	1, $pop60       # 1: down to label6
 # BB#40:                                # %for.cond
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push126=, 1
-	i32.add 	$push125=, $3, $pop126
-	tee_local	$push124=, $3=, $pop125
-	i32.const	$push123=, 15
-	i32.lt_s	$push61=, $pop124, $pop123
-	br_if   	0, $pop61       # 0: up to label7
+	i32.const	$push126=, 14
+	i32.lt_u	$0=, $2, $pop126
+	i32.const	$push125=, 1
+	i32.add 	$push0=, $2, $pop125
+	copy_local	$2=, $pop0
+	br_if   	0, $0           # 0: up to label7
 # BB#41:                                # %for.body13.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_42:                               # %for.body13
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label14:
-	i32.const	$push143=, u
-	i32.const	$push142=, 97
-	i32.const	$push141=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop143, $pop142, $pop141
+	i32.const	$push148=, 0
+	i64.const	$push147=, 7016996765293437281
+	i64.store	u+23($pop148):p2align=0, $pop147
+	i32.const	$push146=, 0
+	i64.const	$push145=, 7016996765293437281
+	i64.store	u+16($pop146), $pop145
+	i32.const	$push144=, 0
+	i64.const	$push143=, 7016996765293437281
+	i64.store	u+8($pop144), $pop143
+	i32.const	$push142=, 0
+	i64.const	$push141=, 7016996765293437281
+	i64.store	u($pop142), $pop141
 	i32.const	$push140=, u+1
 	i32.const	$push139=, 0
-	i32.call	$0=, memset@FUNCTION, $pop140, $pop139, $3
+	i32.call	$0=, memset@FUNCTION, $pop140, $pop139, $2
 	i32.const	$push138=, 1
 	i32.const	$push137=, 0
-	call    	check@FUNCTION, $pop138, $3, $pop137
+	call    	check@FUNCTION, $pop138, $2, $pop137
 	i32.const	$push136=, 0
-	i32.load8_u	$push62=, A($pop136)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop62, $3
+	i32.load8_u	$push61=, A($pop136)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop61, $2
 	i32.const	$push135=, 1
 	i32.const	$push134=, 65
-	call    	check@FUNCTION, $pop135, $3, $pop134
+	call    	check@FUNCTION, $pop135, $2, $pop134
 	i32.const	$push133=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop133, $3
+	i32.call	$drop=, memset@FUNCTION, $0, $pop133, $2
 	i32.const	$push132=, 1
 	i32.const	$push131=, 66
-	call    	check@FUNCTION, $pop132, $3, $pop131
+	call    	check@FUNCTION, $pop132, $2, $pop131
 	i32.const	$push130=, 1
-	i32.add 	$push129=, $3, $pop130
-	tee_local	$push128=, $3=, $pop129
+	i32.add 	$push129=, $2, $pop130
+	tee_local	$push128=, $2=, $pop129
 	i32.const	$push127=, 15
-	i32.ne  	$push63=, $pop128, $pop127
-	br_if   	0, $pop63       # 0: up to label14
+	i32.ne  	$push62=, $pop128, $pop127
+	br_if   	0, $pop62       # 0: up to label14
 # BB#43:                                # %for.body33.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_44:                               # %for.body33
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.const	$push160=, u
-	i32.const	$push159=, 97
-	i32.const	$push158=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop160, $pop159, $pop158
-	i32.const	$push157=, u+2
-	i32.const	$push156=, 0
-	i32.call	$0=, memset@FUNCTION, $pop157, $pop156, $3
-	i32.const	$push155=, 2
-	i32.const	$push154=, 0
-	call    	check@FUNCTION, $pop155, $3, $pop154
-	i32.const	$push153=, 0
-	i32.load8_u	$push64=, A($pop153)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop64, $3
-	i32.const	$push152=, 2
-	i32.const	$push151=, 65
-	call    	check@FUNCTION, $pop152, $3, $pop151
-	i32.const	$push150=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop150, $3
-	i32.const	$push149=, 2
-	i32.const	$push148=, 66
-	call    	check@FUNCTION, $pop149, $3, $pop148
-	i32.const	$push147=, 1
-	i32.add 	$push146=, $3, $pop147
-	tee_local	$push145=, $3=, $pop146
-	i32.const	$push144=, 15
-	i32.ne  	$push65=, $pop145, $pop144
-	br_if   	0, $pop65       # 0: up to label15
+	i32.const	$push170=, 0
+	i64.const	$push169=, 7016996765293437281
+	i64.store	u+23($pop170):p2align=0, $pop169
+	i32.const	$push168=, 0
+	i64.const	$push167=, 7016996765293437281
+	i64.store	u+16($pop168), $pop167
+	i32.const	$push166=, 0
+	i64.const	$push165=, 7016996765293437281
+	i64.store	u+8($pop166), $pop165
+	i32.const	$push164=, 0
+	i64.const	$push163=, 7016996765293437281
+	i64.store	u($pop164), $pop163
+	i32.const	$push162=, u+2
+	i32.const	$push161=, 0
+	i32.call	$0=, memset@FUNCTION, $pop162, $pop161, $2
+	i32.const	$push160=, 2
+	i32.const	$push159=, 0
+	call    	check@FUNCTION, $pop160, $2, $pop159
+	i32.const	$push158=, 0
+	i32.load8_u	$push63=, A($pop158)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop63, $2
+	i32.const	$push157=, 2
+	i32.const	$push156=, 65
+	call    	check@FUNCTION, $pop157, $2, $pop156
+	i32.const	$push155=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop155, $2
+	i32.const	$push154=, 2
+	i32.const	$push153=, 66
+	call    	check@FUNCTION, $pop154, $2, $pop153
+	i32.const	$push152=, 1
+	i32.add 	$push151=, $2, $pop152
+	tee_local	$push150=, $2=, $pop151
+	i32.const	$push149=, 15
+	i32.ne  	$push64=, $pop150, $pop149
+	br_if   	0, $pop64       # 0: up to label15
 # BB#45:                                # %for.body53.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_46:                               # %for.body53
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label16:
-	i32.const	$push177=, u
-	i32.const	$push176=, 97
-	i32.const	$push175=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop177, $pop176, $pop175
-	i32.const	$push174=, u+3
-	i32.const	$push173=, 0
-	i32.call	$0=, memset@FUNCTION, $pop174, $pop173, $3
-	i32.const	$push172=, 3
-	i32.const	$push171=, 0
-	call    	check@FUNCTION, $pop172, $3, $pop171
-	i32.const	$push170=, 0
-	i32.load8_u	$push66=, A($pop170)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop66, $3
-	i32.const	$push169=, 3
-	i32.const	$push168=, 65
-	call    	check@FUNCTION, $pop169, $3, $pop168
-	i32.const	$push167=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop167, $3
-	i32.const	$push166=, 3
-	i32.const	$push165=, 66
-	call    	check@FUNCTION, $pop166, $3, $pop165
-	i32.const	$push164=, 1
-	i32.add 	$push163=, $3, $pop164
-	tee_local	$push162=, $3=, $pop163
-	i32.const	$push161=, 15
-	i32.ne  	$push67=, $pop162, $pop161
-	br_if   	0, $pop67       # 0: up to label16
+	i32.const	$push192=, 0
+	i64.const	$push191=, 7016996765293437281
+	i64.store	u+23($pop192):p2align=0, $pop191
+	i32.const	$push190=, 0
+	i64.const	$push189=, 7016996765293437281
+	i64.store	u+16($pop190), $pop189
+	i32.const	$push188=, 0
+	i64.const	$push187=, 7016996765293437281
+	i64.store	u+8($pop188), $pop187
+	i32.const	$push186=, 0
+	i64.const	$push185=, 7016996765293437281
+	i64.store	u($pop186), $pop185
+	i32.const	$push184=, u+3
+	i32.const	$push183=, 0
+	i32.call	$0=, memset@FUNCTION, $pop184, $pop183, $2
+	i32.const	$push182=, 3
+	i32.const	$push181=, 0
+	call    	check@FUNCTION, $pop182, $2, $pop181
+	i32.const	$push180=, 0
+	i32.load8_u	$push65=, A($pop180)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop65, $2
+	i32.const	$push179=, 3
+	i32.const	$push178=, 65
+	call    	check@FUNCTION, $pop179, $2, $pop178
+	i32.const	$push177=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop177, $2
+	i32.const	$push176=, 3
+	i32.const	$push175=, 66
+	call    	check@FUNCTION, $pop176, $2, $pop175
+	i32.const	$push174=, 1
+	i32.add 	$push173=, $2, $pop174
+	tee_local	$push172=, $2=, $pop173
+	i32.const	$push171=, 15
+	i32.ne  	$push66=, $pop172, $pop171
+	br_if   	0, $pop66       # 0: up to label16
 # BB#47:                                # %for.body73.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_48:                               # %for.body73
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label17:
-	i32.const	$push194=, u
-	i32.const	$push193=, 97
-	i32.const	$push192=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop194, $pop193, $pop192
-	i32.const	$push191=, u+4
-	i32.const	$push190=, 0
-	i32.call	$0=, memset@FUNCTION, $pop191, $pop190, $3
-	i32.const	$push189=, 4
-	i32.const	$push188=, 0
-	call    	check@FUNCTION, $pop189, $3, $pop188
-	i32.const	$push187=, 0
-	i32.load8_u	$push68=, A($pop187)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop68, $3
-	i32.const	$push186=, 4
-	i32.const	$push185=, 65
-	call    	check@FUNCTION, $pop186, $3, $pop185
-	i32.const	$push184=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop184, $3
-	i32.const	$push183=, 4
-	i32.const	$push182=, 66
-	call    	check@FUNCTION, $pop183, $3, $pop182
-	i32.const	$push181=, 1
-	i32.add 	$push180=, $3, $pop181
-	tee_local	$push179=, $3=, $pop180
-	i32.const	$push178=, 15
-	i32.ne  	$push69=, $pop179, $pop178
-	br_if   	0, $pop69       # 0: up to label17
+	i32.const	$push214=, 0
+	i64.const	$push213=, 7016996765293437281
+	i64.store	u+23($pop214):p2align=0, $pop213
+	i32.const	$push212=, 0
+	i64.const	$push211=, 7016996765293437281
+	i64.store	u+16($pop212), $pop211
+	i32.const	$push210=, 0
+	i64.const	$push209=, 7016996765293437281
+	i64.store	u+8($pop210), $pop209
+	i32.const	$push208=, 0
+	i64.const	$push207=, 7016996765293437281
+	i64.store	u($pop208), $pop207
+	i32.const	$push206=, u+4
+	i32.const	$push205=, 0
+	i32.call	$0=, memset@FUNCTION, $pop206, $pop205, $2
+	i32.const	$push204=, 4
+	i32.const	$push203=, 0
+	call    	check@FUNCTION, $pop204, $2, $pop203
+	i32.const	$push202=, 0
+	i32.load8_u	$push67=, A($pop202)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop67, $2
+	i32.const	$push201=, 4
+	i32.const	$push200=, 65
+	call    	check@FUNCTION, $pop201, $2, $pop200
+	i32.const	$push199=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop199, $2
+	i32.const	$push198=, 4
+	i32.const	$push197=, 66
+	call    	check@FUNCTION, $pop198, $2, $pop197
+	i32.const	$push196=, 1
+	i32.add 	$push195=, $2, $pop196
+	tee_local	$push194=, $2=, $pop195
+	i32.const	$push193=, 15
+	i32.ne  	$push68=, $pop194, $pop193
+	br_if   	0, $pop68       # 0: up to label17
 # BB#49:                                # %for.body93.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_50:                               # %for.body93
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.const	$push211=, u
-	i32.const	$push210=, 97
-	i32.const	$push209=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop211, $pop210, $pop209
-	i32.const	$push208=, u+5
-	i32.const	$push207=, 0
-	i32.call	$0=, memset@FUNCTION, $pop208, $pop207, $3
-	i32.const	$push206=, 5
-	i32.const	$push205=, 0
-	call    	check@FUNCTION, $pop206, $3, $pop205
-	i32.const	$push204=, 0
-	i32.load8_u	$push70=, A($pop204)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop70, $3
-	i32.const	$push203=, 5
-	i32.const	$push202=, 65
-	call    	check@FUNCTION, $pop203, $3, $pop202
-	i32.const	$push201=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop201, $3
-	i32.const	$push200=, 5
-	i32.const	$push199=, 66
-	call    	check@FUNCTION, $pop200, $3, $pop199
-	i32.const	$push198=, 1
-	i32.add 	$push197=, $3, $pop198
-	tee_local	$push196=, $3=, $pop197
-	i32.const	$push195=, 15
-	i32.ne  	$push71=, $pop196, $pop195
-	br_if   	0, $pop71       # 0: up to label18
+	i32.const	$push236=, 0
+	i64.const	$push235=, 7016996765293437281
+	i64.store	u+23($pop236):p2align=0, $pop235
+	i32.const	$push234=, 0
+	i64.const	$push233=, 7016996765293437281
+	i64.store	u+16($pop234), $pop233
+	i32.const	$push232=, 0
+	i64.const	$push231=, 7016996765293437281
+	i64.store	u+8($pop232), $pop231
+	i32.const	$push230=, 0
+	i64.const	$push229=, 7016996765293437281
+	i64.store	u($pop230), $pop229
+	i32.const	$push228=, u+5
+	i32.const	$push227=, 0
+	i32.call	$0=, memset@FUNCTION, $pop228, $pop227, $2
+	i32.const	$push226=, 5
+	i32.const	$push225=, 0
+	call    	check@FUNCTION, $pop226, $2, $pop225
+	i32.const	$push224=, 0
+	i32.load8_u	$push69=, A($pop224)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop69, $2
+	i32.const	$push223=, 5
+	i32.const	$push222=, 65
+	call    	check@FUNCTION, $pop223, $2, $pop222
+	i32.const	$push221=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop221, $2
+	i32.const	$push220=, 5
+	i32.const	$push219=, 66
+	call    	check@FUNCTION, $pop220, $2, $pop219
+	i32.const	$push218=, 1
+	i32.add 	$push217=, $2, $pop218
+	tee_local	$push216=, $2=, $pop217
+	i32.const	$push215=, 15
+	i32.ne  	$push70=, $pop216, $pop215
+	br_if   	0, $pop70       # 0: up to label18
 # BB#51:                                # %for.body113.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_52:                               # %for.body113
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label19:
-	i32.const	$push228=, u
-	i32.const	$push227=, 97
-	i32.const	$push226=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop228, $pop227, $pop226
-	i32.const	$push225=, u+6
-	i32.const	$push224=, 0
-	i32.call	$0=, memset@FUNCTION, $pop225, $pop224, $3
-	i32.const	$push223=, 6
-	i32.const	$push222=, 0
-	call    	check@FUNCTION, $pop223, $3, $pop222
-	i32.const	$push221=, 0
-	i32.load8_u	$push72=, A($pop221)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop72, $3
-	i32.const	$push220=, 6
-	i32.const	$push219=, 65
-	call    	check@FUNCTION, $pop220, $3, $pop219
-	i32.const	$push218=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop218, $3
-	i32.const	$push217=, 6
-	i32.const	$push216=, 66
-	call    	check@FUNCTION, $pop217, $3, $pop216
-	i32.const	$push215=, 1
-	i32.add 	$push214=, $3, $pop215
-	tee_local	$push213=, $3=, $pop214
-	i32.const	$push212=, 15
-	i32.ne  	$push73=, $pop213, $pop212
-	br_if   	0, $pop73       # 0: up to label19
+	i32.const	$push258=, 0
+	i64.const	$push257=, 7016996765293437281
+	i64.store	u+23($pop258):p2align=0, $pop257
+	i32.const	$push256=, 0
+	i64.const	$push255=, 7016996765293437281
+	i64.store	u+16($pop256), $pop255
+	i32.const	$push254=, 0
+	i64.const	$push253=, 7016996765293437281
+	i64.store	u+8($pop254), $pop253
+	i32.const	$push252=, 0
+	i64.const	$push251=, 7016996765293437281
+	i64.store	u($pop252), $pop251
+	i32.const	$push250=, u+6
+	i32.const	$push249=, 0
+	i32.call	$0=, memset@FUNCTION, $pop250, $pop249, $2
+	i32.const	$push248=, 6
+	i32.const	$push247=, 0
+	call    	check@FUNCTION, $pop248, $2, $pop247
+	i32.const	$push246=, 0
+	i32.load8_u	$push71=, A($pop246)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop71, $2
+	i32.const	$push245=, 6
+	i32.const	$push244=, 65
+	call    	check@FUNCTION, $pop245, $2, $pop244
+	i32.const	$push243=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop243, $2
+	i32.const	$push242=, 6
+	i32.const	$push241=, 66
+	call    	check@FUNCTION, $pop242, $2, $pop241
+	i32.const	$push240=, 1
+	i32.add 	$push239=, $2, $pop240
+	tee_local	$push238=, $2=, $pop239
+	i32.const	$push237=, 15
+	i32.ne  	$push72=, $pop238, $pop237
+	br_if   	0, $pop72       # 0: up to label19
 # BB#53:                                # %for.body133.preheader
 	end_loop
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 .LBB2_54:                               # %for.body133
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label20:
-	i32.const	$push245=, u
-	i32.const	$push244=, 97
-	i32.const	$push243=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop245, $pop244, $pop243
-	i32.const	$push242=, u+7
-	i32.const	$push241=, 0
-	i32.call	$0=, memset@FUNCTION, $pop242, $pop241, $3
-	i32.const	$push240=, 7
-	i32.const	$push239=, 0
-	call    	check@FUNCTION, $pop240, $3, $pop239
-	i32.const	$push238=, 0
-	i32.load8_u	$push74=, A($pop238)
-	i32.call	$drop=, memset@FUNCTION, $0, $pop74, $3
-	i32.const	$push237=, 7
-	i32.const	$push236=, 65
-	call    	check@FUNCTION, $pop237, $3, $pop236
-	i32.const	$push235=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop235, $3
-	i32.const	$push234=, 7
-	i32.const	$push233=, 66
-	call    	check@FUNCTION, $pop234, $3, $pop233
-	i32.const	$push232=, 1
-	i32.add 	$push231=, $3, $pop232
-	tee_local	$push230=, $3=, $pop231
-	i32.const	$push229=, 15
-	i32.ne  	$push75=, $pop230, $pop229
-	br_if   	0, $pop75       # 0: up to label20
+	i32.const	$push280=, 0
+	i64.const	$push279=, 7016996765293437281
+	i64.store	u+23($pop280):p2align=0, $pop279
+	i32.const	$push278=, 0
+	i64.const	$push277=, 7016996765293437281
+	i64.store	u+16($pop278), $pop277
+	i32.const	$push276=, 0
+	i64.const	$push275=, 7016996765293437281
+	i64.store	u+8($pop276), $pop275
+	i32.const	$push274=, 0
+	i64.const	$push273=, 7016996765293437281
+	i64.store	u($pop274), $pop273
+	i32.const	$push272=, u+7
+	i32.const	$push271=, 0
+	i32.call	$0=, memset@FUNCTION, $pop272, $pop271, $2
+	i32.const	$push270=, 7
+	i32.const	$push269=, 0
+	call    	check@FUNCTION, $pop270, $2, $pop269
+	i32.const	$push268=, 0
+	i32.load8_u	$push73=, A($pop268)
+	i32.call	$drop=, memset@FUNCTION, $0, $pop73, $2
+	i32.const	$push267=, 7
+	i32.const	$push266=, 65
+	call    	check@FUNCTION, $pop267, $2, $pop266
+	i32.const	$push265=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop265, $2
+	i32.const	$push264=, 7
+	i32.const	$push263=, 66
+	call    	check@FUNCTION, $pop264, $2, $pop263
+	i32.const	$push262=, 1
+	i32.add 	$push261=, $2, $pop262
+	tee_local	$push260=, $2=, $pop261
+	i32.const	$push259=, 15
+	i32.ne  	$push74=, $pop260, $pop259
+	br_if   	0, $pop74       # 0: up to label20
 # BB#55:                                # %for.end149
 	end_loop
-	i32.const	$push76=, 0
-	call    	exit@FUNCTION, $pop76
+	i32.const	$push75=, 0
+	call    	exit@FUNCTION, $pop75
 	unreachable
-.LBB2_56:                               # %if.then23.i287
+.LBB2_56:                               # %if.then10.i
 	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	A                       # @A
 	.type	A,@object
 	.section	.data.A,"aw",@progbits
@@ -660,6 +733,6 @@ u:
 	.size	u, 32
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/mod-1.c.s b/test/torture-s/mod-1.c.s
index 0da274cb2..4af150eed 100644
--- a/test/torture-s/mod-1.c.s
+++ b/test/torture-s/mod-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/mod-1.c"
+	.file	"mod-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,8 +34,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/mode-dependent-address.c.s b/test/torture-s/mode-dependent-address.c.s
index b77d7990a..f965ca4ef 100644
--- a/test/torture-s/mode-dependent-address.c.s
+++ b/test/torture-s/mode-dependent-address.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c"
+	.file	"mode-dependent-address.c"
 	.section	.text.f883b,"ax",@progbits
-	.hidden	f883b
+	.hidden	f883b                   # -- Begin function f883b
 	.globl	f883b
 	.type	f883b,@function
 f883b:                                  # @f883b
@@ -13,6 +13,7 @@ f883b:                                  # @f883b
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	i32.add 	$push12=, $0, $6
+	i64.load	$push10=, 0($3)
 	i32.load16_s	$push29=, 0($1)
 	tee_local	$push28=, $5=, $pop29
 	i32.const	$push27=, 1
@@ -32,8 +33,7 @@ f883b:                                  # @f883b
 	i32.const	$push21=, 251
 	i32.or  	$push8=, $pop7, $pop21
 	i64.extend_u/i32	$push9=, $pop8
-	i64.load	$push10=, 0($3)
-	i64.and 	$push11=, $pop9, $pop10
+	i64.and 	$push11=, $pop10, $pop9
 	i64.store8	0($pop12), $pop11
 	i32.const	$push20=, 8
 	i32.add 	$3=, $3, $pop20
@@ -53,9 +53,9 @@ f883b:                                  # @f883b
 	.endfunc
 .Lfunc_end0:
 	.size	f883b, .Lfunc_end0-f883b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -102,6 +102,7 @@ main:                                   # @main
 .LBB1_3:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
+	i64.load	$push15=, 0($3)
 	i32.const	$push50=, arg1+192
 	i32.add 	$push4=, $1, $pop50
 	i32.load16_s	$push49=, 0($pop4)
@@ -123,8 +124,7 @@ main:                                   # @main
 	i32.const	$push41=, 251
 	i32.or  	$push13=, $pop12, $pop41
 	i64.extend_u/i32	$push14=, $pop13
-	i64.load	$push15=, 0($3)
-	i64.and 	$push16=, $pop14, $pop15
+	i64.and 	$push16=, $pop15, $pop14
 	i64.store8	0($4), $pop16
 	i32.const	$push40=, 4
 	i32.add 	$2=, $2, $pop40
@@ -138,17 +138,17 @@ main:                                   # @main
 	br_if   	0, $pop35       # 0: up to label2
 # BB#4:                                 # %for.body10.preheader
 	end_loop
-	i32.const	$4=, 0
+	i32.const	$4=, -1
 	i32.const	$3=, .Lmain.correct
 .LBB1_5:                                # %for.body10
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	i32.const	$push51=, result
+	i32.load	$push19=, 0($3)
+	i32.const	$push51=, result+1
 	i32.add 	$push17=, $4, $pop51
 	i32.load8_s	$push18=, 0($pop17)
-	i32.load	$push19=, 0($3)
-	i32.ne  	$push20=, $pop18, $pop19
+	i32.ne  	$push20=, $pop19, $pop18
 	br_if   	1, $pop20       # 1: down to label3
 # BB#6:                                 # %for.cond7
                                         #   in Loop: Header=BB1_5 Depth=1
@@ -157,8 +157,8 @@ main:                                   # @main
 	i32.const	$push55=, 1
 	i32.add 	$push54=, $4, $pop55
 	tee_local	$push53=, $4=, $pop54
-	i32.const	$push52=, 95
-	i32.le_s	$push21=, $pop53, $pop52
+	i32.const	$push52=, 94
+	i32.le_u	$push21=, $pop53, $pop52
 	br_if   	0, $pop21       # 0: up to label4
 # BB#7:                                 # %for.end18
 	end_loop
@@ -171,7 +171,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.correct,@object  # @main.correct
 	.section	.rodata..Lmain.correct,"a",@progbits
 	.p2align	4
@@ -320,5 +320,5 @@ result:
 	.size	result, 96
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/multdi-1.c.s b/test/torture-s/multdi-1.c.s
index 910023f02..a4d5970e3 100644
--- a/test/torture-s/multdi-1.c.s
+++ b/test/torture-s/multdi-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/multdi-1.c"
+	.file	"multdi-1.c"
 	.section	.text.mpy,"ax",@progbits
-	.hidden	mpy
+	.hidden	mpy                     # -- Begin function mpy
 	.globl	mpy
 	.type	mpy,@function
 mpy:                                    # @mpy
@@ -15,9 +15,9 @@ mpy:                                    # @mpy
 	.endfunc
 .Lfunc_end0:
 	.size	mpy, .Lfunc_end0-mpy
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	mpy_res                 # @mpy_res
 	.type	mpy_res,@object
 	.section	.bss.mpy_res,"aw",@nobits
@@ -42,4 +42,4 @@ mpy_res:
 	.size	mpy_res, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/multi-ix.c.s b/test/torture-s/multi-ix.c.s
index d53457d57..a71003332 100644
--- a/test/torture-s/multi-ix.c.s
+++ b/test/torture-s/multi-ix.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/multi-ix.c"
+	.file	"multi-ix.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,10 +9,10 @@ f:                                      # @f
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push193=, 0
-	i32.const	$push190=, 0
-	i32.load	$push191=, __stack_pointer($pop190)
+	i32.const	$push191=, 0
+	i32.load	$push190=, __stack_pointer($pop191)
 	i32.const	$push192=, 80480
-	i32.sub 	$push666=, $pop191, $pop192
+	i32.sub 	$push666=, $pop190, $pop192
 	tee_local	$push665=, $41=, $pop666
 	i32.store	__stack_pointer($pop193), $pop665
 	block   	
@@ -291,8 +291,8 @@ f:                                      # @f
 	i32.const	$push349=, 320
 	i32.add 	$push350=, $41, $pop349
 	call    	s@FUNCTION, $pop784, $pop350
-	i32.load	$1=, 480($41)
-	i32.load	$2=, 2480($41)
+	i32.load	$1=, 2480($41)
+	i32.load	$2=, 480($41)
 	i32.load	$3=, 4480($41)
 	i32.load	$4=, 6480($41)
 	i32.load	$5=, 8480($41)
@@ -310,8 +310,8 @@ f:                                      # @f
 	i32.load	$17=, 32480($41)
 	i32.load	$18=, 34480($41)
 	i32.load	$19=, 36480($41)
-	i32.load	$20=, 38480($41)
-	i32.load	$21=, 40480($41)
+	i32.load	$20=, 40480($41)
+	i32.load	$21=, 38480($41)
 	i32.load	$22=, 42480($41)
 	i32.load	$23=, 44480($41)
 	i32.load	$24=, 46480($41)
@@ -713,13 +713,13 @@ f:                                      # @f
 	i32.shl 	$push110=, $22, $pop728
 	i32.add 	$push111=, $pop542, $pop110
 	i32.store	0($pop111), $22
-	i32.const	$push543=, 40480
+	i32.const	$push543=, 38480
 	i32.add 	$push544=, $41, $pop543
 	i32.const	$push727=, 2
 	i32.shl 	$push112=, $21, $pop727
 	i32.add 	$push113=, $pop544, $pop112
 	i32.store	0($pop113), $21
-	i32.const	$push545=, 38480
+	i32.const	$push545=, 40480
 	i32.add 	$push546=, $41, $pop545
 	i32.const	$push726=, 2
 	i32.shl 	$push114=, $20, $pop726
@@ -827,13 +827,13 @@ f:                                      # @f
 	i32.shl 	$push148=, $3, $pop709
 	i32.add 	$push149=, $pop580, $pop148
 	i32.store	0($pop149), $3
-	i32.const	$push581=, 2480
+	i32.const	$push581=, 480
 	i32.add 	$push582=, $41, $pop581
 	i32.const	$push708=, 2
 	i32.shl 	$push150=, $2, $pop708
 	i32.add 	$push151=, $pop582, $pop150
 	i32.store	0($pop151), $2
-	i32.const	$push583=, 480
+	i32.const	$push583=, 2480
 	i32.add 	$push584=, $41, $pop583
 	i32.const	$push707=, 2
 	i32.shl 	$push152=, $1, $pop707
@@ -1048,19 +1048,19 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.s,"ax",@progbits
-	.hidden	s
+	.hidden	s                       # -- Begin function s
 	.globl	s
 	.type	s,@function
 s:                                      # @s
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push7=, $pop4, $pop5
+	i32.sub 	$push7=, $pop3, $pop5
 	tee_local	$push6=, $2=, $pop7
 	i32.store	12($pop6), $1
 	block   	
@@ -1092,9 +1092,9 @@ s:                                      # @s
 	.endfunc
 .Lfunc_end1:
 	.size	s, .Lfunc_end1-s
-
+                                        # -- End function
 	.section	.text.z,"ax",@progbits
-	.hidden	z
+	.hidden	z                       # -- Begin function z
 	.globl	z
 	.type	z,@function
 z:                                      # @z
@@ -1102,17 +1102,17 @@ z:                                      # @z
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $3=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($3), $1
 	block   	
 	i32.eqz 	$push18=, $0
 	br_if   	0, $pop18       # 0: down to label4
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.load	$1=, 12($3)
 .LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
@@ -1141,68 +1141,76 @@ z:                                      # @z
 	.endfunc
 .Lfunc_end2:
 	.size	z, .Lfunc_end2-z
-
+                                        # -- End function
 	.section	.text.c,"ax",@progbits
-	.hidden	c
+	.hidden	c                       # -- Begin function c
 	.globl	c
 	.type	c,@function
 c:                                      # @c
 	.param  	i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
-	tee_local	$push15=, $3=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
-	i32.store	12($3), $1
-	i32.const	$push1=, 2
-	i32.shl 	$push2=, $0, $pop1
-	i32.const	$push14=, -4
-	i32.add 	$1=, $pop2, $pop14
-.LBB3_1:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.sub 	$push15=, $pop7, $pop9
+	tee_local	$push14=, $4=, $pop15
+	i32.store	__stack_pointer($pop10), $pop14
+	i32.store	12($4), $1
 	block   	
-	loop    	                # label7:
-	i32.eqz 	$push24=, $0
-	br_if   	1, $pop24       # 1: down to label6
-# BB#2:                                 # %while.body
-                                        #   in Loop: Header=BB3_1 Depth=1
-	i32.load	$push23=, 12($3)
-	tee_local	$push22=, $2=, $pop23
-	i32.const	$push21=, 4
-	i32.add 	$push3=, $pop22, $pop21
-	i32.store	12($3), $pop3
-	i32.load	$push4=, 0($2)
-	i32.add 	$2=, $pop4, $1
-	i32.const	$push20=, -4
-	i32.add 	$push0=, $1, $pop20
-	copy_local	$1=, $pop0
-	i32.const	$push19=, -1
-	i32.add 	$push18=, $0, $pop19
-	tee_local	$push17=, $0=, $pop18
-	i32.load	$push5=, 0($2)
-	i32.eq  	$push6=, $pop17, $pop5
-	br_if   	0, $pop6        # 0: up to label7
-# BB#3:                                 # %if.then
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+	block   	
+	i32.eqz 	$push26=, $0
+	br_if   	0, $pop26       # 0: down to label7
+# BB#1:                                 # %while.body.lr.ph
+	i32.const	$push17=, -1
+	i32.add 	$1=, $0, $pop17
+	i32.const	$push0=, 2
+	i32.shl 	$push1=, $0, $pop0
+	i32.const	$push16=, -4
+	i32.add 	$0=, $pop1, $pop16
+	i32.load	$3=, 12($4)
+.LBB3_2:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label8:
+	i32.const	$push20=, 4
+	i32.add 	$push19=, $3, $pop20
+	tee_local	$push18=, $2=, $pop19
+	i32.store	12($4), $pop18
+	i32.load	$push2=, 0($3)
+	i32.add 	$push3=, $pop2, $0
+	i32.load	$push4=, 0($pop3)
+	i32.ne  	$push5=, $1, $pop4
+	br_if   	2, $pop5        # 2: down to label6
+# BB#3:                                 # %while.cond
+                                        #   in Loop: Header=BB3_2 Depth=1
+	i32.const	$push25=, -4
+	i32.add 	$0=, $0, $pop25
+	copy_local	$3=, $2
+	i32.const	$push24=, -1
+	i32.add 	$push23=, $1, $pop24
+	tee_local	$push22=, $1=, $pop23
+	i32.const	$push21=, -1
+	i32.ne  	$push6=, $pop22, $pop21
+	br_if   	0, $pop6        # 0: up to label8
 .LBB3_4:                                # %while.end
-	end_block                       # label6:
+	end_loop
+	end_block                       # label7:
 	i32.const	$push13=, 0
 	i32.const	$push11=, 16
-	i32.add 	$push12=, $3, $pop11
+	i32.add 	$push12=, $4, $pop11
 	i32.store	__stack_pointer($pop13), $pop12
-                                        # fallthrough-return
+	return
+.LBB3_5:                                # %if.then
+	end_block                       # label6:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	c, .Lfunc_end3-c
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1216,8 +1224,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/nestfunc-4.c.s b/test/torture-s/nestfunc-4.c.s
index 3e757faf3..2e1b2ce37 100644
--- a/test/torture-s/nestfunc-4.c.s
+++ b/test/torture-s/nestfunc-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/nestfunc-4.c"
+	.file	"nestfunc-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,9 +25,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -50,9 +50,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -76,7 +76,7 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end2:
 	.size	bar, .Lfunc_end2-bar
-
+                                        # -- End function
 	.hidden	level                   # @level
 	.type	level,@object
 	.section	.bss.level,"aw",@nobits
@@ -87,5 +87,5 @@ level:
 	.size	level, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/p18298.c.s b/test/torture-s/p18298.c.s
index 9a91bd617..b451802e0 100644
--- a/test/torture-s/p18298.c.s
+++ b/test/torture-s/p18298.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/p18298.c"
+	.file	"p18298.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	i32.load8_u	$push0=, s($pop1)
 	i32.eqz 	$push5=, $pop0
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %while.body
+# BB#1:                                 # %while.cond
 	i32.const	$push3=, 0
 	i32.const	$push2=, 0
 	i32.store8	s($pop3), $pop2
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -50,5 +50,5 @@ s:
 	.size	s, 2048
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/packed-1.c.s b/test/torture-s/packed-1.c.s
index cf03abef9..89877790a 100644
--- a/test/torture-s/packed-1.c.s
+++ b/test/torture-s/packed-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/packed-1.c"
+	.file	"packed-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -26,9 +26,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x1                      # @x1
 	.type	x1,@object
 	.section	.data.x1,"aw",@progbits
@@ -61,6 +61,6 @@ t:
 	.size	t, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/packed-2.c.s b/test/torture-s/packed-2.c.s
index 1b5fe0a76..0376f2fdd 100644
--- a/test/torture-s/packed-2.c.s
+++ b/test/torture-s/packed-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/packed-2.c"
+	.file	"packed-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -26,4 +26,4 @@ t:
 	.size	t, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pending-4.c.s b/test/torture-s/pending-4.c.s
index 4610c1a9f..0215f0e58 100644
--- a/test/torture-s/pending-4.c.s
+++ b/test/torture-s/pending-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pending-4.c"
+	.file	"pending-4.c"
 	.section	.text.dummy,"ax",@progbits
-	.hidden	dummy
+	.hidden	dummy                   # -- Begin function dummy
 	.globl	dummy
 	.type	dummy,@function
 dummy:                                  # @dummy
@@ -11,70 +11,142 @@ dummy:                                  # @dummy
 	.endfunc
 .Lfunc_end0:
 	.size	dummy, .Lfunc_end0-dummy
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$4=, 8
 	i32.const	$2=, 0
 	i32.const	$3=, 0
-.LBB1_1:                                # %for.cond
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label0:
 	block   	
+	block   	
+	i32.const	$push9=, 8
 	i32.const	$push8=, 1
-	i32.ne  	$push0=, $4, $pop8
-	br_if   	0, $pop0        # 0: down to label1
-# BB#2:                                 # %if.then
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push7=, 1
-	i32.add 	$2=, $2, $pop7
-	i32.const	$push6=, -1
-	i32.add 	$4=, $4, $pop6
-	br      	1               # 1: up to label0
-.LBB1_3:                                # %for.cond
-                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.ne  	$push1=, $pop9, $pop8
+	br_if   	0, $pop1        # 0: down to label1
+# BB#1:
+	i32.const	$5=, 2
+	br      	1               # 1: down to label0
+.LBB1_2:
 	end_block                       # label1:
+	i32.const	$5=, 0
+.LBB1_3:                                # =>This Inner Loop Header: Depth=1
+	end_block                       # label0:
+	loop    	i32             # label2:
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
 	block   	
-	i32.eqz 	$push11=, $4
-	br_if   	0, $pop11       # 0: down to label2
-# BB#4:                                 # %if.else
-                                        #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push10=, 1
-	i32.add 	$3=, $3, $pop10
-	i32.const	$push9=, -1
-	i32.add 	$4=, $4, $pop9
-	br      	1               # 1: up to label0
-.LBB1_5:                                # %for.end
-	end_block                       # label2:
-	end_loop
 	block   	
-	i32.const	$push1=, 1
-	i32.ne  	$push2=, $2, $pop1
-	br_if   	0, $pop2        # 0: down to label3
-# BB#6:                                 # %for.end
-	i32.const	$push3=, 7
-	i32.ne  	$push4=, $3, $pop3
-	br_if   	0, $pop4        # 0: down to label3
-# BB#7:                                 # %if.end7
-	i32.const	$push5=, 0
-	call    	exit@FUNCTION, $pop5
+	block   	
+	block   	
+	block   	
+	block   	
+	br_table 	$5, 2, 0, 1, 3, 4, 5, 6, 6 # 2: down to label12
+                                        # 0: down to label14
+                                        # 1: down to label13
+                                        # 3: down to label11
+                                        # 4: down to label10
+                                        # 5: down to label9
+                                        # 6: down to label8
+.LBB1_4:                                # %if.else
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label14:
+	i32.const	$push14=, 1
+	i32.add 	$3=, $3, $pop14
+	i32.const	$push13=, -1
+	i32.add 	$push12=, $4, $pop13
+	tee_local	$push11=, $4=, $pop12
+	i32.const	$push10=, 1
+	i32.ne  	$push2=, $pop11, $pop10
+	br_if   	8, $pop2        # 8: down to label5
+# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 2
+	br      	11              # 11: up to label2
+.LBB1_6:                                # %if.then
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label13:
+	i32.const	$push19=, 1
+	i32.add 	$2=, $2, $pop19
+	i32.const	$push18=, -1
+	i32.add 	$push17=, $4, $pop18
+	tee_local	$push16=, $4=, $pop17
+	i32.const	$push15=, 1
+	i32.eq  	$push0=, $pop16, $pop15
+	br_if   	6, $pop0        # 6: down to label6
+# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 0
+	br      	10              # 10: up to label2
+.LBB1_8:                                # %for.cond
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label12:
+	br_if   	4, $4           # 4: down to label7
+# BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 3
+	br      	9               # 9: up to label2
+.LBB1_10:                               # %for.end
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label11:
+	i32.const	$push3=, 1
+	i32.ne  	$push4=, $2, $pop3
+	br_if   	6, $pop4        # 6: down to label4
+# BB#11:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 4
+	br      	8               # 8: up to label2
+.LBB1_12:                               # %for.end
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label10:
+	i32.const	$push5=, 7
+	i32.ne  	$push6=, $3, $pop5
+	br_if   	6, $pop6        # 6: down to label3
+# BB#13:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 5
+	br      	7               # 7: up to label2
+.LBB1_14:                               # %if.end7
+	end_block                       # label9:
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
-.LBB1_8:                                # %if.then6
-	end_block                       # label3:
+.LBB1_15:                               # %if.then6
+	end_block                       # label8:
 	call    	abort@FUNCTION
 	unreachable
+.LBB1_16:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label7:
+	i32.const	$5=, 1
+	br      	4               # 4: up to label2
+.LBB1_17:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label6:
+	i32.const	$5=, 2
+	br      	3               # 3: up to label2
+.LBB1_18:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label5:
+	i32.const	$5=, 0
+	br      	2               # 2: up to label2
+.LBB1_19:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label4:
+	i32.const	$5=, 6
+	br      	1               # 1: up to label2
+.LBB1_20:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label3:
+	i32.const	$5=, 6
+	br      	0               # 0: up to label2
+.LBB1_21:
+	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/postmod-1.c.s b/test/torture-s/postmod-1.c.s
index 77f1bae9f..1e7cc5972 100644
--- a/test/torture-s/postmod-1.c.s
+++ b/test/torture-s/postmod-1.c.s
@@ -1,372 +1,392 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/postmod-1.c"
+	.file	"postmod-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-	.local  	i32, i32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, i32, i32, i32, i32, i32
+	.local  	i32, i32, f32, f32, f32, f32, f32, f32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$2=, $0, $pop0
 	i32.const	$push1=, 3
-	i32.shl 	$1=, $0, $pop1
-	i32.const	$17=, 0
+	i32.shl 	$push2=, $0, $pop1
+	i32.const	$push140=, 12
+	i32.add 	$1=, $pop2, $pop140
+	i32.const	$13=, 0
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.add 	$push269=, $2, $17
-	tee_local	$push268=, $0=, $pop269
-	i32.const	$push267=, array5
-	i32.add 	$push9=, $pop268, $pop267
-	f32.load	$3=, 0($pop9)
-	i32.const	$push266=, array4
-	i32.add 	$push10=, $0, $pop266
-	f32.load	$4=, 0($pop10)
-	i32.const	$push265=, array3
-	i32.add 	$push11=, $0, $pop265
-	f32.load	$5=, 0($pop11)
-	i32.const	$push264=, array2
-	i32.add 	$push12=, $0, $pop264
-	f32.load	$6=, 0($pop12)
-	i32.const	$push263=, array1
-	i32.add 	$push13=, $0, $pop263
-	f32.load	$7=, 0($pop13)
-	i32.const	$push262=, 0
-	f32.load	$8=, counter5($pop262)
+	i32.const	$push293=, 0
+	i32.add 	$push292=, $2, $13
+	tee_local	$push291=, $0=, $pop292
+	i32.const	$push290=, array0
+	i32.add 	$push3=, $pop291, $pop290
+	f32.load	$push4=, 0($pop3)
+	i32.const	$push289=, 0
+	f32.load	$push5=, counter0($pop289)
+	f32.add 	$push288=, $pop4, $pop5
+	tee_local	$push287=, $3=, $pop288
+	f32.store	counter0($pop293), $pop287
+	i32.const	$push286=, 0
+	i32.const	$push285=, array1
+	i32.add 	$push6=, $0, $pop285
+	f32.load	$push7=, 0($pop6)
+	i32.const	$push284=, 0
+	f32.load	$push8=, counter1($pop284)
+	f32.add 	$push283=, $pop7, $pop8
+	tee_local	$push282=, $4=, $pop283
+	f32.store	counter1($pop286), $pop282
+	i32.const	$push281=, 0
+	i32.const	$push280=, array2
+	i32.add 	$push9=, $0, $pop280
+	f32.load	$push10=, 0($pop9)
+	i32.const	$push279=, 0
+	f32.load	$push11=, counter2($pop279)
+	f32.add 	$push278=, $pop10, $pop11
+	tee_local	$push277=, $5=, $pop278
+	f32.store	counter2($pop281), $pop277
+	i32.const	$push276=, 0
+	i32.const	$push275=, array3
+	i32.add 	$push12=, $0, $pop275
+	f32.load	$push13=, 0($pop12)
+	i32.const	$push274=, 0
+	f32.load	$push14=, counter3($pop274)
+	f32.add 	$push273=, $pop13, $pop14
+	tee_local	$push272=, $6=, $pop273
+	f32.store	counter3($pop276), $pop272
+	i32.const	$push271=, 0
+	i32.const	$push270=, array4
+	i32.add 	$push15=, $0, $pop270
+	f32.load	$push16=, 0($pop15)
+	i32.const	$push269=, 0
+	f32.load	$push17=, counter4($pop269)
+	f32.add 	$push268=, $pop16, $pop17
+	tee_local	$push267=, $7=, $pop268
+	f32.store	counter4($pop271), $pop267
+	i32.const	$push266=, 0
+	i32.const	$push265=, array5
+	i32.add 	$push18=, $0, $pop265
+	f32.load	$push19=, 0($pop18)
+	i32.const	$push264=, 0
+	f32.load	$push20=, counter5($pop264)
+	f32.add 	$push263=, $pop19, $pop20
+	tee_local	$push262=, $8=, $pop263
+	f32.store	counter5($pop266), $pop262
 	i32.const	$push261=, 0
-	f32.load	$9=, counter4($pop261)
-	i32.const	$push260=, 0
-	f32.load	$10=, counter3($pop260)
-	i32.const	$push259=, 0
-	f32.load	$11=, counter2($pop259)
-	i32.const	$push258=, 0
-	f32.load	$12=, counter1($pop258)
+	i32.add 	$push260=, $1, $13
+	tee_local	$push259=, $0=, $pop260
+	i32.const	$push258=, array0
+	i32.add 	$push21=, $pop259, $pop258
+	f32.load	$push22=, 0($pop21)
+	f32.add 	$push23=, $3, $pop22
+	f32.store	counter0($pop261), $pop23
 	i32.const	$push257=, 0
-	i32.add 	$push256=, $1, $17
-	tee_local	$push255=, $13=, $pop256
-	i32.const	$push254=, array0+12
-	i32.add 	$push6=, $pop255, $pop254
-	f32.load	$push7=, 0($pop6)
-	i32.const	$push253=, array0
-	i32.add 	$push2=, $0, $pop253
-	f32.load	$push3=, 0($pop2)
-	i32.const	$push252=, 0
-	f32.load	$push4=, counter0($pop252)
-	f32.add 	$push5=, $pop3, $pop4
-	f32.add 	$push8=, $pop7, $pop5
-	f32.store	counter0($pop257), $pop8
+	i32.const	$push256=, array1
+	i32.add 	$push24=, $0, $pop256
+	f32.load	$push25=, 0($pop24)
+	f32.add 	$push26=, $4, $pop25
+	f32.store	counter1($pop257), $pop26
+	i32.const	$push255=, 0
+	i32.const	$push254=, array2
+	i32.add 	$push27=, $0, $pop254
+	f32.load	$push28=, 0($pop27)
+	f32.add 	$push29=, $5, $pop28
+	f32.store	counter2($pop255), $pop29
+	i32.const	$push253=, 0
+	i32.const	$push252=, array3
+	i32.add 	$push30=, $0, $pop252
+	f32.load	$push31=, 0($pop30)
+	f32.add 	$push32=, $6, $pop31
+	f32.store	counter3($pop253), $pop32
 	i32.const	$push251=, 0
-	i32.const	$push250=, array1+12
-	i32.add 	$push15=, $13, $pop250
-	f32.load	$push16=, 0($pop15)
-	f32.add 	$push14=, $7, $12
-	f32.add 	$push17=, $pop16, $pop14
-	f32.store	counter1($pop251), $pop17
+	i32.const	$push250=, array4
+	i32.add 	$push33=, $0, $pop250
+	f32.load	$push34=, 0($pop33)
+	f32.add 	$push35=, $7, $pop34
+	f32.store	counter4($pop251), $pop35
 	i32.const	$push249=, 0
-	i32.const	$push248=, array2+12
-	i32.add 	$push19=, $13, $pop248
-	f32.load	$push20=, 0($pop19)
-	f32.add 	$push18=, $6, $11
-	f32.add 	$push21=, $pop20, $pop18
-	f32.store	counter2($pop249), $pop21
+	i32.const	$push248=, array5
+	i32.add 	$push36=, $0, $pop248
+	f32.load	$push37=, 0($pop36)
+	f32.add 	$push38=, $8, $pop37
+	f32.store	counter5($pop249), $pop38
 	i32.const	$push247=, 0
-	i32.const	$push246=, array3+12
-	i32.add 	$push23=, $13, $pop246
-	f32.load	$push24=, 0($pop23)
-	f32.add 	$push22=, $5, $10
-	f32.add 	$push25=, $pop24, $pop22
-	f32.store	counter3($pop247), $pop25
+	i32.load	$0=, vol($pop247)
+	i32.const	$push246=, 0
+	i32.load	$9=, vol($pop246)
 	i32.const	$push245=, 0
-	i32.const	$push244=, array4+12
-	i32.add 	$push27=, $13, $pop244
-	f32.load	$push28=, 0($pop27)
-	f32.add 	$push26=, $4, $9
-	f32.add 	$push29=, $pop28, $pop26
-	f32.store	counter4($pop245), $pop29
+	i32.load	$10=, vol($pop245)
+	i32.const	$push244=, 0
+	i32.load	$11=, vol($pop244)
 	i32.const	$push243=, 0
-	i32.const	$push242=, array5+12
-	i32.add 	$push31=, $13, $pop242
-	f32.load	$push32=, 0($pop31)
-	f32.add 	$push30=, $3, $8
-	f32.add 	$push33=, $pop32, $pop30
-	f32.store	counter5($pop243), $pop33
+	i32.load	$12=, vol($pop243)
+	i32.const	$push242=, 0
 	i32.const	$push241=, 0
-	i32.load	$0=, vol($pop241)
+	i32.load	$push39=, vol($pop241)
+	i32.add 	$push40=, $0, $pop39
+	i32.store	vol($pop242), $pop40
 	i32.const	$push240=, 0
-	i32.load	$13=, vol($pop240)
 	i32.const	$push239=, 0
-	i32.load	$14=, vol($pop239)
+	i32.load	$push41=, vol($pop239)
+	i32.add 	$push42=, $9, $pop41
+	i32.store	vol($pop240), $pop42
 	i32.const	$push238=, 0
-	i32.load	$15=, vol($pop238)
 	i32.const	$push237=, 0
-	i32.load	$16=, vol($pop237)
+	i32.load	$push43=, vol($pop237)
+	i32.add 	$push44=, $10, $pop43
+	i32.store	vol($pop238), $pop44
 	i32.const	$push236=, 0
 	i32.const	$push235=, 0
-	i32.load	$push34=, vol($pop235)
-	i32.add 	$push35=, $0, $pop34
-	i32.store	vol($pop236), $pop35
+	i32.load	$push45=, vol($pop235)
+	i32.add 	$push46=, $11, $pop45
+	i32.store	vol($pop236), $pop46
 	i32.const	$push234=, 0
 	i32.const	$push233=, 0
-	i32.load	$push36=, vol($pop233)
-	i32.add 	$push37=, $13, $pop36
-	i32.store	vol($pop234), $pop37
+	i32.load	$push47=, vol($pop233)
+	i32.add 	$push48=, $12, $pop47
+	i32.store	vol($pop234), $pop48
 	i32.const	$push232=, 0
 	i32.const	$push231=, 0
-	i32.load	$push38=, vol($pop231)
-	i32.add 	$push39=, $14, $pop38
-	i32.store	vol($pop232), $pop39
+	i32.load	$push49=, vol($pop231)
+	i32.add 	$push50=, $0, $pop49
+	i32.store	vol($pop232), $pop50
 	i32.const	$push230=, 0
 	i32.const	$push229=, 0
-	i32.load	$push40=, vol($pop229)
-	i32.add 	$push41=, $15, $pop40
-	i32.store	vol($pop230), $pop41
+	i32.load	$push51=, vol($pop229)
+	i32.add 	$push52=, $9, $pop51
+	i32.store	vol($pop230), $pop52
 	i32.const	$push228=, 0
 	i32.const	$push227=, 0
-	i32.load	$push42=, vol($pop227)
-	i32.add 	$push43=, $16, $pop42
-	i32.store	vol($pop228), $pop43
+	i32.load	$push53=, vol($pop227)
+	i32.add 	$push54=, $10, $pop53
+	i32.store	vol($pop228), $pop54
 	i32.const	$push226=, 0
 	i32.const	$push225=, 0
-	i32.load	$push44=, vol($pop225)
-	i32.add 	$push45=, $0, $pop44
-	i32.store	vol($pop226), $pop45
+	i32.load	$push55=, vol($pop225)
+	i32.add 	$push56=, $11, $pop55
+	i32.store	vol($pop226), $pop56
 	i32.const	$push224=, 0
 	i32.const	$push223=, 0
-	i32.load	$push46=, vol($pop223)
-	i32.add 	$push47=, $13, $pop46
-	i32.store	vol($pop224), $pop47
+	i32.load	$push57=, vol($pop223)
+	i32.add 	$push58=, $12, $pop57
+	i32.store	vol($pop224), $pop58
 	i32.const	$push222=, 0
 	i32.const	$push221=, 0
-	i32.load	$push48=, vol($pop221)
-	i32.add 	$push49=, $14, $pop48
-	i32.store	vol($pop222), $pop49
+	i32.load	$push59=, vol($pop221)
+	i32.add 	$push60=, $0, $pop59
+	i32.store	vol($pop222), $pop60
 	i32.const	$push220=, 0
 	i32.const	$push219=, 0
-	i32.load	$push50=, vol($pop219)
-	i32.add 	$push51=, $15, $pop50
-	i32.store	vol($pop220), $pop51
+	i32.load	$push61=, vol($pop219)
+	i32.add 	$push62=, $9, $pop61
+	i32.store	vol($pop220), $pop62
 	i32.const	$push218=, 0
 	i32.const	$push217=, 0
-	i32.load	$push52=, vol($pop217)
-	i32.add 	$push53=, $16, $pop52
-	i32.store	vol($pop218), $pop53
+	i32.load	$push63=, vol($pop217)
+	i32.add 	$push64=, $10, $pop63
+	i32.store	vol($pop218), $pop64
 	i32.const	$push216=, 0
 	i32.const	$push215=, 0
-	i32.load	$push54=, vol($pop215)
-	i32.add 	$push55=, $0, $pop54
-	i32.store	vol($pop216), $pop55
+	i32.load	$push65=, vol($pop215)
+	i32.add 	$push66=, $11, $pop65
+	i32.store	vol($pop216), $pop66
 	i32.const	$push214=, 0
 	i32.const	$push213=, 0
-	i32.load	$push56=, vol($pop213)
-	i32.add 	$push57=, $13, $pop56
-	i32.store	vol($pop214), $pop57
+	i32.load	$push67=, vol($pop213)
+	i32.add 	$push68=, $12, $pop67
+	i32.store	vol($pop214), $pop68
 	i32.const	$push212=, 0
 	i32.const	$push211=, 0
-	i32.load	$push58=, vol($pop211)
-	i32.add 	$push59=, $14, $pop58
-	i32.store	vol($pop212), $pop59
+	i32.load	$push69=, vol($pop211)
+	i32.add 	$push70=, $0, $pop69
+	i32.store	vol($pop212), $pop70
 	i32.const	$push210=, 0
 	i32.const	$push209=, 0
-	i32.load	$push60=, vol($pop209)
-	i32.add 	$push61=, $15, $pop60
-	i32.store	vol($pop210), $pop61
+	i32.load	$push71=, vol($pop209)
+	i32.add 	$push72=, $9, $pop71
+	i32.store	vol($pop210), $pop72
 	i32.const	$push208=, 0
 	i32.const	$push207=, 0
-	i32.load	$push62=, vol($pop207)
-	i32.add 	$push63=, $16, $pop62
-	i32.store	vol($pop208), $pop63
+	i32.load	$push73=, vol($pop207)
+	i32.add 	$push74=, $10, $pop73
+	i32.store	vol($pop208), $pop74
 	i32.const	$push206=, 0
 	i32.const	$push205=, 0
-	i32.load	$push64=, vol($pop205)
-	i32.add 	$push65=, $0, $pop64
-	i32.store	vol($pop206), $pop65
+	i32.load	$push75=, vol($pop205)
+	i32.add 	$push76=, $11, $pop75
+	i32.store	vol($pop206), $pop76
 	i32.const	$push204=, 0
 	i32.const	$push203=, 0
-	i32.load	$push66=, vol($pop203)
-	i32.add 	$push67=, $13, $pop66
-	i32.store	vol($pop204), $pop67
+	i32.load	$push77=, vol($pop203)
+	i32.add 	$push78=, $12, $pop77
+	i32.store	vol($pop204), $pop78
 	i32.const	$push202=, 0
 	i32.const	$push201=, 0
-	i32.load	$push68=, vol($pop201)
-	i32.add 	$push69=, $14, $pop68
-	i32.store	vol($pop202), $pop69
+	i32.load	$push79=, vol($pop201)
+	i32.add 	$push80=, $0, $pop79
+	i32.store	vol($pop202), $pop80
 	i32.const	$push200=, 0
 	i32.const	$push199=, 0
-	i32.load	$push70=, vol($pop199)
-	i32.add 	$push71=, $15, $pop70
-	i32.store	vol($pop200), $pop71
+	i32.load	$push81=, vol($pop199)
+	i32.add 	$push82=, $9, $pop81
+	i32.store	vol($pop200), $pop82
 	i32.const	$push198=, 0
 	i32.const	$push197=, 0
-	i32.load	$push72=, vol($pop197)
-	i32.add 	$push73=, $16, $pop72
-	i32.store	vol($pop198), $pop73
+	i32.load	$push83=, vol($pop197)
+	i32.add 	$push84=, $10, $pop83
+	i32.store	vol($pop198), $pop84
 	i32.const	$push196=, 0
 	i32.const	$push195=, 0
-	i32.load	$push74=, vol($pop195)
-	i32.add 	$push75=, $0, $pop74
-	i32.store	vol($pop196), $pop75
+	i32.load	$push85=, vol($pop195)
+	i32.add 	$push86=, $11, $pop85
+	i32.store	vol($pop196), $pop86
 	i32.const	$push194=, 0
 	i32.const	$push193=, 0
-	i32.load	$push76=, vol($pop193)
-	i32.add 	$push77=, $13, $pop76
-	i32.store	vol($pop194), $pop77
+	i32.load	$push87=, vol($pop193)
+	i32.add 	$push88=, $12, $pop87
+	i32.store	vol($pop194), $pop88
 	i32.const	$push192=, 0
 	i32.const	$push191=, 0
-	i32.load	$push78=, vol($pop191)
-	i32.add 	$push79=, $14, $pop78
-	i32.store	vol($pop192), $pop79
+	i32.load	$push89=, vol($pop191)
+	i32.add 	$push90=, $0, $pop89
+	i32.store	vol($pop192), $pop90
 	i32.const	$push190=, 0
 	i32.const	$push189=, 0
-	i32.load	$push80=, vol($pop189)
-	i32.add 	$push81=, $15, $pop80
-	i32.store	vol($pop190), $pop81
+	i32.load	$push91=, vol($pop189)
+	i32.add 	$push92=, $9, $pop91
+	i32.store	vol($pop190), $pop92
 	i32.const	$push188=, 0
 	i32.const	$push187=, 0
-	i32.load	$push82=, vol($pop187)
-	i32.add 	$push83=, $16, $pop82
-	i32.store	vol($pop188), $pop83
+	i32.load	$push93=, vol($pop187)
+	i32.add 	$push94=, $10, $pop93
+	i32.store	vol($pop188), $pop94
 	i32.const	$push186=, 0
 	i32.const	$push185=, 0
-	i32.load	$push84=, vol($pop185)
-	i32.add 	$push85=, $0, $pop84
-	i32.store	vol($pop186), $pop85
+	i32.load	$push95=, vol($pop185)
+	i32.add 	$push96=, $11, $pop95
+	i32.store	vol($pop186), $pop96
 	i32.const	$push184=, 0
 	i32.const	$push183=, 0
-	i32.load	$push86=, vol($pop183)
-	i32.add 	$push87=, $13, $pop86
-	i32.store	vol($pop184), $pop87
+	i32.load	$push97=, vol($pop183)
+	i32.add 	$push98=, $12, $pop97
+	i32.store	vol($pop184), $pop98
 	i32.const	$push182=, 0
 	i32.const	$push181=, 0
-	i32.load	$push88=, vol($pop181)
-	i32.add 	$push89=, $14, $pop88
-	i32.store	vol($pop182), $pop89
+	i32.load	$push99=, vol($pop181)
+	i32.add 	$push100=, $0, $pop99
+	i32.store	vol($pop182), $pop100
 	i32.const	$push180=, 0
 	i32.const	$push179=, 0
-	i32.load	$push90=, vol($pop179)
-	i32.add 	$push91=, $15, $pop90
-	i32.store	vol($pop180), $pop91
+	i32.load	$push101=, vol($pop179)
+	i32.add 	$push102=, $9, $pop101
+	i32.store	vol($pop180), $pop102
 	i32.const	$push178=, 0
 	i32.const	$push177=, 0
-	i32.load	$push92=, vol($pop177)
-	i32.add 	$push93=, $16, $pop92
-	i32.store	vol($pop178), $pop93
+	i32.load	$push103=, vol($pop177)
+	i32.add 	$push104=, $10, $pop103
+	i32.store	vol($pop178), $pop104
 	i32.const	$push176=, 0
 	i32.const	$push175=, 0
-	i32.load	$push94=, vol($pop175)
-	i32.add 	$push95=, $0, $pop94
-	i32.store	vol($pop176), $pop95
+	i32.load	$push105=, vol($pop175)
+	i32.add 	$push106=, $11, $pop105
+	i32.store	vol($pop176), $pop106
 	i32.const	$push174=, 0
 	i32.const	$push173=, 0
-	i32.load	$push96=, vol($pop173)
-	i32.add 	$push97=, $13, $pop96
-	i32.store	vol($pop174), $pop97
+	i32.load	$push107=, vol($pop173)
+	i32.add 	$push108=, $12, $pop107
+	i32.store	vol($pop174), $pop108
 	i32.const	$push172=, 0
 	i32.const	$push171=, 0
-	i32.load	$push98=, vol($pop171)
-	i32.add 	$push99=, $14, $pop98
-	i32.store	vol($pop172), $pop99
+	i32.load	$push109=, vol($pop171)
+	i32.add 	$push110=, $0, $pop109
+	i32.store	vol($pop172), $pop110
 	i32.const	$push170=, 0
 	i32.const	$push169=, 0
-	i32.load	$push100=, vol($pop169)
-	i32.add 	$push101=, $15, $pop100
-	i32.store	vol($pop170), $pop101
+	i32.load	$push111=, vol($pop169)
+	i32.add 	$push112=, $9, $pop111
+	i32.store	vol($pop170), $pop112
 	i32.const	$push168=, 0
 	i32.const	$push167=, 0
-	i32.load	$push102=, vol($pop167)
-	i32.add 	$push103=, $16, $pop102
-	i32.store	vol($pop168), $pop103
+	i32.load	$push113=, vol($pop167)
+	i32.add 	$push114=, $10, $pop113
+	i32.store	vol($pop168), $pop114
 	i32.const	$push166=, 0
 	i32.const	$push165=, 0
-	i32.load	$push104=, vol($pop165)
-	i32.add 	$push105=, $0, $pop104
-	i32.store	vol($pop166), $pop105
+	i32.load	$push115=, vol($pop165)
+	i32.add 	$push116=, $11, $pop115
+	i32.store	vol($pop166), $pop116
 	i32.const	$push164=, 0
 	i32.const	$push163=, 0
-	i32.load	$push106=, vol($pop163)
-	i32.add 	$push107=, $13, $pop106
-	i32.store	vol($pop164), $pop107
+	i32.load	$push117=, vol($pop163)
+	i32.add 	$push118=, $12, $pop117
+	i32.store	vol($pop164), $pop118
 	i32.const	$push162=, 0
 	i32.const	$push161=, 0
-	i32.load	$push108=, vol($pop161)
-	i32.add 	$push109=, $14, $pop108
-	i32.store	vol($pop162), $pop109
+	i32.load	$push119=, vol($pop161)
+	i32.add 	$push120=, $0, $pop119
+	i32.store	vol($pop162), $pop120
 	i32.const	$push160=, 0
 	i32.const	$push159=, 0
-	i32.load	$push110=, vol($pop159)
-	i32.add 	$push111=, $15, $pop110
-	i32.store	vol($pop160), $pop111
+	i32.load	$push121=, vol($pop159)
+	i32.add 	$push122=, $9, $pop121
+	i32.store	vol($pop160), $pop122
 	i32.const	$push158=, 0
 	i32.const	$push157=, 0
-	i32.load	$push112=, vol($pop157)
-	i32.add 	$push113=, $16, $pop112
-	i32.store	vol($pop158), $pop113
+	i32.load	$push123=, vol($pop157)
+	i32.add 	$push124=, $10, $pop123
+	i32.store	vol($pop158), $pop124
 	i32.const	$push156=, 0
 	i32.const	$push155=, 0
-	i32.load	$push114=, vol($pop155)
-	i32.add 	$push115=, $0, $pop114
-	i32.store	vol($pop156), $pop115
+	i32.load	$push125=, vol($pop155)
+	i32.add 	$push126=, $11, $pop125
+	i32.store	vol($pop156), $pop126
 	i32.const	$push154=, 0
 	i32.const	$push153=, 0
-	i32.load	$push116=, vol($pop153)
-	i32.add 	$push117=, $13, $pop116
-	i32.store	vol($pop154), $pop117
+	i32.load	$push127=, vol($pop153)
+	i32.add 	$push128=, $12, $pop127
+	i32.store	vol($pop154), $pop128
 	i32.const	$push152=, 0
 	i32.const	$push151=, 0
-	i32.load	$push118=, vol($pop151)
-	i32.add 	$push119=, $14, $pop118
-	i32.store	vol($pop152), $pop119
+	i32.load	$push129=, vol($pop151)
+	i32.add 	$push130=, $0, $pop129
+	i32.store	vol($pop152), $pop130
 	i32.const	$push150=, 0
 	i32.const	$push149=, 0
-	i32.load	$push120=, vol($pop149)
-	i32.add 	$push121=, $15, $pop120
-	i32.store	vol($pop150), $pop121
+	i32.load	$push131=, vol($pop149)
+	i32.add 	$push132=, $9, $pop131
+	i32.store	vol($pop150), $pop132
 	i32.const	$push148=, 0
 	i32.const	$push147=, 0
-	i32.load	$push122=, vol($pop147)
-	i32.add 	$push123=, $16, $pop122
-	i32.store	vol($pop148), $pop123
+	i32.load	$push133=, vol($pop147)
+	i32.add 	$push134=, $10, $pop133
+	i32.store	vol($pop148), $pop134
 	i32.const	$push146=, 0
 	i32.const	$push145=, 0
-	i32.load	$push124=, vol($pop145)
-	i32.add 	$push125=, $0, $pop124
-	i32.store	vol($pop146), $pop125
+	i32.load	$push135=, vol($pop145)
+	i32.add 	$push136=, $11, $pop135
+	i32.store	vol($pop146), $pop136
 	i32.const	$push144=, 0
 	i32.const	$push143=, 0
-	i32.load	$push126=, vol($pop143)
-	i32.add 	$push127=, $13, $pop126
-	i32.store	vol($pop144), $pop127
-	i32.const	$push142=, 0
+	i32.load	$push137=, vol($pop143)
+	i32.add 	$push138=, $12, $pop137
+	i32.store	vol($pop144), $pop138
+	i32.const	$push142=, 12
+	i32.add 	$13=, $13, $pop142
 	i32.const	$push141=, 0
-	i32.load	$push128=, vol($pop141)
-	i32.add 	$push129=, $14, $pop128
-	i32.store	vol($pop142), $pop129
-	i32.const	$push140=, 0
-	i32.const	$push139=, 0
-	i32.load	$push130=, vol($pop139)
-	i32.add 	$push131=, $15, $pop130
-	i32.store	vol($pop140), $pop131
-	i32.const	$push138=, 0
-	i32.const	$push137=, 0
-	i32.load	$push132=, vol($pop137)
-	i32.add 	$push133=, $16, $pop132
-	i32.store	vol($pop138), $pop133
-	i32.const	$push136=, 12
-	i32.add 	$17=, $17, $pop136
-	i32.const	$push135=, 0
-	i32.load	$push134=, stop($pop135)
-	i32.eqz 	$push270=, $pop134
-	br_if   	0, $pop270      # 0: up to label0
+	i32.load	$push139=, stop($pop141)
+	i32.eqz 	$push294=, $pop139
+	br_if   	0, $pop294      # 0: up to label0
 # BB#2:                                 # %do.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -443,7 +463,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	counter0                # @counter0
 	.type	counter0,@object
 	.section	.bss.counter0,"aw",@nobits
@@ -571,4 +591,4 @@ vol:
 	.size	vol, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr15262-1.c.s b/test/torture-s/pr15262-1.c.s
index ca52d922b..94b85726a 100644
--- a/test/torture-s/pr15262-1.c.s
+++ b/test/torture-s/pr15262-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr15262-1.c"
+	.file	"pr15262-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr15262-2.c.s b/test/torture-s/pr15262-2.c.s
index 131bab9f9..67614715b 100644
--- a/test/torture-s/pr15262-2.c.s
+++ b/test/torture-s/pr15262-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr15262-2.c"
+	.file	"pr15262-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	X                       # @X
 	.type	X,@object
 	.section	.bss.X,"aw",@nobits
@@ -56,4 +56,4 @@ X:
 	.size	X, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr15262.c.s b/test/torture-s/pr15262.c.s
index 2588035fc..a80b3982a 100644
--- a/test/torture-s/pr15262.c.s
+++ b/test/torture-s/pr15262.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr15262.c"
+	.file	"pr15262.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -42,9 +42,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -55,6 +55,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr15296.c.s b/test/torture-s/pr15296.c.s
index 97ddf2dcb..b0a1f07f7 100644
--- a/test/torture-s/pr15296.c.s
+++ b/test/torture-s/pr15296.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr15296.c"
+	.file	"pr15296.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -75,9 +75,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -88,9 +88,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -98,10 +98,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push38=, 0
-	i32.const	$push35=, 0
-	i32.load	$push36=, __stack_pointer($pop35)
+	i32.const	$push36=, 0
+	i32.load	$push35=, __stack_pointer($pop36)
 	i32.const	$push37=, 48
-	i32.sub 	$push53=, $pop36, $pop37
+	i32.sub 	$push53=, $pop35, $pop37
 	tee_local	$push52=, $1=, $pop53
 	i32.store	__stack_pointer($pop38), $pop52
 	i32.const	$push0=, 0
@@ -184,7 +184,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.Lmain.uv,@object       # @main.uv
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4
@@ -207,6 +207,6 @@ main:                                   # @main
 	.size	.Lmain.s, 20
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr16790-1.c.s b/test/torture-s/pr16790-1.c.s
index 46e3b9a0a..d12aefd2c 100644
--- a/test/torture-s/pr16790-1.c.s
+++ b/test/torture-s/pr16790-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr16790-1.c"
+	.file	"pr16790-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr17078-1.c.s b/test/torture-s/pr17078-1.c.s
index 4093850f6..0ac3292cf 100644
--- a/test/torture-s/pr17078-1.c.s
+++ b/test/torture-s/pr17078-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr17078-1.c"
+	.file	"pr17078-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -13,9 +13,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,6 +26,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr17133.c.s b/test/torture-s/pr17133.c.s
index ca60c7da8..3578744ce 100644
--- a/test/torture-s/pr17133.c.s
+++ b/test/torture-s/pr17133.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr17133.c"
+	.file	"pr17133.c"
 	.section	.text.pure_alloc,"ax",@progbits
-	.hidden	pure_alloc
+	.hidden	pure_alloc              # -- Begin function pure_alloc
 	.globl	pure_alloc
 	.type	pure_alloc,@function
 pure_alloc:                             # @pure_alloc
@@ -47,9 +47,9 @@ pure_alloc:                             # @pure_alloc
 	.endfunc
 .Lfunc_end0:
 	.size	pure_alloc, .Lfunc_end0-pure_alloc
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,49 +57,51 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push1=, foo($pop13)
-	i32.const	$push12=, 2
-	i32.add 	$push11=, $pop1, $pop12
-	tee_local	$push10=, $0=, $pop11
-	i32.store	foo($pop0), $pop10
+	i32.const	$push14=, 0
+	i32.load	$push1=, foo($pop14)
+	i32.const	$push13=, 2
+	i32.add 	$push12=, $pop1, $pop13
+	tee_local	$push11=, $0=, $pop12
+	i32.store	foo($pop0), $pop11
 	block   	
 	block   	
-	block   	
-	i32.const	$push9=, 0
-	i32.load	$push8=, baz($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.ge_u	$push2=, $0, $pop7
-	br_if   	0, $pop2        # 0: down to label4
+	i32.const	$push10=, 0
+	i32.load	$push9=, baz($pop10)
+	tee_local	$push8=, $1=, $pop9
+	i32.ge_u	$push2=, $0, $pop8
+	br_if   	0, $pop2        # 0: down to label3
 # BB#1:                                 # %pure_alloc.exit
-	br_if   	1, $0           # 1: down to label3
-# BB#2:                                 # %if.then
-	call    	abort@FUNCTION
-	unreachable
+	i32.eqz 	$push16=, $0
+	br_if   	1, $pop16       # 1: down to label2
+# BB#2:                                 # %if.end
+	i32.const	$push7=, 0
+	return  	$pop7
 .LBB1_3:                                # %if.end.lr.ph.i
-	end_block                       # label4:
-	i32.const	$push14=, 2
-	i32.le_u	$push3=, $1, $pop14
-	br_if   	1, $pop3        # 1: down to label2
+	end_block                       # label3:
+	block   	
+	i32.const	$push15=, 2
+	i32.le_u	$push3=, $1, $pop15
+	br_if   	0, $pop3        # 0: down to label4
 # BB#4:                                 # %pure_alloc.exit.thread.split
 	i32.const	$push5=, 0
 	i32.const	$push4=, 2
 	i32.store	foo($pop5), $pop4
-.LBB1_5:                                # %if.end
-	end_block                       # label3:
 	i32.const	$push6=, 0
 	return  	$pop6
-.LBB1_6:                                # %if.end.i
+.LBB1_5:                                # %if.end.i
                                         # =>This Inner Loop Header: Depth=1
-	end_block                       # label2:
-	loop    	i32             # label5:
+	end_block                       # label4:
+	loop    	                # label5:
 	br      	0               # 0: up to label5
-.LBB1_7:
+.LBB1_6:                                # %if.then
 	end_loop
+	end_block                       # label2:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -128,5 +130,5 @@ baz:
 	.size	baz, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr17252.c.s b/test/torture-s/pr17252.c.s
index fcf861ecf..614de5751 100644
--- a/test/torture-s/pr17252.c.s
+++ b/test/torture-s/pr17252.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr17252.c"
+	.file	"pr17252.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -40,5 +40,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19005.c.s b/test/torture-s/pr19005.c.s
index df6193017..5f8a6a6ce 100644
--- a/test/torture-s/pr19005.c.s
+++ b/test/torture-s/pr19005.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19005.c"
+	.file	"pr19005.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -9,180 +9,191 @@ bar:                                    # @bar
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load	$push16=, v($pop0)
-	tee_local	$push15=, $4=, $pop16
-	i32.const	$push1=, 255
-	i32.and 	$3=, $pop15, $pop1
-	i32.const	$push2=, 1
-	i32.add 	$push3=, $4, $pop2
-	i32.const	$push14=, 255
-	i32.and 	$4=, $pop3, $pop14
+	i32.load	$push20=, v($pop0)
+	tee_local	$push19=, $2=, $pop20
+	i32.const	$push18=, 255
+	i32.and 	$4=, $pop19, $pop18
 	block   	
 	block   	
 	block   	
-	i32.const	$push13=, 0
-	i32.load	$push12=, s($pop13)
-	tee_local	$push11=, $2=, $pop12
-	i32.eqz 	$push17=, $pop11
-	br_if   	0, $pop17       # 0: down to label2
+	i32.const	$push17=, 0
+	i32.load	$push16=, s($pop17)
+	tee_local	$push15=, $3=, $pop16
+	i32.eqz 	$push22=, $pop15
+	br_if   	0, $pop22       # 0: down to label2
 # BB#1:                                 # %if.else
-	block   	
-	i32.ne  	$push4=, $3, $1
-	br_if   	0, $pop4        # 0: down to label3
+	i32.ne  	$push4=, $4, $1
+	br_if   	2, $pop4        # 2: down to label0
 # BB#2:                                 # %if.else
-	i32.eq  	$push5=, $4, $0
-	br_if   	2, $pop5        # 2: down to label1
-.LBB0_3:                                # %if.then19
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_4:                                # %if.then
+	i32.const	$push2=, 1
+	i32.add 	$push3=, $2, $pop2
+	i32.const	$push21=, 255
+	i32.and 	$push1=, $pop3, $pop21
+	i32.eq  	$push5=, $pop1, $0
+	br_if   	1, $pop5        # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_3:                                # %if.then
 	end_block                       # label2:
-	i32.ne  	$push6=, $3, $0
+	i32.ne  	$push6=, $4, $0
 	br_if   	1, $pop6        # 1: down to label0
-# BB#5:                                 # %if.then
-	i32.ne  	$push7=, $4, $1
-	br_if   	1, $pop7        # 1: down to label0
-.LBB0_6:                                # %if.end21
+# BB#4:                                 # %lor.lhs.false
+	i32.const	$push7=, 1
+	i32.add 	$push8=, $2, $pop7
+	i32.const	$push9=, 255
+	i32.and 	$push10=, $pop8, $pop9
+	i32.ne  	$push11=, $pop10, $1
+	br_if   	1, $pop11       # 1: down to label0
+.LBB0_5:                                # %if.end21
 	end_block                       # label1:
-	i32.const	$push10=, 0
-	i32.const	$push8=, 1
-	i32.xor 	$push9=, $2, $pop8
-	i32.store	s($pop10), $pop9
+	i32.const	$push14=, 0
+	i32.const	$push12=, 1
+	i32.xor 	$push13=, $3, $pop12
+	i32.store	s($pop14), $pop13
 	return
-.LBB0_7:                                # %if.then8
+.LBB0_6:                                # %if.then8
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 255
-	i32.and 	$1=, $0, $pop0
-	i32.const	$push1=, 0
-	i32.load	$push23=, v($pop1)
-	tee_local	$push22=, $4=, $pop23
-	i32.const	$push21=, 255
-	i32.and 	$3=, $pop22, $pop21
-	i32.const	$push2=, 1
-	i32.add 	$push3=, $0, $pop2
+	i32.const	$push23=, 255
+	i32.and 	$1=, $0, $pop23
+	i32.const	$push0=, 0
+	i32.load	$push22=, v($pop0)
+	tee_local	$push21=, $2=, $pop22
 	i32.const	$push20=, 255
-	i32.and 	$2=, $pop3, $pop20
+	i32.and 	$4=, $pop21, $pop20
 	i32.const	$push19=, 1
-	i32.add 	$push4=, $4, $pop19
+	i32.add 	$push1=, $0, $pop19
 	i32.const	$push18=, 255
-	i32.and 	$4=, $pop4, $pop18
+	i32.and 	$0=, $pop1, $pop18
 	block   	
 	block   	
 	block   	
 	block   	
 	i32.const	$push17=, 0
 	i32.load	$push16=, s($pop17)
-	tee_local	$push15=, $0=, $pop16
-	i32.eqz 	$push31=, $pop15
-	br_if   	0, $pop31       # 0: down to label7
+	tee_local	$push15=, $3=, $pop16
+	i32.eqz 	$push35=, $pop15
+	br_if   	0, $pop35       # 0: down to label6
 # BB#1:                                 # %if.else.i
-	block   	
-	i32.ne  	$push25=, $3, $2
-	tee_local	$push24=, $5=, $pop25
-	br_if   	0, $pop24       # 0: down to label8
+	i32.ne  	$push3=, $4, $0
+	br_if   	3, $pop3        # 3: down to label3
 # BB#2:                                 # %if.else.i
-	i32.eq  	$push27=, $4, $1
-	tee_local	$push26=, $6=, $pop27
-	i32.eqz 	$push32=, $pop26
-	br_if   	0, $pop32       # 0: down to label8
+	i32.const	$push27=, 1
+	i32.add 	$push2=, $2, $pop27
+	i32.const	$push26=, 255
+	i32.and 	$push25=, $pop2, $pop26
+	tee_local	$push24=, $2=, $pop25
+	i32.ne  	$push4=, $pop24, $1
+	br_if   	3, $pop4        # 3: down to label3
 # BB#3:                                 # %bar.exit
 	i32.const	$push6=, 0
 	i32.const	$push5=, 1
-	i32.xor 	$push29=, $0, $pop5
-	tee_local	$push28=, $7=, $pop29
+	i32.xor 	$push29=, $3, $pop5
+	tee_local	$push28=, $5=, $pop29
 	i32.store	s($pop6), $pop28
-	br_if   	2, $7           # 2: down to label6
-# BB#4:                                 # %if.then.i33
-	br_if   	0, $5           # 0: down to label8
-# BB#5:                                 # %if.then.i33
-	br_if   	3, $6           # 3: down to label5
-.LBB1_6:                                # %if.then8.i34
-	end_block                       # label8:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_7:                                # %if.then.i
-	end_block                       # label7:
-	i32.ne  	$push7=, $3, $1
-	br_if   	2, $pop7        # 2: down to label4
-# BB#8:                                 # %if.then.i
-	i32.ne  	$push8=, $4, $2
-	br_if   	2, $pop8        # 2: down to label4
-# BB#9:                                 # %bar.exit.thread
-	i32.const	$push11=, 0
-	i32.const	$push9=, 1
-	i32.xor 	$push10=, $0, $pop9
-	i32.store	s($pop11), $pop10
-.LBB1_10:                               # %if.else.i38
+	br_if   	1, $5           # 1: down to label5
+	br      	2               # 2: down to label4
+.LBB1_4:                                # %if.then.i
 	end_block                       # label6:
-	i32.ne  	$push12=, $3, $1
-	br_if   	1, $pop12       # 1: down to label4
-# BB#11:                                # %if.else.i38
-	i32.ne  	$push13=, $4, $2
-	br_if   	1, $pop13       # 1: down to label4
-.LBB1_12:                               # %bar.exit41
+	i32.ne  	$push7=, $4, $1
+	br_if   	2, $pop7        # 2: down to label3
+# BB#5:                                 # %lor.lhs.false.i
+	i32.const	$push32=, 1
+	i32.add 	$push8=, $2, $pop32
+	i32.const	$push9=, 255
+	i32.and 	$push31=, $pop8, $pop9
+	tee_local	$push30=, $2=, $pop31
+	i32.ne  	$push10=, $pop30, $0
+	br_if   	2, $pop10       # 2: down to label3
+# BB#6:                                 # %bar.exit.thread
+	i32.const	$push11=, 0
+	i32.const	$push33=, 1
+	i32.store	s($pop11), $pop33
+.LBB1_7:                                # %if.else.i40
 	end_block                       # label5:
-	i32.const	$push14=, 0
-	i32.store	s($pop14), $0
-	i32.const	$push30=, 0
-	return  	$pop30
-.LBB1_13:                               # %if.then8.i
+	i32.ne  	$push12=, $4, $1
+	br_if   	1, $pop12       # 1: down to label3
+# BB#8:                                 # %if.else.i40
+	i32.ne  	$push13=, $2, $0
+	br_if   	1, $pop13       # 1: down to label3
+.LBB1_9:                                # %bar.exit43
 	end_block                       # label4:
+	i32.const	$push14=, 0
+	i32.store	s($pop14), $3
+	i32.const	$push34=, 0
+	return  	$pop34
+.LBB1_10:                               # %if.then8.i
+	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$0=, -10
-	i32.const	$push4=, 0
-	i32.const	$push3=, -10
-	i32.store	v($pop4), $pop3
+	i32.const	$push6=, 0
+	i32.const	$push0=, -10
+	i32.store	v($pop6), $pop0
+	i32.const	$push5=, 0
+	i32.load	$0=, s($pop5)
+	i32.const	$2=, -11
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label9:
-	i32.call	$drop=, foo@FUNCTION, $0
-	i32.const	$push10=, 0
-	i32.const	$push9=, 0
-	i32.load	$push0=, v($pop9)
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $pop0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	i32.store	v($pop10), $pop6
-	i32.const	$push5=, 266
-	i32.lt_s	$push1=, $0, $pop5
-	br_if   	0, $pop1        # 0: up to label9
-# BB#2:                                 # %for.end
+	block   	
+	loop    	                # label8:
+	i32.const	$push8=, 2
+	i32.add 	$1=, $2, $pop8
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
+	block   	
+	i32.eqz 	$push12=, $0
+	br_if   	0, $pop12       # 0: down to label9
+# BB#2:                                 # %if.else.i.i
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.xor 	$push1=, $1, $2
+	i32.const	$push9=, 255
+	i32.and 	$push2=, $pop1, $pop9
+	br_if   	2, $pop2        # 2: down to label7
+.LBB2_3:                                # %foo.exit
+                                        #   in Loop: Header=BB2_1 Depth=1
+	end_block                       # label9:
+	i32.const	$push11=, 0
+	i32.store	v($pop11), $1
+	i32.const	$push10=, 265
+	i32.lt_s	$push3=, $2, $pop10
+	br_if   	0, $pop3        # 0: up to label8
+# BB#4:                                 # %for.end
 	end_loop
-	i32.const	$push2=, 0
-                                        # fallthrough-return: $pop2
+	i32.const	$push4=, 0
+	return  	$pop4
+.LBB2_5:                                # %if.then19.i.i
+	end_block                       # label7:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -202,5 +213,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19449.c.s b/test/torture-s/pr19449.c.s
index 3b03dfc37..428539e9e 100644
--- a/test/torture-s/pr19449.c.s
+++ b/test/torture-s/pr19449.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19449.c"
+	.file	"pr19449.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	z                       # @z
 	.type	z,@object
 	.section	.data.z,"aw",@progbits
@@ -61,5 +61,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19515.c.s b/test/torture-s/pr19515.c.s
index 8c4167aea..7cfe8e527 100644
--- a/test/torture-s/pr19515.c.s
+++ b/test/torture-s/pr19515.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19515.c"
+	.file	"pr19515.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr19606.c.s b/test/torture-s/pr19606.c.s
index 421e4cd2e..c993c383a 100644
--- a/test/torture-s/pr19606.c.s
+++ b/test/torture-s/pr19606.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19606.c"
+	.file	"pr19606.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -31,9 +31,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -59,14 +59,14 @@ main:                                   # @main
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
-.LBB2_3:                                # %if.then6
+.LBB2_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -76,6 +76,6 @@ a:
 	.size	a, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr19687.c.s b/test/torture-s/pr19687.c.s
index 624e4fa0e..c9ce76410 100644
--- a/test/torture-s/pr19687.c.s
+++ b/test/torture-s/pr19687.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19687.c"
+	.file	"pr19687.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr19689.c.s b/test/torture-s/pr19689.c.s
index 6f3e2c625..37df17e04 100644
--- a/test/torture-s/pr19689.c.s
+++ b/test/torture-s/pr19689.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr19689.c"
+	.file	"pr19689.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	f                       # @f
 	.type	f,@object
 	.section	.bss.f,"aw",@nobits
@@ -52,4 +52,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr20100-1.c.s b/test/torture-s/pr20100-1.c.s
index c60167d2e..3886e6410 100644
--- a/test/torture-s/pr20100-1.c.s
+++ b/test/torture-s/pr20100-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20100-1.c"
+	.file	"pr20100-1.c"
 	.section	.text.frob,"ax",@progbits
-	.hidden	frob
+	.hidden	frob                    # -- Begin function frob
 	.globl	frob
 	.type	frob,@function
 frob:                                   # @frob
@@ -18,7 +18,7 @@ frob:                                   # @frob
 	i32.load8_u	$push3=, e($pop12)
 	i32.const	$push4=, -1
 	i32.add 	$push5=, $pop3, $pop4
-	i32.eq  	$push6=, $0, $pop5
+	i32.eq  	$push6=, $pop5, $0
 	i32.select	$push11=, $pop13, $pop2, $pop6
 	tee_local	$push10=, $0=, $pop11
 	i32.store16	g($pop14), $pop10
@@ -29,9 +29,9 @@ frob:                                   # @frob
 	.endfunc
 .Lfunc_end0:
 	.size	frob, .Lfunc_end0-frob
-
+                                        # -- End function
 	.section	.text.get_n,"ax",@progbits
-	.hidden	get_n
+	.hidden	get_n                   # -- Begin function get_n
 	.globl	get_n
 	.type	get_n,@function
 get_n:                                  # @get_n
@@ -64,7 +64,7 @@ get_n:                                  # @get_n
 	tee_local	$push25=, $2=, $pop26
 	i32.const	$push24=, 1
 	i32.add 	$push4=, $pop25, $pop24
-	i32.eq  	$push3=, $2, $1
+	i32.eq  	$push3=, $1, $2
 	i32.select	$2=, $pop28, $pop4, $pop3
 	i32.const	$push23=, 1
 	i32.add 	$push22=, $3, $pop23
@@ -93,9 +93,9 @@ get_n:                                  # @get_n
 	.endfunc
 .Lfunc_end1:
 	.size	get_n, .Lfunc_end1-get_n
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -116,7 +116,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	g,@object               # @g
 	.section	.bss.g,"aw",@nobits
 	.p2align	1
@@ -140,5 +140,5 @@ e:
 	.size	e, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr20187-1.c.s b/test/torture-s/pr20187-1.c.s
index ae442e893..70c57bc55 100644
--- a/test/torture-s/pr20187-1.c.s
+++ b/test/torture-s/pr20187-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20187-1.c"
+	.file	"pr20187-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -24,9 +24,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -70,4 +70,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr20466-1.c.s b/test/torture-s/pr20466-1.c.s
index 30b6f7de3..7f2a249b1 100644
--- a/test/torture-s/pr20466-1.c.s
+++ b/test/torture-s/pr20466-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20466-1.c"
+	.file	"pr20466-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -23,9 +23,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,10 +33,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push25=, 0
-	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
+	i32.const	$push23=, 0
+	i32.load	$push22=, __stack_pointer($pop23)
 	i32.const	$push24=, 32
-	i32.sub 	$push46=, $pop23, $pop24
+	i32.sub 	$push46=, $pop22, $pop24
 	tee_local	$push45=, $0=, $pop46
 	i32.store	__stack_pointer($pop25), $pop45
 	i32.const	$push4=, 42
@@ -111,8 +111,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr20527-1.c.s b/test/torture-s/pr20527-1.c.s
index b8b7ea549..35ad86dbf 100644
--- a/test/torture-s/pr20527-1.c.s
+++ b/test/torture-s/pr20527-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20527-1.c"
+	.file	"pr20527-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -51,9 +51,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,10 +61,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push20=, $pop14, $pop15
+	i32.sub 	$push20=, $pop13, $pop15
 	tee_local	$push19=, $0=, $pop20
 	i32.store	__stack_pointer($pop16), $pop19
 	i32.const	$push17=, 4
@@ -99,7 +99,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -113,6 +113,6 @@ b:
 	.size	b, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr20601-1.c.s b/test/torture-s/pr20601-1.c.s
index 84eeb6ee6..32adc4fb0 100644
--- a/test/torture-s/pr20601-1.c.s
+++ b/test/torture-s/pr20601-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20601-1.c"
+	.file	"pr20601-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -29,26 +29,26 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %land.rhs.lr.ph.i
 	i32.const	$push35=, 0
 	i32.const	$push34=, 4
 	i32.store	b($pop35), $pop34
 	i32.const	$push33=, 0
 	i32.const	$push0=, g
 	i32.store	c($pop33), $pop0
-	i32.const	$1=, g+4
+	i32.const	$0=, g+4
 	i32.const	$push32=, 0
 	i32.const	$push31=, g+4
 	i32.store	e($pop32), $pop31
-	i32.const	$0=, 3
+	i32.const	$1=, 3
 	i32.const	$push30=, 0
 	i32.const	$push29=, 3
 	i32.store	d($pop30), $pop29
@@ -61,7 +61,7 @@ main:                                   # @main
 	block   	
 	block   	
 	loop    	                # label6:
-	i32.load	$push38=, 0($1)
+	i32.load	$push38=, 0($0)
 	tee_local	$push37=, $2=, $pop38
 	i32.load8_u	$push1=, 0($pop37)
 	i32.const	$push36=, 45
@@ -72,12 +72,12 @@ main:                                   # @main
 	block   	
 	i32.load8_s	$push40=, 1($2)
 	tee_local	$push39=, $4=, $pop40
-	i32.eqz 	$push83=, $pop39
-	br_if   	0, $pop83       # 0: down to label7
+	i32.eqz 	$push81=, $pop39
+	br_if   	0, $pop81       # 0: down to label7
 # BB#3:                                 # %land.lhs.true.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push3=, 2($2)
-	br_if   	5, $pop3        # 5: down to label2
+	i32.load8_u	$push5=, 2($2)
+	br_if   	5, $pop5        # 5: down to label2
 .LBB2_4:                                # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label7:
@@ -86,18 +86,18 @@ main:                                   # @main
 	block   	
 	block   	
 	i32.const	$push41=, 80
-	i32.eq  	$push4=, $4, $pop41
-	br_if   	0, $pop4        # 0: down to label11
+	i32.eq  	$push6=, $4, $pop41
+	br_if   	0, $pop6        # 0: down to label11
 # BB#5:                                 # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.const	$push42=, 117
-	i32.eq  	$push5=, $4, $pop42
-	br_if   	2, $pop5        # 2: down to label9
+	i32.eq  	$push7=, $4, $pop42
+	br_if   	2, $pop7        # 2: down to label9
 # BB#6:                                 # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.const	$push43=, 45
-	i32.ne  	$push6=, $4, $pop43
-	br_if   	1, $pop6        # 1: down to label10
+	i32.ne  	$push8=, $4, $pop43
+	br_if   	1, $pop8        # 1: down to label10
 	br      	6               # 6: down to label4
 .LBB2_7:                                # %sw.bb21.i
                                         #   in Loop: Header=BB2_1 Depth=1
@@ -107,26 +107,26 @@ main:                                   # @main
 .LBB2_8:                                # %sw.epilog.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label10:
-	copy_local	$4=, $0
+	copy_local	$4=, $1
 	br      	1               # 1: down to label8
 .LBB2_9:                                # %sw.bb.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label9:
-	i32.load	$push14=, 4($1)
-	i32.eqz 	$push84=, $pop14
-	br_if   	5, $pop84       # 5: down to label2
+	i32.load	$push16=, 4($0)
+	i32.eqz 	$push82=, $pop16
+	br_if   	5, $pop82       # 5: down to label2
 # BB#10:                                # %if.end19.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.const	$push53=, 0
 	i32.const	$push52=, 4
-	i32.add 	$push51=, $1, $pop52
-	tee_local	$push50=, $1=, $pop51
+	i32.add 	$push51=, $0, $pop52
+	tee_local	$push50=, $0=, $pop51
 	i32.store	t+4100($pop53), $pop50
 	i32.const	$push49=, 0
-	i32.store	e($pop49), $1
+	i32.store	e($pop49), $0
 	i32.const	$push48=, 0
 	i32.const	$push47=, -1
-	i32.add 	$push46=, $0, $pop47
+	i32.add 	$push46=, $1, $pop47
 	tee_local	$push45=, $4=, $pop46
 	i32.store	d($pop48), $pop45
 .LBB2_11:                               # %sw.epilog.i
@@ -134,97 +134,94 @@ main:                                   # @main
 	end_block                       # label8:
 	i32.const	$push62=, 0
 	i32.const	$push61=, 4
-	i32.add 	$push60=, $1, $pop61
-	tee_local	$push59=, $1=, $pop60
+	i32.add 	$push60=, $0, $pop61
+	tee_local	$push59=, $0=, $pop60
 	i32.store	e($pop62), $pop59
 	i32.const	$push58=, 0
 	i32.const	$push57=, -1
 	i32.add 	$push56=, $4, $pop57
-	tee_local	$push55=, $0=, $pop56
+	tee_local	$push55=, $1=, $pop56
 	i32.store	d($pop58), $pop55
 	i32.const	$push54=, 1
-	i32.gt_s	$push15=, $4, $pop54
-	br_if   	0, $pop15       # 0: up to label6
+	i32.gt_s	$push17=, $4, $pop54
+	br_if   	0, $pop17       # 0: up to label6
+	br      	3               # 3: down to label3
 .LBB2_12:                               # %while.end.i
 	end_loop
 	end_block                       # label5:
-	i32.const	$push63=, 1
-	i32.lt_s	$push17=, $0, $pop63
-	br_if   	1, $pop17       # 1: down to label3
-# BB#13:                                # %while.end.i
-	i32.const	$push64=, 1
-	i32.and 	$push16=, $3, $pop64
-	br_if   	1, $pop16       # 1: down to label3
+	i32.const	$push3=, 1
+	i32.and 	$push4=, $3, $pop3
+	br_if   	1, $pop4        # 1: down to label3
 	br      	2               # 2: down to label2
-.LBB2_14:                               # %sw.bb22.i
+.LBB2_13:                               # %sw.bb22.i
 	end_block                       # label4:
-	i32.const	$push8=, 0
-	i32.const	$push7=, 4
-	i32.add 	$push69=, $1, $pop7
-	tee_local	$push68=, $1=, $pop69
-	i32.store	e($pop8), $pop68
-	i32.const	$push67=, 0
-	i32.const	$push9=, -1
-	i32.add 	$push66=, $0, $pop9
-	tee_local	$push65=, $0=, $pop66
-	i32.store	d($pop67), $pop65
-	i32.const	$push12=, 1536
-	i32.or  	$push13=, $3, $pop12
-	i32.const	$push10=, 1
-	i32.eq  	$push11=, $3, $pop10
-	i32.select	$3=, $pop13, $3, $pop11
-.LBB2_15:                               # %setup2.exit
+	i32.const	$push10=, 0
+	i32.const	$push9=, 4
+	i32.add 	$push67=, $0, $pop9
+	tee_local	$push66=, $0=, $pop67
+	i32.store	e($pop10), $pop66
+	i32.const	$push65=, 0
+	i32.const	$push11=, -1
+	i32.add 	$push64=, $1, $pop11
+	tee_local	$push63=, $1=, $pop64
+	i32.store	d($pop65), $pop63
+	i32.const	$push14=, 1536
+	i32.or  	$push15=, $3, $pop14
+	i32.const	$push12=, 1
+	i32.eq  	$push13=, $3, $pop12
+	i32.select	$3=, $pop15, $3, $pop13
+.LBB2_14:                               # %setup2.exit
 	end_block                       # label3:
-	i32.const	$push71=, 0
-	i32.const	$push70=, .L.str.4
-	i32.store	t($pop71), $pop70
+	i32.const	$push69=, 0
+	i32.const	$push68=, .L.str.4
+	i32.store	t($pop69), $pop68
 	block   	
 	i32.const	$push18=, 512
 	i32.and 	$push19=, $3, $pop18
-	i32.eqz 	$push85=, $pop19
-	br_if   	0, $pop85       # 0: down to label12
-# BB#16:                                # %if.then6.i
-	i32.const	$push76=, 0
-	i32.const	$push75=, f
-	i32.store	e($pop76), $pop75
+	i32.eqz 	$push83=, $pop19
+	br_if   	0, $pop83       # 0: down to label12
+# BB#15:                                # %if.then6.i
 	i32.const	$push74=, 0
-	i32.const	$push73=, .L.str.4
-	i32.store	f($pop74), $pop73
+	i32.const	$push73=, f
+	i32.store	e($pop74), $pop73
 	i32.const	$push72=, 0
+	i32.const	$push71=, .L.str.4
+	i32.store	f($pop72), $pop71
+	i32.const	$push70=, 0
 	i32.const	$push20=, 1
-	i32.add 	$push21=, $0, $pop20
-	i32.store	d($pop72), $pop21
+	i32.add 	$push21=, $1, $pop20
+	i32.store	d($pop70), $pop21
 	i32.const	$4=, 4
-.LBB2_17:                               # %for.cond.i
+.LBB2_16:                               # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	i32.const	$push81=, f
-	i32.add 	$push22=, $4, $pop81
-	i32.add 	$push23=, $1, $4
-	i32.const	$push80=, -4
-	i32.add 	$push24=, $pop23, $pop80
-	i32.load	$push79=, 0($pop24)
-	tee_local	$push78=, $2=, $pop79
-	i32.store	0($pop22), $pop78
-	i32.const	$push77=, 4
-	i32.add 	$4=, $4, $pop77
+	i32.const	$push79=, f
+	i32.add 	$push22=, $4, $pop79
+	i32.add 	$push23=, $0, $4
+	i32.const	$push78=, -4
+	i32.add 	$push24=, $pop23, $pop78
+	i32.load	$push77=, 0($pop24)
+	tee_local	$push76=, $2=, $pop77
+	i32.store	0($pop22), $pop76
+	i32.const	$push75=, 4
+	i32.add 	$4=, $4, $pop75
 	br_if   	0, $2           # 0: up to label13
-.LBB2_18:                               # %setup1.exit
+.LBB2_17:                               # %setup1.exit
 	end_loop
 	end_block                       # label12:
 	i32.const	$push26=, 1024
 	i32.and 	$push27=, $3, $pop26
-	i32.eqz 	$push86=, $pop27
-	br_if   	1, $pop86       # 1: down to label1
-# BB#19:                                # %setup1.exit
-	i32.const	$push82=, 0
-	i32.load	$push25=, a+16($pop82)
+	i32.eqz 	$push84=, $pop27
+	br_if   	1, $pop84       # 1: down to label1
+# BB#18:                                # %setup1.exit
+	i32.const	$push80=, 0
+	i32.load	$push25=, a+16($pop80)
 	br_if   	1, $pop25       # 1: down to label1
-.LBB2_20:                               # %if.then
+.LBB2_19:                               # %if.then.i
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
-.LBB2_21:                               # %if.end
+.LBB2_20:                               # %if.end
 	end_block                       # label1:
 	i32.const	$push28=, 0
 	call    	exit@FUNCTION, $pop28
@@ -232,7 +229,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -336,6 +333,6 @@ f:
 	.size	f, 64
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr20621-1.c.s b/test/torture-s/pr20621-1.c.s
index 7420f6ce5..8664bfa45 100644
--- a/test/torture-s/pr20621-1.c.s
+++ b/test/torture-s/pr20621-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr20621-1.c"
+	.file	"pr20621-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	gb                      # @gb
 	.type	gb,@object
 	.section	.bss.gb,"aw",@nobits
@@ -44,4 +44,4 @@ gb:
 	.size	gb, 65536
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr21173.c.s b/test/torture-s/pr21173.c.s
index 68d979458..ae83d8d32 100644
--- a/test/torture-s/pr21173.c.s
+++ b/test/torture-s/pr21173.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr21173.c"
+	.file	"pr21173.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	q                       # @q
 	.type	q,@object
 	.section	.bss.q,"aw",@nobits
@@ -68,5 +68,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr21331.c.s b/test/torture-s/pr21331.c.s
index 4e9cfada9..204f06f15 100644
--- a/test/torture-s/pr21331.c.s
+++ b/test/torture-s/pr21331.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr21331.c"
+	.file	"pr21331.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -12,9 +12,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,6 +38,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr21964-1.c.s b/test/torture-s/pr21964-1.c.s
index 02246cfa0..ab7f56fec 100644
--- a/test/torture-s/pr21964-1.c.s
+++ b/test/torture-s/pr21964-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr21964-1.c"
+	.file	"pr21964-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,8 +38,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr22061-1.c.s b/test/torture-s/pr22061-1.c.s
index e87159309..fb9845dd3 100644
--- a/test/torture-s/pr22061-1.c.s
+++ b/test/torture-s/pr22061-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22061-1.c"
+	.file	"pr22061-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,9 +10,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,14 +28,14 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 4
 	i32.store	N($pop1), $pop0
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	N                       # @N
 	.type	N,@object
 	.section	.data.N,"aw",@progbits
@@ -56,5 +56,5 @@ N:
 	.size	N, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22061-2.c.s b/test/torture-s/pr22061-2.c.s
index b16c424d5..822ffd9f2 100644
--- a/test/torture-s/pr22061-2.c.s
+++ b/test/torture-s/pr22061-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22061-2.c"
+	.file	"pr22061-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -24,5 +24,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-1.c.s b/test/torture-s/pr22098-1.c.s
index b10bd2870..e3d7764d8 100644
--- a/test/torture-s/pr22098-1.c.s
+++ b/test/torture-s/pr22098-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22098-1.c"
+	.file	"pr22098-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-2.c.s b/test/torture-s/pr22098-2.c.s
index 47da9bbd8..bcf8d5a7b 100644
--- a/test/torture-s/pr22098-2.c.s
+++ b/test/torture-s/pr22098-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22098-2.c"
+	.file	"pr22098-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-3.c.s b/test/torture-s/pr22098-3.c.s
index 0f53b5358..5adfa6c08 100644
--- a/test/torture-s/pr22098-3.c.s
+++ b/test/torture-s/pr22098-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22098-3.c"
+	.file	"pr22098-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.bss.n,"aw",@nobits
@@ -60,6 +60,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22348.c.s b/test/torture-s/pr22348.c.s
index aa9a5dfb4..62464db07 100644
--- a/test/torture-s/pr22348.c.s
+++ b/test/torture-s/pr22348.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22348.c"
+	.file	"pr22348.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -20,9 +20,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,7 +33,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr22429.c.s b/test/torture-s/pr22429.c.s
index 26eafa5c1..f2d0c9cf5 100644
--- a/test/torture-s/pr22429.c.s
+++ b/test/torture-s/pr22429.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22429.c"
+	.file	"pr22429.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -18,9 +18,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,6 +31,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr22493-1.c.s b/test/torture-s/pr22493-1.c.s
index c7e64b164..39331b40a 100644
--- a/test/torture-s/pr22493-1.c.s
+++ b/test/torture-s/pr22493-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22493-1.c"
+	.file	"pr22493-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,22 +12,21 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, -2147483648
-	call    	f@FUNCTION, $pop0
+	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr22630.c.s b/test/torture-s/pr22630.c.s
index cb9008d2d..60f21ed05 100644
--- a/test/torture-s/pr22630.c.s
+++ b/test/torture-s/pr22630.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr22630.c"
+	.file	"pr22630.c"
 	.section	.text.bla,"ax",@progbits
-	.hidden	bla
+	.hidden	bla                     # -- Begin function bla
 	.globl	bla
 	.type	bla,@function
 bla:                                    # @bla
@@ -22,9 +22,9 @@ bla:                                    # @bla
 	.endfunc
 .Lfunc_end0:
 	.size	bla, .Lfunc_end0-bla
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	j                       # @j
 	.type	j,@object
 	.section	.bss.j,"aw",@nobits
@@ -49,4 +49,4 @@ j:
 	.size	j, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr23047.c.s b/test/torture-s/pr23047.c.s
index 64e13f5af..ed208d885 100644
--- a/test/torture-s/pr23047.c.s
+++ b/test/torture-s/pr23047.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23047.c"
+	.file	"pr23047.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -26,9 +26,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,8 +43,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23135.c.s b/test/torture-s/pr23135.c.s
index 551df2bdb..ed94e2c8c 100644
--- a/test/torture-s/pr23135.c.s
+++ b/test/torture-s/pr23135.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23135.c"
+	.file	"pr23135.c"
 	.section	.text.verify,"ax",@progbits
-	.hidden	verify
+	.hidden	verify                  # -- Begin function verify
 	.globl	verify
 	.type	verify,@function
 verify:                                 # @verify
@@ -22,258 +22,258 @@ verify:                                 # @verify
 	.endfunc
 .Lfunc_end0:
 	.size	verify, .Lfunc_end0-verify
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
 	i32.const	$push100=, 0
-	i32.load	$push99=, j+4($pop100)
-	tee_local	$push98=, $3=, $pop99
-	i32.const	$push97=, 0
-	i32.load	$push96=, i+4($pop97)
-	tee_local	$push95=, $1=, $pop96
-	i32.add 	$push94=, $pop98, $pop95
-	tee_local	$push93=, $5=, $pop94
-	i32.store	res+4($pop0), $pop93
-	i32.const	$push92=, 0
+	i32.const	$push99=, 0
+	i32.load	$push98=, j+4($pop99)
+	tee_local	$push97=, $5=, $pop98
+	i32.const	$push96=, 0
+	i32.load	$push95=, i+4($pop96)
+	tee_local	$push94=, $1=, $pop95
+	i32.add 	$push93=, $pop97, $pop94
+	tee_local	$push92=, $7=, $pop93
+	i32.store	res+4($pop100), $pop92
 	i32.const	$push91=, 0
-	i32.load	$push90=, j($pop91)
-	tee_local	$push89=, $2=, $pop90
-	i32.const	$push88=, 0
-	i32.load	$push87=, i($pop88)
-	tee_local	$push86=, $0=, $pop87
-	i32.add 	$push85=, $pop89, $pop86
-	tee_local	$push84=, $4=, $pop85
-	i32.store	res($pop92), $pop84
+	i32.const	$push90=, 0
+	i32.load	$push89=, j($pop90)
+	tee_local	$push88=, $4=, $pop89
+	i32.const	$push87=, 0
+	i32.load	$push86=, i($pop87)
+	tee_local	$push85=, $0=, $pop86
+	i32.add 	$push84=, $pop88, $pop85
+	tee_local	$push83=, $6=, $pop84
+	i32.store	res($pop91), $pop83
 	block   	
-	i32.const	$push1=, 160
-	i32.ne  	$push2=, $4, $pop1
-	br_if   	0, $pop2        # 0: down to label1
+	i32.const	$push0=, 160
+	i32.ne  	$push1=, $6, $pop0
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %entry
-	i32.const	$push3=, 113
-	i32.ne  	$push4=, $5, $pop3
-	br_if   	0, $pop4        # 0: down to label1
+	i32.const	$push2=, 113
+	i32.ne  	$push3=, $7, $pop2
+	br_if   	0, $pop3        # 0: down to label1
 # BB#2:                                 # %verify.exit
-	i32.const	$push5=, 0
-	i32.mul 	$push105=, $2, $0
-	tee_local	$push104=, $6=, $pop105
-	i32.store	res($pop5), $pop104
+	i32.const	$push4=, 0
+	i32.mul 	$push105=, $4, $0
+	tee_local	$push104=, $8=, $pop105
+	i32.store	res($pop4), $pop104
 	i32.const	$push103=, 0
-	i32.mul 	$push102=, $3, $1
-	tee_local	$push101=, $7=, $pop102
+	i32.mul 	$push102=, $5, $1
+	tee_local	$push101=, $9=, $pop102
 	i32.store	res+4($pop103), $pop101
-	i32.const	$push6=, 1500
-	i32.ne  	$push7=, $6, $pop6
-	br_if   	0, $pop7        # 0: down to label1
+	i32.const	$push5=, 1500
+	i32.ne  	$push6=, $8, $pop5
+	br_if   	0, $pop6        # 0: down to label1
 # BB#3:                                 # %verify.exit
-	i32.const	$push8=, 1300
-	i32.ne  	$push9=, $7, $pop8
-	br_if   	0, $pop9        # 0: down to label1
+	i32.const	$push7=, 1300
+	i32.ne  	$push8=, $9, $pop7
+	br_if   	0, $pop8        # 0: down to label1
 # BB#4:                                 # %verify.exit48
-	i32.const	$push10=, 0
-	i32.div_s	$push110=, $0, $2
-	tee_local	$push109=, $8=, $pop110
-	i32.store	res($pop10), $pop109
+	i32.const	$push9=, 0
+	i32.div_s	$push110=, $0, $4
+	tee_local	$push109=, $10=, $pop110
+	i32.store	res($pop9), $pop109
 	i32.const	$push108=, 0
-	i32.div_s	$push107=, $1, $3
-	tee_local	$push106=, $9=, $pop107
+	i32.div_s	$push107=, $1, $5
+	tee_local	$push106=, $11=, $pop107
 	i32.store	res+4($pop108), $pop106
-	i32.const	$push11=, 15
-	i32.ne  	$push12=, $8, $pop11
-	br_if   	0, $pop12       # 0: down to label1
+	i32.const	$push10=, 15
+	i32.ne  	$push11=, $10, $pop10
+	br_if   	0, $pop11       # 0: down to label1
 # BB#5:                                 # %verify.exit48
-	i32.const	$push13=, 7
-	i32.ne  	$push14=, $9, $pop13
-	br_if   	0, $pop14       # 0: down to label1
+	i32.const	$push12=, 7
+	i32.ne  	$push13=, $11, $pop12
+	br_if   	0, $pop13       # 0: down to label1
 # BB#6:                                 # %verify.exit54
-	i32.const	$push15=, 0
-	i32.and 	$push115=, $2, $0
-	tee_local	$push114=, $10=, $pop115
-	i32.store	res($pop15), $pop114
+	i32.const	$push14=, 0
+	i32.and 	$push115=, $4, $0
+	tee_local	$push114=, $12=, $pop115
+	i32.store	res($pop14), $pop114
 	i32.const	$push113=, 0
-	i32.and 	$push112=, $3, $1
-	tee_local	$push111=, $11=, $pop112
+	i32.and 	$push112=, $5, $1
+	tee_local	$push111=, $13=, $pop112
 	i32.store	res+4($pop113), $pop111
-	i32.const	$push16=, 2
-	i32.ne  	$push17=, $10, $pop16
-	br_if   	0, $pop17       # 0: down to label1
+	i32.const	$push15=, 2
+	i32.ne  	$push16=, $12, $pop15
+	br_if   	0, $pop16       # 0: down to label1
 # BB#7:                                 # %verify.exit54
-	i32.const	$push18=, 4
-	i32.ne  	$push19=, $11, $pop18
-	br_if   	0, $pop19       # 0: down to label1
+	i32.const	$push17=, 4
+	i32.ne  	$push18=, $13, $pop17
+	br_if   	0, $pop18       # 0: down to label1
 # BB#8:                                 # %verify.exit60
-	i32.const	$push20=, 0
-	i32.or  	$push120=, $2, $0
-	tee_local	$push119=, $12=, $pop120
-	i32.store	res($pop20), $pop119
+	i32.const	$push19=, 0
+	i32.or  	$push120=, $4, $0
+	tee_local	$push119=, $14=, $pop120
+	i32.store	res($pop19), $pop119
 	i32.const	$push118=, 0
-	i32.or  	$push117=, $3, $1
-	tee_local	$push116=, $13=, $pop117
+	i32.or  	$push117=, $5, $1
+	tee_local	$push116=, $15=, $pop117
 	i32.store	res+4($pop118), $pop116
-	i32.const	$push21=, 158
-	i32.ne  	$push22=, $12, $pop21
-	br_if   	0, $pop22       # 0: down to label1
+	i32.const	$push20=, 158
+	i32.ne  	$push21=, $14, $pop20
+	br_if   	0, $pop21       # 0: down to label1
 # BB#9:                                 # %verify.exit60
-	i32.const	$push23=, 109
-	i32.ne  	$push24=, $13, $pop23
-	br_if   	0, $pop24       # 0: down to label1
+	i32.const	$push22=, 109
+	i32.ne  	$push23=, $15, $pop22
+	br_if   	0, $pop23       # 0: down to label1
 # BB#10:                                # %verify.exit66
-	i32.const	$push25=, 0
-	i32.xor 	$push125=, $0, $2
-	tee_local	$push124=, $2=, $pop125
-	i32.store	res($pop25), $pop124
+	i32.const	$push24=, 0
+	i32.xor 	$push125=, $4, $0
+	tee_local	$push124=, $4=, $pop125
+	i32.store	res($pop24), $pop124
 	i32.const	$push123=, 0
-	i32.xor 	$push122=, $1, $3
-	tee_local	$push121=, $3=, $pop122
+	i32.xor 	$push122=, $5, $1
+	tee_local	$push121=, $5=, $pop122
 	i32.store	res+4($pop123), $pop121
-	i32.const	$push26=, 156
-	i32.ne  	$push27=, $2, $pop26
-	br_if   	0, $pop27       # 0: down to label1
+	i32.const	$push25=, 156
+	i32.ne  	$push26=, $4, $pop25
+	br_if   	0, $pop26       # 0: down to label1
 # BB#11:                                # %verify.exit66
-	i32.const	$push28=, 105
-	i32.ne  	$push29=, $3, $pop28
-	br_if   	0, $pop29       # 0: down to label1
+	i32.const	$push27=, 105
+	i32.ne  	$push28=, $5, $pop27
+	br_if   	0, $pop28       # 0: down to label1
 # BB#12:                                # %verify.exit72
-	i32.const	$push30=, 0
+	i32.const	$push29=, 0
 	i32.const	$push132=, 0
 	i32.sub 	$push131=, $pop132, $0
-	tee_local	$push130=, $14=, $pop131
-	i32.store	res($pop30), $pop130
+	tee_local	$push130=, $2=, $pop131
+	i32.store	res($pop29), $pop130
 	i32.const	$push129=, 0
 	i32.const	$push128=, 0
 	i32.sub 	$push127=, $pop128, $1
-	tee_local	$push126=, $15=, $pop127
+	tee_local	$push126=, $3=, $pop127
 	i32.store	res+4($pop129), $pop126
-	i32.const	$push31=, -150
-	i32.ne  	$push32=, $14, $pop31
-	br_if   	0, $pop32       # 0: down to label1
+	i32.const	$push30=, -150
+	i32.ne  	$push31=, $2, $pop30
+	br_if   	0, $pop31       # 0: down to label1
 # BB#13:                                # %verify.exit72
-	i32.const	$push33=, -100
-	i32.ne  	$push34=, $15, $pop33
-	br_if   	0, $pop34       # 0: down to label1
+	i32.const	$push32=, -100
+	i32.ne  	$push33=, $3, $pop32
+	br_if   	0, $pop33       # 0: down to label1
 # BB#14:                                # %verify.exit78
-	i32.const	$push36=, 0
-	i32.const	$push35=, -1
-	i32.xor 	$push138=, $0, $pop35
+	i32.const	$push35=, 0
+	i32.const	$push34=, -1
+	i32.xor 	$push138=, $0, $pop34
 	tee_local	$push137=, $16=, $pop138
-	i32.store	res($pop36), $pop137
+	i32.store	res($pop35), $pop137
 	i32.const	$push136=, 0
 	i32.const	$push135=, -1
 	i32.xor 	$push134=, $1, $pop135
 	tee_local	$push133=, $17=, $pop134
 	i32.store	res+4($pop136), $pop133
-	i32.const	$push37=, 150
-	i32.ne  	$push38=, $0, $pop37
-	br_if   	0, $pop38       # 0: down to label1
+	i32.const	$push36=, 150
+	i32.ne  	$push37=, $0, $pop36
+	br_if   	0, $pop37       # 0: down to label1
 # BB#15:                                # %verify.exit78
-	i32.const	$push39=, -101
-	i32.ne  	$push40=, $17, $pop39
-	br_if   	0, $pop40       # 0: down to label1
+	i32.const	$push38=, -101
+	i32.ne  	$push39=, $17, $pop38
+	br_if   	0, $pop39       # 0: down to label1
 # BB#16:                                # %verify.exit84
-	i32.const	$push46=, 0
-	i32.add 	$push41=, $6, $4
-	i32.add 	$push42=, $pop41, $10
+	i32.const	$push45=, 0
+	i32.sub 	$push40=, $16, $0
+	i32.add 	$push41=, $pop40, $8
+	i32.add 	$push42=, $pop41, $6
 	i32.add 	$push43=, $pop42, $12
-	i32.add 	$push44=, $pop43, $2
-	i32.sub 	$push45=, $pop44, $0
-	i32.add 	$push145=, $pop45, $16
+	i32.add 	$push44=, $pop43, $14
+	i32.add 	$push145=, $pop44, $4
 	tee_local	$push144=, $0=, $pop145
-	i32.store	res($pop46), $pop144
+	i32.store	res($pop45), $pop144
 	i32.const	$push143=, 0
 	i32.store	k($pop143), $0
 	i32.const	$push142=, 0
-	i32.add 	$push47=, $7, $5
-	i32.add 	$push48=, $pop47, $11
+	i32.sub 	$push46=, $17, $1
+	i32.add 	$push47=, $pop46, $9
+	i32.add 	$push48=, $pop47, $7
 	i32.add 	$push49=, $pop48, $13
-	i32.add 	$push50=, $pop49, $3
-	i32.sub 	$push51=, $pop50, $1
-	i32.add 	$push141=, $pop51, $17
+	i32.add 	$push50=, $pop49, $15
+	i32.add 	$push141=, $pop50, $5
 	tee_local	$push140=, $1=, $pop141
 	i32.store	res+4($pop142), $pop140
 	i32.const	$push139=, 0
 	i32.store	k+4($pop139), $1
-	i32.const	$push52=, 1675
-	i32.ne  	$push53=, $0, $pop52
-	br_if   	0, $pop53       # 0: down to label1
+	i32.const	$push51=, 1675
+	i32.ne  	$push52=, $0, $pop51
+	br_if   	0, $pop52       # 0: down to label1
 # BB#17:                                # %verify.exit84
-	i32.const	$push54=, 1430
-	i32.ne  	$push55=, $1, $pop54
-	br_if   	0, $pop55       # 0: down to label1
+	i32.const	$push53=, 1430
+	i32.ne  	$push54=, $1, $pop53
+	br_if   	0, $pop54       # 0: down to label1
 # BB#18:                                # %verify.exit90
-	i32.const	$push61=, 0
-	i32.mul 	$push56=, $6, $4
-	i32.mul 	$push57=, $pop56, $10
+	i32.const	$push60=, 0
+	i32.mul 	$push55=, $16, $2
+	i32.mul 	$push56=, $pop55, $8
+	i32.mul 	$push57=, $pop56, $6
 	i32.mul 	$push58=, $pop57, $12
-	i32.mul 	$push59=, $pop58, $2
-	i32.mul 	$push60=, $pop59, $14
-	i32.mul 	$push152=, $pop60, $16
+	i32.mul 	$push59=, $pop58, $14
+	i32.mul 	$push152=, $pop59, $4
 	tee_local	$push151=, $0=, $pop152
-	i32.store	res($pop61), $pop151
+	i32.store	res($pop60), $pop151
 	i32.const	$push150=, 0
 	i32.store	k($pop150), $0
 	i32.const	$push149=, 0
-	i32.mul 	$push62=, $7, $5
-	i32.mul 	$push63=, $pop62, $11
+	i32.mul 	$push61=, $17, $3
+	i32.mul 	$push62=, $pop61, $9
+	i32.mul 	$push63=, $pop62, $7
 	i32.mul 	$push64=, $pop63, $13
-	i32.mul 	$push65=, $pop64, $3
-	i32.mul 	$push66=, $pop65, $15
-	i32.mul 	$push148=, $pop66, $17
+	i32.mul 	$push65=, $pop64, $15
+	i32.mul 	$push148=, $pop65, $5
 	tee_local	$push147=, $1=, $pop148
 	i32.store	res+4($pop149), $pop147
 	i32.const	$push146=, 0
 	i32.store	k+4($pop146), $1
-	i32.const	$push67=, 1456467968
-	i32.ne  	$push68=, $0, $pop67
-	br_if   	0, $pop68       # 0: down to label1
+	i32.const	$push66=, 1456467968
+	i32.ne  	$push67=, $0, $pop66
+	br_if   	0, $pop67       # 0: down to label1
 # BB#19:                                # %verify.exit90
-	i32.const	$push69=, -1579586240
-	i32.ne  	$push70=, $1, $pop69
-	br_if   	0, $pop70       # 0: down to label1
+	i32.const	$push68=, -1579586240
+	i32.ne  	$push69=, $1, $pop68
+	br_if   	0, $pop69       # 0: down to label1
 # BB#20:                                # %verify.exit96
 	i32.const	$push160=, 0
-	i32.div_s	$push71=, $4, $6
-	i32.div_s	$push72=, $pop71, $8
-	i32.div_s	$push73=, $pop72, $10
-	i32.div_s	$push74=, $pop73, $12
+	i32.div_s	$push70=, $6, $8
+	i32.div_s	$push71=, $pop70, $10
+	i32.div_s	$push72=, $pop71, $12
+	i32.div_s	$push73=, $pop72, $14
+	i32.div_s	$push74=, $pop73, $4
 	i32.div_s	$push75=, $pop74, $2
-	i32.div_s	$push76=, $pop75, $14
-	i32.div_s	$push159=, $pop76, $16
-	tee_local	$push158=, $4=, $pop159
+	i32.div_s	$push159=, $pop75, $16
+	tee_local	$push158=, $6=, $pop159
 	i32.store	res($pop160), $pop158
 	i32.const	$push157=, 0
-	i32.store	k($pop157), $4
+	i32.store	k($pop157), $6
 	i32.const	$push156=, 0
-	i32.div_s	$push77=, $5, $7
-	i32.div_s	$push78=, $pop77, $9
-	i32.div_s	$push79=, $pop78, $11
-	i32.div_s	$push80=, $pop79, $13
+	i32.div_s	$push76=, $7, $9
+	i32.div_s	$push77=, $pop76, $11
+	i32.div_s	$push78=, $pop77, $13
+	i32.div_s	$push79=, $pop78, $15
+	i32.div_s	$push80=, $pop79, $5
 	i32.div_s	$push81=, $pop80, $3
-	i32.div_s	$push82=, $pop81, $15
-	i32.div_s	$push155=, $pop82, $17
+	i32.div_s	$push155=, $pop81, $17
 	tee_local	$push154=, $0=, $pop155
 	i32.store	res+4($pop156), $pop154
 	i32.const	$push153=, 0
 	i32.store	k+4($pop153), $0
-	i32.or  	$push83=, $0, $4
-	br_if   	0, $pop83       # 0: down to label1
+	i32.or  	$push82=, $0, $6
+	br_if   	0, $pop82       # 0: down to label1
 # BB#21:                                # %verify.exit102
 	i32.const	$push161=, 0
 	call    	exit@FUNCTION, $pop161
 	unreachable
-.LBB1_22:                               # %if.then.i101
+.LBB1_22:                               # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -313,6 +313,6 @@ k:
 	.size	k, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23324.c.s b/test/torture-s/pr23324.c.s
index 2ad486e43..41b88d31e 100644
--- a/test/torture-s/pr23324.c.s
+++ b/test/torture-s/pr23324.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23324.c"
+	.file	"pr23324.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,14 +41,14 @@ main:                                   # @main
 # BB#5:                                 # %caller_bf7.exit
 	i32.const	$push6=, 0
 	return  	$pop6
-.LBB0_6:                                # %if.then37.i.i
+.LBB0_6:                                # %if.then109.i.i
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	wv6,@object             # @wv6
 	.section	.data.wv6,"aw",@progbits
 	.p2align	3
@@ -94,5 +94,5 @@ yv7:
 	.size	yv7, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr23467.c.s b/test/torture-s/pr23467.c.s
index 50aa1eaa5..7d6f9dc0d 100644
--- a/test/torture-s/pr23467.c.s
+++ b/test/torture-s/pr23467.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23467.c"
+	.file	"pr23467.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -24,5 +24,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23604.c.s b/test/torture-s/pr23604.c.s
index bf3794a41..60cc0f180 100644
--- a/test/torture-s/pr23604.c.s
+++ b/test/torture-s/pr23604.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23604.c"
+	.file	"pr23604.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -9,29 +9,28 @@ g:                                      # @g
 	.result 	i32
 # BB#0:                                 # %entry
 	block   	
-	block   	
 	i32.const	$push0=, 1
 	i32.gt_u	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label1
+	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %if.then2
 	i32.eq  	$push2=, $0, $1
-	br_if   	0, $pop2        # 0: down to label1
+	br_if   	0, $pop2        # 0: down to label0
 # BB#2:                                 # %if.then2
-	i32.const	$0=, 0
-	br_if   	1, $1           # 1: down to label0
-.LBB0_3:                                # %if.end9
-	end_block                       # label1:
-	i32.const	$0=, 1
-.LBB0_4:                                # %return
+	i32.eqz 	$push5=, $1
+	br_if   	0, $pop5        # 0: down to label0
+# BB#3:                                 # %return
+	i32.const	$push4=, 0
+	return  	$pop4
+.LBB0_4:                                # %if.end9
 	end_block                       # label0:
-	copy_local	$push3=, $0
+	i32.const	$push3=, 1
                                         # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,6 +41,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr23941.c.s b/test/torture-s/pr23941.c.s
index 247709dd2..8f4a5404e 100644
--- a/test/torture-s/pr23941.c.s
+++ b/test/torture-s/pr23941.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr23941.c"
+	.file	"pr23941.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.data.d,"aw",@progbits
@@ -34,5 +34,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr24141.c.s b/test/torture-s/pr24141.c.s
index a68329378..6b9d9ea88 100644
--- a/test/torture-s/pr24141.c.s
+++ b/test/torture-s/pr24141.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr24141.c"
+	.file	"pr24141.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -13,9 +13,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -36,9 +36,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,7 +52,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -63,4 +63,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr24142.c.s b/test/torture-s/pr24142.c.s
index 6b702f6ae..b24678c1e 100644
--- a/test/torture-s/pr24142.c.s
+++ b/test/torture-s/pr24142.c.s
@@ -1,27 +1,25 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr24142.c"
+	.file	"pr24142.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push2=, 1
-	i32.or  	$push3=, $0, $pop2
-	i32.const	$push6=, 1
-	i32.eq  	$push4=, $pop3, $pop6
+	i32.const	$push2=, 2
+	i32.lt_u	$push3=, $0, $pop2
 	i32.const	$push0=, 0
 	i32.ne  	$push1=, $1, $pop0
-	i32.and 	$push5=, $pop4, $pop1
-                                        # fallthrough-return: $pop5
+	i32.and 	$push4=, $pop3, $pop1
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,6 +30,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr24716.c.s b/test/torture-s/pr24716.c.s
index 46926e871..b1182823f 100644
--- a/test/torture-s/pr24716.c.s
+++ b/test/torture-s/pr24716.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr24716.c"
+	.file	"pr24716.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,12 +10,12 @@ f:                                      # @f
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$5=, 0
-	i32.const	$4=, 0
+	i32.const	$3=, 0
 	block   	
 	block   	
-	i32.const	$push17=, 0
-	i32.const	$push16=, 3
-	i32.lt_s	$push0=, $pop17, $pop16
+	i32.const	$push16=, 0
+	i32.const	$push15=, 3
+	i32.lt_s	$push0=, $pop16, $pop15
 	br_if   	0, $pop0        # 0: down to label1
 # BB#1:
 	i32.const	$6=, 12
@@ -60,275 +60,277 @@ f:                                      # @f
 	block   	
 	block   	
 	block   	
-	br_table 	$6, 3, 6, 7, 8, 9, 10, 11, 12, 16, 0, 2, 17, 1, 4, 5, 15, 14, 13, 13 # 3: down to label33
+	br_table 	$6, 3, 6, 7, 8, 9, 10, 11, 15, 16, 0, 2, 18, 1, 4, 5, 12, 13, 14, 17, 17 # 3: down to label33
                                         # 6: down to label30
                                         # 7: down to label29
                                         # 8: down to label28
                                         # 9: down to label27
                                         # 10: down to label26
                                         # 11: down to label25
-                                        # 12: down to label24
+                                        # 15: down to label21
                                         # 16: down to label20
                                         # 0: down to label36
                                         # 2: down to label34
-                                        # 17: down to label19
+                                        # 18: down to label18
                                         # 1: down to label35
                                         # 4: down to label32
                                         # 5: down to label31
-                                        # 15: down to label21
-                                        # 14: down to label22
+                                        # 12: down to label24
                                         # 13: down to label23
+                                        # 14: down to label22
+                                        # 17: down to label19
 .LBB0_4:                                #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label36:
-	i32.const	$4=, 1
+	i32.const	$3=, 1
 	i32.const	$0=, -1
-	i32.const	$push18=, 3
-	i32.lt_s	$push1=, $5, $pop18
-	br_if   	17, $pop1       # 17: down to label18
+	i32.const	$push17=, 3
+	i32.lt_s	$push1=, $5, $pop17
+	br_if   	18, $pop1       # 18: down to label17
 # BB#5:                                 #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 12
 	br      	33              # 33: up to label2
 .LBB0_6:                                # %if.end.thread
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label35:
-	i32.const	$push22=, -1
-	i32.add 	$3=, $4, $pop22
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $5, $pop21
-	tee_local	$push19=, $5=, $pop20
-	i32.gt_s	$push3=, $pop19, $1
-	br_if   	20, $pop3       # 20: down to label14
-	br      	21              # 21: down to label13
+	i32.const	$push21=, -1
+	i32.add 	$4=, $3, $pop21
+	i32.const	$push20=, 1
+	i32.add 	$push19=, $5, $pop20
+	tee_local	$push18=, $5=, $pop19
+	i32.gt_s	$push3=, $pop18, $1
+	br_if   	21, $pop3       # 21: down to label13
+	br      	22              # 22: down to label12
 .LBB0_7:                                # %if.end
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label34:
-	i32.const	$3=, 0
-	i32.const	$push23=, 1
-	i32.eq  	$push2=, $4, $pop23
-	br_if   	17, $pop2       # 17: down to label16
+	i32.const	$4=, 0
+	i32.const	$push22=, 1
+	i32.eq  	$push2=, $3, $pop22
+	br_if   	18, $pop2       # 18: down to label15
 # BB#8:                                 #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 0
 	br      	31              # 31: up to label2
-.LBB0_9:                                # %while.cond.preheader
+.LBB0_9:                                # %if.end4
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label33:
 	i32.le_s	$push4=, $5, $1
-	br_if   	15, $pop4       # 15: down to label17
+	br_if   	16, $pop4       # 16: down to label16
 # BB#10:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 13
 	br      	30              # 30: up to label2
 .LBB0_11:                               # %while.body.lr.ph
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label32:
-	i32.eq  	$4=, $3, $1
+	i32.eq  	$3=, $4, $1
 # BB#12:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 14
 	br      	29              # 29: up to label2
 .LBB0_13:                               # %while.body
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label31:
-	i32.add 	$push25=, $5, $4
-	tee_local	$push24=, $5=, $pop25
-	i32.gt_s	$push5=, $pop24, $1
-	br_if   	15, $pop5       # 15: down to label15
+	i32.add 	$push24=, $5, $3
+	tee_local	$push23=, $5=, $pop24
+	i32.gt_s	$push5=, $pop23, $1
+	br_if   	16, $pop5       # 16: down to label14
 # BB#14:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 1
 	br      	28              # 28: up to label2
-.LBB0_15:                               # %do.body10.preheader
+.LBB0_15:                               # %while.end
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label30:
-	i32.const	$push27=, 2
-	i32.shl 	$push6=, $0, $pop27
-	i32.const	$push26=, W
-	i32.add 	$2=, $pop6, $pop26
+	i32.const	$push28=, 2
+	i32.shl 	$push6=, $0, $pop28
+	i32.const	$push27=, W
+	i32.add 	$push26=, $pop6, $pop27
+	tee_local	$push25=, $2=, $pop26
+	i32.load	$3=, 0($pop25)
 # BB#16:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 2
 	br      	27              # 27: up to label2
 .LBB0_17:                               # %do.body10
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label29:
-	i32.load	$4=, 0($2)
+	i32.eqz 	$push38=, $3
+	br_if   	18, $pop38      # 18: down to label10
 # BB#18:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 3
 	br      	26              # 26: up to label2
-.LBB0_19:                               # %do.body11
+.LBB0_19:                               # %if.then13.peel
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label28:
-	i32.eqz 	$push37=, $4
-	br_if   	17, $pop37      # 17: down to label10
+	i32.const	$push29=, 0
+	i32.store	0($2), $pop29
+	i32.const	$5=, 1
 # BB#20:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 4
 	br      	25              # 25: up to label2
-.LBB0_21:                               # %if.then13
+.LBB0_21:                               # %do.cond16.peel
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label27:
-	i32.const	$push28=, 0
-	i32.store	0($2), $pop28
-	i32.const	$5=, 1
+	i32.const	$push30=, 0
+	i32.le_s	$push7=, $1, $pop30
+	br_if   	17, $pop7       # 17: down to label9
 # BB#22:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 5
 	br      	24              # 24: up to label2
-.LBB0_23:                               # %do.cond16
+.LBB0_23:                               # %do.cond19
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label26:
-	i32.const	$4=, 0
-	i32.const	$push29=, 1
-	i32.lt_s	$push7=, $1, $pop29
-	br_if   	14, $pop7       # 14: down to label11
+	i32.const	$3=, 0
+	i32.const	$push31=, 0
+	i32.gt_s	$push8=, $0, $pop31
+	br_if   	14, $pop8       # 14: down to label11
 # BB#24:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 6
 	br      	23              # 23: up to label2
-.LBB0_25:                               # %do.cond19
+.LBB0_25:                               # %do.body22
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label25:
-	i32.const	$push30=, 0
-	i32.gt_s	$push8=, $0, $pop30
-	br_if   	12, $pop8       # 12: down to label12
+	i32.const	$push34=, 2
+	i32.shl 	$push10=, $0, $pop34
+	i32.const	$push33=, Link
+	i32.add 	$push11=, $pop10, $pop33
+	i32.load	$0=, 0($pop11)
+	i32.const	$push32=, 1
+	i32.lt_s	$push9=, $4, $pop32
+	br_if   	18, $pop9       # 18: down to label6
 # BB#26:                                #   in Loop: Header=BB0_3 Depth=1
-	i32.const	$6=, 7
+	i32.const	$6=, 15
 	br      	22              # 22: up to label2
-.LBB0_27:                               # %do.body22
+.LBB0_27:                               # %while.body26.lr.ph
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label24:
-	i32.const	$push33=, 2
-	i32.shl 	$push9=, $0, $pop33
-	i32.const	$push32=, Link
-	i32.add 	$push10=, $pop9, $pop32
-	i32.load	$0=, 0($pop10)
+	i32.const	$push35=, -1
+	i32.ne  	$3=, $0, $pop35
 	i32.const	$1=, 0
-	i32.const	$push31=, 0
-	i32.lt_s	$push11=, $pop31, $3
-	br_if   	17, $pop11      # 17: down to label6
-	br      	18              # 18: down to label5
-.LBB0_28:                               # %if.then28
+# BB#28:                                #   in Loop: Header=BB0_3 Depth=1
+	i32.const	$6=, 16
+	br      	21              # 21: up to label2
+.LBB0_29:                               # %while.body26
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label23:
-	i32.const	$push35=, 1
-	i32.add 	$1=, $1, $pop35
-	i32.const	$push34=, 1
-	i32.add 	$5=, $5, $pop34
-# BB#29:                                #   in Loop: Header=BB0_3 Depth=1
-	i32.const	$6=, 16
+	i32.add 	$push37=, $1, $3
+	tee_local	$push36=, $1=, $pop37
+	i32.lt_s	$push12=, $pop36, $4
+	br_if   	18, $pop12      # 18: down to label4
+# BB#30:                                #   in Loop: Header=BB0_3 Depth=1
+	i32.const	$6=, 17
 	br      	20              # 20: up to label2
-.LBB0_30:                               # %while.cond24
+.LBB0_31:                               # %do.cond33.loopexit
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label22:
-	i32.ge_s	$push12=, $1, $3
-	br_if   	14, $pop12      # 14: down to label7
-# BB#31:                                #   in Loop: Header=BB0_3 Depth=1
-	i32.const	$6=, 15
-	br      	19              # 19: up to label2
-.LBB0_32:                               # %while.body26
-                                        #   in Loop: Header=BB0_3 Depth=1
+	i32.add 	$5=, $5, $1
+	br      	16              # 16: down to label5
+.LBB0_32:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label21:
-	i32.const	$push36=, -1
-	i32.eq  	$push15=, $0, $pop36
-	br_if   	17, $pop15      # 17: down to label3
-	br      	16              # 16: down to label4
-.LBB0_33:                               # %do.cond33
+	i32.const	$1=, 0
+# BB#33:                                #   in Loop: Header=BB0_3 Depth=1
+	i32.const	$6=, 8
+	br      	18              # 18: up to label2
+.LBB0_34:                               # %do.cond33
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label20:
 	i32.const	$push13=, -1
 	i32.ne  	$push14=, $0, $pop13
-	br_if   	10, $pop14      # 10: down to label9
-	br      	11              # 11: down to label8
-.LBB0_34:                               # %for.end
+	br_if   	11, $pop14      # 11: down to label8
+	br      	12              # 12: down to label7
+.LBB0_35:                               # %do.cond16
+                                        #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label19:
-	return  	$5
-.LBB0_35:                               #   in Loop: Header=BB0_3 Depth=1
+	br      	15              # 15: down to label3
+.LBB0_36:                               # %for.end
 	end_block                       # label18:
-	i32.const	$6=, 10
-	br      	15              # 15: up to label2
-.LBB0_36:                               #   in Loop: Header=BB0_3 Depth=1
+	return  	$5
+.LBB0_37:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label17:
-	i32.const	$6=, 1
+	i32.const	$6=, 10
 	br      	14              # 14: up to label2
-.LBB0_37:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_38:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label16:
-	i32.const	$6=, 11
+	i32.const	$6=, 1
 	br      	13              # 13: up to label2
-.LBB0_38:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_39:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label15:
-	i32.const	$6=, 14
+	i32.const	$6=, 11
 	br      	12              # 12: up to label2
-.LBB0_39:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_40:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label14:
-	i32.const	$6=, 13
+	i32.const	$6=, 14
 	br      	11              # 11: up to label2
-.LBB0_40:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_41:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label13:
-	i32.const	$6=, 1
+	i32.const	$6=, 13
 	br      	10              # 10: up to label2
-.LBB0_41:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_42:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label12:
-	i32.const	$6=, 2
+	i32.const	$6=, 1
 	br      	9               # 9: up to label2
-.LBB0_42:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_43:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label11:
-	i32.const	$6=, 3
+	i32.const	$6=, 2
 	br      	8               # 8: up to label2
-.LBB0_43:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_44:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label10:
-	i32.const	$6=, 5
+	i32.const	$6=, 4
 	br      	7               # 7: up to label2
-.LBB0_44:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_45:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label9:
-	i32.const	$6=, 7
+	i32.const	$6=, 18
 	br      	6               # 6: up to label2
-.LBB0_45:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_46:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label8:
-	i32.const	$6=, 9
+	i32.const	$6=, 6
 	br      	5               # 5: up to label2
-.LBB0_46:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_47:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label7:
-	i32.const	$6=, 8
+	i32.const	$6=, 9
 	br      	4               # 4: up to label2
-.LBB0_47:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_48:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label6:
-	i32.const	$6=, 15
+	i32.const	$6=, 7
 	br      	3               # 3: up to label2
-.LBB0_48:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_49:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label5:
 	i32.const	$6=, 8
 	br      	2               # 2: up to label2
-.LBB0_49:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_50:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label4:
-	i32.const	$6=, 17
+	i32.const	$6=, 16
 	br      	1               # 1: up to label2
-.LBB0_50:                               #   in Loop: Header=BB0_3 Depth=1
+.LBB0_51:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label3:
-	i32.const	$6=, 16
+	i32.const	$6=, 18
 	br      	0               # 0: up to label2
-.LBB0_51:
+.LBB0_52:
 	end_loop
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$4=, 0
-	i32.const	$1=, 2
 	i32.const	$2=, 0
-	i32.const	$3=, 0
+	i32.const	$1=, 2
+	i32.const	$4=, 0
+	i32.const	$0=, 0
 	block   	
 	block   	
-	i32.const	$push13=, 0
-	i32.const	$push12=, 3
-	i32.lt_s	$push0=, $pop13, $pop12
+	i32.const	$push15=, 0
+	i32.const	$push14=, 3
+	i32.lt_s	$push0=, $pop15, $pop14
 	br_if   	0, $pop0        # 0: down to label38
 # BB#1:
-	i32.const	$5=, 11
+	i32.const	$5=, 10
 	br      	1               # 1: down to label37
 .LBB1_2:
 	end_block                       # label38:
-	i32.const	$5=, 7
+	i32.const	$5=, 6
 .LBB1_3:                                # =>This Inner Loop Header: Depth=1
 	end_block                       # label37:
 	loop    	i32             # label39:
@@ -357,194 +359,205 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	br_table 	$5, 3, 6, 7, 8, 9, 10, 0, 2, 11, 12, 13, 1, 4, 5, 5 # 3: down to label61
-                                        # 6: down to label58
-                                        # 7: down to label57
-                                        # 8: down to label56
-                                        # 9: down to label55
-                                        # 10: down to label54
-                                        # 0: down to label64
-                                        # 2: down to label62
-                                        # 11: down to label53
-                                        # 12: down to label52
-                                        # 13: down to label51
-                                        # 1: down to label63
-                                        # 4: down to label60
-                                        # 5: down to label59
-.LBB1_4:                                #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label64:
-	i32.const	$3=, 1
-	i32.const	$1=, 0
-	i32.const	$4=, -1
-	i32.const	$push14=, 3
-	i32.lt_s	$push1=, $2, $pop14
-	br_if   	13, $pop1       # 13: down to label50
+	block   	
+	br_table 	$5, 3, 6, 7, 8, 9, 0, 2, 11, 12, 13, 1, 4, 5, 10, 10 # 3: down to label62
+                                        # 6: down to label59
+                                        # 7: down to label58
+                                        # 8: down to label57
+                                        # 9: down to label56
+                                        # 0: down to label65
+                                        # 2: down to label63
+                                        # 11: down to label54
+                                        # 12: down to label53
+                                        # 13: down to label52
+                                        # 1: down to label64
+                                        # 4: down to label61
+                                        # 5: down to label60
+                                        # 10: down to label55
+.LBB1_4:                                # %do.end35.i
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label65:
+	i32.const	$push12=, -1
+	i32.ne  	$push13=, $2, $pop12
+	i32.and 	$1=, $0, $pop13
+	i32.const	$0=, 1
+	i32.const	$2=, -1
+	i32.const	$push16=, 3
+	i32.lt_s	$push1=, $4, $pop16
+	br_if   	13, $pop1       # 13: down to label51
 # BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 11
-	br      	24              # 24: up to label39
+	i32.const	$5=, 10
+	br      	25              # 25: up to label39
 .LBB1_6:                                # %if.end.thread.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label63:
-	i32.const	$push18=, -1
-	i32.add 	$0=, $3, $pop18
-	i32.const	$push17=, 1
-	i32.add 	$push16=, $2, $pop17
-	tee_local	$push15=, $2=, $pop16
-	i32.gt_s	$push4=, $pop15, $1
-	br_if   	16, $pop4       # 16: down to label46
-	br      	17              # 17: down to label45
+	end_block                       # label64:
+	i32.const	$push20=, -1
+	i32.add 	$3=, $0, $pop20
+	i32.const	$push19=, 1
+	i32.add 	$push18=, $4, $pop19
+	tee_local	$push17=, $4=, $pop18
+	i32.gt_s	$push4=, $pop17, $1
+	br_if   	16, $pop4       # 16: down to label47
+	br      	17              # 17: down to label46
 .LBB1_7:                                # %if.end.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label62:
-	i32.const	$0=, 0
-	i32.const	$push19=, 1
-	i32.eq  	$push2=, $3, $pop19
-	br_if   	13, $pop2       # 13: down to label48
+	end_block                       # label63:
+	i32.const	$3=, 0
+	i32.const	$push21=, 1
+	i32.eq  	$push2=, $0, $pop21
+	br_if   	13, $pop2       # 13: down to label49
 # BB#8:                                 #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 0
-	br      	22              # 22: up to label39
-.LBB1_9:                                # %while.cond.preheader.i
+	br      	23              # 23: up to label39
+.LBB1_9:                                # %if.end4.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label61:
-	i32.le_s	$push5=, $2, $1
-	br_if   	11, $pop5       # 11: down to label49
+	end_block                       # label62:
+	i32.le_s	$push5=, $4, $1
+	br_if   	11, $pop5       # 11: down to label50
 # BB#10:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 12
-	br      	21              # 21: up to label39
+	i32.const	$5=, 11
+	br      	22              # 22: up to label39
 .LBB1_11:                               # %while.body.lr.ph.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label60:
-	i32.eq  	$3=, $0, $1
+	end_block                       # label61:
+	i32.eq  	$0=, $3, $1
 # BB#12:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 13
-	br      	20              # 20: up to label39
+	i32.const	$5=, 12
+	br      	21              # 21: up to label39
 .LBB1_13:                               # %while.body.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label59:
-	i32.add 	$push21=, $2, $3
-	tee_local	$push20=, $2=, $pop21
-	i32.gt_s	$push6=, $pop20, $1
-	br_if   	11, $pop6       # 11: down to label47
+	end_block                       # label60:
+	i32.add 	$push23=, $4, $0
+	tee_local	$push22=, $4=, $pop23
+	i32.gt_s	$push6=, $pop22, $1
+	br_if   	11, $pop6       # 11: down to label48
 # BB#14:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 1
-	br      	19              # 19: up to label39
+	br      	20              # 20: up to label39
 .LBB1_15:                               # %do.body10.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label58:
-	i32.const	$push25=, 2
-	i32.shl 	$push7=, $4, $pop25
-	i32.const	$push24=, W
-	i32.add 	$push23=, $pop7, $pop24
-	tee_local	$push22=, $0=, $pop23
-	i32.load	$3=, 0($pop22)
+	end_block                       # label59:
+	i32.const	$push27=, 2
+	i32.shl 	$push7=, $2, $pop27
+	i32.const	$push26=, W
+	i32.add 	$push25=, $pop7, $pop26
+	tee_local	$push24=, $0=, $pop25
+	i32.load	$push8=, 0($pop24)
+	i32.eqz 	$push39=, $pop8
+	br_if   	13, $pop39      # 13: down to label45
 # BB#16:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 2
-	br      	18              # 18: up to label39
-.LBB1_17:                               # %do.body11.i
+	br      	19              # 19: up to label39
+.LBB1_17:                               # %if.then13.peel.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label57:
-	i32.eqz 	$push31=, $3
-	br_if   	13, $pop31      # 13: down to label43
+	end_block                       # label58:
+	i32.const	$push28=, 0
+	i32.store	0($0), $pop28
+	i32.const	$4=, 1
 # BB#18:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 3
-	br      	17              # 17: up to label39
-.LBB1_19:                               # %if.then13.i
+	br      	18              # 18: up to label39
+.LBB1_19:                               # %do.cond16.peel.i
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label56:
-	i32.const	$push26=, 0
-	i32.store	0($0), $pop26
-	i32.const	$2=, 1
+	end_block                       # label57:
+	i32.eqz 	$push40=, $1
+	br_if   	14, $pop40      # 14: down to label42
 # BB#20:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 4
-	br      	16              # 16: up to label39
-.LBB1_21:                               # %do.cond16.i
+	br      	17              # 17: up to label39
+.LBB1_21:                               # %do.body22.i
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label56:
+	i32.const	$push38=, 0
+	i32.gt_s	$push37=, $3, $pop38
+	tee_local	$push36=, $0=, $pop37
+	i32.const	$push35=, 2
+	i32.shl 	$push9=, $2, $pop35
+	i32.const	$push34=, Link
+	i32.add 	$push10=, $pop9, $pop34
+	i32.load	$push33=, 0($pop10)
+	tee_local	$push32=, $2=, $pop33
+	i32.const	$push31=, -1
+	i32.ne  	$push30=, $pop32, $pop31
+	tee_local	$push29=, $1=, $pop30
+	i32.and 	$push11=, $pop36, $pop29
+	i32.add 	$4=, $4, $pop11
+	br_if   	11, $1          # 11: down to label44
+	br      	12              # 12: down to label43
+.LBB1_22:                               # %do.cond16.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label55:
-	i32.const	$3=, 0
-	i32.eqz 	$push32=, $1
-	br_if   	10, $pop32      # 10: down to label44
-# BB#22:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 5
-	br      	15              # 15: up to label39
-.LBB1_23:                               # %do.cond33.i
+	br      	14              # 14: down to label40
+.LBB1_23:                               # %f.exit
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label54:
-	i32.const	$push30=, 2
-	i32.shl 	$push9=, $4, $pop30
-	i32.const	$push29=, Link
-	i32.add 	$push10=, $pop9, $pop29
-	i32.load	$push28=, 0($pop10)
-	tee_local	$push27=, $4=, $pop28
-	i32.const	$push8=, -1
-	i32.ne  	$push11=, $pop27, $pop8
-	br_if   	12, $pop11      # 12: down to label41
-	br      	11              # 11: down to label42
-.LBB1_24:                               # %f.exit
-                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.eqz 	$push41=, $4
+	br_if   	12, $pop41      # 12: down to label41
+# BB#24:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$5=, 8
+	br      	14              # 14: up to label39
+.LBB1_25:                               # %if.end
 	end_block                       # label53:
-	i32.eqz 	$push33=, $2
-	br_if   	12, $pop33      # 12: down to label40
-# BB#25:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 9
-	br      	13              # 13: up to label39
-.LBB1_26:                               # %if.end
-	end_block                       # label52:
 	i32.const	$push3=, 0
 	return  	$pop3
-.LBB1_27:                               # %if.then
-	end_block                       # label51:
+.LBB1_26:                               # %if.then
+	end_block                       # label52:
 	call    	abort@FUNCTION
 	unreachable
+.LBB1_27:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label51:
+	i32.const	$5=, 6
+	br      	11              # 11: up to label39
 .LBB1_28:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label50:
-	i32.const	$5=, 7
+	i32.const	$5=, 1
 	br      	10              # 10: up to label39
 .LBB1_29:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label49:
-	i32.const	$5=, 1
+	i32.const	$5=, 7
 	br      	9               # 9: up to label39
 .LBB1_30:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label48:
-	i32.const	$5=, 8
+	i32.const	$5=, 12
 	br      	8               # 8: up to label39
 .LBB1_31:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label47:
-	i32.const	$5=, 13
+	i32.const	$5=, 11
 	br      	7               # 7: up to label39
 .LBB1_32:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label46:
-	i32.const	$5=, 12
+	i32.const	$5=, 1
 	br      	6               # 6: up to label39
 .LBB1_33:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label45:
-	i32.const	$5=, 1
+	i32.const	$5=, 3
 	br      	5               # 5: up to label39
 .LBB1_34:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label44:
-	i32.const	$5=, 2
+	i32.const	$5=, 4
 	br      	4               # 4: up to label39
 .LBB1_35:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label43:
-	i32.const	$5=, 4
+	i32.const	$5=, 5
 	br      	3               # 3: up to label39
 .LBB1_36:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label42:
-	i32.const	$5=, 6
+	i32.const	$5=, 13
 	br      	2               # 2: up to label39
 .LBB1_37:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label41:
-	i32.const	$5=, 5
+	i32.const	$5=, 9
 	br      	1               # 1: up to label39
 .LBB1_38:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label40:
-	i32.const	$5=, 10
+	i32.const	$5=, 13
 	br      	0               # 0: up to label39
 .LBB1_39:
 	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	Link                    # @Link
 	.type	Link,@object
 	.section	.data.Link,"aw",@progbits
@@ -564,5 +577,5 @@ W:
 	.size	W, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr24851.c.s b/test/torture-s/pr24851.c.s
index 0a9a44c02..dc2418315 100644
--- a/test/torture-s/pr24851.c.s
+++ b/test/torture-s/pr24851.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr24851.c"
+	.file	"pr24851.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr25125.c.s b/test/torture-s/pr25125.c.s
index 51cadfd9e..76c365226 100644
--- a/test/torture-s/pr25125.c.s
+++ b/test/torture-s/pr25125.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr25125.c"
+	.file	"pr25125.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -27,9 +27,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,8 +52,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr25737.c.s b/test/torture-s/pr25737.c.s
index 30259c848..a89071e9b 100644
--- a/test/torture-s/pr25737.c.s
+++ b/test/torture-s/pr25737.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr25737.c"
+	.file	"pr25737.c"
 	.section	.text.time_enqueue,"ax",@progbits
-	.hidden	time_enqueue
+	.hidden	time_enqueue            # -- Begin function time_enqueue
 	.globl	time_enqueue
 	.type	time_enqueue,@function
 time_enqueue:                           # @time_enqueue
@@ -16,9 +16,9 @@ time_enqueue:                           # @time_enqueue
 	.endfunc
 .Lfunc_end0:
 	.size	time_enqueue, .Lfunc_end0-time_enqueue
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,7 +32,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	Timer_Queue,@object     # @Timer_Queue
 	.section	.bss.Timer_Queue,"aw",@nobits
 	.p2align	2
@@ -41,4 +41,4 @@ Timer_Queue:
 	.size	Timer_Queue, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr27073.c.s b/test/torture-s/pr27073.c.s
index c84fee085..3077079a1 100644
--- a/test/torture-s/pr27073.c.s
+++ b/test/torture-s/pr27073.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr27073.c"
+	.file	"pr27073.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,7 +10,7 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push13=, $4
 	br_if   	0, $pop13       # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push0=, 0
 	i32.sub 	$4=, $pop0, $4
 .LBB0_2:                                # %while.body
@@ -42,9 +42,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -52,10 +52,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
+	i32.const	$push35=, 0
+	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 48
-	i32.sub 	$push41=, $pop35, $pop36
+	i32.sub 	$push41=, $pop34, $pop36
 	tee_local	$push40=, $0=, $pop41
 	i32.store	__stack_pointer($pop37), $pop40
 	i32.const	$push4=, 2
@@ -126,8 +126,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr27260.c.s b/test/torture-s/pr27260.c.s
index 291dad2eb..77abbea6b 100644
--- a/test/torture-s/pr27260.c.s
+++ b/test/torture-s/pr27260.c.s
@@ -1,117 +1,176 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr27260.c"
+	.file	"pr27260.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
+	.local  	i64
 # BB#0:                                 # %entry
-	i32.const	$push3=, buf
+	i32.const	$push4=, 0
 	i32.const	$push0=, 2
 	i32.ne  	$push1=, $0, $pop0
-	i32.const	$push2=, 64
-	i32.call	$drop=, memset@FUNCTION, $pop3, $pop1, $pop2
+	i64.extend_u/i32	$push2=, $pop1
+	i64.const	$push3=, 72340172838076673
+	i64.mul 	$push13=, $pop2, $pop3
+	tee_local	$push12=, $1=, $pop13
+	i64.store	buf+56($pop4), $pop12
+	i32.const	$push11=, 0
+	i64.store	buf+48($pop11), $1
+	i32.const	$push10=, 0
+	i64.store	buf+40($pop10), $1
+	i32.const	$push9=, 0
+	i64.store	buf+32($pop9), $1
+	i32.const	$push8=, 0
+	i64.store	buf+24($pop8), $1
+	i32.const	$push7=, 0
+	i64.store	buf+16($pop7), $1
+	i32.const	$push6=, 0
+	i64.store	buf+8($pop6), $1
+	i32.const	$push5=, 0
+	i64.store	buf($pop5), $1
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$2=, 0
-	i32.const	$push17=, 0
+	i32.const	$push3=, 0
 	i32.const	$push2=, 2
-	i32.store8	buf+64($pop17), $pop2
+	i32.store8	buf+64($pop3), $pop2
+	i32.const	$1=, -1
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label1:
-	i32.const	$push18=, buf
-	i32.add 	$push3=, $2, $pop18
-	i32.load8_u	$push4=, 0($pop3)
-	br_if   	1, $pop4        # 1: down to label0
+	block   	
+	loop    	                # label2:
+	i32.const	$push19=, buf+1
+	i32.add 	$push4=, $1, $pop19
+	i32.load8_u	$push5=, 0($pop4)
+	br_if   	1, $pop5        # 1: down to label1
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push22=, 1
-	i32.add 	$push21=, $2, $pop22
-	tee_local	$push20=, $2=, $pop21
-	i32.const	$push19=, 63
-	i32.le_s	$push5=, $pop20, $pop19
-	br_if   	0, $pop5        # 0: up to label1
+	i32.const	$push23=, 1
+	i32.add 	$push22=, $1, $pop23
+	tee_local	$push21=, $1=, $pop22
+	i32.const	$push20=, 62
+	i32.le_u	$push6=, $pop21, $pop20
+	br_if   	0, $pop6        # 0: up to label2
 # BB#3:                                 # %for.end
 	end_loop
-	i32.const	$push7=, buf
-	i32.const	$push23=, 1
-	i32.const	$push6=, 64
-	i32.call	$0=, memset@FUNCTION, $pop7, $pop23, $pop6
-	i32.const	$2=, 1
+	i32.const	$push8=, 0
+	i64.const	$push7=, 72340172838076673
+	i64.store	buf+56($pop8), $pop7
+	i32.const	$push37=, 0
+	i64.const	$push36=, 72340172838076673
+	i64.store	buf+48($pop37), $pop36
+	i32.const	$push35=, 0
+	i64.const	$push34=, 72340172838076673
+	i64.store	buf+40($pop35), $pop34
+	i32.const	$push33=, 0
+	i64.const	$push32=, 72340172838076673
+	i64.store	buf+32($pop33), $pop32
+	i32.const	$push31=, 0
+	i64.const	$push30=, 72340172838076673
+	i64.store	buf+24($pop31), $pop30
+	i32.const	$push29=, 0
+	i64.const	$push28=, 72340172838076673
+	i64.store	buf+16($pop29), $pop28
+	i32.const	$push27=, 0
+	i64.const	$push26=, 72340172838076673
+	i64.store	buf+8($pop27), $pop26
+	i32.const	$push25=, 0
+	i64.const	$push24=, 72340172838076673
+	i64.store	buf($pop25), $pop24
+	i32.const	$1=, 1
 .LBB1_4:                                # %for.cond3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label3:
-	i32.const	$push24=, 63
-	i32.gt_s	$push8=, $2, $pop24
-	br_if   	1, $pop8        # 1: down to label2
+	loop    	                # label4:
+	i32.const	$push39=, -1
+	i32.add 	$push9=, $1, $pop39
+	i32.const	$push38=, 62
+	i32.gt_u	$push10=, $pop9, $pop38
+	br_if   	1, $pop10       # 1: down to label3
 # BB#5:                                 # %for.cond3.for.body6_crit_edge
                                         #   in Loop: Header=BB1_4 Depth=1
-	i32.add 	$1=, $2, $0
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $2, $pop26
-	copy_local	$2=, $pop0
-	i32.load8_u	$push15=, 0($1)
-	i32.const	$push25=, 1
-	i32.eq  	$push16=, $pop15, $pop25
-	br_if   	0, $pop16       # 0: up to label3
-# BB#6:                                 # %if.then11
+	i32.const	$push42=, buf
+	i32.add 	$0=, $1, $pop42
+	i32.const	$push41=, 1
+	i32.add 	$push0=, $1, $pop41
+	copy_local	$1=, $pop0
+	i32.load8_u	$push17=, 0($0)
+	i32.const	$push40=, 1
+	i32.eq  	$push18=, $pop17, $pop40
+	br_if   	0, $pop18       # 0: up to label4
+	br      	2               # 2: down to label1
+.LBB1_6:                                # %for.end15
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_7:                                # %for.end15
-	end_block                       # label2:
-	i32.const	$push11=, buf
-	i32.const	$push10=, 0
-	i32.const	$push9=, 64
-	i32.call	$0=, memset@FUNCTION, $pop11, $pop10, $pop9
-	i32.const	$2=, 1
-.LBB1_8:                                # %for.cond16
+	end_block                       # label3:
+	i32.const	$push12=, 0
+	i64.const	$push11=, 0
+	i64.store	buf+56($pop12), $pop11
+	i32.const	$push56=, 0
+	i64.const	$push55=, 0
+	i64.store	buf+48($pop56), $pop55
+	i32.const	$push54=, 0
+	i64.const	$push53=, 0
+	i64.store	buf+40($pop54), $pop53
+	i32.const	$push52=, 0
+	i64.const	$push51=, 0
+	i64.store	buf+32($pop52), $pop51
+	i32.const	$push50=, 0
+	i64.const	$push49=, 0
+	i64.store	buf+24($pop50), $pop49
+	i32.const	$push48=, 0
+	i64.const	$push47=, 0
+	i64.store	buf+16($pop48), $pop47
+	i32.const	$push46=, 0
+	i64.const	$push45=, 0
+	i64.store	buf+8($pop46), $pop45
+	i32.const	$push44=, 0
+	i64.const	$push43=, 0
+	i64.store	buf($pop44), $pop43
+	i32.const	$1=, 1
+.LBB1_7:                                # %for.cond16
                                         # =>This Inner Loop Header: Depth=1
-	block   	
 	loop    	                # label5:
-	i32.const	$push27=, 63
-	i32.gt_s	$push12=, $2, $pop27
-	br_if   	1, $pop12       # 1: down to label4
-# BB#9:                                 # %for.cond16.for.body19_crit_edge
-                                        #   in Loop: Header=BB1_8 Depth=1
-	i32.add 	$1=, $2, $0
-	i32.const	$push28=, 1
-	i32.add 	$push1=, $2, $pop28
-	copy_local	$2=, $pop1
-	i32.load8_u	$push14=, 0($1)
-	i32.eqz 	$push29=, $pop14
-	br_if   	0, $pop29       # 0: up to label5
-# BB#10:                                # %if.then24
+	i32.const	$push58=, -1
+	i32.add 	$push13=, $1, $pop58
+	i32.const	$push57=, 62
+	i32.gt_u	$push14=, $pop13, $pop57
+	br_if   	2, $pop14       # 2: down to label0
+# BB#8:                                 # %for.cond16.for.body19_crit_edge
+                                        #   in Loop: Header=BB1_7 Depth=1
+	i32.const	$push60=, buf
+	i32.add 	$0=, $1, $pop60
+	i32.const	$push59=, 1
+	i32.add 	$push1=, $1, $pop59
+	copy_local	$1=, $pop1
+	i32.load8_u	$push16=, 0($0)
+	i32.eqz 	$push61=, $pop16
+	br_if   	0, $pop61       # 0: up to label5
+.LBB1_9:                                # %if.then
 	end_loop
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
-.LBB1_11:                               # %if.end33
-	end_block                       # label4:
-	i32.const	$push13=, 0
-	return  	$pop13
-.LBB1_12:                               # %if.then
+.LBB1_10:                               # %if.end33
 	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+	i32.const	$push15=, 0
+                                        # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -122,5 +181,5 @@ buf:
 	.size	buf, 65
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr27285.c.s b/test/torture-s/pr27285.c.s
index 66d9912ec..92f3c50da 100644
--- a/test/torture-s/pr27285.c.s
+++ b/test/torture-s/pr27285.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr27285.c"
+	.file	"pr27285.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,7 +13,7 @@ foo:                                    # @foo
 	tee_local	$push7=, $3=, $pop8
 	i32.eqz 	$push22=, $pop7
 	br_if   	0, $pop22       # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push0=, 3
 	i32.add 	$1=, $1, $pop0
 	i32.const	$push9=, 3
@@ -21,7 +21,6 @@ foo:                                    # @foo
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.load8_u	$push4=, 0($0)
 	i32.const	$push21=, 255
 	i32.const	$push20=, 255
 	i32.const	$push19=, 8
@@ -31,7 +30,8 @@ foo:                                    # @foo
 	i32.gt_s	$push17=, $3, $pop18
 	tee_local	$push16=, $2=, $pop17
 	i32.select	$push3=, $pop21, $pop2, $pop16
-	i32.and 	$push5=, $pop4, $pop3
+	i32.load8_u	$push4=, 0($0)
+	i32.and 	$push5=, $pop3, $pop4
 	i32.store8	0($1), $pop5
 	i32.const	$push15=, 1
 	i32.add 	$1=, $1, $pop15
@@ -50,9 +50,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,10 +60,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push31=, 0
-	i32.const	$push28=, 0
-	i32.load	$push29=, __stack_pointer($pop28)
+	i32.const	$push29=, 0
+	i32.load	$push28=, __stack_pointer($pop29)
 	i32.const	$push30=, 48
-	i32.sub 	$push53=, $pop29, $pop30
+	i32.sub 	$push53=, $pop28, $pop30
 	tee_local	$push52=, $0=, $pop53
 	i32.store	__stack_pointer($pop31), $pop52
 	i32.const	$push35=, 24
@@ -141,7 +141,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.x,@object        # @main.x
 	.section	.rodata..Lmain.x,"a",@progbits
 .Lmain.x:
@@ -152,5 +152,5 @@ main:                                   # @main
 	.size	.Lmain.x, 19
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr27364.c.s b/test/torture-s/pr27364.c.s
index 14009af71..61bf57673 100644
--- a/test/torture-s/pr27364.c.s
+++ b/test/torture-s/pr27364.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr27364.c"
+	.file	"pr27364.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -30,9 +30,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr27671-1.c.s b/test/torture-s/pr27671-1.c.s
index c440ab85d..fe14c4181 100644
--- a/test/torture-s/pr27671-1.c.s
+++ b/test/torture-s/pr27671-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr27671-1.c"
+	.file	"pr27671-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28289.c.s b/test/torture-s/pr28289.c.s
index 8630296b9..4c86272f2 100644
--- a/test/torture-s/pr28289.c.s
+++ b/test/torture-s/pr28289.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28289.c"
+	.file	"pr28289.c"
 	.section	.text.ix86_split_ashr,"ax",@progbits
-	.hidden	ix86_split_ashr
+	.hidden	ix86_split_ashr         # -- Begin function ix86_split_ashr
 	.globl	ix86_split_ashr
 	.type	ix86_split_ashr,@function
 ix86_split_ashr:                        # @ix86_split_ashr
@@ -16,9 +16,9 @@ ix86_split_ashr:                        # @ix86_split_ashr
 	.endfunc
 .Lfunc_end0:
 	.size	ix86_split_ashr, .Lfunc_end0-ix86_split_ashr
-
+                                        # -- End function
 	.section	.text.ok,"ax",@progbits
-	.hidden	ok
+	.hidden	ok                      # -- Begin function ok
 	.globl	ok
 	.type	ok,@function
 ok:                                     # @ok
@@ -30,9 +30,9 @@ ok:                                     # @ok
 	.endfunc
 .Lfunc_end1:
 	.size	ok, .Lfunc_end1-ok
-
+                                        # -- End function
 	.section	.text.gen_x86_64_shrd,"ax",@progbits
-	.type	gen_x86_64_shrd,@function
+	.type	gen_x86_64_shrd,@function # -- Begin function gen_x86_64_shrd
 gen_x86_64_shrd:                        # @gen_x86_64_shrd
 	.param  	i32
 	.result 	i32
@@ -42,9 +42,9 @@ gen_x86_64_shrd:                        # @gen_x86_64_shrd
 	.endfunc
 .Lfunc_end2:
 	.size	gen_x86_64_shrd, .Lfunc_end2-gen_x86_64_shrd
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	one                     # @one
 	.type	one,@object
 	.section	.data.one,"aw",@progbits
@@ -73,5 +73,5 @@ one:
 	.size	one, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28403.c.s b/test/torture-s/pr28403.c.s
index fac9f6a61..50860c224 100644
--- a/test/torture-s/pr28403.c.s
+++ b/test/torture-s/pr28403.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28403.c"
+	.file	"pr28403.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -47,9 +47,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -72,7 +72,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	global                  # @global
 	.type	global,@object
 	.section	.bss.global,"aw",@nobits
@@ -83,6 +83,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28651.c.s b/test/torture-s/pr28651.c.s
index 2898ad6f5..c27b1ce98 100644
--- a/test/torture-s/pr28651.c.s
+++ b/test/torture-s/pr28651.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28651.c"
+	.file	"pr28651.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr28778.c.s b/test/torture-s/pr28778.c.s
index b52d1a4ac..77f187a60 100644
--- a/test/torture-s/pr28778.c.s
+++ b/test/torture-s/pr28778.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28778.c"
+	.file	"pr28778.c"
 	.section	.text.find,"ax",@progbits
-	.hidden	find
+	.hidden	find                    # -- Begin function find
 	.globl	find
 	.type	find,@function
 find:                                   # @find
@@ -9,10 +9,10 @@ find:                                   # @find
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 128
-	i32.sub 	$push12=, $pop5, $pop6
+	i32.sub 	$push12=, $pop4, $pop6
 	tee_local	$push11=, $1=, $pop12
 	i32.store	__stack_pointer($pop7), $pop11
 	block   	
@@ -41,9 +41,9 @@ find:                                   # @find
 	.endfunc
 .Lfunc_end0:
 	.size	find, .Lfunc_end0-find
-
+                                        # -- End function
 	.section	.text.aglChoosePixelFormat,"ax",@progbits
-	.hidden	aglChoosePixelFormat
+	.hidden	aglChoosePixelFormat    # -- Begin function aglChoosePixelFormat
 	.globl	aglChoosePixelFormat
 	.type	aglChoosePixelFormat,@function
 aglChoosePixelFormat:                   # @aglChoosePixelFormat
@@ -63,9 +63,9 @@ aglChoosePixelFormat:                   # @aglChoosePixelFormat
 	.endfunc
 .Lfunc_end1:
 	.size	aglChoosePixelFormat, .Lfunc_end1-aglChoosePixelFormat
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -76,7 +76,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr28982a.c.s b/test/torture-s/pr28982a.c.s
index e46729983..c152bd957 100644
--- a/test/torture-s/pr28982a.c.s
+++ b/test/torture-s/pr28982a.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28982a.c"
+	.file	"pr28982a.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,7 +12,7 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push143=, $0
 	br_if   	0, $pop143      # 0: down to label1
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push119=, 0
 	i32.load	$push0=, incs($pop119)
 	i32.const	$push40=, 2
@@ -310,9 +310,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -321,246 +321,234 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$0=, input
 	i32.const	$1=, 0
-	i32.const	$push162=, 0
-	i32.const	$push161=, input
-	i32.store	ptrs($pop162), $pop161
-	i32.const	$push160=, 0
-	i32.const	$push0=, input+4
-	i32.store	ptrs+4($pop160), $pop0
-	i32.const	$push159=, 0
-	i32.const	$push1=, input+8
-	i32.store	ptrs+8($pop159), $pop1
-	i32.const	$push158=, 0
-	i64.const	$push2=, 8589934593
-	i64.store	incs+4($pop158):p2align=2, $pop2
-	i32.const	$push157=, 0
-	i32.const	$push3=, input+12
-	i32.store	ptrs+12($pop157), $pop3
-	i32.const	$push156=, 0
-	i32.const	$push155=, 0
-	i32.store	incs($pop156), $pop155
 	i32.const	$push154=, 0
-	i32.const	$push4=, 3
-	i32.store	incs+12($pop154), $pop4
-	i32.const	$push153=, 0
-	i32.const	$push5=, input+16
-	i32.store	ptrs+16($pop153), $pop5
+	i32.const	$push153=, input
+	i32.store	ptrs($pop154), $pop153
 	i32.const	$push152=, 0
-	i32.const	$push151=, 4
-	i32.store	incs+16($pop152), $pop151
+	i32.const	$push0=, input+4
+	i32.store	ptrs+4($pop152), $pop0
+	i32.const	$push151=, 0
+	i32.const	$push1=, input+8
+	i32.store	ptrs+8($pop151), $pop1
 	i32.const	$push150=, 0
-	i32.const	$push6=, input+20
-	i32.store	ptrs+20($pop150), $pop6
+	i64.const	$push2=, 8589934593
+	i64.store	incs+4($pop150):p2align=2, $pop2
 	i32.const	$push149=, 0
-	i32.const	$push7=, 5
-	i32.store	incs+20($pop149), $pop7
+	i32.const	$push3=, input+12
+	i32.store	ptrs+12($pop149), $pop3
 	i32.const	$push148=, 0
-	i32.const	$push8=, input+24
-	i32.store	ptrs+24($pop148), $pop8
+	i32.const	$push4=, input+16
+	i32.store	ptrs+16($pop148), $pop4
 	i32.const	$push147=, 0
-	i32.const	$push9=, 6
-	i32.store	incs+24($pop147), $pop9
+	i64.const	$push5=, 17179869187
+	i64.store	incs+12($pop147):p2align=2, $pop5
 	i32.const	$push146=, 0
-	i32.const	$push10=, input+28
-	i32.store	ptrs+28($pop146), $pop10
+	i32.const	$push6=, input+20
+	i32.store	ptrs+20($pop146), $pop6
 	i32.const	$push145=, 0
-	i32.const	$push11=, 7
-	i32.store	incs+28($pop145), $pop11
+	i32.const	$push7=, input+24
+	i32.store	ptrs+24($pop145), $pop7
 	i32.const	$push144=, 0
-	i32.const	$push12=, input+32
-	i32.store	ptrs+32($pop144), $pop12
+	i64.const	$push8=, 25769803781
+	i64.store	incs+20($pop144):p2align=2, $pop8
 	i32.const	$push143=, 0
-	i32.const	$push13=, 8
-	i32.store	incs+32($pop143), $pop13
+	i32.const	$push9=, input+28
+	i32.store	ptrs+28($pop143), $pop9
 	i32.const	$push142=, 0
-	i32.const	$push14=, input+36
-	i32.store	ptrs+36($pop142), $pop14
+	i32.const	$push10=, input+32
+	i32.store	ptrs+32($pop142), $pop10
 	i32.const	$push141=, 0
-	i32.const	$push15=, 9
-	i32.store	incs+36($pop141), $pop15
+	i64.const	$push11=, 34359738375
+	i64.store	incs+28($pop141):p2align=2, $pop11
 	i32.const	$push140=, 0
-	i32.const	$push16=, input+40
-	i32.store	ptrs+40($pop140), $pop16
+	i32.const	$push12=, input+36
+	i32.store	ptrs+36($pop140), $pop12
 	i32.const	$push139=, 0
-	i32.const	$push17=, 10
-	i32.store	incs+40($pop139), $pop17
+	i32.const	$push13=, input+40
+	i32.store	ptrs+40($pop139), $pop13
 	i32.const	$push138=, 0
-	i32.const	$push18=, input+44
-	i32.store	ptrs+44($pop138), $pop18
+	i64.const	$push14=, 42949672969
+	i64.store	incs+36($pop138):p2align=2, $pop14
 	i32.const	$push137=, 0
-	i32.const	$push19=, 11
-	i32.store	incs+44($pop137), $pop19
+	i32.const	$push15=, input+44
+	i32.store	ptrs+44($pop137), $pop15
 	i32.const	$push136=, 0
-	i32.const	$push20=, input+48
-	i32.store	ptrs+48($pop136), $pop20
 	i32.const	$push135=, 0
-	i32.const	$push21=, 12
-	i32.store	incs+48($pop135), $pop21
+	i32.store	incs($pop136), $pop135
 	i32.const	$push134=, 0
-	i32.const	$push22=, input+52
-	i32.store	ptrs+52($pop134), $pop22
+	i32.const	$push16=, input+48
+	i32.store	ptrs+48($pop134), $pop16
 	i32.const	$push133=, 0
-	i32.const	$push23=, 13
-	i32.store	incs+52($pop133), $pop23
+	i32.const	$push17=, 11
+	i32.store	incs+44($pop133), $pop17
 	i32.const	$push132=, 0
-	i32.const	$push24=, input+56
-	i32.store	ptrs+56($pop132), $pop24
+	i32.const	$push18=, 12
+	i32.store	incs+48($pop132), $pop18
 	i32.const	$push131=, 0
-	i32.const	$push25=, 14
-	i32.store	incs+56($pop131), $pop25
+	i32.const	$push19=, input+52
+	i32.store	ptrs+52($pop131), $pop19
 	i32.const	$push130=, 0
-	i32.const	$push26=, input+60
-	i32.store	ptrs+60($pop130), $pop26
+	i32.const	$push20=, 13
+	i32.store	incs+52($pop130), $pop20
 	i32.const	$push129=, 0
-	i32.const	$push27=, 15
-	i32.store	incs+60($pop129), $pop27
+	i32.const	$push21=, input+56
+	i32.store	ptrs+56($pop129), $pop21
 	i32.const	$push128=, 0
-	i32.const	$push28=, input+64
-	i32.store	ptrs+64($pop128), $pop28
+	i32.const	$push22=, 14
+	i32.store	incs+56($pop128), $pop22
 	i32.const	$push127=, 0
-	i32.const	$push29=, 16
-	i32.store	incs+64($pop127), $pop29
+	i32.const	$push23=, input+60
+	i32.store	ptrs+60($pop127), $pop23
 	i32.const	$push126=, 0
-	i32.const	$push30=, input+68
-	i32.store	ptrs+68($pop126), $pop30
+	i32.const	$push24=, 15
+	i32.store	incs+60($pop126), $pop24
 	i32.const	$push125=, 0
-	i32.const	$push31=, 17
-	i32.store	incs+68($pop125), $pop31
+	i32.const	$push25=, input+64
+	i32.store	ptrs+64($pop125), $pop25
 	i32.const	$push124=, 0
-	i32.const	$push32=, input+72
-	i32.store	ptrs+72($pop124), $pop32
+	i32.const	$push26=, 16
+	i32.store	incs+64($pop124), $pop26
 	i32.const	$push123=, 0
-	i32.const	$push33=, 18
-	i32.store	incs+72($pop123), $pop33
+	i32.const	$push27=, input+68
+	i32.store	ptrs+68($pop123), $pop27
 	i32.const	$push122=, 0
-	i32.const	$push34=, input+76
-	i32.store	ptrs+76($pop122), $pop34
+	i32.const	$push28=, 17
+	i32.store	incs+68($pop122), $pop28
 	i32.const	$push121=, 0
-	i32.const	$push35=, 19
-	i32.store	incs+76($pop121), $pop35
+	i32.const	$push29=, input+72
+	i32.store	ptrs+72($pop121), $pop29
+	i32.const	$push120=, 0
+	i32.const	$push30=, 18
+	i32.store	incs+72($pop120), $pop30
+	i32.const	$push119=, 0
+	i32.const	$push31=, input+76
+	i32.store	ptrs+76($pop119), $pop31
+	i32.const	$push118=, 0
+	i32.const	$push32=, 19
+	i32.store	incs+76($pop118), $pop32
 .LBB1_1:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	f32.convert_s/i32	$push36=, $1
-	f32.store	0($0), $pop36
-	i32.const	$push167=, 4
-	i32.add 	$0=, $0, $pop167
-	i32.const	$push166=, 1
-	i32.add 	$push165=, $1, $pop166
-	tee_local	$push164=, $1=, $pop165
-	i32.const	$push163=, 80
-	i32.ne  	$push37=, $pop164, $pop163
-	br_if   	0, $pop37       # 0: up to label3
+	f32.convert_s/i32	$push33=, $1
+	f32.store	0($0), $pop33
+	i32.const	$push159=, 4
+	i32.add 	$0=, $0, $pop159
+	i32.const	$push158=, 1
+	i32.add 	$push157=, $1, $pop158
+	tee_local	$push156=, $1=, $pop157
+	i32.const	$push155=, 80
+	i32.ne  	$push34=, $pop156, $pop155
+	br_if   	0, $pop34       # 0: up to label3
 # BB#2:                                 # %for.end8
 	end_loop
-	i32.const	$push38=, 4
-	call    	foo@FUNCTION, $pop38
-	i32.const	$push39=, 0
-	f32.load	$push43=, results($pop39)
-	f32.const	$push44=, 0x0p0
-	f32.ne  	$push45=, $pop43, $pop44
-	i32.const	$push186=, 0
-	f32.load	$push40=, results+4($pop186)
-	f32.const	$push41=, 0x1.4p3
+	i32.const	$push35=, 4
+	call    	foo@FUNCTION, $pop35
+	i32.const	$push36=, 0
+	f32.load	$push40=, results($pop36)
+	f32.const	$push41=, 0x0p0
 	f32.ne  	$push42=, $pop40, $pop41
-	i32.or  	$push46=, $pop45, $pop42
-	i32.const	$push185=, 0
-	f32.load	$push47=, results+8($pop185)
-	f32.const	$push48=, 0x1.4p4
-	f32.ne  	$push49=, $pop47, $pop48
-	i32.or  	$push50=, $pop46, $pop49
-	i32.const	$push184=, 0
-	f32.load	$push51=, results+12($pop184)
-	f32.const	$push52=, 0x1.ep4
-	f32.ne  	$push53=, $pop51, $pop52
-	i32.or  	$push54=, $pop50, $pop53
-	i32.const	$push183=, 0
-	f32.load	$push55=, results+16($pop183)
-	f32.const	$push56=, 0x1.4p5
-	f32.ne  	$push57=, $pop55, $pop56
-	i32.or  	$push58=, $pop54, $pop57
-	i32.const	$push182=, 0
-	f32.load	$push59=, results+20($pop182)
-	f32.const	$push60=, 0x1.9p5
-	f32.ne  	$push61=, $pop59, $pop60
-	i32.or  	$push62=, $pop58, $pop61
-	i32.const	$push181=, 0
-	f32.load	$push63=, results+24($pop181)
-	f32.const	$push64=, 0x1.ep5
-	f32.ne  	$push65=, $pop63, $pop64
-	i32.or  	$push66=, $pop62, $pop65
-	i32.const	$push180=, 0
-	f32.load	$push67=, results+28($pop180)
-	f32.const	$push68=, 0x1.18p6
-	f32.ne  	$push69=, $pop67, $pop68
-	i32.or  	$push70=, $pop66, $pop69
-	i32.const	$push179=, 0
-	f32.load	$push71=, results+32($pop179)
-	f32.const	$push72=, 0x1.4p6
-	f32.ne  	$push73=, $pop71, $pop72
-	i32.or  	$push74=, $pop70, $pop73
 	i32.const	$push178=, 0
-	f32.load	$push75=, results+36($pop178)
-	f32.const	$push76=, 0x1.68p6
-	f32.ne  	$push77=, $pop75, $pop76
-	i32.or  	$push78=, $pop74, $pop77
+	f32.load	$push37=, results+4($pop178)
+	f32.const	$push38=, 0x1.4p3
+	f32.ne  	$push39=, $pop37, $pop38
+	i32.or  	$push43=, $pop42, $pop39
 	i32.const	$push177=, 0
-	f32.load	$push79=, results+40($pop177)
-	f32.const	$push80=, 0x1.9p6
-	f32.ne  	$push81=, $pop79, $pop80
-	i32.or  	$push82=, $pop78, $pop81
+	f32.load	$push44=, results+8($pop177)
+	f32.const	$push45=, 0x1.4p4
+	f32.ne  	$push46=, $pop44, $pop45
+	i32.or  	$push47=, $pop43, $pop46
 	i32.const	$push176=, 0
-	f32.load	$push83=, results+44($pop176)
-	f32.const	$push84=, 0x1.b8p6
-	f32.ne  	$push85=, $pop83, $pop84
-	i32.or  	$push86=, $pop82, $pop85
+	f32.load	$push48=, results+12($pop176)
+	f32.const	$push49=, 0x1.ep4
+	f32.ne  	$push50=, $pop48, $pop49
+	i32.or  	$push51=, $pop47, $pop50
 	i32.const	$push175=, 0
-	f32.load	$push87=, results+48($pop175)
-	f32.const	$push88=, 0x1.ep6
-	f32.ne  	$push89=, $pop87, $pop88
-	i32.or  	$push90=, $pop86, $pop89
+	f32.load	$push52=, results+16($pop175)
+	f32.const	$push53=, 0x1.4p5
+	f32.ne  	$push54=, $pop52, $pop53
+	i32.or  	$push55=, $pop51, $pop54
 	i32.const	$push174=, 0
-	f32.load	$push91=, results+52($pop174)
-	f32.const	$push92=, 0x1.04p7
-	f32.ne  	$push93=, $pop91, $pop92
-	i32.or  	$push94=, $pop90, $pop93
+	f32.load	$push56=, results+20($pop174)
+	f32.const	$push57=, 0x1.9p5
+	f32.ne  	$push58=, $pop56, $pop57
+	i32.or  	$push59=, $pop55, $pop58
 	i32.const	$push173=, 0
-	f32.load	$push95=, results+56($pop173)
-	f32.const	$push96=, 0x1.18p7
-	f32.ne  	$push97=, $pop95, $pop96
-	i32.or  	$push98=, $pop94, $pop97
+	f32.load	$push60=, results+24($pop173)
+	f32.const	$push61=, 0x1.ep5
+	f32.ne  	$push62=, $pop60, $pop61
+	i32.or  	$push63=, $pop59, $pop62
 	i32.const	$push172=, 0
-	f32.load	$push99=, results+60($pop172)
-	f32.const	$push100=, 0x1.2cp7
-	f32.ne  	$push101=, $pop99, $pop100
-	i32.or  	$push102=, $pop98, $pop101
+	f32.load	$push64=, results+28($pop172)
+	f32.const	$push65=, 0x1.18p6
+	f32.ne  	$push66=, $pop64, $pop65
+	i32.or  	$push67=, $pop63, $pop66
 	i32.const	$push171=, 0
-	f32.load	$push103=, results+64($pop171)
-	f32.const	$push104=, 0x1.4p7
-	f32.ne  	$push105=, $pop103, $pop104
-	i32.or  	$push106=, $pop102, $pop105
+	f32.load	$push68=, results+32($pop171)
+	f32.const	$push69=, 0x1.4p6
+	f32.ne  	$push70=, $pop68, $pop69
+	i32.or  	$push71=, $pop67, $pop70
 	i32.const	$push170=, 0
-	f32.load	$push107=, results+68($pop170)
-	f32.const	$push108=, 0x1.54p7
-	f32.ne  	$push109=, $pop107, $pop108
-	i32.or  	$push110=, $pop106, $pop109
+	f32.load	$push72=, results+36($pop170)
+	f32.const	$push73=, 0x1.68p6
+	f32.ne  	$push74=, $pop72, $pop73
+	i32.or  	$push75=, $pop71, $pop74
 	i32.const	$push169=, 0
-	f32.load	$push111=, results+72($pop169)
-	f32.const	$push112=, 0x1.68p7
-	f32.ne  	$push113=, $pop111, $pop112
-	i32.or  	$push114=, $pop110, $pop113
+	f32.load	$push76=, results+40($pop169)
+	f32.const	$push77=, 0x1.9p6
+	f32.ne  	$push78=, $pop76, $pop77
+	i32.or  	$push79=, $pop75, $pop78
 	i32.const	$push168=, 0
-	f32.load	$push115=, results+76($pop168)
-	f32.const	$push116=, 0x1.7cp7
-	f32.ne  	$push117=, $pop115, $pop116
-	i32.or  	$push118=, $pop114, $pop117
-	i32.const	$push119=, 1
-	i32.and 	$push120=, $pop118, $pop119
-                                        # fallthrough-return: $pop120
+	f32.load	$push80=, results+44($pop168)
+	f32.const	$push81=, 0x1.b8p6
+	f32.ne  	$push82=, $pop80, $pop81
+	i32.or  	$push83=, $pop79, $pop82
+	i32.const	$push167=, 0
+	f32.load	$push84=, results+48($pop167)
+	f32.const	$push85=, 0x1.ep6
+	f32.ne  	$push86=, $pop84, $pop85
+	i32.or  	$push87=, $pop83, $pop86
+	i32.const	$push166=, 0
+	f32.load	$push88=, results+52($pop166)
+	f32.const	$push89=, 0x1.04p7
+	f32.ne  	$push90=, $pop88, $pop89
+	i32.or  	$push91=, $pop87, $pop90
+	i32.const	$push165=, 0
+	f32.load	$push92=, results+56($pop165)
+	f32.const	$push93=, 0x1.18p7
+	f32.ne  	$push94=, $pop92, $pop93
+	i32.or  	$push95=, $pop91, $pop94
+	i32.const	$push164=, 0
+	f32.load	$push96=, results+60($pop164)
+	f32.const	$push97=, 0x1.2cp7
+	f32.ne  	$push98=, $pop96, $pop97
+	i32.or  	$push99=, $pop95, $pop98
+	i32.const	$push163=, 0
+	f32.load	$push100=, results+64($pop163)
+	f32.const	$push101=, 0x1.4p7
+	f32.ne  	$push102=, $pop100, $pop101
+	i32.or  	$push103=, $pop99, $pop102
+	i32.const	$push162=, 0
+	f32.load	$push104=, results+68($pop162)
+	f32.const	$push105=, 0x1.54p7
+	f32.ne  	$push106=, $pop104, $pop105
+	i32.or  	$push107=, $pop103, $pop106
+	i32.const	$push161=, 0
+	f32.load	$push108=, results+72($pop161)
+	f32.const	$push109=, 0x1.68p7
+	f32.ne  	$push110=, $pop108, $pop109
+	i32.or  	$push111=, $pop107, $pop110
+	i32.const	$push160=, 0
+	f32.load	$push112=, results+76($pop160)
+	f32.const	$push113=, 0x1.7cp7
+	f32.ne  	$push114=, $pop112, $pop113
+	i32.or  	$push115=, $pop111, $pop114
+	i32.const	$push116=, 1
+	i32.and 	$push117=, $pop115, $pop116
+                                        # fallthrough-return: $pop117
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	incs                    # @incs
 	.type	incs,@object
 	.section	.bss.incs,"aw",@nobits
@@ -598,4 +586,4 @@ input:
 	.size	input, 320
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr28982b.c.s b/test/torture-s/pr28982b.c.s
index c9b37aedc..6c24d54db 100644
--- a/test/torture-s/pr28982b.c.s
+++ b/test/torture-s/pr28982b.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr28982b.c"
+	.file	"pr28982b.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -17,9 +17,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -27,10 +27,10 @@ foo:                                    # @foo
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, i32
 # BB#0:                                 # %entry
 	i32.const	$push64=, 0
-	i32.const	$push61=, 0
-	i32.load	$push62=, __stack_pointer($pop61)
+	i32.const	$push62=, 0
+	i32.load	$push61=, __stack_pointer($pop62)
 	i32.const	$push63=, 524288
-	i32.sub 	$push75=, $pop62, $pop63
+	i32.sub 	$push75=, $pop61, $pop63
 	tee_local	$push74=, $61=, $pop75
 	i32.store	__stack_pointer($pop64), $pop74
 	i32.const	$push68=, 262144
@@ -42,7 +42,7 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push161=, $0
 	br_if   	0, $pop161      # 0: down to label1
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push134=, 0
 	i32.load	$push0=, incs($pop134)
 	i32.const	$push40=, 2
@@ -350,9 +350,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -361,246 +361,234 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$0=, input
 	i32.const	$1=, 0
-	i32.const	$push162=, 0
-	i32.const	$push161=, input
-	i32.store	ptrs($pop162), $pop161
-	i32.const	$push160=, 0
-	i32.const	$push0=, input+4
-	i32.store	ptrs+4($pop160), $pop0
-	i32.const	$push159=, 0
-	i32.const	$push1=, input+8
-	i32.store	ptrs+8($pop159), $pop1
-	i32.const	$push158=, 0
-	i64.const	$push2=, 8589934593
-	i64.store	incs+4($pop158):p2align=2, $pop2
-	i32.const	$push157=, 0
-	i32.const	$push3=, input+12
-	i32.store	ptrs+12($pop157), $pop3
-	i32.const	$push156=, 0
-	i32.const	$push155=, 0
-	i32.store	incs($pop156), $pop155
 	i32.const	$push154=, 0
-	i32.const	$push4=, 3
-	i32.store	incs+12($pop154), $pop4
-	i32.const	$push153=, 0
-	i32.const	$push5=, input+16
-	i32.store	ptrs+16($pop153), $pop5
+	i32.const	$push153=, input
+	i32.store	ptrs($pop154), $pop153
 	i32.const	$push152=, 0
-	i32.const	$push151=, 4
-	i32.store	incs+16($pop152), $pop151
+	i32.const	$push0=, input+4
+	i32.store	ptrs+4($pop152), $pop0
+	i32.const	$push151=, 0
+	i32.const	$push1=, input+8
+	i32.store	ptrs+8($pop151), $pop1
 	i32.const	$push150=, 0
-	i32.const	$push6=, input+20
-	i32.store	ptrs+20($pop150), $pop6
+	i64.const	$push2=, 8589934593
+	i64.store	incs+4($pop150):p2align=2, $pop2
 	i32.const	$push149=, 0
-	i32.const	$push7=, 5
-	i32.store	incs+20($pop149), $pop7
+	i32.const	$push3=, input+12
+	i32.store	ptrs+12($pop149), $pop3
 	i32.const	$push148=, 0
-	i32.const	$push8=, input+24
-	i32.store	ptrs+24($pop148), $pop8
+	i32.const	$push4=, input+16
+	i32.store	ptrs+16($pop148), $pop4
 	i32.const	$push147=, 0
-	i32.const	$push9=, 6
-	i32.store	incs+24($pop147), $pop9
+	i64.const	$push5=, 17179869187
+	i64.store	incs+12($pop147):p2align=2, $pop5
 	i32.const	$push146=, 0
-	i32.const	$push10=, input+28
-	i32.store	ptrs+28($pop146), $pop10
+	i32.const	$push6=, input+20
+	i32.store	ptrs+20($pop146), $pop6
 	i32.const	$push145=, 0
-	i32.const	$push11=, 7
-	i32.store	incs+28($pop145), $pop11
+	i32.const	$push7=, input+24
+	i32.store	ptrs+24($pop145), $pop7
 	i32.const	$push144=, 0
-	i32.const	$push12=, input+32
-	i32.store	ptrs+32($pop144), $pop12
+	i64.const	$push8=, 25769803781
+	i64.store	incs+20($pop144):p2align=2, $pop8
 	i32.const	$push143=, 0
-	i32.const	$push13=, 8
-	i32.store	incs+32($pop143), $pop13
+	i32.const	$push9=, input+28
+	i32.store	ptrs+28($pop143), $pop9
 	i32.const	$push142=, 0
-	i32.const	$push14=, input+36
-	i32.store	ptrs+36($pop142), $pop14
+	i32.const	$push10=, input+32
+	i32.store	ptrs+32($pop142), $pop10
 	i32.const	$push141=, 0
-	i32.const	$push15=, 9
-	i32.store	incs+36($pop141), $pop15
+	i64.const	$push11=, 34359738375
+	i64.store	incs+28($pop141):p2align=2, $pop11
 	i32.const	$push140=, 0
-	i32.const	$push16=, input+40
-	i32.store	ptrs+40($pop140), $pop16
+	i32.const	$push12=, input+36
+	i32.store	ptrs+36($pop140), $pop12
 	i32.const	$push139=, 0
-	i32.const	$push17=, 10
-	i32.store	incs+40($pop139), $pop17
+	i32.const	$push13=, input+40
+	i32.store	ptrs+40($pop139), $pop13
 	i32.const	$push138=, 0
-	i32.const	$push18=, input+44
-	i32.store	ptrs+44($pop138), $pop18
+	i64.const	$push14=, 42949672969
+	i64.store	incs+36($pop138):p2align=2, $pop14
 	i32.const	$push137=, 0
-	i32.const	$push19=, 11
-	i32.store	incs+44($pop137), $pop19
+	i32.const	$push15=, input+44
+	i32.store	ptrs+44($pop137), $pop15
 	i32.const	$push136=, 0
-	i32.const	$push20=, input+48
-	i32.store	ptrs+48($pop136), $pop20
 	i32.const	$push135=, 0
-	i32.const	$push21=, 12
-	i32.store	incs+48($pop135), $pop21
+	i32.store	incs($pop136), $pop135
 	i32.const	$push134=, 0
-	i32.const	$push22=, input+52
-	i32.store	ptrs+52($pop134), $pop22
+	i32.const	$push16=, input+48
+	i32.store	ptrs+48($pop134), $pop16
 	i32.const	$push133=, 0
-	i32.const	$push23=, 13
-	i32.store	incs+52($pop133), $pop23
+	i32.const	$push17=, 11
+	i32.store	incs+44($pop133), $pop17
 	i32.const	$push132=, 0
-	i32.const	$push24=, input+56
-	i32.store	ptrs+56($pop132), $pop24
+	i32.const	$push18=, 12
+	i32.store	incs+48($pop132), $pop18
 	i32.const	$push131=, 0
-	i32.const	$push25=, 14
-	i32.store	incs+56($pop131), $pop25
+	i32.const	$push19=, input+52
+	i32.store	ptrs+52($pop131), $pop19
 	i32.const	$push130=, 0
-	i32.const	$push26=, input+60
-	i32.store	ptrs+60($pop130), $pop26
+	i32.const	$push20=, 13
+	i32.store	incs+52($pop130), $pop20
 	i32.const	$push129=, 0
-	i32.const	$push27=, 15
-	i32.store	incs+60($pop129), $pop27
+	i32.const	$push21=, input+56
+	i32.store	ptrs+56($pop129), $pop21
 	i32.const	$push128=, 0
-	i32.const	$push28=, input+64
-	i32.store	ptrs+64($pop128), $pop28
+	i32.const	$push22=, 14
+	i32.store	incs+56($pop128), $pop22
 	i32.const	$push127=, 0
-	i32.const	$push29=, 16
-	i32.store	incs+64($pop127), $pop29
+	i32.const	$push23=, input+60
+	i32.store	ptrs+60($pop127), $pop23
 	i32.const	$push126=, 0
-	i32.const	$push30=, input+68
-	i32.store	ptrs+68($pop126), $pop30
+	i32.const	$push24=, 15
+	i32.store	incs+60($pop126), $pop24
 	i32.const	$push125=, 0
-	i32.const	$push31=, 17
-	i32.store	incs+68($pop125), $pop31
+	i32.const	$push25=, input+64
+	i32.store	ptrs+64($pop125), $pop25
 	i32.const	$push124=, 0
-	i32.const	$push32=, input+72
-	i32.store	ptrs+72($pop124), $pop32
+	i32.const	$push26=, 16
+	i32.store	incs+64($pop124), $pop26
 	i32.const	$push123=, 0
-	i32.const	$push33=, 18
-	i32.store	incs+72($pop123), $pop33
+	i32.const	$push27=, input+68
+	i32.store	ptrs+68($pop123), $pop27
 	i32.const	$push122=, 0
-	i32.const	$push34=, input+76
-	i32.store	ptrs+76($pop122), $pop34
+	i32.const	$push28=, 17
+	i32.store	incs+68($pop122), $pop28
 	i32.const	$push121=, 0
-	i32.const	$push35=, 19
-	i32.store	incs+76($pop121), $pop35
+	i32.const	$push29=, input+72
+	i32.store	ptrs+72($pop121), $pop29
+	i32.const	$push120=, 0
+	i32.const	$push30=, 18
+	i32.store	incs+72($pop120), $pop30
+	i32.const	$push119=, 0
+	i32.const	$push31=, input+76
+	i32.store	ptrs+76($pop119), $pop31
+	i32.const	$push118=, 0
+	i32.const	$push32=, 19
+	i32.store	incs+76($pop118), $pop32
 .LBB2_1:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	f32.convert_s/i32	$push36=, $1
-	f32.store	0($0), $pop36
-	i32.const	$push167=, 4
-	i32.add 	$0=, $0, $pop167
-	i32.const	$push166=, 1
-	i32.add 	$push165=, $1, $pop166
-	tee_local	$push164=, $1=, $pop165
-	i32.const	$push163=, 80
-	i32.ne  	$push37=, $pop164, $pop163
-	br_if   	0, $pop37       # 0: up to label3
+	f32.convert_s/i32	$push33=, $1
+	f32.store	0($0), $pop33
+	i32.const	$push159=, 4
+	i32.add 	$0=, $0, $pop159
+	i32.const	$push158=, 1
+	i32.add 	$push157=, $1, $pop158
+	tee_local	$push156=, $1=, $pop157
+	i32.const	$push155=, 80
+	i32.ne  	$push34=, $pop156, $pop155
+	br_if   	0, $pop34       # 0: up to label3
 # BB#2:                                 # %for.end8
 	end_loop
-	i32.const	$push38=, 4
-	call    	foo@FUNCTION, $pop38
-	i32.const	$push39=, 0
-	f32.load	$push43=, results($pop39)
-	f32.const	$push44=, 0x0p0
-	f32.ne  	$push45=, $pop43, $pop44
-	i32.const	$push186=, 0
-	f32.load	$push40=, results+4($pop186)
-	f32.const	$push41=, 0x1.4p3
+	i32.const	$push35=, 4
+	call    	foo@FUNCTION, $pop35
+	i32.const	$push36=, 0
+	f32.load	$push40=, results($pop36)
+	f32.const	$push41=, 0x0p0
 	f32.ne  	$push42=, $pop40, $pop41
-	i32.or  	$push46=, $pop45, $pop42
-	i32.const	$push185=, 0
-	f32.load	$push47=, results+8($pop185)
-	f32.const	$push48=, 0x1.4p4
-	f32.ne  	$push49=, $pop47, $pop48
-	i32.or  	$push50=, $pop46, $pop49
-	i32.const	$push184=, 0
-	f32.load	$push51=, results+12($pop184)
-	f32.const	$push52=, 0x1.ep4
-	f32.ne  	$push53=, $pop51, $pop52
-	i32.or  	$push54=, $pop50, $pop53
-	i32.const	$push183=, 0
-	f32.load	$push55=, results+16($pop183)
-	f32.const	$push56=, 0x1.4p5
-	f32.ne  	$push57=, $pop55, $pop56
-	i32.or  	$push58=, $pop54, $pop57
-	i32.const	$push182=, 0
-	f32.load	$push59=, results+20($pop182)
-	f32.const	$push60=, 0x1.9p5
-	f32.ne  	$push61=, $pop59, $pop60
-	i32.or  	$push62=, $pop58, $pop61
-	i32.const	$push181=, 0
-	f32.load	$push63=, results+24($pop181)
-	f32.const	$push64=, 0x1.ep5
-	f32.ne  	$push65=, $pop63, $pop64
-	i32.or  	$push66=, $pop62, $pop65
-	i32.const	$push180=, 0
-	f32.load	$push67=, results+28($pop180)
-	f32.const	$push68=, 0x1.18p6
-	f32.ne  	$push69=, $pop67, $pop68
-	i32.or  	$push70=, $pop66, $pop69
-	i32.const	$push179=, 0
-	f32.load	$push71=, results+32($pop179)
-	f32.const	$push72=, 0x1.4p6
-	f32.ne  	$push73=, $pop71, $pop72
-	i32.or  	$push74=, $pop70, $pop73
 	i32.const	$push178=, 0
-	f32.load	$push75=, results+36($pop178)
-	f32.const	$push76=, 0x1.68p6
-	f32.ne  	$push77=, $pop75, $pop76
-	i32.or  	$push78=, $pop74, $pop77
+	f32.load	$push37=, results+4($pop178)
+	f32.const	$push38=, 0x1.4p3
+	f32.ne  	$push39=, $pop37, $pop38
+	i32.or  	$push43=, $pop42, $pop39
 	i32.const	$push177=, 0
-	f32.load	$push79=, results+40($pop177)
-	f32.const	$push80=, 0x1.9p6
-	f32.ne  	$push81=, $pop79, $pop80
-	i32.or  	$push82=, $pop78, $pop81
+	f32.load	$push44=, results+8($pop177)
+	f32.const	$push45=, 0x1.4p4
+	f32.ne  	$push46=, $pop44, $pop45
+	i32.or  	$push47=, $pop43, $pop46
 	i32.const	$push176=, 0
-	f32.load	$push83=, results+44($pop176)
-	f32.const	$push84=, 0x1.b8p6
-	f32.ne  	$push85=, $pop83, $pop84
-	i32.or  	$push86=, $pop82, $pop85
+	f32.load	$push48=, results+12($pop176)
+	f32.const	$push49=, 0x1.ep4
+	f32.ne  	$push50=, $pop48, $pop49
+	i32.or  	$push51=, $pop47, $pop50
 	i32.const	$push175=, 0
-	f32.load	$push87=, results+48($pop175)
-	f32.const	$push88=, 0x1.ep6
-	f32.ne  	$push89=, $pop87, $pop88
-	i32.or  	$push90=, $pop86, $pop89
+	f32.load	$push52=, results+16($pop175)
+	f32.const	$push53=, 0x1.4p5
+	f32.ne  	$push54=, $pop52, $pop53
+	i32.or  	$push55=, $pop51, $pop54
 	i32.const	$push174=, 0
-	f32.load	$push91=, results+52($pop174)
-	f32.const	$push92=, 0x1.04p7
-	f32.ne  	$push93=, $pop91, $pop92
-	i32.or  	$push94=, $pop90, $pop93
+	f32.load	$push56=, results+20($pop174)
+	f32.const	$push57=, 0x1.9p5
+	f32.ne  	$push58=, $pop56, $pop57
+	i32.or  	$push59=, $pop55, $pop58
 	i32.const	$push173=, 0
-	f32.load	$push95=, results+56($pop173)
-	f32.const	$push96=, 0x1.18p7
-	f32.ne  	$push97=, $pop95, $pop96
-	i32.or  	$push98=, $pop94, $pop97
+	f32.load	$push60=, results+24($pop173)
+	f32.const	$push61=, 0x1.ep5
+	f32.ne  	$push62=, $pop60, $pop61
+	i32.or  	$push63=, $pop59, $pop62
 	i32.const	$push172=, 0
-	f32.load	$push99=, results+60($pop172)
-	f32.const	$push100=, 0x1.2cp7
-	f32.ne  	$push101=, $pop99, $pop100
-	i32.or  	$push102=, $pop98, $pop101
+	f32.load	$push64=, results+28($pop172)
+	f32.const	$push65=, 0x1.18p6
+	f32.ne  	$push66=, $pop64, $pop65
+	i32.or  	$push67=, $pop63, $pop66
 	i32.const	$push171=, 0
-	f32.load	$push103=, results+64($pop171)
-	f32.const	$push104=, 0x1.4p7
-	f32.ne  	$push105=, $pop103, $pop104
-	i32.or  	$push106=, $pop102, $pop105
+	f32.load	$push68=, results+32($pop171)
+	f32.const	$push69=, 0x1.4p6
+	f32.ne  	$push70=, $pop68, $pop69
+	i32.or  	$push71=, $pop67, $pop70
 	i32.const	$push170=, 0
-	f32.load	$push107=, results+68($pop170)
-	f32.const	$push108=, 0x1.54p7
-	f32.ne  	$push109=, $pop107, $pop108
-	i32.or  	$push110=, $pop106, $pop109
+	f32.load	$push72=, results+36($pop170)
+	f32.const	$push73=, 0x1.68p6
+	f32.ne  	$push74=, $pop72, $pop73
+	i32.or  	$push75=, $pop71, $pop74
 	i32.const	$push169=, 0
-	f32.load	$push111=, results+72($pop169)
-	f32.const	$push112=, 0x1.68p7
-	f32.ne  	$push113=, $pop111, $pop112
-	i32.or  	$push114=, $pop110, $pop113
+	f32.load	$push76=, results+40($pop169)
+	f32.const	$push77=, 0x1.9p6
+	f32.ne  	$push78=, $pop76, $pop77
+	i32.or  	$push79=, $pop75, $pop78
 	i32.const	$push168=, 0
-	f32.load	$push115=, results+76($pop168)
-	f32.const	$push116=, 0x1.7cp7
-	f32.ne  	$push117=, $pop115, $pop116
-	i32.or  	$push118=, $pop114, $pop117
-	i32.const	$push119=, 1
-	i32.and 	$push120=, $pop118, $pop119
-                                        # fallthrough-return: $pop120
+	f32.load	$push80=, results+44($pop168)
+	f32.const	$push81=, 0x1.b8p6
+	f32.ne  	$push82=, $pop80, $pop81
+	i32.or  	$push83=, $pop79, $pop82
+	i32.const	$push167=, 0
+	f32.load	$push84=, results+48($pop167)
+	f32.const	$push85=, 0x1.ep6
+	f32.ne  	$push86=, $pop84, $pop85
+	i32.or  	$push87=, $pop83, $pop86
+	i32.const	$push166=, 0
+	f32.load	$push88=, results+52($pop166)
+	f32.const	$push89=, 0x1.04p7
+	f32.ne  	$push90=, $pop88, $pop89
+	i32.or  	$push91=, $pop87, $pop90
+	i32.const	$push165=, 0
+	f32.load	$push92=, results+56($pop165)
+	f32.const	$push93=, 0x1.18p7
+	f32.ne  	$push94=, $pop92, $pop93
+	i32.or  	$push95=, $pop91, $pop94
+	i32.const	$push164=, 0
+	f32.load	$push96=, results+60($pop164)
+	f32.const	$push97=, 0x1.2cp7
+	f32.ne  	$push98=, $pop96, $pop97
+	i32.or  	$push99=, $pop95, $pop98
+	i32.const	$push163=, 0
+	f32.load	$push100=, results+64($pop163)
+	f32.const	$push101=, 0x1.4p7
+	f32.ne  	$push102=, $pop100, $pop101
+	i32.or  	$push103=, $pop99, $pop102
+	i32.const	$push162=, 0
+	f32.load	$push104=, results+68($pop162)
+	f32.const	$push105=, 0x1.54p7
+	f32.ne  	$push106=, $pop104, $pop105
+	i32.or  	$push107=, $pop103, $pop106
+	i32.const	$push161=, 0
+	f32.load	$push108=, results+72($pop161)
+	f32.const	$push109=, 0x1.68p7
+	f32.ne  	$push110=, $pop108, $pop109
+	i32.or  	$push111=, $pop107, $pop110
+	i32.const	$push160=, 0
+	f32.load	$push112=, results+76($pop160)
+	f32.const	$push113=, 0x1.7cp7
+	f32.ne  	$push114=, $pop112, $pop113
+	i32.or  	$push115=, $pop111, $pop114
+	i32.const	$push116=, 1
+	i32.and 	$push117=, $pop115, $pop116
+                                        # fallthrough-return: $pop117
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	incs                    # @incs
 	.type	incs,@object
 	.section	.bss.incs,"aw",@nobits
@@ -638,4 +626,4 @@ input:
 	.size	input, 320
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29006.c.s b/test/torture-s/pr29006.c.s
index 5c961e932..3f4564970 100644
--- a/test/torture-s/pr29006.c.s
+++ b/test/torture-s/pr29006.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29006.c"
+	.file	"pr29006.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,10 +23,10 @@ main:                                   # @main
 	.local  	i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
+	i32.sub 	$push16=, $pop7, $pop9
 	tee_local	$push15=, $1=, $pop16
 	i32.store	__stack_pointer($pop10), $pop15
 	i32.const	$push2=, 8
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.s,@object        # @main.s
 	.section	.rodata..Lmain.s,"a",@progbits
 .Lmain.s:
@@ -58,4 +58,4 @@ main:                                   # @main
 	.size	.Lmain.s, 9
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29156.c.s b/test/torture-s/pr29156.c.s
index 0a2816235..f5e7290cd 100644
--- a/test/torture-s/pr29156.c.s
+++ b/test/torture-s/pr29156.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29156.c"
+	.file	"pr29156.c"
 	.section	.text.bla,"ax",@progbits
-	.hidden	bla
+	.hidden	bla                     # -- Begin function bla
 	.globl	bla
 	.type	bla,@function
 bla:                                    # @bla
@@ -20,9 +20,9 @@ bla:                                    # @bla
 	.endfunc
 .Lfunc_end0:
 	.size	bla, .Lfunc_end0-bla
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	global                  # @global
 	.type	global,@object
 	.section	.bss.global,"aw",@nobits
@@ -47,4 +47,4 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29695-1.c.s b/test/torture-s/pr29695-1.c.s
index b3ff0a9ce..12ce8c3eb 100644
--- a/test/torture-s/pr29695-1.c.s
+++ b/test/torture-s/pr29695-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29695-1.c"
+	.file	"pr29695-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -12,9 +12,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -25,9 +25,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -38,9 +38,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -51,9 +51,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -64,9 +64,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -77,9 +77,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -90,9 +90,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end6:
 	.size	f7, .Lfunc_end6-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -103,9 +103,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end7:
 	.size	f8, .Lfunc_end7-f8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -116,6 +116,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29695-2.c.s b/test/torture-s/pr29695-2.c.s
index 7d6ccb3c5..73a6b0411 100644
--- a/test/torture-s/pr29695-2.c.s
+++ b/test/torture-s/pr29695-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29695-2.c"
+	.file	"pr29695-2.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -15,27 +15,25 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load8_s	$push1=, b($pop0)
-	i32.const	$push5=, 0
-	i32.lt_s	$push2=, $pop1, $pop5
-	i32.const	$push3=, 7
-	i32.shl 	$push4=, $pop2, $pop3
-                                        # fallthrough-return: $pop4
+	i32.load8_u	$push1=, b($pop0)
+	i32.const	$push2=, 128
+	i32.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -51,9 +49,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -69,47 +67,41 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
 	.result 	i64
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load	$push1=, c($pop0)
-	i32.const	$push6=, 0
-	i32.lt_s	$push2=, $pop1, $pop6
-	i64.extend_u/i32	$push3=, $pop2
-	i64.const	$push4=, 31
-	i64.shl 	$push5=, $pop3, $pop4
-                                        # fallthrough-return: $pop5
+	i64.load	$push1=, c($pop0)
+	i64.const	$push2=, 2147483648
+	i64.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.result 	i64
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load	$push1=, d($pop0)
-	i32.const	$push6=, 0
-	i32.lt_s	$push2=, $pop1, $pop6
-	i64.extend_u/i32	$push3=, $pop2
-	i64.const	$push4=, 31
-	i64.shl 	$push5=, $pop3, $pop4
-                                        # fallthrough-return: $pop5
+	i64.load32_u	$push1=, d($pop0)
+	i64.const	$push2=, 2147483648
+	i64.and 	$push3=, $pop1, $pop2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -126,9 +118,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end6:
 	.size	f7, .Lfunc_end6-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -145,9 +137,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end7:
 	.size	f8, .Lfunc_end7-f8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -181,14 +173,14 @@ main:                                   # @main
 # BB#4:                                 # %if.end28
 	i32.const	$push9=, 0
 	return  	$pop9
-.LBB8_5:                                # %if.then19
+.LBB8_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -225,5 +217,5 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr29797-1.c.s b/test/torture-s/pr29797-1.c.s
index 05294d26c..d3bd96e09 100644
--- a/test/torture-s/pr29797-1.c.s
+++ b/test/torture-s/pr29797-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29797-1.c"
+	.file	"pr29797-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -12,9 +12,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29797-2.c.s b/test/torture-s/pr29797-2.c.s
index 1ac8e1c33..2b218c545 100644
--- a/test/torture-s/pr29797-2.c.s
+++ b/test/torture-s/pr29797-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29797-2.c"
+	.file	"pr29797-2.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -12,9 +12,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr29798.c.s b/test/torture-s/pr29798.c.s
index 1fc0e865d..2d74d9866 100644
--- a/test/torture-s/pr29798.c.s
+++ b/test/torture-s/pr29798.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr29798.c"
+	.file	"pr29798.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr30185.c.s b/test/torture-s/pr30185.c.s
index bc97a6b67..9009600e2 100644
--- a/test/torture-s/pr30185.c.s
+++ b/test/torture-s/pr30185.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr30185.c"
+	.file	"pr30185.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,6 +28,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr30778.c.s b/test/torture-s/pr30778.c.s
index 45d3a0aec..701a7dd4c 100644
--- a/test/torture-s/pr30778.c.s
+++ b/test/torture-s/pr30778.c.s
@@ -1,40 +1,36 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr30778.c"
+	.file	"pr30778.c"
 	.section	.text.init_reg_last,"ax",@progbits
-	.hidden	init_reg_last
+	.hidden	init_reg_last           # -- Begin function init_reg_last
 	.globl	init_reg_last
 	.type	init_reg_last,@function
 init_reg_last:                          # @init_reg_last
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.load	$push15=, reg_stat($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i32.const	$push13=, 0
-	i32.store	0($pop14):p2align=0, $pop13
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $0, $pop1
-	i64.const	$push3=, 0
-	i64.store	0($pop2):p2align=0, $pop3
-	i32.const	$push4=, 18
+	i32.load	$push12=, reg_stat($pop0)
+	tee_local	$push11=, $0=, $pop12
+	i64.const	$push1=, 0
+	i64.store	0($pop11):p2align=0, $pop1
+	i32.const	$push2=, 18
+	i32.add 	$push3=, $0, $pop2
+	i32.const	$push10=, 0
+	i32.store8	0($pop3), $pop10
+	i32.const	$push4=, 16
 	i32.add 	$push5=, $0, $pop4
-	i32.const	$push12=, 0
-	i32.store8	0($pop5), $pop12
-	i32.const	$push6=, 16
+	i32.const	$push9=, 0
+	i32.store16	0($pop5):p2align=0, $pop9
+	i32.const	$push6=, 8
 	i32.add 	$push7=, $0, $pop6
-	i32.const	$push11=, 0
-	i32.store16	0($pop7):p2align=0, $pop11
-	i32.const	$push8=, 4
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push10=, 0
-	i32.store	0($pop9):p2align=0, $pop10
+	i64.const	$push8=, 0
+	i64.store	0($pop7):p2align=0, $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	init_reg_last, .Lfunc_end0-init_reg_last
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,10 +38,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push15=, $pop4, $pop5
+	i32.sub 	$push15=, $pop3, $pop5
 	tee_local	$push14=, $0=, $pop15
 	i32.store	__stack_pointer($pop6), $pop14
 	i32.const	$push13=, 0
@@ -74,7 +70,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	reg_stat,@object        # @reg_stat
 	.section	.bss.reg_stat,"aw",@nobits
 	.p2align	2
@@ -83,5 +79,5 @@ reg_stat:
 	.size	reg_stat, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr31072.c.s b/test/torture-s/pr31072.c.s
index c0f4547a3..dc6f093c9 100644
--- a/test/torture-s/pr31072.c.s
+++ b/test/torture-s/pr31072.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31072.c"
+	.file	"pr31072.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	ReadyFlag_NotProperlyInitialized # @ReadyFlag_NotProperlyInitialized
 	.type	ReadyFlag_NotProperlyInitialized,@object
 	.section	.data.ReadyFlag_NotProperlyInitialized,"aw",@progbits
@@ -34,5 +34,5 @@ ReadyFlag_NotProperlyInitialized:
 	.size	ReadyFlag_NotProperlyInitialized, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr31136.c.s b/test/torture-s/pr31136.c.s
index b9812a26a..0c7c9c9d0 100644
--- a/test/torture-s/pr31136.c.s
+++ b/test/torture-s/pr31136.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31136.c"
+	.file	"pr31136.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -20,7 +20,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -31,4 +31,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr31169.c.s b/test/torture-s/pr31169.c.s
index f66aa304d..cc67be1ae 100644
--- a/test/torture-s/pr31169.c.s
+++ b/test/torture-s/pr31169.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31169.c"
+	.file	"pr31169.c"
 	.section	.text.sign_bit_p,"ax",@progbits
-	.hidden	sign_bit_p
+	.hidden	sign_bit_p              # -- Begin function sign_bit_p
 	.globl	sign_bit_p
 	.type	sign_bit_p,@function
 sign_bit_p:                             # @sign_bit_p
@@ -53,9 +53,9 @@ sign_bit_p:                             # @sign_bit_p
 	.endfunc
 .Lfunc_end0:
 	.size	sign_bit_p, .Lfunc_end0-sign_bit_p
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,6 +66,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr31448-2.c.s b/test/torture-s/pr31448-2.c.s
index 6c2eb9ce2..5dba89522 100644
--- a/test/torture-s/pr31448-2.c.s
+++ b/test/torture-s/pr31448-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31448-2.c"
+	.file	"pr31448-2.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -11,9 +11,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -41,19 +41,19 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %if.end6
 	i32.const	$push0=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop2, $pop3
+	i32.sub 	$push6=, $pop1, $pop3
 	i32.const	$push4=, 8
 	i32.add 	$push5=, $pop6, $pop4
 	i32.store	next($pop0), $pop5
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	next                    # @next
 	.type	next,@object
 	.section	.bss.next,"aw",@nobits
@@ -73,4 +73,4 @@ next:
 	.size	next, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr31448.c.s b/test/torture-s/pr31448.c.s
index 6e4e16383..2c9a3ade7 100644
--- a/test/torture-s/pr31448.c.s
+++ b/test/torture-s/pr31448.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31448.c"
+	.file	"pr31448.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -11,9 +11,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -41,19 +41,19 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %if.end6
 	i32.const	$push0=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop2, $pop3
+	i32.sub 	$push6=, $pop1, $pop3
 	i32.const	$push4=, 8
 	i32.add 	$push5=, $pop6, $pop4
 	i32.store	next($pop0), $pop5
@@ -62,7 +62,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	next                    # @next
 	.type	next,@object
 	.section	.bss.next,"aw",@nobits
@@ -73,4 +73,4 @@ next:
 	.size	next, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr31605.c.s b/test/torture-s/pr31605.c.s
index 5572e893f..32535939d 100644
--- a/test/torture-s/pr31605.c.s
+++ b/test/torture-s/pr31605.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr31605.c"
+	.file	"pr31605.c"
 	.section	.text.put_field,"ax",@progbits
-	.hidden	put_field
+	.hidden	put_field               # -- Begin function put_field
 	.globl	put_field
 	.type	put_field,@function
 put_field:                              # @put_field
@@ -24,24 +24,21 @@ put_field:                              # @put_field
 	.endfunc
 .Lfunc_end0:
 	.size	put_field, .Lfunc_end0-put_field
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	call    	put_field@FUNCTION, $pop1, $pop0
-	call    	abort@FUNCTION
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
-	.functype	abort, void
diff --git a/test/torture-s/pr32244-1.c.s b/test/torture-s/pr32244-1.c.s
index efba531a4..80b448fd5 100644
--- a/test/torture-s/pr32244-1.c.s
+++ b/test/torture-s/pr32244-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr32244-1.c"
+	.file	"pr32244-1.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -23,9 +23,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -55,5 +55,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr32500.c.s b/test/torture-s/pr32500.c.s
index 59d1c2ebd..63896dc66 100644
--- a/test/torture-s/pr32500.c.s
+++ b/test/torture-s/pr32500.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr32500.c"
+	.file	"pr32500.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -26,9 +26,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -59,5 +59,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr33142.c.s b/test/torture-s/pr33142.c.s
index a2487dc76..ef8b4310a 100644
--- a/test/torture-s/pr33142.c.s
+++ b/test/torture-s/pr33142.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33142.c"
+	.file	"pr33142.c"
 	.section	.text.lisp_atan2,"ax",@progbits
-	.hidden	lisp_atan2
+	.hidden	lisp_atan2              # -- Begin function lisp_atan2
 	.globl	lisp_atan2
 	.type	lisp_atan2,@function
 lisp_atan2:                             # @lisp_atan2
@@ -32,9 +32,9 @@ lisp_atan2:                             # @lisp_atan2
 	.endfunc
 .Lfunc_end0:
 	.size	lisp_atan2, .Lfunc_end0-lisp_atan2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,10 +42,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push14=, $pop7, $pop8
+	i32.sub 	$push14=, $pop6, $pop8
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop9), $pop13
 	i32.const	$push0=, 63
@@ -71,7 +71,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33382.c.s b/test/torture-s/pr33382.c.s
index 6aab8e228..1e65a66cb 100644
--- a/test/torture-s/pr33382.c.s
+++ b/test/torture-s/pr33382.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33382.c"
+	.file	"pr33382.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -56,5 +56,5 @@ x:
 	.size	x, 20
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33631.c.s b/test/torture-s/pr33631.c.s
index 29968293c..faf821458 100644
--- a/test/torture-s/pr33631.c.s
+++ b/test/torture-s/pr33631.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33631.c"
+	.file	"pr33631.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr33669.c.s b/test/torture-s/pr33669.c.s
index 5b0fffe89..94c47d9ab 100644
--- a/test/torture-s/pr33669.c.s
+++ b/test/torture-s/pr33669.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33669.c"
+	.file	"pr33669.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -42,9 +42,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -55,6 +55,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr33779-1.c.s b/test/torture-s/pr33779-1.c.s
index 73887a0cf..c1524f253 100644
--- a/test/torture-s/pr33779-1.c.s
+++ b/test/torture-s/pr33779-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33779-1.c"
+	.file	"pr33779-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,6 +29,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr33779-2.c.s b/test/torture-s/pr33779-2.c.s
index e1d334583..62c5a2880 100644
--- a/test/torture-s/pr33779-2.c.s
+++ b/test/torture-s/pr33779-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33779-2.c"
+	.file	"pr33779-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,6 +31,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr33870-1.c.s b/test/torture-s/pr33870-1.c.s
index 3e6f6a6ce..2dec7d37b 100644
--- a/test/torture-s/pr33870-1.c.s
+++ b/test/torture-s/pr33870-1.c.s
@@ -1,50 +1,54 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33870-1.c"
+	.file	"pr33870-1.c"
 	.section	.text.sort_pagelist,"ax",@progbits
-	.hidden	sort_pagelist
+	.hidden	sort_pagelist           # -- Begin function sort_pagelist
 	.globl	sort_pagelist
 	.type	sort_pagelist,@function
 sort_pagelist:                          # @sort_pagelist
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push44=, 0
-	i32.const	$push41=, 0
-	i32.load	$push42=, __stack_pointer($pop41)
-	i32.const	$push43=, 160
-	i32.sub 	$push66=, $pop42, $pop43
-	tee_local	$push65=, $3=, $pop66
-	i32.store	__stack_pointer($pop44), $pop65
+	i32.const	$push42=, 0
+	i32.const	$push40=, 0
+	i32.load	$push39=, __stack_pointer($pop40)
+	i32.const	$push41=, 160
+	i32.sub 	$push66=, $pop39, $pop41
+	tee_local	$push65=, $4=, $pop66
+	i32.store	__stack_pointer($pop42), $pop65
 	i32.const	$push64=, 0
 	i32.const	$push0=, 100
-	i32.call	$1=, memset@FUNCTION, $3, $pop64, $pop0
-	i32.const	$3=, 0
+	i32.call	$1=, memset@FUNCTION, $4, $pop64, $pop0
+	i32.const	$4=, 0
 	block   	
-	i32.eqz 	$push116=, $0
-	br_if   	0, $pop116      # 0: down to label0
+	i32.eqz 	$push122=, $0
+	br_if   	0, $pop122      # 0: down to label0
 # BB#1:                                 # %while.body.lr.ph
+	i32.const	$push52=, 112
+	i32.add 	$push53=, $1, $pop52
+	i32.const	$push68=, 32
+	i32.add 	$3=, $pop53, $pop68
 	i32.const	$push54=, 112
 	i32.add 	$push55=, $1, $pop54
 	i32.const	$push67=, 32
 	i32.add 	$2=, $pop55, $pop67
-	i32.const	$push14=, 96
-	i32.add 	$5=, $1, $pop14
+	i32.const	$push13=, 96
+	i32.add 	$6=, $1, $pop13
 .LBB0_2:                                # %while.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_3 Depth 2
                                         #       Child Loop BB0_6 Depth 3
                                         #     Child Loop BB0_19 Depth 2
 	loop    	                # label1:
-	copy_local	$push73=, $0
-	tee_local	$push72=, $3=, $pop73
-	i32.const	$push71=, 32
-	i32.add 	$push70=, $pop72, $pop71
-	tee_local	$push69=, $8=, $pop70
-	i32.load	$0=, 0($pop69)
-	i32.const	$push68=, 0
-	i32.store	0($8), $pop68
-	i32.const	$6=, 0
+	copy_local	$push74=, $0
+	tee_local	$push73=, $4=, $pop74
+	i32.const	$push72=, 32
+	i32.add 	$push71=, $pop73, $pop72
+	tee_local	$push70=, $9=, $pop71
+	i32.load	$0=, 0($pop70)
+	i32.const	$push69=, 0
+	i32.store	0($9), $pop69
+	i32.const	$7=, 0
 .LBB0_3:                                # %for.body
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Loop Header: Depth=2
@@ -55,29 +59,28 @@ sort_pagelist:                          # @sort_pagelist
 	block   	
 	block   	
 	loop    	                # label7:
-	i32.const	$push78=, 2
-	i32.shl 	$push1=, $6, $pop78
-	i32.add 	$push77=, $1, $pop1
-	tee_local	$push76=, $4=, $pop77
-	i32.load	$push75=, 0($pop76)
-	tee_local	$push74=, $9=, $pop75
-	i32.eqz 	$push117=, $pop74
-	br_if   	1, $pop117      # 1: down to label6
+	i32.const	$push79=, 2
+	i32.shl 	$push1=, $7, $pop79
+	i32.add 	$push78=, $1, $pop1
+	tee_local	$push77=, $5=, $pop78
+	i32.load	$push76=, 0($pop77)
+	tee_local	$push75=, $9=, $pop76
+	i32.eqz 	$push123=, $pop75
+	br_if   	1, $pop123      # 1: down to label6
 # BB#4:                                 # %if.else
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push79=, 0
-	i32.store	xx($pop79), $2
+	i32.const	$push80=, 0
+	i32.store	xx($pop80), $2
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push118=, $3
-	br_if   	0, $pop118      # 0: down to label10
+	i32.eqz 	$push124=, $4
+	br_if   	0, $pop124      # 0: down to label10
 # BB#5:                                 # %while.body.i.preheader
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push62=, 112
-	i32.add 	$push63=, $1, $pop62
-	copy_local	$7=, $pop63
-	copy_local	$8=, $9
+	i32.const	$push60=, 112
+	i32.add 	$push61=, $1, $pop60
+	copy_local	$8=, $pop61
 .LBB0_6:                                # %while.body.i
                                         #   Parent Loop BB0_2 Depth=1
                                         #     Parent Loop BB0_3 Depth=2
@@ -85,297 +88,315 @@ sort_pagelist:                          # @sort_pagelist
 	loop    	                # label11:
 	block   	
 	block   	
-	i32.load	$push3=, 4($8)
-	i32.load	$push2=, 4($3)
+	i32.load	$push3=, 4($9)
+	i32.load	$push2=, 4($4)
 	i32.ge_u	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label13
 # BB#7:                                 # %if.then.i
                                         #   in Loop: Header=BB0_6 Depth=3
+	i32.const	$push82=, 32
+	i32.add 	$push7=, $8, $pop82
+	i32.store	0($pop7), $9
 	i32.const	$push81=, 32
-	i32.add 	$push7=, $7, $pop81
-	i32.store	0($pop7), $8
-	i32.const	$push80=, 32
-	i32.add 	$push8=, $8, $pop80
-	i32.load	$9=, 0($pop8)
-	copy_local	$10=, $3
-	copy_local	$7=, $8
+	i32.add 	$push8=, $9, $pop81
+	i32.load	$10=, 0($pop8)
+	copy_local	$11=, $4
+	copy_local	$8=, $9
 	br      	1               # 1: down to label12
 .LBB0_8:                                # %if.else.i
                                         #   in Loop: Header=BB0_6 Depth=3
 	end_block                       # label13:
+	i32.const	$push84=, 32
+	i32.add 	$push5=, $8, $pop84
+	i32.store	0($pop5), $4
 	i32.const	$push83=, 32
-	i32.add 	$push5=, $7, $pop83
-	i32.store	0($pop5), $3
-	i32.const	$push82=, 32
-	i32.add 	$push6=, $3, $pop82
-	i32.load	$10=, 0($pop6)
-	copy_local	$9=, $8
-	copy_local	$7=, $3
+	i32.add 	$push6=, $4, $pop83
+	i32.load	$11=, 0($pop6)
+	copy_local	$10=, $9
+	copy_local	$8=, $4
 .LBB0_9:                                # %if.end.i
                                         #   in Loop: Header=BB0_6 Depth=3
 	end_block                       # label12:
 	block   	
-	i32.const	$push84=, 0
-	i32.load	$push9=, 0($2)
+	i32.const	$push86=, 0
+	i32.const	$push62=, 112
+	i32.add 	$push63=, $1, $pop62
+	i32.const	$push85=, 32
+	i32.add 	$push9=, $pop63, $pop85
 	i32.load	$push10=, 0($pop9)
-	i32.store	vx($pop84), $pop10
-	i32.eqz 	$push119=, $9
-	br_if   	0, $pop119      # 0: down to label14
+	i32.load	$push11=, 0($pop10)
+	i32.store	vx($pop86), $pop11
+	i32.eqz 	$push125=, $10
+	br_if   	0, $pop125      # 0: down to label14
 # BB#10:                                # %if.end.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	copy_local	$3=, $10
-	copy_local	$8=, $9
-	br_if   	1, $10          # 1: up to label11
+	copy_local	$4=, $11
+	copy_local	$9=, $10
+	br_if   	1, $11          # 1: up to label11
 .LBB0_11:                               # %merge_pagelist.exit
                                         #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label14:
 	end_loop
-	br_if   	1, $9           # 1: down to label9
+	i32.const	$push87=, 32
+	i32.add 	$4=, $8, $pop87
+	br_if   	1, $10          # 1: down to label9
 	br      	2               # 2: down to label8
 .LBB0_12:                               #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label10:
-	i32.const	$push56=, 112
-	i32.add 	$push57=, $1, $pop56
-	copy_local	$7=, $pop57
+	copy_local	$10=, $9
+	copy_local	$4=, $2
 .LBB0_13:                               # %merge_pagelist.exit.thread
                                         #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label9:
-	copy_local	$10=, $9
-.LBB0_14:                               #   in Loop: Header=BB0_3 Depth=2
+	copy_local	$11=, $10
+.LBB0_14:                               # %for.cond
+                                        #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label8:
-	i32.const	$push90=, 32
-	i32.add 	$push11=, $7, $pop90
-	i32.store	0($pop11), $10
-	i32.load	$3=, 0($2)
-	i32.const	$push89=, 0
-	i32.store	0($4), $pop89
-	i32.const	$push88=, 1
-	i32.add 	$push87=, $6, $pop88
-	tee_local	$push86=, $6=, $pop87
-	i32.const	$push85=, 24
-	i32.lt_s	$push12=, $pop86, $pop85
-	br_if   	0, $pop12       # 0: up to label7
+	i32.store	0($4), $11
+	i32.const	$push56=, 112
+	i32.add 	$push57=, $1, $pop56
+	i32.const	$push95=, 32
+	i32.add 	$push94=, $pop57, $pop95
+	tee_local	$push93=, $10=, $pop94
+	i32.load	$4=, 0($pop93)
+	i32.const	$push92=, 0
+	i32.store	0($5), $pop92
+	i32.const	$push91=, 23
+	i32.lt_u	$9=, $7, $pop91
+	i32.const	$push90=, 1
+	i32.add 	$push89=, $7, $pop90
+	tee_local	$push88=, $11=, $pop89
+	copy_local	$7=, $pop88
+	br_if   	0, $9           # 0: up to label7
 # BB#15:                                # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
-	i32.const	$push91=, 24
-	i32.ne  	$push13=, $6, $pop91
-	br_if   	3, $pop13       # 3: down to label3
+	i32.const	$push96=, 24
+	i32.ne  	$push12=, $11, $pop96
+	br_if   	1, $pop12       # 1: down to label5
 # BB#16:                                # %if.then9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.load	$8=, 0($5)
-	i32.const	$push93=, 0
-	i32.store	xx($pop93), $2
-	i32.const	$push92=, 0
-	i32.ne  	$6=, $8, $pop92
-	i32.const	$push58=, 112
-	i32.add 	$push59=, $1, $pop58
-	copy_local	$7=, $pop59
-	i32.eqz 	$push120=, $3
-	br_if   	1, $pop120      # 1: down to label5
+	i32.load	$9=, 0($6)
+	i32.const	$push98=, 0
+	i32.store	xx($pop98), $3
+	i32.const	$push97=, 0
+	i32.ne  	$5=, $9, $pop97
+	i32.eqz 	$push126=, $4
+	br_if   	2, $pop126      # 2: down to label4
 # BB#17:                                # %if.then9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.eqz 	$push121=, $8
-	br_if   	1, $pop121      # 1: down to label5
-# BB#18:                                # %while.body.i84.preheader
+	i32.eqz 	$push127=, $9
+	br_if   	2, $pop127      # 2: down to label4
+# BB#18:                                # %while.body.i87.preheader
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push60=, 112
-	i32.add 	$push61=, $1, $pop60
-	copy_local	$7=, $pop61
-.LBB0_19:                               # %while.body.i84
+	i32.const	$push58=, 112
+	i32.add 	$push59=, $1, $pop58
+	copy_local	$7=, $pop59
+.LBB0_19:                               # %while.body.i87
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label15:
 	block   	
 	block   	
-	i32.load	$push16=, 4($8)
-	i32.load	$push15=, 4($3)
-	i32.ge_u	$push17=, $pop16, $pop15
-	br_if   	0, $pop17       # 0: down to label17
-# BB#20:                                # %if.then.i86
+	i32.load	$push15=, 4($9)
+	i32.load	$push14=, 4($4)
+	i32.ge_u	$push16=, $pop15, $pop14
+	br_if   	0, $pop16       # 0: down to label17
+# BB#20:                                # %if.then.i89
                                         #   in Loop: Header=BB0_19 Depth=2
-	i32.const	$push95=, 32
-	i32.add 	$push20=, $7, $pop95
-	i32.store	0($pop20), $8
-	i32.const	$push94=, 32
-	i32.add 	$push21=, $8, $pop94
-	i32.load	$9=, 0($pop21)
-	copy_local	$10=, $3
-	copy_local	$7=, $8
+	i32.const	$push100=, 32
+	i32.add 	$push19=, $7, $pop100
+	i32.store	0($pop19), $9
+	i32.const	$push99=, 32
+	i32.add 	$push20=, $9, $pop99
+	i32.load	$11=, 0($pop20)
+	copy_local	$8=, $4
+	copy_local	$7=, $9
 	br      	1               # 1: down to label16
-.LBB0_21:                               # %if.else.i88
+.LBB0_21:                               # %if.else.i91
                                         #   in Loop: Header=BB0_19 Depth=2
 	end_block                       # label17:
-	i32.const	$push97=, 32
-	i32.add 	$push18=, $7, $pop97
-	i32.store	0($pop18), $3
-	i32.const	$push96=, 32
-	i32.add 	$push19=, $3, $pop96
-	i32.load	$10=, 0($pop19)
-	copy_local	$9=, $8
-	copy_local	$7=, $3
-.LBB0_22:                               # %if.end.i95
+	i32.const	$push102=, 32
+	i32.add 	$push17=, $7, $pop102
+	i32.store	0($pop17), $4
+	i32.const	$push101=, 32
+	i32.add 	$push18=, $4, $pop101
+	i32.load	$8=, 0($pop18)
+	copy_local	$11=, $9
+	copy_local	$7=, $4
+.LBB0_22:                               # %if.end.i98
                                         #   in Loop: Header=BB0_19 Depth=2
 	end_block                       # label16:
-	i32.const	$push99=, 0
-	i32.load	$push22=, 0($2)
-	i32.load	$push23=, 0($pop22)
-	i32.store	vx($pop99), $pop23
-	i32.const	$push98=, 0
-	i32.ne  	$6=, $9, $pop98
-	i32.eqz 	$push122=, $9
-	br_if   	3, $pop122      # 3: down to label4
-# BB#23:                                # %if.end.i95
+	block   	
+	i32.const	$push103=, 0
+	i32.load	$push21=, 0($10)
+	i32.load	$push22=, 0($pop21)
+	i32.store	vx($pop103), $pop22
+	i32.eqz 	$push128=, $11
+	br_if   	0, $pop128      # 0: down to label18
+# BB#23:                                # %if.end.i98
                                         #   in Loop: Header=BB0_19 Depth=2
-	copy_local	$3=, $10
-	copy_local	$8=, $9
-	br_if   	0, $10          # 0: up to label15
-	br      	3               # 3: down to label4
-.LBB0_24:                               # %for.end.thread
+	copy_local	$4=, $8
+	copy_local	$9=, $11
+	br_if   	1, $8           # 1: up to label15
+.LBB0_24:                               # %while.end.loopexit.i100
                                         #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label18:
 	end_loop
+	i32.const	$push105=, 0
+	i32.ne  	$5=, $11, $pop105
+	i32.const	$push104=, 32
+	i32.add 	$7=, $7, $pop104
+	br      	3               # 3: down to label3
+.LBB0_25:                               # %for.end.thread
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label6:
-	i32.store	0($4), $3
-	br_if   	4, $0           # 4: up to label1
-	br      	3               # 3: down to label2
-.LBB0_25:                               #   in Loop: Header=BB0_2 Depth=1
-	end_block                       # label5:
-	copy_local	$9=, $8
-	copy_local	$10=, $3
-.LBB0_26:                               # %merge_pagelist.exit102
+	i32.store	0($5), $4
+.LBB0_26:                               # %if.end13
                                         #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label5:
+	br_if   	3, $0           # 3: up to label1
+	br      	2               # 2: down to label2
+.LBB0_27:                               #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
-	i32.const	$push100=, 32
-	i32.add 	$push25=, $7, $pop100
-	i32.select	$push24=, $9, $10, $6
-	i32.store	0($pop25), $pop24
-	i32.load	$push26=, 0($2)
-	i32.store	0($5), $pop26
-.LBB0_27:                               # %while.cond.backedge
+	copy_local	$7=, $3
+	copy_local	$11=, $9
+	copy_local	$8=, $4
+.LBB0_28:                               # %merge_pagelist.exit106
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
+	i32.select	$push23=, $11, $8, $5
+	i32.store	0($7), $pop23
+	i32.load	$push24=, 0($10)
+	i32.store	0($6), $pop24
 	br_if   	1, $0           # 1: up to label1
-.LBB0_28:                               # %while.end.loopexit
+.LBB0_29:                               # %while.end.loopexit
 	end_block                       # label2:
 	end_loop
-	i32.load	$3=, 0($1)
-.LBB0_29:                               # %while.end
+	i32.load	$4=, 0($1)
+.LBB0_30:                               # %while.end
 	end_block                       # label0:
-	i32.const	$push48=, 112
-	i32.add 	$push49=, $1, $pop48
-	i32.const	$push101=, 32
-	i32.add 	$2=, $pop49, $pop101
-	i32.const	$4=, 1
-.LBB0_30:                               # %for.body17
+	i32.const	$push46=, 112
+	i32.add 	$push47=, $1, $pop46
+	i32.const	$push106=, 32
+	i32.add 	$5=, $pop47, $pop106
+	i32.const	$7=, 1
+.LBB0_31:                               # %for.body17
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB0_33 Depth 2
-	loop    	                # label18:
-	i32.const	$push104=, 2
-	i32.shl 	$push27=, $4, $pop104
-	i32.add 	$push28=, $1, $pop27
-	i32.load	$8=, 0($pop28)
-	i32.const	$push103=, 0
-	i32.store	xx($pop103), $2
-	i32.const	$push102=, 0
-	i32.ne  	$6=, $3, $pop102
-	i32.const	$push50=, 112
-	i32.add 	$push51=, $1, $pop50
-	copy_local	$7=, $pop51
+                                        #     Child Loop BB0_34 Depth 2
+	loop    	                # label19:
+	i32.const	$push109=, 2
+	i32.shl 	$push25=, $7, $pop109
+	i32.add 	$push26=, $1, $pop25
+	i32.load	$9=, 0($pop26)
+	i32.const	$push108=, 0
+	i32.store	xx($pop108), $5
+	i32.const	$push107=, 0
+	i32.ne  	$2=, $4, $pop107
 	block   	
 	block   	
-	i32.eqz 	$push123=, $3
-	br_if   	0, $pop123      # 0: down to label20
-# BB#31:                                # %for.body17
-                                        #   in Loop: Header=BB0_30 Depth=1
-	i32.eqz 	$push124=, $8
-	br_if   	0, $pop124      # 0: down to label20
-# BB#32:                                # %while.body.i54.preheader
-                                        #   in Loop: Header=BB0_30 Depth=1
-	i32.const	$push52=, 112
-	i32.add 	$push53=, $1, $pop52
-	copy_local	$7=, $pop53
-.LBB0_33:                               # %while.body.i54
-                                        #   Parent Loop BB0_30 Depth=1
+	i32.eqz 	$push129=, $4
+	br_if   	0, $pop129      # 0: down to label21
+# BB#32:                                # %for.body17
+                                        #   in Loop: Header=BB0_31 Depth=1
+	i32.eqz 	$push130=, $9
+	br_if   	0, $pop130      # 0: down to label21
+# BB#33:                                # %while.body.i55.preheader
+                                        #   in Loop: Header=BB0_31 Depth=1
+	i32.const	$push48=, 112
+	i32.add 	$push49=, $1, $pop48
+	copy_local	$8=, $pop49
+.LBB0_34:                               # %while.body.i55
+                                        #   Parent Loop BB0_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label21:
+	loop    	                # label22:
 	block   	
 	block   	
-	i32.load	$push30=, 4($3)
-	i32.load	$push29=, 4($8)
-	i32.ge_u	$push31=, $pop30, $pop29
-	br_if   	0, $pop31       # 0: down to label23
-# BB#34:                                # %if.then.i56
-                                        #   in Loop: Header=BB0_33 Depth=2
-	i32.const	$push106=, 32
-	i32.add 	$push34=, $7, $pop106
-	i32.store	0($pop34), $3
-	i32.const	$push105=, 32
-	i32.add 	$push35=, $3, $pop105
-	i32.load	$9=, 0($pop35)
-	copy_local	$10=, $8
-	copy_local	$7=, $3
-	br      	1               # 1: down to label22
-.LBB0_35:                               # %if.else.i58
-                                        #   in Loop: Header=BB0_33 Depth=2
-	end_block                       # label23:
-	i32.const	$push108=, 32
-	i32.add 	$push32=, $7, $pop108
-	i32.store	0($pop32), $8
-	i32.const	$push107=, 32
-	i32.add 	$push33=, $8, $pop107
+	i32.load	$push28=, 4($4)
+	i32.load	$push27=, 4($9)
+	i32.ge_u	$push29=, $pop28, $pop27
+	br_if   	0, $pop29       # 0: down to label24
+# BB#35:                                # %if.then.i57
+                                        #   in Loop: Header=BB0_34 Depth=2
+	i32.const	$push111=, 32
+	i32.add 	$push32=, $8, $pop111
+	i32.store	0($pop32), $4
+	i32.const	$push110=, 32
+	i32.add 	$push33=, $4, $pop110
 	i32.load	$10=, 0($pop33)
-	copy_local	$9=, $3
-	copy_local	$7=, $8
-.LBB0_36:                               # %if.end.i65
-                                        #   in Loop: Header=BB0_33 Depth=2
-	end_block                       # label22:
-	i32.const	$push110=, 0
-	i32.load	$push36=, 0($2)
-	i32.load	$push37=, 0($pop36)
-	i32.store	vx($pop110), $pop37
-	i32.const	$push109=, 0
-	i32.ne  	$6=, $9, $pop109
-	i32.eqz 	$push125=, $9
-	br_if   	2, $pop125      # 2: down to label19
-# BB#37:                                # %if.end.i65
-                                        #   in Loop: Header=BB0_33 Depth=2
-	copy_local	$8=, $10
-	copy_local	$3=, $9
-	br_if   	0, $10          # 0: up to label21
-	br      	2               # 2: down to label19
-.LBB0_38:                               #   in Loop: Header=BB0_30 Depth=1
+	copy_local	$11=, $9
+	copy_local	$8=, $4
+	br      	1               # 1: down to label23
+.LBB0_36:                               # %if.else.i59
+                                        #   in Loop: Header=BB0_34 Depth=2
+	end_block                       # label24:
+	i32.const	$push113=, 32
+	i32.add 	$push30=, $8, $pop113
+	i32.store	0($pop30), $9
+	i32.const	$push112=, 32
+	i32.add 	$push31=, $9, $pop112
+	i32.load	$11=, 0($pop31)
+	copy_local	$10=, $4
+	copy_local	$8=, $9
+.LBB0_37:                               # %if.end.i66
+                                        #   in Loop: Header=BB0_34 Depth=2
+	end_block                       # label23:
+	block   	
+	i32.const	$push115=, 0
+	i32.const	$push50=, 112
+	i32.add 	$push51=, $1, $pop50
+	i32.const	$push114=, 32
+	i32.add 	$push34=, $pop51, $pop114
+	i32.load	$push35=, 0($pop34)
+	i32.load	$push36=, 0($pop35)
+	i32.store	vx($pop115), $pop36
+	i32.eqz 	$push131=, $10
+	br_if   	0, $pop131      # 0: down to label25
+# BB#38:                                # %if.end.i66
+                                        #   in Loop: Header=BB0_34 Depth=2
+	copy_local	$9=, $11
+	copy_local	$4=, $10
+	br_if   	1, $11          # 1: up to label22
+.LBB0_39:                               # %while.end.loopexit.i68
+                                        #   in Loop: Header=BB0_31 Depth=1
+	end_block                       # label25:
 	end_loop
+	i32.const	$push117=, 0
+	i32.ne  	$2=, $10, $pop117
+	i32.const	$push116=, 32
+	i32.add 	$8=, $8, $pop116
+	br      	1               # 1: down to label20
+.LBB0_40:                               #   in Loop: Header=BB0_31 Depth=1
+	end_block                       # label21:
+	copy_local	$8=, $5
+	copy_local	$10=, $4
+	copy_local	$11=, $9
+.LBB0_41:                               # %merge_pagelist.exit74
+                                        #   in Loop: Header=BB0_31 Depth=1
 	end_block                       # label20:
-	copy_local	$9=, $3
-	copy_local	$10=, $8
-.LBB0_39:                               # %merge_pagelist.exit72
-                                        #   in Loop: Header=BB0_30 Depth=1
-	end_block                       # label19:
-	i32.const	$push115=, 32
-	i32.add 	$push39=, $7, $pop115
-	i32.select	$push38=, $9, $10, $6
-	i32.store	0($pop39), $pop38
-	i32.load	$3=, 0($2)
-	i32.const	$push114=, 1
-	i32.add 	$push113=, $4, $pop114
-	tee_local	$push112=, $4=, $pop113
-	i32.const	$push111=, 25
-	i32.ne  	$push40=, $pop112, $pop111
-	br_if   	0, $pop40       # 0: up to label18
-# BB#40:                                # %for.end22
+	i32.select	$push37=, $10, $11, $2
+	i32.store	0($8), $pop37
+	i32.load	$4=, 0($5)
+	i32.const	$push121=, 1
+	i32.add 	$push120=, $7, $pop121
+	tee_local	$push119=, $7=, $pop120
+	i32.const	$push118=, 25
+	i32.ne  	$push38=, $pop119, $pop118
+	br_if   	0, $pop38       # 0: up to label19
+# BB#42:                                # %for.end22
 	end_loop
-	i32.const	$push47=, 0
-	i32.const	$push45=, 160
-	i32.add 	$push46=, $1, $pop45
-	i32.store	__stack_pointer($pop47), $pop46
-	copy_local	$push126=, $3
-                                        # fallthrough-return: $pop126
+	i32.const	$push45=, 0
+	i32.const	$push43=, 160
+	i32.add 	$push44=, $1, $pop43
+	i32.store	__stack_pointer($pop45), $pop44
+	copy_local	$push132=, $4
+                                        # fallthrough-return: $pop132
 	.endfunc
 .Lfunc_end0:
 	.size	sort_pagelist, .Lfunc_end0-sort_pagelist
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -383,10 +404,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push30=, 0
-	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 224
-	i32.sub 	$push39=, $pop28, $pop29
+	i32.sub 	$push39=, $pop27, $pop29
 	tee_local	$push38=, $1=, $pop39
 	i32.store	__stack_pointer($pop30), $pop38
 	i32.const	$push2=, 32
@@ -416,12 +437,12 @@ main:                                   # @main
 	i32.add 	$push19=, $1, $pop18
 	i32.const	$push20=, 3
 	i32.store	0($pop19), $pop20
-	i32.const	$push21=, 5
-	i32.store	4($1), $pop21
-	i32.const	$push22=, 164
-	i32.add 	$push23=, $1, $pop22
+	i32.const	$push21=, 164
+	i32.add 	$push22=, $1, $pop21
 	i32.const	$push37=, 0
-	i32.store	0($pop23), $pop37
+	i32.store	0($pop22), $pop37
+	i32.const	$push23=, 5
+	i32.store	4($1), $pop23
 	block   	
 	i32.call	$push36=, sort_pagelist@FUNCTION, $1
 	tee_local	$push35=, $0=, $pop36
@@ -429,7 +450,7 @@ main:                                   # @main
 	i32.add 	$push24=, $0, $pop34
 	i32.load	$push25=, 0($pop24)
 	i32.eq  	$push26=, $pop35, $pop25
-	br_if   	0, $pop26       # 0: down to label24
+	br_if   	0, $pop26       # 0: down to label26
 # BB#1:                                 # %if.end
 	i32.const	$push33=, 0
 	i32.const	$push31=, 224
@@ -438,13 +459,13 @@ main:                                   # @main
 	i32.const	$push40=, 0
 	return  	$pop40
 .LBB1_2:                                # %if.then
-	end_block                       # label24:
+	end_block                       # label26:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	xx                      # @xx
 	.type	xx,@object
 	.section	.bss.xx,"aw",@nobits
@@ -464,5 +485,5 @@ vx:
 	.size	vx, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33870.c.s b/test/torture-s/pr33870.c.s
index 9039f0256..bad2b18a0 100644
--- a/test/torture-s/pr33870.c.s
+++ b/test/torture-s/pr33870.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33870.c"
+	.file	"pr33870.c"
 	.section	.text.sort_pagelist,"ax",@progbits
-	.hidden	sort_pagelist
+	.hidden	sort_pagelist           # -- Begin function sort_pagelist
 	.globl	sort_pagelist
 	.type	sort_pagelist,@function
 sort_pagelist:                          # @sort_pagelist
@@ -9,374 +9,353 @@ sort_pagelist:                          # @sort_pagelist
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push25=, 0
-	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
-	i32.const	$push24=, 144
-	i32.sub 	$push47=, $pop23, $pop24
-	tee_local	$push46=, $10=, $pop47
-	i32.store	__stack_pointer($pop25), $pop46
-	i32.const	$4=, 0
-	i32.const	$push45=, 0
+	i32.const	$push28=, 0
+	i32.const	$push26=, 0
+	i32.load	$push25=, __stack_pointer($pop26)
+	i32.const	$push27=, 144
+	i32.sub 	$push48=, $pop25, $pop27
+	tee_local	$push47=, $3=, $pop48
+	i32.store	__stack_pointer($pop28), $pop47
+	i32.const	$push46=, 0
 	i32.const	$push0=, 100
-	i32.call	$1=, memset@FUNCTION, $10, $pop45, $pop0
+	i32.call	$1=, memset@FUNCTION, $3, $pop46, $pop0
+	i32.const	$3=, 0
 	block   	
 	i32.eqz 	$push99=, $0
 	br_if   	0, $pop99       # 0: down to label0
 # BB#1:                                 # %while.body.lr.ph
-	i32.const	$push35=, 104
-	i32.add 	$push36=, $1, $pop35
-	i32.const	$push48=, 28
-	i32.add 	$5=, $pop36, $pop48
+	i32.const	$push36=, 104
+	i32.add 	$push37=, $1, $pop36
+	i32.const	$push49=, 28
+	i32.add 	$2=, $pop37, $pop49
 	i32.const	$push8=, 96
-	i32.add 	$6=, $1, $pop8
+	i32.add 	$5=, $1, $pop8
 .LBB0_2:                                # %while.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_3 Depth 2
                                         #       Child Loop BB0_6 Depth 3
-                                        #         Child Loop BB0_7 Depth 4
-                                        #     Child Loop BB0_17 Depth 2
-                                        #       Child Loop BB0_18 Depth 3
+                                        #     Child Loop BB0_18 Depth 2
 	loop    	                # label1:
-	copy_local	$push51=, $0
-	tee_local	$push50=, $8=, $pop51
-	i32.load	$0=, 28($pop50)
-	i32.const	$push49=, 0
-	i32.store	28($8), $pop49
-	i32.const	$7=, 0
+	copy_local	$push52=, $0
+	tee_local	$push51=, $3=, $pop52
+	i32.load	$0=, 28($pop51)
+	i32.const	$push50=, 0
+	i32.store	28($3), $pop50
+	i32.const	$6=, 0
 .LBB0_3:                                # %for.body
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB0_6 Depth 3
-                                        #         Child Loop BB0_7 Depth 4
-	block   	
-	block   	
 	block   	
 	block   	
 	block   	
 	block   	
 	block   	
-	loop    	                # label9:
-	i32.const	$push56=, 2
-	i32.shl 	$push1=, $7, $pop56
-	i32.add 	$push55=, $1, $pop1
-	tee_local	$push54=, $2=, $pop55
-	i32.load	$push53=, 0($pop54)
-	tee_local	$push52=, $10=, $pop53
-	i32.eqz 	$push100=, $pop52
-	br_if   	1, $pop100      # 1: down to label8
+	loop    	                # label7:
+	i32.const	$push57=, 2
+	i32.shl 	$push1=, $6, $pop57
+	i32.add 	$push56=, $1, $pop1
+	tee_local	$push55=, $4=, $pop56
+	i32.load	$push54=, 0($pop55)
+	tee_local	$push53=, $9=, $pop54
+	i32.eqz 	$push100=, $pop53
+	br_if   	1, $pop100      # 1: down to label6
 # BB#4:                                 # %if.else
                                         #   in Loop: Header=BB0_3 Depth=2
 	block   	
 	block   	
-	i32.eqz 	$push101=, $8
-	br_if   	0, $pop101      # 0: down to label11
-# BB#5:                                 # %while.body.lr.ph.i.preheader
+	block   	
+	i32.eqz 	$push101=, $3
+	br_if   	0, $pop101      # 0: down to label10
+# BB#5:                                 # %while.body.i.preheader
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push43=, 104
-	i32.add 	$push44=, $1, $pop43
-	copy_local	$9=, $pop44
-	copy_local	$3=, $10
-.LBB0_6:                                # %while.body.lr.ph.i
+	i32.const	$push44=, 104
+	i32.add 	$push45=, $1, $pop44
+	copy_local	$7=, $pop45
+	copy_local	$8=, $9
+.LBB0_6:                                # %while.body.i
                                         #   Parent Loop BB0_2 Depth=1
                                         #     Parent Loop BB0_3 Depth=2
-                                        # =>    This Loop Header: Depth=3
-                                        #         Child Loop BB0_7 Depth 4
+                                        # =>    This Inner Loop Header: Depth=3
+	block   	
 	loop    	                # label12:
-	copy_local	$push58=, $3
-	tee_local	$push57=, $3=, $pop58
-	i32.load	$4=, 0($pop57)
-.LBB0_7:                                # %while.body.i
-                                        #   Parent Loop BB0_2 Depth=1
-                                        #     Parent Loop BB0_3 Depth=2
-                                        #       Parent Loop BB0_6 Depth=3
-                                        # =>      This Inner Loop Header: Depth=4
 	block   	
 	block   	
-	loop    	                # label15:
-	copy_local	$push60=, $8
-	tee_local	$push59=, $10=, $pop60
-	i32.load	$push2=, 0($pop59)
-	i32.lt_u	$push3=, $4, $pop2
-	br_if   	1, $pop3        # 1: down to label14
-# BB#8:                                 # %if.else.i
-                                        #   in Loop: Header=BB0_7 Depth=4
-	i32.const	$push63=, 28
-	i32.add 	$push4=, $9, $pop63
-	i32.store	0($pop4), $10
-	copy_local	$9=, $10
-	i32.load	$push62=, 28($10)
-	tee_local	$push61=, $8=, $pop62
-	br_if   	0, $pop61       # 0: up to label15
-	br      	2               # 2: down to label13
-.LBB0_9:                                # %if.then.i
+	i32.load	$push3=, 0($8)
+	i32.load	$push2=, 0($3)
+	i32.ge_u	$push4=, $pop3, $pop2
+	br_if   	0, $pop4        # 0: down to label14
+# BB#7:                                 # %if.then.i
+                                        #   in Loop: Header=BB0_6 Depth=3
+	i32.const	$push60=, 28
+	i32.add 	$push6=, $7, $pop60
+	i32.store	0($pop6), $8
+	copy_local	$10=, $3
+	copy_local	$7=, $8
+	i32.load	$push59=, 28($8)
+	tee_local	$push58=, $9=, $pop59
+	br_if   	1, $pop58       # 1: down to label13
+	br      	3               # 3: down to label11
+.LBB0_8:                                # %if.else.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	end_loop
 	end_block                       # label14:
-	i32.const	$push66=, 28
-	i32.add 	$push5=, $9, $pop66
+	i32.const	$push63=, 28
+	i32.add 	$push5=, $7, $pop63
 	i32.store	0($pop5), $3
-	copy_local	$9=, $3
-	copy_local	$8=, $10
-	copy_local	$4=, $3
-	i32.load	$push65=, 28($3)
-	tee_local	$push64=, $3=, $pop65
-	br_if   	1, $pop64       # 1: up to label12
-	br      	3               # 3: down to label10
-.LBB0_10:                               #   in Loop: Header=BB0_3 Depth=2
+	i32.load	$10=, 28($3)
+	copy_local	$7=, $3
+	copy_local	$push62=, $8
+	tee_local	$push61=, $9=, $pop62
+	i32.eqz 	$push102=, $pop61
+	br_if   	2, $pop102      # 2: down to label11
+.LBB0_9:                                # %if.end.i
+                                        #   in Loop: Header=BB0_6 Depth=3
 	end_block                       # label13:
+	copy_local	$3=, $10
+	copy_local	$8=, $9
+	br_if   	0, $10          # 0: up to label12
+.LBB0_10:                               # %merge_pagelist.exit
+                                        #   in Loop: Header=BB0_3 Depth=2
 	end_loop
-	copy_local	$4=, $10
-	copy_local	$10=, $3
-	br      	1               # 1: down to label10
-.LBB0_11:                               #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label11:
-	i32.const	$push37=, 104
-	i32.add 	$push38=, $1, $pop37
-	copy_local	$4=, $pop38
-.LBB0_12:                               # %merge_pagelist.exit
-                                        #   in Loop: Header=BB0_3 Depth=2
+	br_if   	1, $9           # 1: down to label9
+	br      	2               # 2: down to label8
+.LBB0_11:                               #   in Loop: Header=BB0_3 Depth=2
 	end_block                       # label10:
-	i32.store	28($4), $10
-	i32.load	$8=, 0($5)
-	i32.const	$push71=, 0
-	i32.store	0($2), $pop71
-	i32.const	$push70=, 1
-	i32.add 	$push69=, $7, $pop70
-	tee_local	$push68=, $7=, $pop69
-	i32.const	$push67=, 24
-	i32.lt_s	$push6=, $pop68, $pop67
-	br_if   	0, $pop6        # 0: up to label9
-# BB#13:                                # %for.end
+	i32.const	$push38=, 104
+	i32.add 	$push39=, $1, $pop38
+	copy_local	$7=, $pop39
+.LBB0_12:                               # %merge_pagelist.exit.thread
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label9:
+	copy_local	$10=, $9
+.LBB0_13:                               # %for.cond
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label8:
+	i32.store	28($7), $10
+	i32.const	$push40=, 104
+	i32.add 	$push41=, $1, $pop40
+	i32.const	$push71=, 28
+	i32.add 	$push70=, $pop41, $pop71
+	tee_local	$push69=, $9=, $pop70
+	i32.load	$3=, 0($pop69)
+	i32.const	$push68=, 0
+	i32.store	0($4), $pop68
+	i32.const	$push67=, 23
+	i32.lt_u	$8=, $6, $pop67
+	i32.const	$push66=, 1
+	i32.add 	$push65=, $6, $pop66
+	tee_local	$push64=, $10=, $pop65
+	copy_local	$6=, $pop64
+	br_if   	0, $8           # 0: up to label7
+# BB#14:                                # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
 	i32.const	$push72=, 24
-	i32.ne  	$push7=, $7, $pop72
-	br_if   	5, $pop7        # 5: down to label3
-# BB#14:                                # %if.then7
-                                        #   in Loop: Header=BB0_2 Depth=1
-	i32.load	$4=, 0($6)
-	i32.eqz 	$push102=, $8
-	br_if   	1, $pop102      # 1: down to label7
+	i32.ne  	$push7=, $10, $pop72
+	br_if   	1, $pop7        # 1: down to label5
 # BB#15:                                # %if.then7
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.eqz 	$push103=, $4
-	br_if   	1, $pop103      # 1: down to label7
-# BB#16:                                # %while.body.lr.ph.i79.preheader
+	i32.load	$push75=, 0($5)
+	tee_local	$push74=, $8=, $pop75
+	i32.const	$push73=, 0
+	i32.ne  	$4=, $pop74, $pop73
+	i32.eqz 	$push103=, $3
+	br_if   	2, $pop103      # 2: down to label4
+# BB#16:                                # %if.then7
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push39=, 104
-	i32.add 	$push40=, $1, $pop39
-	copy_local	$9=, $pop40
-.LBB0_17:                               # %while.body.lr.ph.i79
+	i32.eqz 	$push104=, $8
+	br_if   	2, $pop104      # 2: down to label4
+# BB#17:                                # %while.body.i81.preheader
+                                        #   in Loop: Header=BB0_2 Depth=1
+	i32.const	$push42=, 104
+	i32.add 	$push43=, $1, $pop42
+	copy_local	$6=, $pop43
+.LBB0_18:                               # %while.body.i81
                                         #   Parent Loop BB0_2 Depth=1
-                                        # =>  This Loop Header: Depth=2
-                                        #       Child Loop BB0_18 Depth 3
+                                        # =>  This Inner Loop Header: Depth=2
+	block   	
 	loop    	                # label16:
-	copy_local	$push74=, $4
-	tee_local	$push73=, $3=, $pop74
-	i32.load	$4=, 0($pop73)
-.LBB0_18:                               # %while.body.i85
-                                        #   Parent Loop BB0_2 Depth=1
-                                        #     Parent Loop BB0_17 Depth=2
-                                        # =>    This Inner Loop Header: Depth=3
 	block   	
-	loop    	                # label18:
-	copy_local	$push76=, $8
-	tee_local	$push75=, $10=, $pop76
-	i32.load	$push9=, 0($pop75)
-	i32.lt_u	$push10=, $4, $pop9
-	br_if   	1, $pop10       # 1: down to label17
-# BB#19:                                # %if.else.i91
-                                        #   in Loop: Header=BB0_18 Depth=3
-	i32.const	$push79=, 28
-	i32.add 	$push11=, $9, $pop79
-	i32.store	0($pop11), $10
-	copy_local	$9=, $10
-	i32.load	$push78=, 28($10)
-	tee_local	$push77=, $8=, $pop78
-	br_if   	0, $pop77       # 0: up to label18
-	br      	5               # 5: down to label6
-.LBB0_20:                               # %if.then.i88
-                                        #   in Loop: Header=BB0_17 Depth=2
-	end_loop
-	end_block                       # label17:
-	i32.const	$push82=, 28
-	i32.add 	$push12=, $9, $pop82
+	block   	
+	i32.load	$push10=, 0($8)
+	i32.load	$push9=, 0($3)
+	i32.ge_u	$push11=, $pop10, $pop9
+	br_if   	0, $pop11       # 0: down to label18
+# BB#19:                                # %if.then.i83
+                                        #   in Loop: Header=BB0_18 Depth=2
+	i32.const	$push78=, 28
+	i32.add 	$push13=, $6, $pop78
+	i32.store	0($pop13), $8
+	copy_local	$10=, $3
+	copy_local	$6=, $8
+	i32.load	$push77=, 28($8)
+	tee_local	$push76=, $7=, $pop77
+	br_if   	1, $pop76       # 1: down to label17
+	br      	3               # 3: down to label15
+.LBB0_20:                               # %if.else.i85
+                                        #   in Loop: Header=BB0_18 Depth=2
+	end_block                       # label18:
+	i32.const	$push81=, 28
+	i32.add 	$push12=, $6, $pop81
 	i32.store	0($pop12), $3
-	copy_local	$9=, $3
-	copy_local	$8=, $10
-	i32.load	$push81=, 28($3)
-	tee_local	$push80=, $4=, $pop81
-	br_if   	0, $pop80       # 0: up to label16
-	br      	5               # 5: down to label4
-.LBB0_21:                               # %for.end.thread
+	i32.load	$10=, 28($3)
+	copy_local	$6=, $3
+	copy_local	$push80=, $8
+	tee_local	$push79=, $7=, $pop80
+	i32.eqz 	$push105=, $pop79
+	br_if   	2, $pop105      # 2: down to label15
+.LBB0_21:                               # %if.end.i91
+                                        #   in Loop: Header=BB0_18 Depth=2
+	end_block                       # label17:
+	copy_local	$3=, $10
+	copy_local	$8=, $7
+	br_if   	0, $10          # 0: up to label16
+.LBB0_22:                               # %merge_pagelist.exit99.loopexit
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
-	end_block                       # label8:
-	i32.store	0($2), $8
-	br_if   	6, $0           # 6: up to label1
-	br      	5               # 5: down to label2
-.LBB0_22:                               # %while.end.i96
+	end_block                       # label15:
+	i32.const	$push83=, 0
+	i32.ne  	$4=, $7, $pop83
+	i32.const	$push82=, 28
+	i32.add 	$6=, $6, $pop82
+	br      	3               # 3: down to label3
+.LBB0_23:                               # %for.end.thread
                                         #   in Loop: Header=BB0_2 Depth=1
-	end_block                       # label7:
-	i32.const	$push41=, 104
-	i32.add 	$push42=, $1, $pop41
-	copy_local	$3=, $pop42
-	block   	
-	br_if   	0, $4           # 0: down to label19
-# BB#23:                                #   in Loop: Header=BB0_2 Depth=1
-	copy_local	$10=, $8
-	br      	3               # 3: down to label4
-.LBB0_24:                               #   in Loop: Header=BB0_2 Depth=1
-	end_block                       # label19:
-	copy_local	$8=, $3
-	copy_local	$10=, $4
-	br      	1               # 1: down to label5
-.LBB0_25:                               #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label6:
-	copy_local	$8=, $10
-	copy_local	$10=, $3
-.LBB0_26:                               # %while.end.thread.i99
+	i32.store	0($4), $3
+.LBB0_24:                               # %if.end11
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label5:
-	copy_local	$3=, $8
-.LBB0_27:                               # %merge_pagelist.exit103
-                                        #   in Loop: Header=BB0_2 Depth=1
+	br_if   	3, $0           # 3: up to label1
+	br      	2               # 2: down to label2
+.LBB0_25:                               #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
-	i32.store	28($3), $10
-	i32.load	$push13=, 0($5)
-	i32.store	0($6), $pop13
-.LBB0_28:                               # %while.cond.backedge
+	copy_local	$6=, $2
+	copy_local	$7=, $8
+	copy_local	$10=, $3
+.LBB0_26:                               # %merge_pagelist.exit99
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
+	i32.select	$push14=, $7, $10, $4
+	i32.store	0($6), $pop14
+	i32.load	$push15=, 0($9)
+	i32.store	0($5), $pop15
 	br_if   	1, $0           # 1: up to label1
-.LBB0_29:                               # %while.end.loopexit
+.LBB0_27:                               # %while.end.loopexit
 	end_block                       # label2:
 	end_loop
-	i32.load	$4=, 0($1)
-.LBB0_30:                               # %while.end
+	i32.load	$3=, 0($1)
+.LBB0_28:                               # %while.end
 	end_block                       # label0:
-	i32.const	$7=, 1
-.LBB0_31:                               # %for.body15
+	i32.const	$push32=, 104
+	i32.add 	$push33=, $1, $pop32
+	i32.const	$push84=, 28
+	i32.add 	$0=, $pop33, $pop84
+	i32.const	$6=, 1
+.LBB0_29:                               # %for.body15
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB0_34 Depth 2
-                                        #       Child Loop BB0_35 Depth 3
-	loop    	                # label20:
-	i32.const	$push83=, 2
-	i32.shl 	$push14=, $7, $pop83
-	i32.add 	$push15=, $1, $pop14
-	i32.load	$8=, 0($pop15)
+                                        #     Child Loop BB0_32 Depth 2
+	loop    	                # label19:
+	i32.const	$push86=, 0
+	i32.ne  	$4=, $3, $pop86
+	i32.const	$push85=, 2
+	i32.shl 	$push16=, $6, $pop85
+	i32.add 	$push17=, $1, $pop16
+	i32.load	$8=, 0($pop17)
 	block   	
 	block   	
+	i32.eqz 	$push106=, $3
+	br_if   	0, $pop106      # 0: down to label21
+# BB#30:                                # %for.body15
+                                        #   in Loop: Header=BB0_29 Depth=1
+	i32.eqz 	$push107=, $8
+	br_if   	0, $pop107      # 0: down to label21
+# BB#31:                                # %while.body.i51.preheader
+                                        #   in Loop: Header=BB0_29 Depth=1
+	i32.const	$push34=, 104
+	i32.add 	$push35=, $1, $pop34
+	copy_local	$7=, $pop35
+.LBB0_32:                               # %while.body.i51
+                                        #   Parent Loop BB0_29 Depth=1
+                                        # =>  This Inner Loop Header: Depth=2
 	block   	
+	loop    	                # label23:
 	block   	
-	i32.eqz 	$push104=, $4
-	br_if   	0, $pop104      # 0: down to label24
-# BB#32:                                # %for.body15
-                                        #   in Loop: Header=BB0_31 Depth=1
-	i32.eqz 	$push105=, $8
-	br_if   	0, $pop105      # 0: down to label24
-# BB#33:                                # %while.body.lr.ph.i47.preheader
-                                        #   in Loop: Header=BB0_31 Depth=1
-	i32.const	$push29=, 104
-	i32.add 	$push30=, $1, $pop29
-	copy_local	$9=, $pop30
-.LBB0_34:                               # %while.body.lr.ph.i47
-                                        #   Parent Loop BB0_31 Depth=1
-                                        # =>  This Loop Header: Depth=2
-                                        #       Child Loop BB0_35 Depth 3
-	loop    	                # label25:
-	copy_local	$push85=, $4
-	tee_local	$push84=, $3=, $pop85
-	i32.load	$4=, 0($pop84)
-.LBB0_35:                               # %while.body.i53
-                                        #   Parent Loop BB0_31 Depth=1
-                                        #     Parent Loop BB0_34 Depth=2
-                                        # =>    This Inner Loop Header: Depth=3
-	block   	
-	loop    	                # label27:
-	copy_local	$push87=, $8
-	tee_local	$push86=, $10=, $pop87
-	i32.load	$push16=, 0($pop86)
-	i32.lt_u	$push17=, $4, $pop16
-	br_if   	1, $pop17       # 1: down to label26
-# BB#36:                                # %if.else.i59
-                                        #   in Loop: Header=BB0_35 Depth=3
-	i32.const	$push90=, 28
-	i32.add 	$push18=, $9, $pop90
-	i32.store	0($pop18), $10
-	copy_local	$9=, $10
-	i32.load	$push89=, 28($10)
-	tee_local	$push88=, $8=, $pop89
-	br_if   	0, $pop88       # 0: up to label27
-	br      	4               # 4: down to label23
-.LBB0_37:                               # %if.then.i56
-                                        #   in Loop: Header=BB0_34 Depth=2
-	end_loop
-	end_block                       # label26:
-	i32.const	$push93=, 28
-	i32.add 	$push19=, $9, $pop93
-	i32.store	0($pop19), $3
-	copy_local	$9=, $3
-	copy_local	$8=, $10
-	i32.load	$push92=, 28($3)
-	tee_local	$push91=, $4=, $pop92
-	br_if   	0, $pop91       # 0: up to label25
-	br      	4               # 4: down to label21
-.LBB0_38:                               # %while.end.i64
-                                        #   in Loop: Header=BB0_31 Depth=1
-	end_loop
-	end_block                       # label24:
-	i32.const	$push33=, 104
-	i32.add 	$push34=, $1, $pop33
-	copy_local	$3=, $pop34
 	block   	
-	br_if   	0, $4           # 0: down to label28
-# BB#39:                                #   in Loop: Header=BB0_31 Depth=1
+	i32.load	$push19=, 0($3)
+	i32.load	$push18=, 0($8)
+	i32.ge_u	$push20=, $pop19, $pop18
+	br_if   	0, $pop20       # 0: down to label25
+# BB#33:                                # %if.then.i53
+                                        #   in Loop: Header=BB0_32 Depth=2
+	i32.const	$push89=, 28
+	i32.add 	$push22=, $7, $pop89
+	i32.store	0($pop22), $3
 	copy_local	$10=, $8
-	br      	3               # 3: down to label21
-.LBB0_40:                               #   in Loop: Header=BB0_31 Depth=1
-	end_block                       # label28:
-	copy_local	$8=, $3
-	copy_local	$10=, $4
-	br      	1               # 1: down to label22
-.LBB0_41:                               #   in Loop: Header=BB0_31 Depth=1
-	end_block                       # label23:
+	copy_local	$7=, $3
+	i32.load	$push88=, 28($3)
+	tee_local	$push87=, $9=, $pop88
+	br_if   	1, $pop87       # 1: down to label24
+	br      	3               # 3: down to label22
+.LBB0_34:                               # %if.else.i55
+                                        #   in Loop: Header=BB0_32 Depth=2
+	end_block                       # label25:
+	i32.const	$push92=, 28
+	i32.add 	$push21=, $7, $pop92
+	i32.store	0($pop21), $8
+	i32.load	$10=, 28($8)
+	copy_local	$7=, $8
+	copy_local	$push91=, $3
+	tee_local	$push90=, $9=, $pop91
+	i32.eqz 	$push108=, $pop90
+	br_if   	2, $pop108      # 2: down to label22
+.LBB0_35:                               # %if.end.i61
+                                        #   in Loop: Header=BB0_32 Depth=2
+	end_block                       # label24:
 	copy_local	$8=, $10
-	copy_local	$10=, $3
-.LBB0_42:                               # %while.end.thread.i67
-                                        #   in Loop: Header=BB0_31 Depth=1
+	copy_local	$3=, $9
+	br_if   	0, $10          # 0: up to label23
+.LBB0_36:                               # %merge_pagelist.exit69.loopexit
+                                        #   in Loop: Header=BB0_29 Depth=1
+	end_loop
 	end_block                       # label22:
-	copy_local	$3=, $8
-.LBB0_43:                               # %merge_pagelist.exit71
-                                        #   in Loop: Header=BB0_31 Depth=1
+	i32.const	$push94=, 0
+	i32.ne  	$4=, $9, $pop94
+	i32.const	$push93=, 28
+	i32.add 	$7=, $7, $pop93
+	br      	1               # 1: down to label20
+.LBB0_37:                               #   in Loop: Header=BB0_29 Depth=1
 	end_block                       # label21:
-	i32.store	28($3), $10
-	i32.const	$push31=, 104
-	i32.add 	$push32=, $1, $pop31
-	i32.const	$push98=, 28
-	i32.add 	$push21=, $pop32, $pop98
-	i32.load	$4=, 0($pop21)
-	i32.const	$push97=, 1
-	i32.add 	$push96=, $7, $pop97
-	tee_local	$push95=, $7=, $pop96
-	i32.const	$push94=, 25
-	i32.ne  	$push20=, $pop95, $pop94
-	br_if   	0, $pop20       # 0: up to label20
-# BB#44:                                # %for.end20
+	copy_local	$7=, $0
+	copy_local	$9=, $3
+	copy_local	$10=, $8
+.LBB0_38:                               # %merge_pagelist.exit69
+                                        #   in Loop: Header=BB0_29 Depth=1
+	end_block                       # label20:
+	i32.select	$push23=, $9, $10, $4
+	i32.store	0($7), $pop23
+	i32.load	$3=, 0($0)
+	i32.const	$push98=, 1
+	i32.add 	$push97=, $6, $pop98
+	tee_local	$push96=, $6=, $pop97
+	i32.const	$push95=, 25
+	i32.ne  	$push24=, $pop96, $pop95
+	br_if   	0, $pop24       # 0: up to label19
+# BB#39:                                # %for.end20
 	end_loop
-	i32.const	$push28=, 0
-	i32.const	$push26=, 144
-	i32.add 	$push27=, $1, $pop26
-	i32.store	__stack_pointer($pop28), $pop27
-	copy_local	$push106=, $4
-                                        # fallthrough-return: $pop106
+	i32.const	$push31=, 0
+	i32.const	$push29=, 144
+	i32.add 	$push30=, $1, $pop29
+	i32.store	__stack_pointer($pop31), $pop30
+	copy_local	$push109=, $3
+                                        # fallthrough-return: $pop109
 	.endfunc
 .Lfunc_end0:
 	.size	sort_pagelist, .Lfunc_end0-sort_pagelist
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -384,10 +363,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push21=, 0
-	i32.const	$push18=, 0
-	i32.load	$push19=, __stack_pointer($pop18)
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
 	i32.const	$push20=, 208
-	i32.sub 	$push29=, $pop19, $pop20
+	i32.sub 	$push29=, $pop18, $pop20
 	tee_local	$push28=, $1=, $pop29
 	i32.store	__stack_pointer($pop21), $pop28
 	i32.const	$push2=, 68
@@ -400,27 +379,27 @@ main:                                   # @main
 	i32.const	$push4=, 120
 	i32.add 	$push5=, $1, $pop4
 	i32.store	0($pop7), $pop5
-	i32.const	$push8=, 5
-	i32.store	0($1), $pop8
-	i32.const	$push9=, 4
-	i32.store	40($1), $pop9
-	i32.const	$push10=, 1
-	i32.store	80($1), $pop10
-	i32.const	$push11=, 3
-	i32.store	120($1), $pop11
-	i32.const	$push12=, 40
-	i32.add 	$push13=, $1, $pop12
-	i32.store	28($1), $pop13
-	i32.const	$push14=, 148
-	i32.add 	$push15=, $1, $pop14
+	i32.const	$push8=, 148
+	i32.add 	$push9=, $1, $pop8
 	i32.const	$push27=, 0
-	i32.store	0($pop15), $pop27
+	i32.store	0($pop9), $pop27
+	i32.const	$push10=, 5
+	i32.store	0($1), $pop10
+	i32.const	$push11=, 4
+	i32.store	40($1), $pop11
+	i32.const	$push12=, 1
+	i32.store	80($1), $pop12
+	i32.const	$push13=, 3
+	i32.store	120($1), $pop13
+	i32.const	$push14=, 40
+	i32.add 	$push15=, $1, $pop14
+	i32.store	28($1), $pop15
 	block   	
 	i32.call	$push26=, sort_pagelist@FUNCTION, $1
 	tee_local	$push25=, $0=, $pop26
 	i32.load	$push16=, 28($0)
 	i32.eq  	$push17=, $pop25, $pop16
-	br_if   	0, $pop17       # 0: down to label29
+	br_if   	0, $pop17       # 0: down to label26
 # BB#1:                                 # %if.end
 	i32.const	$push24=, 0
 	i32.const	$push22=, 208
@@ -429,13 +408,13 @@ main:                                   # @main
 	i32.const	$push30=, 0
 	return  	$pop30
 .LBB1_2:                                # %if.then
-	end_block                       # label29:
+	end_block                       # label26:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33992.c.s b/test/torture-s/pr33992.c.s
index 2ae74eea5..41eb0e077 100644
--- a/test/torture-s/pr33992.c.s
+++ b/test/torture-s/pr33992.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr33992.c"
+	.file	"pr33992.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -20,9 +20,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.do_test,"ax",@progbits
-	.hidden	do_test
+	.hidden	do_test                 # -- Begin function do_test
 	.globl	do_test
 	.type	do_test,@function
 do_test:                                # @do_test
@@ -79,9 +79,9 @@ do_test:                                # @do_test
 	.endfunc
 .Lfunc_end1:
 	.size	do_test, .Lfunc_end1-do_test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -89,10 +89,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop3, $pop4
+	i32.sub 	$push12=, $pop2, $pop4
 	tee_local	$push11=, $0=, $pop12
 	i32.store	__stack_pointer($pop5), $pop11
 	i64.const	$push0=, -9223372036854775807
@@ -109,7 +109,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34070-1.c.s b/test/torture-s/pr34070-1.c.s
index 4f0484a19..a30e6feff 100644
--- a/test/torture-s/pr34070-1.c.s
+++ b/test/torture-s/pr34070-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34070-1.c"
+	.file	"pr34070-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34070-2.c.s b/test/torture-s/pr34070-2.c.s
index 926cb6770..35a52b1be 100644
--- a/test/torture-s/pr34070-2.c.s
+++ b/test/torture-s/pr34070-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34070-2.c"
+	.file	"pr34070-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,9 +15,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,6 +28,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34099-2.c.s b/test/torture-s/pr34099-2.c.s
index eeebd77ae..e67c3cdeb 100644
--- a/test/torture-s/pr34099-2.c.s
+++ b/test/torture-s/pr34099-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34099-2.c"
+	.file	"pr34099-2.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -13,9 +13,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -27,9 +27,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -41,9 +41,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -57,9 +57,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,6 +70,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34099.c.s b/test/torture-s/pr34099.c.s
index 2d0cdd85e..574610183 100644
--- a/test/torture-s/pr34099.c.s
+++ b/test/torture-s/pr34099.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34099.c"
+	.file	"pr34099.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,6 +26,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34130.c.s b/test/torture-s/pr34130.c.s
index 41e8e023a..27777c678 100644
--- a/test/torture-s/pr34130.c.s
+++ b/test/torture-s/pr34130.c.s
@@ -1,33 +1,31 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34130.c"
+	.file	"pr34130.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push2=, -2
-	i32.add 	$push11=, $0, $pop2
-	tee_local	$push10=, $1=, $pop11
-	i32.const	$push0=, 2
-	i32.sub 	$push1=, $pop0, $0
-	i32.const	$push3=, -1
-	i32.gt_s	$push4=, $1, $pop3
-	i32.select	$push5=, $pop10, $pop1, $pop4
-	i32.const	$push6=, 1
-	i32.shl 	$push7=, $pop5, $pop6
+	i32.const	$push4=, -2
+	i32.add 	$push5=, $0, $pop4
+	i32.const	$push2=, 2
+	i32.sub 	$push3=, $pop2, $0
+	i32.const	$push0=, 1
+	i32.gt_s	$push1=, $0, $pop0
+	i32.select	$push6=, $pop5, $pop3, $pop1
+	i32.const	$push10=, 1
+	i32.shl 	$push7=, $pop6, $pop10
 	i32.sub 	$push9=, $pop8, $pop7
                                         # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,6 +36,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34154.c.s b/test/torture-s/pr34154.c.s
index dcbf96f92..7cb4903c5 100644
--- a/test/torture-s/pr34154.c.s
+++ b/test/torture-s/pr34154.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34154.c"
+	.file	"pr34154.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,9 +19,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -32,6 +32,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34176.c.s b/test/torture-s/pr34176.c.s
index 4ff17272f..300c177e4 100644
--- a/test/torture-s/pr34176.c.s
+++ b/test/torture-s/pr34176.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34176.c"
+	.file	"pr34176.c"
 	.section	.text.hash_find_entry,"ax",@progbits
-	.hidden	hash_find_entry
+	.hidden	hash_find_entry         # -- Begin function hash_find_entry
 	.globl	hash_find_entry
 	.type	hash_find_entry,@function
 hash_find_entry:                        # @hash_find_entry
@@ -15,9 +15,9 @@ hash_find_entry:                        # @hash_find_entry
 	.endfunc
 .Lfunc_end0:
 	.size	hash_find_entry, .Lfunc_end0-hash_find_entry
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -46,9 +46,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,10 +56,10 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push13=, $pop2, $pop3
+	i32.sub 	$push13=, $pop1, $pop3
 	tee_local	$push12=, $2=, $pop13
 	i32.store	__stack_pointer($pop4), $pop12
 	i32.const	$push8=, 12
@@ -85,7 +85,7 @@ main:                                   # @main
 	i32.add 	$push15=, $0, $pop16
 	tee_local	$push14=, $0=, $pop15
 	br_if   	0, $pop14       # 0: up to label3
-.LBB2_3:                                # %cleanup.thread
+.LBB2_3:                                # %cleanup.cont7
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	end_block                       # label2:
@@ -105,7 +105,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	foo.count,@object       # @foo.count
 	.section	.bss.foo.count,"aw",@nobits
 	.p2align	2
@@ -114,5 +114,5 @@ foo.count:
 	.size	foo.count, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34415.c.s b/test/torture-s/pr34415.c.s
index 61ef65316..89718ed5d 100644
--- a/test/torture-s/pr34415.c.s
+++ b/test/torture-s/pr34415.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34415.c"
+	.file	"pr34415.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,35 +10,35 @@ foo:                                    # @foo
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
                                         # implicit-def: %vreg64
-	i32.const	$5=, 1
+	i32.const	$4=, 1
 .LBB0_1:                                # %for.cond
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_4 Depth 2
 	loop    	i32             # label0:
-	copy_local	$push25=, $0
-	tee_local	$push24=, $1=, $pop25
-	copy_local	$0=, $pop24
+	copy_local	$push24=, $0
+	tee_local	$push23=, $1=, $pop24
+	copy_local	$5=, $pop23
 	block   	
-	i32.load8_s	$push23=, 0($1)
-	tee_local	$push22=, $2=, $pop23
-	i32.const	$push21=, -32
-	i32.add 	$push0=, $pop22, $pop21
-	i32.const	$push20=, -97
-	i32.add 	$push1=, $2, $pop20
-	i32.const	$push19=, 255
-	i32.and 	$push2=, $pop1, $pop19
-	i32.const	$push18=, 26
-	i32.lt_u	$push3=, $pop2, $pop18
-	i32.select	$push17=, $pop0, $2, $pop3
-	tee_local	$push16=, $3=, $pop17
-	i32.const	$push15=, 66
-	i32.eq  	$push4=, $pop16, $pop15
+	i32.load8_s	$push22=, 0($1)
+	tee_local	$push21=, $0=, $pop22
+	i32.const	$push20=, -32
+	i32.add 	$push0=, $pop21, $pop20
+	i32.const	$push19=, -97
+	i32.add 	$push1=, $0, $pop19
+	i32.const	$push18=, 255
+	i32.and 	$push2=, $pop1, $pop18
+	i32.const	$push17=, 26
+	i32.lt_u	$push3=, $pop2, $pop17
+	i32.select	$push16=, $pop0, $0, $pop3
+	tee_local	$push15=, $2=, $pop16
+	i32.const	$push14=, 66
+	i32.eq  	$push4=, $pop15, $pop14
 	br_if   	0, $pop4        # 0: down to label1
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
-	i32.const	$push26=, 65
-	i32.ne  	$push5=, $3, $pop26
+	i32.const	$push25=, 65
+	i32.ne  	$push5=, $2, $pop25
 	br_if   	0, $pop5        # 0: down to label2
 # BB#3:                                 # %do.body.preheader
                                         #   in Loop: Header=BB0_1 Depth=1
@@ -47,46 +47,47 @@ foo:                                    # @foo
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label3:
-	i32.const	$push30=, 1
-	i32.add 	$push29=, $0, $pop30
-	tee_local	$push28=, $0=, $pop29
-	i32.load8_u	$push6=, 0($pop28)
-	i32.const	$push27=, 43
-	i32.eq  	$push7=, $pop6, $pop27
-	br_if   	0, $pop7        # 0: up to label3
+	i32.load8_u	$2=, 1($0)
+	i32.const	$push29=, 1
+	i32.add 	$push28=, $0, $pop29
+	tee_local	$push27=, $5=, $pop28
+	copy_local	$0=, $pop27
+	i32.const	$push26=, 43
+	i32.eq  	$push6=, $2, $pop26
+	br_if   	0, $pop6        # 0: up to label3
 	br      	2               # 2: down to label1
 .LBB0_5:                                # %for.end
 	end_loop
 	end_block                       # label2:
 	block   	
-	i32.const	$push8=, 3
-	i32.lt_s	$push9=, $5, $pop8
-	br_if   	0, $pop9        # 0: down to label4
+	i32.const	$push7=, 3
+	i32.lt_s	$push8=, $4, $pop7
+	br_if   	0, $pop8        # 0: down to label4
 # BB#6:                                 # %land.lhs.true17
-	i32.const	$push10=, 58
-	i32.eq  	$push11=, $2, $pop10
-	i32.select	$push12=, $4, $1, $pop11
-	return  	$pop12
+	i32.const	$push9=, 58
+	i32.eq  	$push10=, $0, $pop9
+	i32.select	$push11=, $3, $1, $pop10
+	return  	$pop11
 .LBB0_7:                                # %if.end22
 	end_block                       # label4:
 	return  	$1
-.LBB0_8:                                # %cleanup.thread
+.LBB0_8:                                # %cleanup.cont
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
-	i32.const	$push14=, 1
-	i32.add 	$5=, $5, $pop14
 	i32.const	$push13=, 1
-	i32.add 	$0=, $0, $pop13
-	copy_local	$4=, $1
+	i32.add 	$4=, $4, $pop13
+	i32.const	$push12=, 1
+	i32.add 	$0=, $5, $pop12
+	copy_local	$3=, $1
 	br      	0               # 0: up to label0
 .LBB0_9:
 	end_loop
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -100,7 +101,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -108,4 +109,4 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr34456.c.s b/test/torture-s/pr34456.c.s
index ed4574797..aab58a093 100644
--- a/test/torture-s/pr34456.c.s
+++ b/test/torture-s/pr34456.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34456.c"
+	.file	"pr34456.c"
 	.section	.text.debug,"ax",@progbits
-	.hidden	debug
+	.hidden	debug                   # -- Begin function debug
 	.globl	debug
 	.type	debug,@function
 debug:                                  # @debug
@@ -12,9 +12,9 @@ debug:                                  # @debug
 	.endfunc
 .Lfunc_end0:
 	.size	debug, .Lfunc_end0-debug
-
+                                        # -- End function
 	.section	.text.bad_compare,"ax",@progbits
-	.hidden	bad_compare
+	.hidden	bad_compare             # -- Begin function bad_compare
 	.globl	bad_compare
 	.type	bad_compare,@function
 bad_compare:                            # @bad_compare
@@ -27,9 +27,9 @@ bad_compare:                            # @bad_compare
 	.endfunc
 .Lfunc_end1:
 	.size	bad_compare, .Lfunc_end1-bad_compare
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,9 +47,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.section	.text.compare,"ax",@progbits
-	.type	compare,@function
+	.type	compare,@function       # -- Begin function compare
 compare:                                # @compare
 	.param  	i32, i32
 	.result 	i32
@@ -80,7 +80,7 @@ compare:                                # @compare
 	.endfunc
 .Lfunc_end3:
 	.size	compare, .Lfunc_end3-compare
-
+                                        # -- End function
 	.hidden	array                   # @array
 	.type	array,@object
 	.section	.data.array,"aw",@progbits
@@ -103,5 +103,5 @@ errors:
 	.size	errors, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	qsort, void, i32, i32, i32, i32
diff --git a/test/torture-s/pr34768-1.c.s b/test/torture-s/pr34768-1.c.s
index 37b5c81b7..5d5e75fb2 100644
--- a/test/torture-s/pr34768-1.c.s
+++ b/test/torture-s/pr34768-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34768-1.c"
+	.file	"pr34768-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -27,9 +27,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -50,9 +50,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end2:
 	.size	test, .Lfunc_end2-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,7 +75,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -86,5 +86,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34768-2.c.s b/test/torture-s/pr34768-2.c.s
index 56b70ec27..c11c5c5aa 100644
--- a/test/torture-s/pr34768-2.c.s
+++ b/test/torture-s/pr34768-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34768-2.c"
+	.file	"pr34768-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -31,9 +31,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -54,9 +54,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end2:
 	.size	test, .Lfunc_end2-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -79,7 +79,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -90,5 +90,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34971.c.s b/test/torture-s/pr34971.c.s
index 581951076..f5e7b761a 100644
--- a/test/torture-s/pr34971.c.s
+++ b/test/torture-s/pr34971.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34971.c"
+	.file	"pr34971.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -30,9 +30,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -62,5 +62,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34982.c.s b/test/torture-s/pr34982.c.s
index 64e350ecd..be92ac5da 100644
--- a/test/torture-s/pr34982.c.s
+++ b/test/torture-s/pr34982.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr34982.c"
+	.file	"pr34982.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr35163.c.s b/test/torture-s/pr35163.c.s
index cb07fecdd..36cc3588e 100644
--- a/test/torture-s/pr35163.c.s
+++ b/test/torture-s/pr35163.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35163.c"
+	.file	"pr35163.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr35231.c.s b/test/torture-s/pr35231.c.s
index 01533537c..b96b7436b 100644
--- a/test/torture-s/pr35231.c.s
+++ b/test/torture-s/pr35231.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35231.c"
+	.file	"pr35231.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35390.c.s b/test/torture-s/pr35390.c.s
index b383d0925..63b2ec7ea 100644
--- a/test/torture-s/pr35390.c.s
+++ b/test/torture-s/pr35390.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35390.c"
+	.file	"pr35390.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,6 +26,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr35456.c.s b/test/torture-s/pr35456.c.s
index f03fc9f54..be477c0f9 100644
--- a/test/torture-s/pr35456.c.s
+++ b/test/torture-s/pr35456.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35456.c"
+	.file	"pr35456.c"
 	.section	.text.not_fabs,"ax",@progbits
-	.hidden	not_fabs
+	.hidden	not_fabs                # -- Begin function not_fabs
 	.globl	not_fabs
 	.type	not_fabs,@function
 not_fabs:                               # @not_fabs
@@ -16,9 +16,9 @@ not_fabs:                               # @not_fabs
 	.endfunc
 .Lfunc_end0:
 	.size	not_fabs, .Lfunc_end0-not_fabs
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35472.c.s b/test/torture-s/pr35472.c.s
index 361a384e6..03ab73a10 100644
--- a/test/torture-s/pr35472.c.s
+++ b/test/torture-s/pr35472.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35472.c"
+	.file	"pr35472.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,51 +15,178 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
-	.local  	i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 128
-	i32.sub 	$push28=, $pop8, $pop9
-	tee_local	$push27=, $0=, $pop28
-	i32.store	__stack_pointer($pop10), $pop27
-	i32.const	$push14=, 64
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push2=, 0
-	i32.const	$push1=, 64
-	i32.call	$drop=, memset@FUNCTION, $pop15, $pop2, $pop1
-	i32.const	$push26=, 0
-	i32.const	$push25=, 64
-	i32.call	$push24=, memset@FUNCTION, $0, $pop26, $pop25
-	tee_local	$push23=, $0=, $pop24
-	i32.const	$push16=, 64
-	i32.add 	$push17=, $pop23, $pop16
-	call    	foo@FUNCTION, $pop17, $0
-	i32.const	$push22=, 0
-	i32.load	$push3=, p($pop22)
-	i32.const	$push18=, 64
-	i32.add 	$push19=, $0, $pop18
-	i32.const	$push21=, 64
-	i32.call	$push0=, memcpy@FUNCTION, $pop3, $pop19, $pop21
-	i32.const	$push20=, 64
-	i32.call	$drop=, memcpy@FUNCTION, $pop0, $0, $pop20
+	i32.const	$push31=, 0
+	i32.const	$push29=, 0
+	i32.load	$push28=, __stack_pointer($pop29)
+	i32.const	$push30=, 128
+	i32.sub 	$push125=, $pop28, $pop30
+	tee_local	$push124=, $16=, $pop125
+	i32.store	__stack_pointer($pop31), $pop124
+	i32.const	$push35=, 64
+	i32.add 	$push36=, $16, $pop35
+	i32.const	$push0=, 56
+	i32.add 	$push123=, $pop36, $pop0
+	tee_local	$push122=, $0=, $pop123
+	i64.const	$push1=, 0
+	i64.store	0($pop122), $pop1
+	i32.const	$push37=, 64
+	i32.add 	$push38=, $16, $pop37
+	i32.const	$push2=, 48
+	i32.add 	$push121=, $pop38, $pop2
+	tee_local	$push120=, $1=, $pop121
+	i64.const	$push119=, 0
+	i64.store	0($pop120), $pop119
+	i32.const	$push39=, 64
+	i32.add 	$push40=, $16, $pop39
+	i32.const	$push3=, 40
+	i32.add 	$push118=, $pop40, $pop3
+	tee_local	$push117=, $2=, $pop118
+	i64.const	$push116=, 0
+	i64.store	0($pop117), $pop116
+	i32.const	$push41=, 64
+	i32.add 	$push42=, $16, $pop41
+	i32.const	$push4=, 32
+	i32.add 	$push115=, $pop42, $pop4
+	tee_local	$push114=, $3=, $pop115
+	i64.const	$push113=, 0
+	i64.store	0($pop114), $pop113
+	i32.const	$push43=, 64
+	i32.add 	$push44=, $16, $pop43
+	i32.const	$push5=, 24
+	i32.add 	$push112=, $pop44, $pop5
+	tee_local	$push111=, $4=, $pop112
+	i64.const	$push110=, 0
+	i64.store	0($pop111), $pop110
+	i32.const	$push45=, 64
+	i32.add 	$push46=, $16, $pop45
+	i32.const	$push6=, 16
+	i32.add 	$push109=, $pop46, $pop6
+	tee_local	$push108=, $5=, $pop109
+	i64.const	$push107=, 0
+	i64.store	0($pop108), $pop107
+	i32.const	$push47=, 64
+	i32.add 	$push48=, $16, $pop47
+	i32.const	$push7=, 8
+	i32.add 	$push106=, $pop48, $pop7
+	tee_local	$push105=, $6=, $pop106
+	i64.const	$push104=, 0
+	i64.store	0($pop105), $pop104
+	i32.const	$push103=, 56
+	i32.add 	$push102=, $16, $pop103
+	tee_local	$push101=, $7=, $pop102
+	i64.const	$push100=, 0
+	i64.store	0($pop101), $pop100
+	i32.const	$push99=, 48
+	i32.add 	$push98=, $16, $pop99
+	tee_local	$push97=, $8=, $pop98
+	i64.const	$push96=, 0
+	i64.store	0($pop97), $pop96
+	i32.const	$push95=, 40
+	i32.add 	$push94=, $16, $pop95
+	tee_local	$push93=, $9=, $pop94
+	i64.const	$push92=, 0
+	i64.store	0($pop93), $pop92
+	i32.const	$push91=, 32
+	i32.add 	$push90=, $16, $pop91
+	tee_local	$push89=, $10=, $pop90
+	i64.const	$push88=, 0
+	i64.store	0($pop89), $pop88
+	i32.const	$push87=, 24
+	i32.add 	$push86=, $16, $pop87
+	tee_local	$push85=, $11=, $pop86
+	i64.const	$push84=, 0
+	i64.store	0($pop85), $pop84
+	i32.const	$push83=, 16
+	i32.add 	$push82=, $16, $pop83
+	tee_local	$push81=, $12=, $pop82
+	i64.const	$push80=, 0
+	i64.store	0($pop81), $pop80
+	i32.const	$push79=, 8
+	i32.add 	$push78=, $16, $pop79
+	tee_local	$push77=, $13=, $pop78
+	i64.const	$push76=, 0
+	i64.store	0($pop77), $pop76
+	i64.const	$push75=, 0
+	i64.store	64($16), $pop75
+	i64.const	$push74=, 0
+	i64.store	0($16), $pop74
+	i32.const	$push49=, 64
+	i32.add 	$push50=, $16, $pop49
+	call    	foo@FUNCTION, $pop50, $16
+	i32.const	$push8=, 0
+	i32.load	$push73=, p($pop8)
+	tee_local	$push72=, $14=, $pop73
+	i64.load	$push9=, 64($16)
+	i64.store	0($pop72):p2align=2, $pop9
+	i32.const	$push71=, 56
+	i32.add 	$push70=, $14, $pop71
+	tee_local	$push69=, $15=, $pop70
+	i64.load	$push10=, 0($0)
+	i64.store	0($pop69):p2align=2, $pop10
+	i32.const	$push68=, 48
+	i32.add 	$push67=, $14, $pop68
+	tee_local	$push66=, $0=, $pop67
+	i64.load	$push11=, 0($1)
+	i64.store	0($pop66):p2align=2, $pop11
+	i32.const	$push65=, 40
+	i32.add 	$push64=, $14, $pop65
+	tee_local	$push63=, $1=, $pop64
+	i64.load	$push12=, 0($2)
+	i64.store	0($pop63):p2align=2, $pop12
+	i32.const	$push62=, 32
+	i32.add 	$push61=, $14, $pop62
+	tee_local	$push60=, $2=, $pop61
+	i64.load	$push13=, 0($3)
+	i64.store	0($pop60):p2align=2, $pop13
+	i32.const	$push59=, 24
+	i32.add 	$push58=, $14, $pop59
+	tee_local	$push57=, $3=, $pop58
+	i64.load	$push14=, 0($4)
+	i64.store	0($pop57):p2align=2, $pop14
+	i32.const	$push56=, 16
+	i32.add 	$push55=, $14, $pop56
+	tee_local	$push54=, $4=, $pop55
+	i64.load	$push15=, 0($5)
+	i64.store	0($pop54):p2align=2, $pop15
+	i32.const	$push53=, 8
+	i32.add 	$push52=, $14, $pop53
+	tee_local	$push51=, $5=, $pop52
+	i64.load	$push16=, 0($6)
+	i64.store	0($pop51):p2align=2, $pop16
+	i64.load	$push17=, 0($16)
+	i64.store	0($14):p2align=2, $pop17
+	i64.load	$push18=, 0($13)
+	i64.store	0($5):p2align=2, $pop18
+	i64.load	$push19=, 0($12)
+	i64.store	0($4):p2align=2, $pop19
+	i64.load	$push20=, 0($11)
+	i64.store	0($3):p2align=2, $pop20
+	i64.load	$push21=, 0($10)
+	i64.store	0($2):p2align=2, $pop21
+	i64.load	$push22=, 0($9)
+	i64.store	0($1):p2align=2, $pop22
+	i64.load	$push23=, 0($8)
+	i64.store	0($0):p2align=2, $pop23
+	i64.load	$push24=, 0($7)
+	i64.store	0($15):p2align=2, $pop24
 	block   	
-	i32.load	$push5=, 0($0)
-	i32.const	$push4=, -1
-	i32.ne  	$push6=, $pop5, $pop4
-	br_if   	0, $pop6        # 0: down to label0
+	i32.load	$push26=, 0($16)
+	i32.const	$push25=, -1
+	i32.ne  	$push27=, $pop26, $pop25
+	br_if   	0, $pop27       # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push13=, 0
-	i32.const	$push11=, 128
-	i32.add 	$push12=, $0, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push34=, 0
+	i32.const	$push32=, 128
+	i32.add 	$push33=, $16, $pop32
+	i32.store	__stack_pointer($pop34), $pop33
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -68,54 +195,181 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end1:
 	.size	test, .Lfunc_end1-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 128
-	i32.sub 	$push28=, $pop7, $pop8
-	tee_local	$push27=, $0=, $pop28
-	i32.store	__stack_pointer($pop9), $pop27
-	i32.const	$push13=, 64
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push26=, 0
-	i32.const	$push1=, 64
-	i32.call	$drop=, memset@FUNCTION, $pop14, $pop26, $pop1
-	i32.const	$push25=, 0
-	i32.const	$push24=, 64
-	i32.call	$push23=, memset@FUNCTION, $0, $pop25, $pop24
-	tee_local	$push22=, $0=, $pop23
-	i32.const	$push15=, 64
-	i32.add 	$push16=, $pop22, $pop15
-	call    	foo@FUNCTION, $pop16, $0
-	i32.const	$push21=, 0
-	i32.load	$push2=, p($pop21)
-	i32.const	$push17=, 64
-	i32.add 	$push18=, $0, $pop17
-	i32.const	$push20=, 64
-	i32.call	$push0=, memcpy@FUNCTION, $pop2, $pop18, $pop20
-	i32.const	$push19=, 64
-	i32.call	$drop=, memcpy@FUNCTION, $pop0, $0, $pop19
+	i32.const	$push30=, 0
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
+	i32.const	$push29=, 128
+	i32.sub 	$push125=, $pop27, $pop29
+	tee_local	$push124=, $16=, $pop125
+	i32.store	__stack_pointer($pop30), $pop124
+	i32.const	$push34=, 64
+	i32.add 	$push35=, $16, $pop34
+	i32.const	$push0=, 56
+	i32.add 	$push123=, $pop35, $pop0
+	tee_local	$push122=, $0=, $pop123
+	i64.const	$push1=, 0
+	i64.store	0($pop122), $pop1
+	i32.const	$push36=, 64
+	i32.add 	$push37=, $16, $pop36
+	i32.const	$push2=, 48
+	i32.add 	$push121=, $pop37, $pop2
+	tee_local	$push120=, $1=, $pop121
+	i64.const	$push119=, 0
+	i64.store	0($pop120), $pop119
+	i32.const	$push38=, 64
+	i32.add 	$push39=, $16, $pop38
+	i32.const	$push3=, 40
+	i32.add 	$push118=, $pop39, $pop3
+	tee_local	$push117=, $2=, $pop118
+	i64.const	$push116=, 0
+	i64.store	0($pop117), $pop116
+	i32.const	$push40=, 64
+	i32.add 	$push41=, $16, $pop40
+	i32.const	$push4=, 32
+	i32.add 	$push115=, $pop41, $pop4
+	tee_local	$push114=, $3=, $pop115
+	i64.const	$push113=, 0
+	i64.store	0($pop114), $pop113
+	i32.const	$push42=, 64
+	i32.add 	$push43=, $16, $pop42
+	i32.const	$push5=, 24
+	i32.add 	$push112=, $pop43, $pop5
+	tee_local	$push111=, $4=, $pop112
+	i64.const	$push110=, 0
+	i64.store	0($pop111), $pop110
+	i32.const	$push44=, 64
+	i32.add 	$push45=, $16, $pop44
+	i32.const	$push6=, 16
+	i32.add 	$push109=, $pop45, $pop6
+	tee_local	$push108=, $5=, $pop109
+	i64.const	$push107=, 0
+	i64.store	0($pop108), $pop107
+	i32.const	$push46=, 64
+	i32.add 	$push47=, $16, $pop46
+	i32.const	$push7=, 8
+	i32.add 	$push106=, $pop47, $pop7
+	tee_local	$push105=, $6=, $pop106
+	i64.const	$push104=, 0
+	i64.store	0($pop105), $pop104
+	i32.const	$push103=, 56
+	i32.add 	$push102=, $16, $pop103
+	tee_local	$push101=, $7=, $pop102
+	i64.const	$push100=, 0
+	i64.store	0($pop101), $pop100
+	i32.const	$push99=, 48
+	i32.add 	$push98=, $16, $pop99
+	tee_local	$push97=, $8=, $pop98
+	i64.const	$push96=, 0
+	i64.store	0($pop97), $pop96
+	i32.const	$push95=, 40
+	i32.add 	$push94=, $16, $pop95
+	tee_local	$push93=, $9=, $pop94
+	i64.const	$push92=, 0
+	i64.store	0($pop93), $pop92
+	i32.const	$push91=, 32
+	i32.add 	$push90=, $16, $pop91
+	tee_local	$push89=, $10=, $pop90
+	i64.const	$push88=, 0
+	i64.store	0($pop89), $pop88
+	i32.const	$push87=, 24
+	i32.add 	$push86=, $16, $pop87
+	tee_local	$push85=, $11=, $pop86
+	i64.const	$push84=, 0
+	i64.store	0($pop85), $pop84
+	i32.const	$push83=, 16
+	i32.add 	$push82=, $16, $pop83
+	tee_local	$push81=, $12=, $pop82
+	i64.const	$push80=, 0
+	i64.store	0($pop81), $pop80
+	i32.const	$push79=, 8
+	i32.add 	$push78=, $16, $pop79
+	tee_local	$push77=, $13=, $pop78
+	i64.const	$push76=, 0
+	i64.store	0($pop77), $pop76
+	i64.const	$push75=, 0
+	i64.store	64($16), $pop75
+	i64.const	$push74=, 0
+	i64.store	0($16), $pop74
+	i32.const	$push48=, 64
+	i32.add 	$push49=, $16, $pop48
+	call    	foo@FUNCTION, $pop49, $16
+	i32.const	$push73=, 0
+	i32.load	$push72=, p($pop73)
+	tee_local	$push71=, $14=, $pop72
+	i64.load	$push8=, 64($16)
+	i64.store	0($pop71):p2align=2, $pop8
+	i32.const	$push70=, 56
+	i32.add 	$push69=, $14, $pop70
+	tee_local	$push68=, $15=, $pop69
+	i64.load	$push9=, 0($0)
+	i64.store	0($pop68):p2align=2, $pop9
+	i32.const	$push67=, 48
+	i32.add 	$push66=, $14, $pop67
+	tee_local	$push65=, $0=, $pop66
+	i64.load	$push10=, 0($1)
+	i64.store	0($pop65):p2align=2, $pop10
+	i32.const	$push64=, 40
+	i32.add 	$push63=, $14, $pop64
+	tee_local	$push62=, $1=, $pop63
+	i64.load	$push11=, 0($2)
+	i64.store	0($pop62):p2align=2, $pop11
+	i32.const	$push61=, 32
+	i32.add 	$push60=, $14, $pop61
+	tee_local	$push59=, $2=, $pop60
+	i64.load	$push12=, 0($3)
+	i64.store	0($pop59):p2align=2, $pop12
+	i32.const	$push58=, 24
+	i32.add 	$push57=, $14, $pop58
+	tee_local	$push56=, $3=, $pop57
+	i64.load	$push13=, 0($4)
+	i64.store	0($pop56):p2align=2, $pop13
+	i32.const	$push55=, 16
+	i32.add 	$push54=, $14, $pop55
+	tee_local	$push53=, $4=, $pop54
+	i64.load	$push14=, 0($5)
+	i64.store	0($pop53):p2align=2, $pop14
+	i32.const	$push52=, 8
+	i32.add 	$push51=, $14, $pop52
+	tee_local	$push50=, $5=, $pop51
+	i64.load	$push15=, 0($6)
+	i64.store	0($pop50):p2align=2, $pop15
+	i64.load	$push16=, 0($16)
+	i64.store	0($14):p2align=2, $pop16
+	i64.load	$push17=, 0($13)
+	i64.store	0($5):p2align=2, $pop17
+	i64.load	$push18=, 0($12)
+	i64.store	0($4):p2align=2, $pop18
+	i64.load	$push19=, 0($11)
+	i64.store	0($3):p2align=2, $pop19
+	i64.load	$push20=, 0($10)
+	i64.store	0($2):p2align=2, $pop20
+	i64.load	$push21=, 0($9)
+	i64.store	0($1):p2align=2, $pop21
+	i64.load	$push22=, 0($8)
+	i64.store	0($0):p2align=2, $pop22
+	i64.load	$push23=, 0($7)
+	i64.store	0($15):p2align=2, $pop23
 	block   	
-	i32.load	$push4=, 0($0)
-	i32.const	$push3=, -1
-	i32.ne  	$push5=, $pop4, $pop3
-	br_if   	0, $pop5        # 0: down to label1
+	i32.load	$push25=, 0($16)
+	i32.const	$push24=, -1
+	i32.ne  	$push26=, $pop25, $pop24
+	br_if   	0, $pop26       # 0: down to label1
 # BB#1:                                 # %test.exit
-	i32.const	$push12=, 0
-	i32.const	$push10=, 128
-	i32.add 	$push11=, $0, $pop10
-	i32.store	__stack_pointer($pop12), $pop11
-	i32.const	$push29=, 0
-	return  	$pop29
+	i32.const	$push33=, 0
+	i32.const	$push31=, 128
+	i32.add 	$push32=, $16, $pop31
+	i32.store	__stack_pointer($pop33), $pop32
+	i32.const	$push126=, 0
+	return  	$pop126
 .LBB2_2:                                # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -123,7 +377,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -134,5 +388,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35800.c.s b/test/torture-s/pr35800.c.s
index 43cd9bd8b..9f692be8e 100644
--- a/test/torture-s/pr35800.c.s
+++ b/test/torture-s/pr35800.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr35800.c"
+	.file	"pr35800.c"
 	.section	.text.stab_xcoff_builtin_type,"ax",@progbits
-	.hidden	stab_xcoff_builtin_type
+	.hidden	stab_xcoff_builtin_type # -- Begin function stab_xcoff_builtin_type
 	.globl	stab_xcoff_builtin_type
 	.type	stab_xcoff_builtin_type,@function
 stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
@@ -26,7 +26,7 @@ stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
 # BB#2:                                 # %switch.lookup
 	i32.const	$push5=, 2
 	i32.shl 	$push6=, $0, $pop5
-	i32.const	$push7=, .Lswitch.table
+	i32.const	$push7=, .Lswitch.table.main
 	i32.add 	$push8=, $pop6, $pop7
 	i32.load	$1=, 0($pop8)
 .LBB0_3:                                # %sw.epilog
@@ -39,48 +39,61 @@ stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
 	.endfunc
 .Lfunc_end0:
 	.size	stab_xcoff_builtin_type, .Lfunc_end0-stab_xcoff_builtin_type
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %if.end8
-	i32.const	$1=, -4
-	i32.const	$0=, .Lswitch.table+8
-.LBB1_1:                                # %stab_xcoff_builtin_type.exit
+	.local  	i32, i32, i32, i32
+# BB#0:                                 # %if.end12
+	i32.const	$2=, .Lswitch.table.main+8
+	i32.const	$1=, 2
+	i32.const	$0=, -3
+.LBB1_1:                                # %if.end.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.load	$push0=, 0($0)
-	i32.load8_u	$push1=, 0($pop0)
-	i32.const	$push5=, 105
-	i32.ne  	$push2=, $pop1, $pop5
+	i32.const	$3=, .L.str
+	block   	
+	i32.const	$push5=, 32
+	i32.gt_u	$push0=, $1, $pop5
+	br_if   	0, $pop0        # 0: down to label4
+# BB#2:                                 # %switch.lookup
+                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.load	$3=, 0($2)
+.LBB1_3:                                # %stab_xcoff_builtin_type.exit
+                                        #   in Loop: Header=BB1_1 Depth=1
+	end_block                       # label4:
+	i32.load8_u	$push1=, 0($3)
+	i32.const	$push6=, 105
+	i32.ne  	$push2=, $pop1, $pop6
 	br_if   	1, $pop2        # 1: down to label2
-# BB#2:                                 # %for.cond
+# BB#4:                                 # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push10=, 4
-	i32.add 	$0=, $0, $pop10
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $1, $pop9
-	tee_local	$push7=, $1=, $pop8
-	i32.const	$push6=, -34
-	i32.ge_s	$push3=, $pop7, $pop6
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
+	i32.const	$push11=, 4
+	i32.add 	$2=, $2, $pop11
+	i32.const	$push10=, -1
+	i32.add 	$push9=, $0, $pop10
+	tee_local	$push8=, $0=, $pop9
+	i32.const	$push7=, -33
+	i32.ge_s	$push3=, $pop8, $pop7
 	br_if   	0, $pop3        # 0: up to label3
-# BB#3:                                 # %if.end21
+# BB#5:                                 # %if.end21
 	end_loop
 	i32.const	$push4=, 0
 	return  	$pop4
-.LBB1_4:                                # %if.then16
+.LBB1_6:                                # %if.then16
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -97,10 +110,10 @@ main:                                   # @main
 	.asciz	"integer*8"
 	.size	.L.str.33, 10
 
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+	.type	.Lswitch.table.main,@object # @switch.table.main
+	.section	.rodata..Lswitch.table.main,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.main:
 	.int32	.L.str.2
 	.int32	.L.str.2
 	.int32	.L.str.33
@@ -134,8 +147,8 @@ main:                                   # @main
 	.int32	.L.str.33
 	.int32	.L.str.33
 	.int32	.L.str.33
-	.size	.Lswitch.table, 132
+	.size	.Lswitch.table.main, 132
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36034-1.c.s b/test/torture-s/pr36034-1.c.s
index 7d76de3f0..9a3488d99 100644
--- a/test/torture-s/pr36034-1.c.s
+++ b/test/torture-s/pr36034-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36034-1.c"
+	.file	"pr36034-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -130,9 +130,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -329,7 +329,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -398,5 +398,5 @@ tmp:
 	.size	tmp, 240
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36034-2.c.s b/test/torture-s/pr36034-2.c.s
index 0ae77fb0e..2da2a0a25 100644
--- a/test/torture-s/pr36034-2.c.s
+++ b/test/torture-s/pr36034-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36034-2.c"
+	.file	"pr36034-2.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -130,9 +130,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -329,7 +329,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -398,5 +398,5 @@ tmp:
 	.size	tmp, 240
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36038.c.s b/test/torture-s/pr36038.c.s
index 927082cc0..d3460ac04 100644
--- a/test/torture-s/pr36038.c.s
+++ b/test/torture-s/pr36038.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36038.c"
+	.file	"pr36038.c"
 	.section	.text.doit,"ax",@progbits
-	.hidden	doit
+	.hidden	doit                    # -- Begin function doit
 	.globl	doit
 	.type	doit,@function
 doit:                                   # @doit
@@ -18,7 +18,7 @@ doit:                                   # @doit
 	i32.const	$push4=, 6
 	i32.eq  	$push5=, $pop15, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push22=, 0
 	i32.load	$push0=, stack_base($pop22)
 	i32.const	$push1=, 40
@@ -54,65 +54,62 @@ doit:                                   # @doit
 	.endfunc
 .Lfunc_end0:
 	.size	doit, .Lfunc_end0-doit
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push31=, 0
-	i64.const	$push0=, 1
-	i64.store	list+8($pop31), $pop0
-	i32.const	$push30=, 0
-	i64.const	$push1=, 0
-	i64.store	list($pop30), $pop1
 	i32.const	$push29=, 0
-	i64.const	$push2=, 2
-	i64.store	list+16($pop29), $pop2
+	i64.const	$push0=, 1
+	i64.store	list+8($pop29), $pop0
 	i32.const	$push28=, 0
-	i64.const	$push3=, 3
-	i64.store	list+24($pop28), $pop3
+	i64.const	$push1=, 0
+	i64.store	list($pop28), $pop1
 	i32.const	$push27=, 0
-	i64.const	$push4=, 4
-	i64.store	list+32($pop27), $pop4
+	i64.const	$push2=, 2
+	i64.store	list+16($pop27), $pop2
 	i32.const	$push26=, 0
-	i64.const	$push5=, 9
-	i64.store	list+72($pop26), $pop5
+	i64.const	$push3=, 3
+	i64.store	list+24($pop26), $pop3
 	i32.const	$push25=, 0
-	i32.const	$push6=, indices+36
-	i32.store	markstack_ptr($pop25), $pop6
+	i64.const	$push4=, 4
+	i64.store	list+32($pop25), $pop4
 	i32.const	$push24=, 0
-	i32.const	$push7=, 2
-	i32.store	indices+32($pop24), $pop7
+	i64.const	$push5=, 9
+	i64.store	list+72($pop24), $pop5
 	i32.const	$push23=, 0
-	i32.const	$push8=, 1
-	i32.store	indices+28($pop23), $pop8
+	i32.const	$push6=, indices+36
+	i32.store	markstack_ptr($pop23), $pop6
 	i32.const	$push22=, 0
-	i32.const	$push9=, list+16
-	i32.store	stack_base($pop22), $pop9
+	i64.const	$push7=, 8589934593
+	i64.store	indices+28($pop22):p2align=2, $pop7
 	i32.const	$push21=, 0
-	i64.const	$push10=, 7
-	i64.store	list+64($pop21), $pop10
+	i32.const	$push8=, list+16
+	i32.store	stack_base($pop21), $pop8
 	i32.const	$push20=, 0
-	i64.const	$push11=, 6
-	i64.store	list+56($pop20), $pop11
+	i64.const	$push9=, 7
+	i64.store	list+64($pop20), $pop9
 	i32.const	$push19=, 0
-	i64.const	$push12=, 5
-	i64.store	list+48($pop19), $pop12
+	i64.const	$push10=, 6
+	i64.store	list+56($pop19), $pop10
 	i32.const	$push18=, 0
-	i64.const	$push17=, 4
-	i64.store	list+40($pop18), $pop17
+	i64.const	$push11=, 5
+	i64.store	list+48($pop18), $pop11
+	i32.const	$push17=, 0
+	i64.const	$push16=, 4
+	i64.store	list+40($pop17), $pop16
 	block   	
-	i32.const	$push15=, expect
-	i32.const	$push14=, list
-	i32.const	$push13=, 80
-	i32.call	$push16=, memcmp@FUNCTION, $pop15, $pop14, $pop13
-	br_if   	0, $pop16       # 0: down to label2
+	i32.const	$push14=, expect
+	i32.const	$push13=, list
+	i32.const	$push12=, 80
+	i32.call	$push15=, memcmp@FUNCTION, $pop14, $pop13, $pop12
+	br_if   	0, $pop15       # 0: down to label2
 # BB#1:                                 # %if.end
-	i32.const	$push32=, 0
-	return  	$pop32
+	i32.const	$push30=, 0
+	return  	$pop30
 .LBB1_2:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -120,7 +117,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	expect                  # @expect
 	.type	expect,@object
 	.section	.data.expect,"aw",@progbits
@@ -176,6 +173,6 @@ indices:
 	.size	indices, 40
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr36077.c.s b/test/torture-s/pr36077.c.s
index 9dd9d4090..74b145d26 100644
--- a/test/torture-s/pr36077.c.s
+++ b/test/torture-s/pr36077.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36077.c"
+	.file	"pr36077.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -13,9 +13,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -26,6 +26,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr36093.c.s b/test/torture-s/pr36093.c.s
index 9fdd94d28..c0359489d 100644
--- a/test/torture-s/pr36093.c.s
+++ b/test/torture-s/pr36093.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36093.c"
+	.file	"pr36093.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -39,4 +39,4 @@ foo:
 	.size	foo, 2560
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr36321.c.s b/test/torture-s/pr36321.c.s
index f7517d681..3f7715618 100644
--- a/test/torture-s/pr36321.c.s
+++ b/test/torture-s/pr36321.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36321.c"
+	.file	"pr36321.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	argp,@object            # @argp
 	.section	.data.argp,"aw",@progbits
 	.p2align	2
@@ -42,4 +42,4 @@ argp:
 	.size	.L.str, 10
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr36339.c.s b/test/torture-s/pr36339.c.s
index 22c311dc7..ee11dfba4 100644
--- a/test/torture-s/pr36339.c.s
+++ b/test/torture-s/pr36339.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36339.c"
+	.file	"pr36339.c"
 	.section	.text.try_a,"ax",@progbits
-	.hidden	try_a
+	.hidden	try_a                   # -- Begin function try_a
 	.globl	try_a
 	.type	try_a,@function
 try_a:                                  # @try_a
@@ -10,10 +10,10 @@ try_a:                                  # @try_a
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop4, $pop5
+	i32.sub 	$push13=, $pop3, $pop5
 	tee_local	$push12=, $1=, $pop13
 	i32.store	__stack_pointer($pop6), $pop12
 	i32.const	$push0=, 0
@@ -33,39 +33,41 @@ try_a:                                  # @try_a
 	.endfunc
 .Lfunc_end0:
 	.size	try_a, .Lfunc_end0-try_a
-
+                                        # -- End function
 	.section	.text.check_a,"ax",@progbits
-	.hidden	check_a
+	.hidden	check_a                 # -- Begin function check_a
 	.globl	check_a
 	.type	check_a,@function
 check_a:                                # @check_a
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, -1
 	block   	
-	i32.const	$push5=, -1
-	i32.add 	$push0=, $0, $pop5
+	block   	
+	i32.const	$push6=, -1
+	i32.add 	$push0=, $0, $pop6
 	i32.load	$push1=, 0($pop0)
 	i32.const	$push2=, 42
 	i32.ne  	$push3=, $pop1, $pop2
-	br_if   	0, $pop3        # 0: down to label0
+	br_if   	0, $pop3        # 0: down to label1
 # BB#1:                                 # %land.lhs.true
 	i32.load	$push4=, 3($0)
-	br_if   	0, $pop4        # 0: down to label0
-# BB#2:
-	i32.const	$1=, 0
-.LBB1_3:                                # %cleanup
+	i32.eqz 	$push8=, $pop4
+	br_if   	1, $pop8        # 1: down to label0
+.LBB1_2:                                # %cleanup
+	end_block                       # label1:
+	i32.const	$push7=, -1
+	return  	$pop7
+.LBB1_3:
 	end_block                       # label0:
-	copy_local	$push6=, $1
-                                        # fallthrough-return: $pop6
+	i32.const	$push5=, 0
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end1:
 	.size	check_a, .Lfunc_end1-check_a
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -76,18 +78,18 @@ main:                                   # @main
 	i32.call	$push1=, try_a@FUNCTION, $pop0
 	i32.const	$push2=, -1
 	i32.le_s	$push3=, $pop1, $pop2
-	br_if   	0, $pop3        # 0: down to label1
+	br_if   	0, $pop3        # 0: down to label2
 # BB#1:                                 # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB2_2:                                # %if.then
-	end_block                       # label1:
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36343.c.s b/test/torture-s/pr36343.c.s
index 16446a2bb..7929193c9 100644
--- a/test/torture-s/pr36343.c.s
+++ b/test/torture-s/pr36343.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36343.c"
+	.file	"pr36343.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,10 +24,10 @@ foo:                                    # @foo
 	.local  	i32, f32, i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push18=, $pop5, $pop6
+	i32.sub 	$push18=, $pop4, $pop6
 	tee_local	$push17=, $3=, $pop18
 	i32.store	__stack_pointer($pop7), $pop17
 	i32.const	$push0=, 0
@@ -64,9 +64,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -88,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36691.c.s b/test/torture-s/pr36691.c.s
index 8d7adea9d..4b1f361c2 100644
--- a/test/torture-s/pr36691.c.s
+++ b/test/torture-s/pr36691.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36691.c"
+	.file	"pr36691.c"
 	.section	.text.func_1,"ax",@progbits
-	.hidden	func_1
+	.hidden	func_1                  # -- Begin function func_1
 	.globl	func_1
 	.type	func_1,@function
 func_1:                                 # @func_1
@@ -13,9 +13,9 @@ func_1:                                 # @func_1
 	.endfunc
 .Lfunc_end0:
 	.size	func_1, .Lfunc_end0-func_1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	g_5                     # @g_5
 	.type	g_5,@object
 	.section	.bss.g_5,"aw",@nobits
@@ -39,4 +39,4 @@ g_5:
 	.size	g_5, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr36765.c.s b/test/torture-s/pr36765.c.s
index f0f971002..dc45b565a 100644
--- a/test/torture-s/pr36765.c.s
+++ b/test/torture-s/pr36765.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr36765.c"
+	.file	"pr36765.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,8 +48,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	__builtin_malloc, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr37102.c.s b/test/torture-s/pr37102.c.s
index dc78a0b4f..4cd6203ff 100644
--- a/test/torture-s/pr37102.c.s
+++ b/test/torture-s/pr37102.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37102.c"
+	.file	"pr37102.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,7 +57,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -86,5 +86,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr37125.c.s b/test/torture-s/pr37125.c.s
index 4c8aa0ef7..24f45f5d4 100644
--- a/test/torture-s/pr37125.c.s
+++ b/test/torture-s/pr37125.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37125.c"
+	.file	"pr37125.c"
 	.section	.text.func_44,"ax",@progbits
-	.hidden	func_44
+	.hidden	func_44                 # -- Begin function func_44
 	.globl	func_44
 	.type	func_44,@function
 func_44:                                # @func_44
@@ -27,9 +27,9 @@ func_44:                                # @func_44
 	.endfunc
 .Lfunc_end0:
 	.size	func_44, .Lfunc_end0-func_44
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr37573.c.s b/test/torture-s/pr37573.c.s
index dbde97736..a5294bdc8 100644
--- a/test/torture-s/pr37573.c.s
+++ b/test/torture-s/pr37573.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37573.c"
+	.file	"pr37573.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,336 +24,339 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.type	bar,@function
+	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push81=, 0
-	i32.const	$push78=, 0
-	i32.load	$push79=, __stack_pointer($pop78)
-	i32.const	$push80=, 2512
-	i32.sub 	$push133=, $pop79, $pop80
-	tee_local	$push132=, $3=, $pop133
-	i32.store	__stack_pointer($pop81), $pop132
+	i32.const	$push79=, 0
+	i32.const	$push77=, 0
+	i32.load	$push76=, __stack_pointer($pop77)
+	i32.const	$push78=, 2512
+	i32.sub 	$push131=, $pop76, $pop78
+	tee_local	$push130=, $3=, $pop131
+	i32.store	__stack_pointer($pop79), $pop130
 	i32.const	$1=, 41589
-	i32.const	$push0=, 16
-	i32.add 	$push1=, $3, $pop0
-	i32.const	$push131=, 41589
-	i32.store	0($pop1), $pop131
-	i32.const	$push2=, 20
-	i32.add 	$0=, $3, $pop2
+	i32.const	$push129=, 41589
+	i32.store	16($3), $pop129
+	i32.const	$push0=, 20
+	i32.add 	$0=, $3, $pop0
 	i32.const	$2=, 1
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push142=, 30
-	i32.shr_u	$push3=, $1, $pop142
-	i32.xor 	$push4=, $pop3, $1
-	i32.const	$push141=, 1812433253
-	i32.mul 	$push5=, $pop4, $pop141
-	i32.add 	$push140=, $pop5, $2
-	tee_local	$push139=, $1=, $pop140
-	i32.store	0($0), $pop139
-	i32.const	$push138=, 4
-	i32.add 	$0=, $0, $pop138
-	i32.const	$push137=, 1
-	i32.add 	$push136=, $2, $pop137
-	tee_local	$push135=, $2=, $pop136
-	i32.const	$push134=, 624
-	i32.ne  	$push6=, $pop135, $pop134
-	br_if   	0, $pop6        # 0: up to label1
+	i32.const	$push140=, 30
+	i32.shr_u	$push1=, $1, $pop140
+	i32.xor 	$push2=, $pop1, $1
+	i32.const	$push139=, 1812433253
+	i32.mul 	$push3=, $pop2, $pop139
+	i32.add 	$push138=, $pop3, $2
+	tee_local	$push137=, $1=, $pop138
+	i32.store	0($0), $pop137
+	i32.const	$push136=, 4
+	i32.add 	$0=, $0, $pop136
+	i32.const	$push135=, 1
+	i32.add 	$push134=, $2, $pop135
+	tee_local	$push133=, $2=, $pop134
+	i32.const	$push132=, 624
+	i32.ne  	$push4=, $pop133, $pop132
+	br_if   	0, $pop4        # 0: up to label1
 # BB#2:                                 # %for.end
 	end_loop
-	i32.const	$push7=, 1
-	i32.store	12($3), $pop7
-	i32.const	$push9=, 0
+	i32.const	$push5=, 1
+	i32.store	12($3), $pop5
+	i32.const	$push7=, 0
+	i32.const	$push83=, 8
+	i32.add 	$push84=, $3, $pop83
+	i32.call	$push6=, foo@FUNCTION, $pop84
+	i32.const	$push185=, 0
+	i32.load8_u	$push8=, p($pop185)
+	i32.xor 	$push9=, $pop6, $pop8
+	i32.store8	p($pop7), $pop9
+	i32.const	$push184=, 0
 	i32.const	$push85=, 8
 	i32.add 	$push86=, $3, $pop85
-	i32.call	$push8=, foo@FUNCTION, $pop86
-	i32.const	$push187=, 0
-	i32.load8_u	$push10=, p($pop187)
-	i32.xor 	$push11=, $pop8, $pop10
-	i32.store8	p($pop9), $pop11
-	i32.const	$push186=, 0
+	i32.call	$push10=, foo@FUNCTION, $pop86
+	i32.const	$push183=, 0
+	i32.load8_u	$push11=, p+1($pop183)
+	i32.xor 	$push12=, $pop10, $pop11
+	i32.store8	p+1($pop184), $pop12
+	i32.const	$push182=, 0
 	i32.const	$push87=, 8
 	i32.add 	$push88=, $3, $pop87
-	i32.call	$push12=, foo@FUNCTION, $pop88
-	i32.const	$push185=, 0
-	i32.load8_u	$push13=, p+1($pop185)
-	i32.xor 	$push14=, $pop12, $pop13
-	i32.store8	p+1($pop186), $pop14
-	i32.const	$push184=, 0
+	i32.call	$push13=, foo@FUNCTION, $pop88
+	i32.const	$push181=, 0
+	i32.load8_u	$push14=, p+2($pop181)
+	i32.xor 	$push15=, $pop13, $pop14
+	i32.store8	p+2($pop182), $pop15
+	i32.const	$push180=, 0
 	i32.const	$push89=, 8
 	i32.add 	$push90=, $3, $pop89
-	i32.call	$push15=, foo@FUNCTION, $pop90
-	i32.const	$push183=, 0
-	i32.load8_u	$push16=, p+2($pop183)
-	i32.xor 	$push17=, $pop15, $pop16
-	i32.store8	p+2($pop184), $pop17
-	i32.const	$push182=, 0
+	i32.call	$push16=, foo@FUNCTION, $pop90
+	i32.const	$push179=, 0
+	i32.load8_u	$push17=, p+3($pop179)
+	i32.xor 	$push18=, $pop16, $pop17
+	i32.store8	p+3($pop180), $pop18
+	i32.const	$push178=, 0
 	i32.const	$push91=, 8
 	i32.add 	$push92=, $3, $pop91
-	i32.call	$push18=, foo@FUNCTION, $pop92
-	i32.const	$push181=, 0
-	i32.load8_u	$push19=, p+3($pop181)
-	i32.xor 	$push20=, $pop18, $pop19
-	i32.store8	p+3($pop182), $pop20
-	i32.const	$push180=, 0
+	i32.call	$push19=, foo@FUNCTION, $pop92
+	i32.const	$push177=, 0
+	i32.load8_u	$push20=, p+4($pop177)
+	i32.xor 	$push21=, $pop19, $pop20
+	i32.store8	p+4($pop178), $pop21
+	i32.const	$push176=, 0
 	i32.const	$push93=, 8
 	i32.add 	$push94=, $3, $pop93
-	i32.call	$push21=, foo@FUNCTION, $pop94
-	i32.const	$push179=, 0
-	i32.load8_u	$push22=, p+4($pop179)
-	i32.xor 	$push23=, $pop21, $pop22
-	i32.store8	p+4($pop180), $pop23
-	i32.const	$push178=, 0
+	i32.call	$push22=, foo@FUNCTION, $pop94
+	i32.const	$push175=, 0
+	i32.load8_u	$push23=, p+5($pop175)
+	i32.xor 	$push24=, $pop22, $pop23
+	i32.store8	p+5($pop176), $pop24
+	i32.const	$push174=, 0
 	i32.const	$push95=, 8
 	i32.add 	$push96=, $3, $pop95
-	i32.call	$push24=, foo@FUNCTION, $pop96
-	i32.const	$push177=, 0
-	i32.load8_u	$push25=, p+5($pop177)
-	i32.xor 	$push26=, $pop24, $pop25
-	i32.store8	p+5($pop178), $pop26
-	i32.const	$push176=, 0
+	i32.call	$push25=, foo@FUNCTION, $pop96
+	i32.const	$push173=, 0
+	i32.load8_u	$push26=, p+6($pop173)
+	i32.xor 	$push27=, $pop25, $pop26
+	i32.store8	p+6($pop174), $pop27
+	i32.const	$push172=, 0
 	i32.const	$push97=, 8
 	i32.add 	$push98=, $3, $pop97
-	i32.call	$push27=, foo@FUNCTION, $pop98
-	i32.const	$push175=, 0
-	i32.load8_u	$push28=, p+6($pop175)
-	i32.xor 	$push29=, $pop27, $pop28
-	i32.store8	p+6($pop176), $pop29
-	i32.const	$push174=, 0
+	i32.call	$push28=, foo@FUNCTION, $pop98
+	i32.const	$push171=, 0
+	i32.load8_u	$push29=, p+7($pop171)
+	i32.xor 	$push30=, $pop28, $pop29
+	i32.store8	p+7($pop172), $pop30
+	i32.const	$push170=, 0
 	i32.const	$push99=, 8
 	i32.add 	$push100=, $3, $pop99
-	i32.call	$push30=, foo@FUNCTION, $pop100
-	i32.const	$push173=, 0
-	i32.load8_u	$push31=, p+7($pop173)
-	i32.xor 	$push32=, $pop30, $pop31
-	i32.store8	p+7($pop174), $pop32
-	i32.const	$push172=, 0
+	i32.call	$push31=, foo@FUNCTION, $pop100
+	i32.const	$push169=, 0
+	i32.load8_u	$push32=, p+8($pop169)
+	i32.xor 	$push33=, $pop31, $pop32
+	i32.store8	p+8($pop170), $pop33
+	i32.const	$push168=, 0
 	i32.const	$push101=, 8
 	i32.add 	$push102=, $3, $pop101
-	i32.call	$push33=, foo@FUNCTION, $pop102
-	i32.const	$push171=, 0
-	i32.load8_u	$push34=, p+8($pop171)
-	i32.xor 	$push35=, $pop33, $pop34
-	i32.store8	p+8($pop172), $pop35
-	i32.const	$push170=, 0
+	i32.call	$push34=, foo@FUNCTION, $pop102
+	i32.const	$push167=, 0
+	i32.load8_u	$push35=, p+9($pop167)
+	i32.xor 	$push36=, $pop34, $pop35
+	i32.store8	p+9($pop168), $pop36
+	i32.const	$push166=, 0
 	i32.const	$push103=, 8
 	i32.add 	$push104=, $3, $pop103
-	i32.call	$push36=, foo@FUNCTION, $pop104
-	i32.const	$push169=, 0
-	i32.load8_u	$push37=, p+9($pop169)
-	i32.xor 	$push38=, $pop36, $pop37
-	i32.store8	p+9($pop170), $pop38
-	i32.const	$push168=, 0
+	i32.call	$push37=, foo@FUNCTION, $pop104
+	i32.const	$push165=, 0
+	i32.load8_u	$push38=, p+10($pop165)
+	i32.xor 	$push39=, $pop37, $pop38
+	i32.store8	p+10($pop166), $pop39
+	i32.const	$push164=, 0
 	i32.const	$push105=, 8
 	i32.add 	$push106=, $3, $pop105
-	i32.call	$push39=, foo@FUNCTION, $pop106
-	i32.const	$push167=, 0
-	i32.load8_u	$push40=, p+10($pop167)
-	i32.xor 	$push41=, $pop39, $pop40
-	i32.store8	p+10($pop168), $pop41
-	i32.const	$push166=, 0
+	i32.call	$push40=, foo@FUNCTION, $pop106
+	i32.const	$push163=, 0
+	i32.load8_u	$push41=, p+11($pop163)
+	i32.xor 	$push42=, $pop40, $pop41
+	i32.store8	p+11($pop164), $pop42
+	i32.const	$push162=, 0
 	i32.const	$push107=, 8
 	i32.add 	$push108=, $3, $pop107
-	i32.call	$push42=, foo@FUNCTION, $pop108
-	i32.const	$push165=, 0
-	i32.load8_u	$push43=, p+11($pop165)
-	i32.xor 	$push44=, $pop42, $pop43
-	i32.store8	p+11($pop166), $pop44
-	i32.const	$push164=, 0
+	i32.call	$push43=, foo@FUNCTION, $pop108
+	i32.const	$push161=, 0
+	i32.load8_u	$push44=, p+12($pop161)
+	i32.xor 	$push45=, $pop43, $pop44
+	i32.store8	p+12($pop162), $pop45
+	i32.const	$push160=, 0
 	i32.const	$push109=, 8
 	i32.add 	$push110=, $3, $pop109
-	i32.call	$push45=, foo@FUNCTION, $pop110
-	i32.const	$push163=, 0
-	i32.load8_u	$push46=, p+12($pop163)
-	i32.xor 	$push47=, $pop45, $pop46
-	i32.store8	p+12($pop164), $pop47
-	i32.const	$push162=, 0
+	i32.call	$push46=, foo@FUNCTION, $pop110
+	i32.const	$push159=, 0
+	i32.load8_u	$push47=, p+13($pop159)
+	i32.xor 	$push48=, $pop46, $pop47
+	i32.store8	p+13($pop160), $pop48
+	i32.const	$push158=, 0
 	i32.const	$push111=, 8
 	i32.add 	$push112=, $3, $pop111
-	i32.call	$push48=, foo@FUNCTION, $pop112
-	i32.const	$push161=, 0
-	i32.load8_u	$push49=, p+13($pop161)
-	i32.xor 	$push50=, $pop48, $pop49
-	i32.store8	p+13($pop162), $pop50
-	i32.const	$push160=, 0
+	i32.call	$push49=, foo@FUNCTION, $pop112
+	i32.const	$push157=, 0
+	i32.load8_u	$push50=, p+14($pop157)
+	i32.xor 	$push51=, $pop49, $pop50
+	i32.store8	p+14($pop158), $pop51
+	i32.const	$push156=, 0
 	i32.const	$push113=, 8
 	i32.add 	$push114=, $3, $pop113
-	i32.call	$push51=, foo@FUNCTION, $pop114
-	i32.const	$push159=, 0
-	i32.load8_u	$push52=, p+14($pop159)
-	i32.xor 	$push53=, $pop51, $pop52
-	i32.store8	p+14($pop160), $pop53
-	i32.const	$push158=, 0
+	i32.call	$push52=, foo@FUNCTION, $pop114
+	i32.const	$push155=, 0
+	i32.load8_u	$push53=, p+15($pop155)
+	i32.xor 	$push54=, $pop52, $pop53
+	i32.store8	p+15($pop156), $pop54
+	i32.const	$push154=, 0
 	i32.const	$push115=, 8
 	i32.add 	$push116=, $3, $pop115
-	i32.call	$push54=, foo@FUNCTION, $pop116
-	i32.const	$push157=, 0
-	i32.load8_u	$push55=, p+15($pop157)
-	i32.xor 	$push56=, $pop54, $pop55
-	i32.store8	p+15($pop158), $pop56
-	i32.const	$push156=, 0
+	i32.call	$push55=, foo@FUNCTION, $pop116
+	i32.const	$push153=, 0
+	i32.load8_u	$push56=, p+16($pop153)
+	i32.xor 	$push57=, $pop55, $pop56
+	i32.store8	p+16($pop154), $pop57
+	i32.const	$push152=, 0
 	i32.const	$push117=, 8
 	i32.add 	$push118=, $3, $pop117
-	i32.call	$push57=, foo@FUNCTION, $pop118
-	i32.const	$push155=, 0
-	i32.load8_u	$push58=, p+16($pop155)
-	i32.xor 	$push59=, $pop57, $pop58
-	i32.store8	p+16($pop156), $pop59
-	i32.const	$push154=, 0
+	i32.call	$push58=, foo@FUNCTION, $pop118
+	i32.const	$push151=, 0
+	i32.load8_u	$push59=, p+17($pop151)
+	i32.xor 	$push60=, $pop58, $pop59
+	i32.store8	p+17($pop152), $pop60
+	i32.const	$push150=, 0
 	i32.const	$push119=, 8
 	i32.add 	$push120=, $3, $pop119
-	i32.call	$push60=, foo@FUNCTION, $pop120
-	i32.const	$push153=, 0
-	i32.load8_u	$push61=, p+17($pop153)
-	i32.xor 	$push62=, $pop60, $pop61
-	i32.store8	p+17($pop154), $pop62
-	i32.const	$push152=, 0
+	i32.call	$push61=, foo@FUNCTION, $pop120
+	i32.const	$push149=, 0
+	i32.load8_u	$push62=, p+18($pop149)
+	i32.xor 	$push63=, $pop61, $pop62
+	i32.store8	p+18($pop150), $pop63
+	i32.const	$push148=, 0
 	i32.const	$push121=, 8
 	i32.add 	$push122=, $3, $pop121
-	i32.call	$push63=, foo@FUNCTION, $pop122
-	i32.const	$push151=, 0
-	i32.load8_u	$push64=, p+18($pop151)
-	i32.xor 	$push65=, $pop63, $pop64
-	i32.store8	p+18($pop152), $pop65
-	i32.const	$push150=, 0
+	i32.call	$push64=, foo@FUNCTION, $pop122
+	i32.const	$push147=, 0
+	i32.load8_u	$push65=, p+19($pop147)
+	i32.xor 	$push66=, $pop64, $pop65
+	i32.store8	p+19($pop148), $pop66
+	i32.const	$push146=, 0
 	i32.const	$push123=, 8
 	i32.add 	$push124=, $3, $pop123
-	i32.call	$push66=, foo@FUNCTION, $pop124
-	i32.const	$push149=, 0
-	i32.load8_u	$push67=, p+19($pop149)
-	i32.xor 	$push68=, $pop66, $pop67
-	i32.store8	p+19($pop150), $pop68
-	i32.const	$push148=, 0
+	i32.call	$push67=, foo@FUNCTION, $pop124
+	i32.const	$push145=, 0
+	i32.load8_u	$push68=, p+20($pop145)
+	i32.xor 	$push69=, $pop67, $pop68
+	i32.store8	p+20($pop146), $pop69
+	i32.const	$push144=, 0
 	i32.const	$push125=, 8
 	i32.add 	$push126=, $3, $pop125
-	i32.call	$push69=, foo@FUNCTION, $pop126
-	i32.const	$push147=, 0
-	i32.load8_u	$push70=, p+20($pop147)
-	i32.xor 	$push71=, $pop69, $pop70
-	i32.store8	p+20($pop148), $pop71
-	i32.const	$push146=, 0
+	i32.call	$push70=, foo@FUNCTION, $pop126
+	i32.const	$push143=, 0
+	i32.load8_u	$push71=, p+21($pop143)
+	i32.xor 	$push72=, $pop70, $pop71
+	i32.store8	p+21($pop144), $pop72
+	i32.const	$push142=, 0
 	i32.const	$push127=, 8
 	i32.add 	$push128=, $3, $pop127
-	i32.call	$push72=, foo@FUNCTION, $pop128
-	i32.const	$push145=, 0
-	i32.load8_u	$push73=, p+21($pop145)
-	i32.xor 	$push74=, $pop72, $pop73
-	i32.store8	p+21($pop146), $pop74
-	i32.const	$push144=, 0
-	i32.const	$push129=, 8
-	i32.add 	$push130=, $3, $pop129
-	i32.call	$push75=, foo@FUNCTION, $pop130
-	i32.const	$push143=, 0
-	i32.load8_u	$push76=, p+22($pop143)
-	i32.xor 	$push77=, $pop75, $pop76
-	i32.store8	p+22($pop144), $pop77
-	i32.const	$push84=, 0
-	i32.const	$push82=, 2512
-	i32.add 	$push83=, $3, $pop82
-	i32.store	__stack_pointer($pop84), $pop83
+	i32.call	$push73=, foo@FUNCTION, $pop128
+	i32.const	$push141=, 0
+	i32.load8_u	$push74=, p+22($pop141)
+	i32.xor 	$push75=, $pop73, $pop74
+	i32.store8	p+22($pop142), $pop75
+	i32.const	$push82=, 0
+	i32.const	$push80=, 2512
+	i32.add 	$push81=, $3, $pop80
+	i32.store	__stack_pointer($pop82), $pop81
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.load	$push0=, 4($0)
 	i32.const	$push1=, -1
-	i32.add 	$push38=, $pop0, $pop1
-	tee_local	$push37=, $4=, $pop38
-	i32.store	4($0), $pop37
+	i32.add 	$push37=, $pop0, $pop1
+	tee_local	$push36=, $4=, $pop37
+	i32.store	4($0), $pop36
+	block   	
 	block   	
-	br_if   	0, $4           # 0: down to label2
-# BB#1:                                 # %if.then
-	i32.const	$push39=, 8
-	i32.add 	$push2=, $0, $pop39
-	i32.store	0($0), $pop2
+	i32.eqz 	$push63=, $4
+	br_if   	0, $pop63       # 0: down to label3
+# BB#1:                                 # %entry.if.end_crit_edge
+	i32.load	$5=, 0($0)
+	br      	1               # 1: down to label2
+.LBB2_2:                                # %if.then
+	end_block                       # label3:
+	i32.const	$push40=, 8
+	i32.add 	$push39=, $0, $pop40
+	tee_local	$push38=, $5=, $pop39
+	i32.store	0($0), $pop38
 	i32.load	$4=, 8($0)
 	i32.const	$3=, 0
-.LBB2_2:                                # %for.body
+.LBB2_3:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i32.add 	$push55=, $0, $3
-	tee_local	$push54=, $2=, $pop55
-	i32.const	$push53=, 8
-	i32.add 	$push15=, $pop54, $pop53
-	i32.const	$push52=, 0
-	i32.const	$push51=, 12
-	i32.add 	$push3=, $2, $pop51
-	i32.load	$push50=, 0($pop3)
-	tee_local	$push49=, $1=, $pop50
-	i32.const	$push48=, 1
-	i32.and 	$push4=, $pop49, $pop48
-	i32.sub 	$push5=, $pop52, $pop4
-	i32.const	$push47=, -1727483681
-	i32.and 	$push6=, $pop5, $pop47
-	i32.const	$push46=, 1596
-	i32.add 	$push7=, $2, $pop46
-	i32.load	$push8=, 0($pop7)
-	i32.xor 	$push9=, $pop6, $pop8
-	i32.xor 	$push10=, $1, $4
-	i32.const	$push45=, 2147483646
-	i32.and 	$push11=, $pop10, $pop45
-	i32.xor 	$push12=, $pop11, $4
-	i32.const	$push44=, 1
-	i32.shr_u	$push13=, $pop12, $pop44
-	i32.xor 	$push14=, $pop9, $pop13
-	i32.store	0($pop15), $pop14
+	loop    	                # label4:
+	i32.add 	$push56=, $0, $3
+	tee_local	$push55=, $2=, $pop56
+	i32.const	$push54=, 8
+	i32.add 	$push14=, $pop55, $pop54
+	i32.const	$push53=, 0
+	i32.const	$push52=, 12
+	i32.add 	$push2=, $2, $pop52
+	i32.load	$push51=, 0($pop2)
+	tee_local	$push50=, $1=, $pop51
+	i32.const	$push49=, 1
+	i32.and 	$push3=, $pop50, $pop49
+	i32.sub 	$push4=, $pop53, $pop3
+	i32.const	$push48=, -1727483681
+	i32.and 	$push5=, $pop4, $pop48
+	i32.const	$push47=, 1596
+	i32.add 	$push6=, $2, $pop47
+	i32.load	$push7=, 0($pop6)
+	i32.xor 	$push8=, $pop5, $pop7
+	i32.xor 	$push9=, $1, $4
+	i32.const	$push46=, 2147483646
+	i32.and 	$push10=, $pop9, $pop46
+	i32.xor 	$push11=, $pop10, $4
+	i32.const	$push45=, 1
+	i32.shr_u	$push12=, $pop11, $pop45
+	i32.xor 	$push13=, $pop8, $pop12
+	i32.store	0($pop14), $pop13
 	copy_local	$4=, $1
-	i32.const	$push43=, 4
-	i32.add 	$push42=, $3, $pop43
-	tee_local	$push41=, $3=, $pop42
-	i32.const	$push40=, 908
-	i32.ne  	$push16=, $pop41, $pop40
-	br_if   	0, $pop16       # 0: up to label3
-.LBB2_3:                                # %if.end
+	i32.const	$push44=, 4
+	i32.add 	$push43=, $3, $pop44
+	tee_local	$push42=, $3=, $pop43
+	i32.const	$push41=, 908
+	i32.ne  	$push15=, $pop42, $pop41
+	br_if   	0, $pop15       # 0: up to label4
+.LBB2_4:                                # %if.end
 	end_loop
 	end_block                       # label2:
-	i32.load	$push63=, 0($0)
-	tee_local	$push62=, $4=, $pop63
-	i32.const	$push17=, 4
-	i32.add 	$push18=, $pop62, $pop17
-	i32.store	0($0), $pop18
-	i32.load	$push61=, 0($4)
-	tee_local	$push60=, $4=, $pop61
-	i32.const	$push19=, 11
-	i32.shr_u	$push20=, $pop60, $pop19
-	i32.xor 	$push59=, $pop20, $4
-	tee_local	$push58=, $4=, $pop59
-	i32.const	$push21=, 7
-	i32.shl 	$push22=, $pop58, $pop21
-	i32.const	$push23=, -1658038656
-	i32.and 	$push24=, $pop22, $pop23
-	i32.xor 	$push57=, $pop24, $4
-	tee_local	$push56=, $4=, $pop57
-	i32.const	$push25=, 15
-	i32.shl 	$push26=, $pop56, $pop25
-	i32.const	$push27=, 130023424
-	i32.and 	$push28=, $pop26, $pop27
-	i32.xor 	$push29=, $pop28, $4
-	i32.const	$push30=, 18
-	i32.shr_u	$push31=, $pop29, $pop30
-	i32.xor 	$push32=, $pop31, $4
-	i32.const	$push33=, 1
-	i32.shr_u	$push34=, $pop32, $pop33
-	i32.const	$push35=, 255
-	i32.and 	$push36=, $pop34, $pop35
-                                        # fallthrough-return: $pop36
+	i32.const	$push16=, 4
+	i32.add 	$push17=, $5, $pop16
+	i32.store	0($0), $pop17
+	i32.load	$push62=, 0($5)
+	tee_local	$push61=, $4=, $pop62
+	i32.const	$push18=, 11
+	i32.shr_u	$push19=, $pop61, $pop18
+	i32.xor 	$push60=, $pop19, $4
+	tee_local	$push59=, $4=, $pop60
+	i32.const	$push20=, 7
+	i32.shl 	$push21=, $pop59, $pop20
+	i32.const	$push22=, -1658038656
+	i32.and 	$push23=, $pop21, $pop22
+	i32.xor 	$push58=, $pop23, $4
+	tee_local	$push57=, $4=, $pop58
+	i32.const	$push24=, 15
+	i32.shl 	$push25=, $pop57, $pop24
+	i32.const	$push26=, 130023424
+	i32.and 	$push27=, $pop25, $pop26
+	i32.xor 	$push28=, $pop27, $4
+	i32.const	$push29=, 18
+	i32.shr_u	$push30=, $pop28, $pop29
+	i32.xor 	$push31=, $pop30, $4
+	i32.const	$push32=, 1
+	i32.shr_u	$push33=, $pop31, $pop32
+	i32.const	$push34=, 255
+	i32.and 	$push35=, $pop33, $pop34
+                                        # fallthrough-return: $pop35
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.type	p,@object               # @p
 	.section	.data.p,"aw",@progbits
 	.p2align	4
@@ -369,6 +372,6 @@ q:
 	.size	q, 23
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr37882.c.s b/test/torture-s/pr37882.c.s
index af46e4b96..46aa7cb5f 100644
--- a/test/torture-s/pr37882.c.s
+++ b/test/torture-s/pr37882.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37882.c"
+	.file	"pr37882.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -20,7 +20,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -30,4 +30,4 @@ s:
 	.size	s, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr37924.c.s b/test/torture-s/pr37924.c.s
index fa309be31..b38825448 100644
--- a/test/torture-s/pr37924.c.s
+++ b/test/torture-s/pr37924.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37924.c"
+	.file	"pr37924.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -9,17 +9,17 @@ test1:                                  # @test1
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, a($pop0)
-	i32.const	$push2=, 9
-	i32.shr_u	$push3=, $pop1, $pop2
-	i32.const	$push4=, 8388607
-	i32.xor 	$push5=, $pop3, $pop4
+	i32.const	$push2=, -1
+	i32.xor 	$push3=, $pop1, $pop2
+	i32.const	$push4=, 9
+	i32.shr_u	$push5=, $pop3, $pop4
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -30,9 +30,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -67,4 +67,4 @@ b:
 	.size	b, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr37931.c.s b/test/torture-s/pr37931.c.s
index 6475f645b..7989abac9 100644
--- a/test/torture-s/pr37931.c.s
+++ b/test/torture-s/pr37931.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr37931.c"
+	.file	"pr37931.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,6 +28,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr38048-1.c.s b/test/torture-s/pr38048-1.c.s
index dc4f29491..4373bec0a 100644
--- a/test/torture-s/pr38048-1.c.s
+++ b/test/torture-s/pr38048-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38048-1.c"
+	.file	"pr38048-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr38048-2.c.s b/test/torture-s/pr38048-2.c.s
index 6497d360e..03845759c 100644
--- a/test/torture-s/pr38048-2.c.s
+++ b/test/torture-s/pr38048-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38048-2.c"
+	.file	"pr38048-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,6 +25,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr38051.c.s b/test/torture-s/pr38051.c.s
index 6217fd507..61d0a7860 100644
--- a/test/torture-s/pr38051.c.s
+++ b/test/torture-s/pr38051.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38051.c"
+	.file	"pr38051.c"
 	.section	.text.mymemcmp,"ax",@progbits
-	.hidden	mymemcmp
+	.hidden	mymemcmp                # -- Begin function mymemcmp
 	.globl	mymemcmp
 	.type	mymemcmp,@function
 mymemcmp:                               # @mymemcmp
@@ -9,10 +9,10 @@ mymemcmp:                               # @mymemcmp
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push104=, 0
-	i32.load	$push105=, __stack_pointer($pop104)
+	i32.const	$push105=, 0
+	i32.load	$push104=, __stack_pointer($pop105)
 	i32.const	$push106=, 16
-	i32.sub 	$10=, $pop105, $pop106
+	i32.sub 	$6=, $pop104, $pop106
 	i32.const	$push26=, 2
 	i32.shr_u	$2=, $2, $pop26
 	block   	
@@ -29,11 +29,10 @@ mymemcmp:                               # @mymemcmp
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.const	$push147=, 3
 	i32.and 	$push27=, $0, $pop147
 	i32.eqz 	$push223=, $pop27
-	br_if   	0, $pop223      # 0: down to label14
+	br_if   	0, $pop223      # 0: down to label13
 # BB#1:                                 # %if.else
 	i32.const	$push28=, -4
 	i32.and 	$4=, $0, $pop28
@@ -48,37 +47,37 @@ mymemcmp:                               # @mymemcmp
 	i32.and 	$push149=, $2, $pop150
 	tee_local	$push148=, $5=, $pop149
 	i32.eqz 	$push224=, $pop148
-	br_if   	1, $pop224      # 1: down to label13
+	br_if   	1, $pop224      # 1: down to label12
 # BB#2:                                 # %if.else
 	i32.const	$push32=, 1
 	i32.eq  	$push33=, $5, $pop32
-	br_if   	2, $pop33       # 2: down to label12
+	br_if   	2, $pop33       # 2: down to label11
 # BB#3:                                 # %if.else
 	i32.const	$push34=, 3
 	i32.ne  	$push35=, $5, $pop34
-	br_if   	3, $pop35       # 3: down to label11
+	br_if   	3, $pop35       # 3: down to label10
 # BB#4:                                 # %sw.bb6.i
 	i32.const	$push40=, 1
 	i32.add 	$2=, $2, $pop40
 	i32.const	$push41=, -4
-	i32.add 	$8=, $1, $pop41
-	i32.load	$7=, 0($4)
-	br      	8               # 8: down to label6
+	i32.add 	$9=, $1, $pop41
+	i32.load	$8=, 0($4)
+	br      	8               # 8: down to label5
 .LBB0_5:                                # %if.then
-	end_block                       # label14:
+	end_block                       # label13:
 	i32.const	$push156=, 3
 	i32.and 	$push155=, $2, $pop156
 	tee_local	$push154=, $4=, $pop155
 	i32.eqz 	$push225=, $pop154
-	br_if   	11, $pop225     # 11: down to label2
+	br_if   	10, $pop225     # 10: down to label2
 # BB#6:                                 # %if.then
 	i32.const	$push70=, 1
 	i32.eq  	$push71=, $4, $pop70
-	br_if   	3, $pop71       # 3: down to label10
+	br_if   	3, $pop71       # 3: down to label9
 # BB#7:                                 # %if.then
 	i32.const	$push72=, 3
 	i32.ne  	$push73=, $4, $pop72
-	br_if   	4, $pop73       # 4: down to label9
+	br_if   	4, $pop73       # 4: down to label8
 # BB#8:                                 # %sw.bb3.i
 	i32.const	$push76=, 1
 	i32.add 	$2=, $2, $pop76
@@ -86,83 +85,81 @@ mymemcmp:                               # @mymemcmp
 	i32.add 	$4=, $1, $pop77
 	i32.const	$push157=, -4
 	i32.add 	$3=, $0, $pop157
-	br      	12              # 12: down to label1
+	br      	11              # 11: down to label1
 .LBB0_9:                                # %sw.bb12.i18
-	end_block                       # label13:
+	end_block                       # label12:
 	i32.const	$push39=, 4
-	i32.add 	$6=, $4, $pop39
+	i32.add 	$7=, $4, $pop39
 	i32.load	$5=, 0($4)
-	br      	5               # 5: down to label7
+	br      	5               # 5: down to label6
 .LBB0_10:                               # %sw.bb17.i
-	end_block                       # label12:
+	end_block                       # label11:
 	i32.const	$push36=, -1
 	i32.add 	$2=, $2, $pop36
 	i32.const	$push38=, 8
-	i32.add 	$6=, $4, $pop38
-	i32.load	$7=, 0($1)
+	i32.add 	$7=, $4, $pop38
+	i32.load	$8=, 0($1)
 	i32.load	$5=, 4($4)
 	i32.load	$4=, 0($4)
 	i32.const	$push37=, 4
 	i32.add 	$push14=, $1, $pop37
 	copy_local	$1=, $pop14
-	br      	3               # 3: down to label8
+	br      	3               # 3: down to label7
 .LBB0_11:                               # %sw.bb.i16
-	end_block                       # label11:
+	end_block                       # label10:
 	i32.const	$push42=, 2
 	i32.add 	$2=, $2, $pop42
 	i32.const	$push43=, -8
-	i32.add 	$8=, $1, $pop43
+	i32.add 	$9=, $1, $pop43
 	i32.const	$push44=, -4
-	i32.add 	$9=, $4, $pop44
+	i32.add 	$10=, $4, $pop44
 	i32.const	$push45=, 4
-	i32.add 	$6=, $4, $pop45
+	i32.add 	$7=, $4, $pop45
 	i32.load	$5=, 0($4)
-	br      	5               # 5: down to label5
+	br      	5               # 5: down to label4
 .LBB0_12:                               # %sw.bb12.i
-	end_block                       # label10:
+	end_block                       # label9:
 	i32.const	$push74=, -1
 	i32.add 	$2=, $2, $pop74
 	i32.load	$5=, 0($1)
-	i32.load	$6=, 0($0)
+	i32.load	$7=, 0($0)
 	i32.const	$push75=, 4
 	i32.add 	$push0=, $0, $pop75
 	copy_local	$0=, $pop0
 	i32.const	$push158=, 4
 	i32.add 	$push1=, $1, $pop158
 	copy_local	$1=, $pop1
-	i32.eq  	$push84=, $6, $5
-	br_if   	5, $pop84       # 5: down to label4
-	br      	6               # 6: down to label3
-.LBB0_13:                               # %sw.bb.i
-	end_block                       # label9:
+	i32.ne  	$push85=, $7, $5
+	br_if   	5, $pop85       # 5: down to label3
+# BB#13:
+	i32.const	$11=, 29
+	br      	8               # 8: down to label0
+.LBB0_14:                               # %sw.bb.i
+	end_block                       # label8:
 	i32.const	$push78=, 2
 	i32.add 	$2=, $2, $pop78
 	i32.const	$push79=, -8
 	i32.add 	$4=, $1, $pop79
-	i32.const	$push159=, -8
-	i32.add 	$3=, $0, $pop159
-# BB#14:
+	i32.const	$push169=, -8
+	i32.add 	$3=, $0, $pop169
+# BB#15:
 	i32.const	$11=, 39
-	br      	8               # 8: down to label0
-.LBB0_15:
-	end_block                       # label8:
-	i32.const	$11=, 0
 	br      	7               # 7: down to label0
 .LBB0_16:
 	end_block                       # label7:
-	i32.const	$11=, 4
+	i32.const	$11=, 0
 	br      	6               # 6: down to label0
 .LBB0_17:
 	end_block                       # label6:
-	i32.const	$11=, 9
+	i32.const	$11=, 4
 	br      	5               # 5: down to label0
 .LBB0_18:
 	end_block                       # label5:
-	i32.const	$11=, 14
+	i32.const	$11=, 9
 	br      	4               # 4: down to label0
 .LBB0_19:
 	end_block                       # label4:
-	i32.const	$11=, 29
+	i32.const	$11=, 14
 	br      	3               # 3: down to label0
 .LBB0_20:
 	end_block                       # label3:
@@ -177,7 +174,7 @@ mymemcmp:                               # @mymemcmp
 	i32.const	$11=, 34
 .LBB0_23:                               # =>This Inner Loop Header: Depth=1
 	end_block                       # label0:
-	loop    	i32             # label15:
+	loop    	i32             # label14:
 	block   	
 	block   	
 	block   	
@@ -250,762 +247,748 @@ mymemcmp:                               # @mymemcmp
 	block   	
 	block   	
 	block   	
-	br_table 	$11, 26, 34, 35, 36, 27, 37, 38, 39, 28, 29, 40, 41, 42, 30, 23, 31, 32, 33, 24, 25, 43, 44, 45, 46, 47, 2, 10, 11, 12, 3, 13, 14, 15, 4, 5, 16, 17, 18, 6, 0, 7, 8, 9, 1, 19, 20, 21, 22, 22 # 26: down to label61
-                                        # 34: down to label53
-                                        # 35: down to label52
-                                        # 36: down to label51
-                                        # 27: down to label60
-                                        # 37: down to label50
-                                        # 38: down to label49
-                                        # 39: down to label48
-                                        # 28: down to label59
-                                        # 29: down to label58
-                                        # 40: down to label47
-                                        # 41: down to label46
-                                        # 42: down to label45
-                                        # 30: down to label57
-                                        # 23: down to label64
-                                        # 31: down to label56
-                                        # 32: down to label55
-                                        # 33: down to label54
-                                        # 24: down to label63
-                                        # 25: down to label62
-                                        # 43: down to label44
-                                        # 44: down to label43
-                                        # 45: down to label42
-                                        # 46: down to label41
-                                        # 47: down to label40
-                                        # 2: down to label85
-                                        # 10: down to label77
-                                        # 11: down to label76
-                                        # 12: down to label75
-                                        # 3: down to label84
-                                        # 13: down to label74
-                                        # 14: down to label73
-                                        # 15: down to label72
-                                        # 4: down to label83
-                                        # 5: down to label82
-                                        # 16: down to label71
-                                        # 17: down to label70
-                                        # 18: down to label69
-                                        # 6: down to label81
-                                        # 0: down to label87
-                                        # 7: down to label80
-                                        # 8: down to label79
-                                        # 9: down to label78
-                                        # 1: down to label86
-                                        # 19: down to label68
-                                        # 20: down to label67
-                                        # 21: down to label66
-                                        # 22: down to label65
-.LBB0_24:                               # %do1.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label87:
-	i32.load	$push163=, 0($0)
-	tee_local	$push162=, $0=, $pop163
-	i32.load	$push161=, 0($1)
-	tee_local	$push160=, $1=, $pop161
-	i32.ne  	$push80=, $pop162, $pop160
-	br_if   	68, $pop80      # 68: down to label18
-# BB#25:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 43
-	br      	71              # 71: up to label15
-.LBB0_26:                               # %if.end37.i
+	br_table 	$11, 23, 31, 32, 33, 24, 34, 35, 36, 25, 26, 37, 38, 39, 27, 28, 40, 41, 42, 29, 30, 43, 44, 45, 46, 47, 6, 7, 8, 9, 0, 10, 11, 12, 1, 2, 13, 14, 15, 3, 4, 16, 17, 18, 5, 19, 20, 21, 22, 22 # 23: down to label63
+                                        # 31: down to label55
+                                        # 32: down to label54
+                                        # 33: down to label53
+                                        # 24: down to label62
+                                        # 34: down to label52
+                                        # 35: down to label51
+                                        # 36: down to label50
+                                        # 25: down to label61
+                                        # 26: down to label60
+                                        # 37: down to label49
+                                        # 38: down to label48
+                                        # 39: down to label47
+                                        # 27: down to label59
+                                        # 28: down to label58
+                                        # 40: down to label46
+                                        # 41: down to label45
+                                        # 42: down to label44
+                                        # 29: down to label57
+                                        # 30: down to label56
+                                        # 43: down to label43
+                                        # 44: down to label42
+                                        # 45: down to label41
+                                        # 46: down to label40
+                                        # 47: down to label39
+                                        # 6: down to label80
+                                        # 7: down to label79
+                                        # 8: down to label78
+                                        # 9: down to label77
+                                        # 0: down to label86
+                                        # 10: down to label76
+                                        # 11: down to label75
+                                        # 12: down to label74
+                                        # 1: down to label85
+                                        # 2: down to label84
+                                        # 13: down to label73
+                                        # 14: down to label72
+                                        # 15: down to label71
+                                        # 3: down to label83
+                                        # 4: down to label82
+                                        # 16: down to label70
+                                        # 17: down to label69
+                                        # 18: down to label68
+                                        # 5: down to label81
+                                        # 19: down to label67
+                                        # 20: down to label66
+                                        # 21: down to label65
+                                        # 22: down to label64
+.LBB0_24:                               # %do3.i
                                         #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label86:
-	i32.load	$5=, 12($4)
-	i32.load	$6=, 12($3)
-	i32.const	$push82=, -4
-	i32.add 	$push165=, $2, $pop82
-	tee_local	$push164=, $2=, $pop165
-	i32.eqz 	$push226=, $pop164
-	br_if   	60, $pop226     # 60: down to label25
-# BB#27:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 25
-	br      	70              # 70: up to label15
-.LBB0_28:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label85:
-	i32.const	$push83=, 16
-	i32.add 	$1=, $4, $pop83
-	i32.const	$push166=, 16
-	i32.add 	$0=, $3, $pop166
-	i32.ne  	$push85=, $6, $5
-	br_if   	45, $pop85      # 45: down to label39
-# BB#29:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 29
-	br      	69              # 69: up to label15
-.LBB0_30:                               # %do3.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label84:
-	i32.load	$push170=, 0($0)
-	tee_local	$push169=, $4=, $pop170
-	i32.load	$push168=, 0($1)
-	tee_local	$push167=, $3=, $pop168
-	i32.ne  	$push88=, $pop169, $pop167
-	br_if   	60, $pop88      # 60: down to label23
-# BB#31:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.load	$push162=, 0($0)
+	tee_local	$push161=, $4=, $pop162
+	i32.load	$push160=, 0($1)
+	tee_local	$push159=, $3=, $pop160
+	i32.ne  	$push88=, $pop161, $pop159
+	br_if   	63, $pop88      # 63: down to label22
+# BB#25:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 33
-	br      	68              # 68: up to label15
-.LBB0_32:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label83:
+	br      	71              # 71: up to label14
+.LBB0_26:                               #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label85:
 	copy_local	$3=, $0
 	copy_local	$4=, $1
 	i32.const	$push87=, 4
 	i32.add 	$push4=, $0, $pop87
 	copy_local	$0=, $pop4
-	i32.const	$push171=, 4
-	i32.add 	$push5=, $1, $pop171
+	i32.const	$push163=, 4
+	i32.add 	$push5=, $1, $pop163
 	copy_local	$1=, $pop5
-# BB#33:                                #   in Loop: Header=BB0_23 Depth=1
+# BB#27:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 34
-	br      	67              # 67: up to label15
-.LBB0_34:                               # %do2.i
+	br      	70              # 70: up to label14
+.LBB0_28:                               # %do2.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label82:
-	i32.load	$push175=, 0($0)
-	tee_local	$push174=, $0=, $pop175
-	i32.load	$push173=, 0($1)
-	tee_local	$push172=, $1=, $pop173
-	i32.ne  	$push91=, $pop174, $pop172
-	br_if   	60, $pop91      # 60: down to label21
-# BB#35:                                #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label84:
+	i32.load	$push167=, 0($0)
+	tee_local	$push166=, $0=, $pop167
+	i32.load	$push165=, 0($1)
+	tee_local	$push164=, $1=, $pop165
+	i32.ne  	$push90=, $pop166, $pop164
+	br_if   	63, $pop90      # 63: down to label20
+# BB#29:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 38
-	br      	66              # 66: up to label15
-.LBB0_36:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label81:
-	i32.const	$push90=, 8
-	i32.add 	$1=, $4, $pop90
-	i32.const	$push176=, 8
-	i32.add 	$0=, $3, $pop176
-	br      	61              # 61: down to label19
-.LBB0_37:                               # %if.then35.i
+	br      	69              # 69: up to label14
+.LBB0_30:                               # %if.end31.i
                                         #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label83:
+	i32.const	$push92=, 8
+	i32.add 	$0=, $3, $pop92
+	i32.const	$push168=, 8
+	i32.add 	$1=, $4, $pop168
+	br      	64              # 64: down to label18
+.LBB0_31:                               # %do1.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label82:
+	i32.load	$push173=, 0($0)
+	tee_local	$push172=, $0=, $pop173
+	i32.load	$push171=, 0($1)
+	tee_local	$push170=, $1=, $pop171
+	i32.ne  	$push80=, $pop172, $pop170
+	br_if   	64, $pop80      # 64: down to label17
+# BB#32:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 43
+	br      	67              # 67: up to label14
+.LBB0_33:                               # %if.end37.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label81:
+	i32.load	$5=, 12($4)
+	i32.load	$7=, 12($3)
+	i32.const	$push82=, -4
+	i32.add 	$push175=, $2, $pop82
+	tee_local	$push174=, $2=, $pop175
+	i32.eqz 	$push226=, $pop174
+	br_if   	56, $pop226     # 56: down to label24
+# BB#34:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 25
+	br      	66              # 66: up to label14
+.LBB0_35:                               #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label80:
-	i32.store	12($10), $0
-	i32.store	8($10), $1
-	i32.const	$push115=, 8
-	i32.add 	$push116=, $10, $pop115
-	copy_local	$1=, $pop116
-	i32.const	$push117=, 12
-	i32.add 	$push118=, $10, $pop117
-	copy_local	$10=, $pop118
-# BB#38:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 41
-	br      	64              # 64: up to label15
-.LBB0_39:                               # %do.body.i116.i
+	i32.const	$push83=, 16
+	i32.add 	$1=, $4, $pop83
+	i32.const	$push176=, 16
+	i32.add 	$0=, $3, $pop176
+	i32.eq  	$push84=, $7, $5
+	br_if   	41, $pop84      # 41: down to label38
+# BB#36:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 26
+	br      	65              # 65: up to label14
+.LBB0_37:                               # %if.then.i
                                         #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label79:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push178=, 1
-	i32.add 	$push11=, $1, $pop178
-	copy_local	$1=, $pop11
-	i32.const	$push177=, 1
-	i32.add 	$push10=, $10, $pop177
-	copy_local	$10=, $pop10
-	i32.eq  	$push81=, $2, $0
-	br_if   	61, $pop81      # 61: down to label17
-# BB#40:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 42
-	br      	63              # 63: up to label15
-.LBB0_41:                               # %mymemcmp1.exit120.i
-	end_block                       # label78:
-	i32.sub 	$push100=, $2, $0
-	return  	$pop100
-.LBB0_42:                               # %if.then.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label77:
-	i32.store	12($10), $6
-	i32.store	8($10), $5
+	i32.store	8($6), $5
+	i32.store	12($6), $7
 	i32.const	$push111=, 8
-	i32.add 	$push112=, $10, $pop111
+	i32.add 	$push112=, $6, $pop111
 	copy_local	$1=, $pop112
 	i32.const	$push113=, 12
-	i32.add 	$push114=, $10, $pop113
-	copy_local	$10=, $pop114
-# BB#43:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push114=, $6, $pop113
+	copy_local	$6=, $pop114
+# BB#38:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 27
-	br      	61              # 61: up to label15
-.LBB0_44:                               # %do.body.i.i
+	br      	64              # 64: up to label14
+.LBB0_39:                               # %do.body.i.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label76:
+	end_block                       # label78:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push180=, 1
-	i32.add 	$push3=, $1, $pop180
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push178=, 1
+	i32.add 	$push3=, $1, $pop178
 	copy_local	$1=, $pop3
-	i32.const	$push179=, 1
-	i32.add 	$push2=, $10, $pop179
-	copy_local	$10=, $pop2
+	i32.const	$push177=, 1
+	i32.add 	$push2=, $6, $pop177
+	copy_local	$6=, $pop2
 	i32.eq  	$push86=, $2, $0
-	br_if   	51, $pop86      # 51: down to label24
-# BB#45:                                #   in Loop: Header=BB0_23 Depth=1
+	br_if   	54, $pop86      # 54: down to label23
+# BB#40:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 28
-	br      	60              # 60: up to label15
-.LBB0_46:                               # %mymemcmp1.exit.i
-	end_block                       # label75:
+	br      	63              # 63: up to label14
+.LBB0_41:                               # %mymemcmp1.exit.i
+	end_block                       # label77:
 	i32.sub 	$push103=, $2, $0
 	return  	$pop103
-.LBB0_47:                               # %if.then23.i
+.LBB0_42:                               # %if.then23.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label74:
-	i32.store	12($10), $4
-	i32.store	8($10), $3
+	end_block                       # label76:
+	i32.store	8($6), $3
+	i32.store	12($6), $4
 	i32.const	$push123=, 8
-	i32.add 	$push124=, $10, $pop123
+	i32.add 	$push124=, $6, $pop123
 	copy_local	$1=, $pop124
 	i32.const	$push125=, 12
-	i32.add 	$push126=, $10, $pop125
-	copy_local	$10=, $pop126
-# BB#48:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push126=, $6, $pop125
+	copy_local	$6=, $pop126
+# BB#43:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 31
-	br      	58              # 58: up to label15
-.LBB0_49:                               # %do.body.i140.i
+	br      	61              # 61: up to label14
+.LBB0_44:                               # %do.body.i140.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label73:
+	end_block                       # label75:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push182=, 1
-	i32.add 	$push7=, $1, $pop182
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push180=, 1
+	i32.add 	$push7=, $1, $pop180
 	copy_local	$1=, $pop7
-	i32.const	$push181=, 1
-	i32.add 	$push6=, $10, $pop181
-	copy_local	$10=, $pop6
+	i32.const	$push179=, 1
+	i32.add 	$push6=, $6, $pop179
+	copy_local	$6=, $pop6
 	i32.eq  	$push89=, $2, $0
-	br_if   	50, $pop89      # 50: down to label22
-# BB#50:                                #   in Loop: Header=BB0_23 Depth=1
+	br_if   	53, $pop89      # 53: down to label21
+# BB#45:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 32
-	br      	57              # 57: up to label15
-.LBB0_51:                               # %mymemcmp1.exit144.i
-	end_block                       # label72:
+	br      	60              # 60: up to label14
+.LBB0_46:                               # %mymemcmp1.exit144.i
+	end_block                       # label74:
 	i32.sub 	$push102=, $2, $0
 	return  	$pop102
-.LBB0_52:                               # %if.then29.i
+.LBB0_47:                               # %if.then29.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label71:
-	i32.store	12($10), $0
-	i32.store	8($10), $1
+	end_block                       # label73:
+	i32.store	8($6), $1
+	i32.store	12($6), $0
 	i32.const	$push119=, 8
-	i32.add 	$push120=, $10, $pop119
+	i32.add 	$push120=, $6, $pop119
 	copy_local	$1=, $pop120
 	i32.const	$push121=, 12
-	i32.add 	$push122=, $10, $pop121
-	copy_local	$10=, $pop122
-# BB#53:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push122=, $6, $pop121
+	copy_local	$6=, $pop122
+# BB#48:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 36
-	br      	55              # 55: up to label15
-.LBB0_54:                               # %do.body.i128.i
+	br      	58              # 58: up to label14
+.LBB0_49:                               # %do.body.i128.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label70:
+	end_block                       # label72:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push184=, 1
-	i32.add 	$push9=, $1, $pop184
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push182=, 1
+	i32.add 	$push9=, $1, $pop182
 	copy_local	$1=, $pop9
-	i32.const	$push183=, 1
-	i32.add 	$push8=, $10, $pop183
-	copy_local	$10=, $pop8
-	i32.eq  	$push92=, $2, $0
-	br_if   	49, $pop92      # 49: down to label20
-# BB#55:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push181=, 1
+	i32.add 	$push8=, $6, $pop181
+	copy_local	$6=, $pop8
+	i32.eq  	$push91=, $2, $0
+	br_if   	52, $pop91      # 52: down to label19
+# BB#50:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 37
-	br      	54              # 54: up to label15
-.LBB0_56:                               # %mymemcmp1.exit132.i
-	end_block                       # label69:
+	br      	57              # 57: up to label14
+.LBB0_51:                               # %mymemcmp1.exit132.i
+	end_block                       # label71:
 	i32.sub 	$push101=, $2, $0
 	return  	$pop101
-.LBB0_57:                               # %do0.i
+.LBB0_52:                               # %if.then35.i
                                         #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label70:
+	i32.store	8($6), $1
+	i32.store	12($6), $0
+	i32.const	$push115=, 8
+	i32.add 	$push116=, $6, $pop115
+	copy_local	$1=, $pop116
+	i32.const	$push117=, 12
+	i32.add 	$push118=, $6, $pop117
+	copy_local	$6=, $pop118
+# BB#53:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 41
+	br      	55              # 55: up to label14
+.LBB0_54:                               # %do.body.i116.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label69:
+	i32.load8_u	$0=, 0($1)
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push184=, 1
+	i32.add 	$push11=, $1, $pop184
+	copy_local	$1=, $pop11
+	i32.const	$push183=, 1
+	i32.add 	$push10=, $6, $pop183
+	copy_local	$6=, $pop10
+	i32.eq  	$push81=, $2, $0
+	br_if   	52, $pop81      # 52: down to label16
+# BB#55:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 42
+	br      	54              # 54: up to label14
+.LBB0_56:                               # %mymemcmp1.exit120.i
 	end_block                       # label68:
+	i32.sub 	$push100=, $2, $0
+	return  	$pop100
+.LBB0_57:                               # %do0.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label67:
 	i32.const	$1=, 0
-	i32.eq  	$push93=, $6, $5
-	br_if   	41, $pop93      # 41: down to label26
+	i32.eq  	$push93=, $7, $5
+	br_if   	41, $pop93      # 41: down to label25
 # BB#58:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 45
-	br      	52              # 52: up to label15
+	br      	52              # 52: up to label14
 .LBB0_59:                               # %if.then43.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label67:
-	i32.store	12($10), $6
-	i32.store	8($10), $5
+	end_block                       # label66:
+	i32.store	8($6), $5
+	i32.store	12($6), $7
 	i32.const	$push107=, 8
-	i32.add 	$push108=, $10, $pop107
+	i32.add 	$push108=, $6, $pop107
 	copy_local	$1=, $pop108
 	i32.const	$push109=, 12
-	i32.add 	$push110=, $10, $pop109
-	copy_local	$10=, $pop110
+	i32.add 	$push110=, $6, $pop109
+	copy_local	$6=, $pop110
 # BB#60:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 46
-	br      	51              # 51: up to label15
+	br      	51              # 51: up to label14
 .LBB0_61:                               # %do.body.i104.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label66:
+	end_block                       # label65:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
+	i32.load8_u	$2=, 0($6)
 	i32.const	$push186=, 1
 	i32.add 	$push13=, $1, $pop186
 	copy_local	$1=, $pop13
 	i32.const	$push185=, 1
-	i32.add 	$push12=, $10, $pop185
-	copy_local	$10=, $pop12
+	i32.add 	$push12=, $6, $pop185
+	copy_local	$6=, $pop12
 	i32.eq  	$push94=, $2, $0
-	br_if   	49, $pop94      # 49: down to label16
+	br_if   	49, $pop94      # 49: down to label15
 # BB#62:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 47
-	br      	50              # 50: up to label15
+	br      	50              # 50: up to label14
 .LBB0_63:                               # %mymemcmp1.exit108.i
-	end_block                       # label65:
+	end_block                       # label64:
 	i32.sub 	$push99=, $2, $0
 	return  	$pop99
-.LBB0_64:                               # %do1.i56
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label64:
-	i32.load	$push192=, 0($6)
-	tee_local	$push191=, $4=, $pop192
-	i32.shl 	$push47=, $pop191, $3
-	i32.shr_u	$push46=, $5, $0
-	i32.or  	$push190=, $pop47, $pop46
-	tee_local	$push189=, $5=, $pop190
-	i32.load	$push188=, 0($1)
-	tee_local	$push187=, $1=, $pop188
-	i32.ne  	$push48=, $pop189, $pop187
-	br_if   	32, $pop48      # 32: down to label31
-# BB#65:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 18
-	br      	48              # 48: up to label15
-.LBB0_66:                               # %if.end54.i
+.LBB0_64:                               # %do.body.i23
                                         #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label63:
-	i32.load	$7=, 12($8)
-	i32.load	$5=, 12($9)
-	i32.const	$push50=, -4
-	i32.add 	$push194=, $2, $pop50
-	tee_local	$push193=, $2=, $pop194
-	i32.eqz 	$push227=, $pop193
-	br_if   	33, $pop227     # 33: down to label29
-# BB#67:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 19
-	br      	47              # 47: up to label15
-.LBB0_68:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label62:
-	i32.const	$push51=, 16
-	i32.add 	$1=, $8, $pop51
-	i32.const	$push195=, 16
-	i32.add 	$6=, $9, $pop195
-# BB#69:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 0
-	br      	46              # 46: up to label15
-.LBB0_70:                               # %do.body.i23
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label61:
 	i32.shl 	$push53=, $5, $3
 	i32.shr_u	$push52=, $4, $0
-	i32.or  	$push197=, $pop53, $pop52
-	tee_local	$push196=, $4=, $pop197
-	i32.ne  	$push54=, $pop196, $7
-	br_if   	22, $pop54      # 22: down to label38
-# BB#71:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.or  	$push188=, $pop53, $pop52
+	tee_local	$push187=, $4=, $pop188
+	i32.ne  	$push54=, $pop187, $8
+	br_if   	25, $pop54      # 25: down to label37
+# BB#65:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 4
-	br      	45              # 45: up to label15
-.LBB0_72:                               # %do3.i42
+	br      	48              # 48: up to label14
+.LBB0_66:                               # %do3.i42
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label60:
-	i32.load	$push203=, 0($6)
-	tee_local	$push202=, $7=, $pop203
-	i32.shl 	$push57=, $pop202, $3
+	end_block                       # label62:
+	i32.load	$push194=, 0($7)
+	tee_local	$push193=, $8=, $pop194
+	i32.shl 	$push57=, $pop193, $3
 	i32.shr_u	$push56=, $5, $0
-	i32.or  	$push201=, $pop57, $pop56
-	tee_local	$push200=, $4=, $pop201
-	i32.load	$push199=, 0($1)
-	tee_local	$push198=, $5=, $pop199
-	i32.ne  	$push58=, $pop200, $pop198
-	br_if   	23, $pop58      # 23: down to label36
-# BB#73:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.or  	$push192=, $pop57, $pop56
+	tee_local	$push191=, $4=, $pop192
+	i32.load	$push190=, 0($1)
+	tee_local	$push189=, $5=, $pop190
+	i32.ne  	$push58=, $pop191, $pop189
+	br_if   	27, $pop58      # 27: down to label34
+# BB#67:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 8
-	br      	44              # 44: up to label15
-.LBB0_74:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label59:
-	copy_local	$8=, $1
-	copy_local	$4=, $6
+	br      	47              # 47: up to label14
+.LBB0_68:                               #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label61:
+	copy_local	$9=, $1
+	copy_local	$4=, $7
 	i32.const	$push59=, 4
 	i32.add 	$push17=, $1, $pop59
 	copy_local	$1=, $pop17
-# BB#75:                                #   in Loop: Header=BB0_23 Depth=1
+# BB#69:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 9
-	br      	43              # 43: up to label15
-.LBB0_76:                               # %do2.i50
+	br      	46              # 46: up to label14
+.LBB0_70:                               # %do2.i50
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label60:
+	i32.load	$push200=, 4($4)
+	tee_local	$push199=, $5=, $pop200
+	i32.shl 	$push62=, $pop199, $3
+	i32.shr_u	$push61=, $8, $0
+	i32.or  	$push198=, $pop62, $pop61
+	tee_local	$push197=, $7=, $pop198
+	i32.load	$push196=, 0($1)
+	tee_local	$push195=, $1=, $pop196
+	i32.ne  	$push63=, $pop197, $pop195
+	br_if   	27, $pop63      # 27: down to label32
+# BB#71:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 13
+	br      	45              # 45: up to label14
+.LBB0_72:                               # %if.end45.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label59:
+	i32.const	$push65=, 8
+	i32.add 	$7=, $4, $pop65
+	i32.const	$push201=, 8
+	i32.add 	$1=, $9, $pop201
+	copy_local	$10=, $4
+# BB#73:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 14
+	br      	44              # 44: up to label14
+.LBB0_74:                               # %do1.i56
                                         #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label58:
-	i32.load	$push209=, 4($4)
-	tee_local	$push208=, $5=, $pop209
-	i32.shl 	$push62=, $pop208, $3
-	i32.shr_u	$push61=, $7, $0
-	i32.or  	$push207=, $pop62, $pop61
-	tee_local	$push206=, $6=, $pop207
-	i32.load	$push205=, 0($1)
-	tee_local	$push204=, $1=, $pop205
-	i32.ne  	$push63=, $pop206, $pop204
-	br_if   	23, $pop63      # 23: down to label34
+	i32.load	$push207=, 0($7)
+	tee_local	$push206=, $4=, $pop207
+	i32.shl 	$push47=, $pop206, $3
+	i32.shr_u	$push46=, $5, $0
+	i32.or  	$push205=, $pop47, $pop46
+	tee_local	$push204=, $5=, $pop205
+	i32.load	$push203=, 0($1)
+	tee_local	$push202=, $1=, $pop203
+	i32.ne  	$push48=, $pop204, $pop202
+	br_if   	27, $pop48      # 27: down to label30
+# BB#75:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 18
+	br      	43              # 43: up to label14
+.LBB0_76:                               # %if.end54.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label57:
+	i32.load	$8=, 12($9)
+	i32.load	$5=, 12($10)
+	i32.const	$push50=, -4
+	i32.add 	$push209=, $2, $pop50
+	tee_local	$push208=, $2=, $pop209
+	i32.eqz 	$push227=, $pop208
+	br_if   	28, $pop227     # 28: down to label28
 # BB#77:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 13
-	br      	42              # 42: up to label15
+	i32.const	$11=, 19
+	br      	42              # 42: up to label14
 .LBB0_78:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label57:
-	i32.const	$push64=, 8
-	i32.add 	$1=, $8, $pop64
-	i32.const	$push210=, 8
-	i32.add 	$6=, $4, $pop210
-	copy_local	$9=, $4
-	br      	24              # 24: down to label32
-.LBB0_79:                               # %if.then52.i
-                                        #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label56:
-	i32.store	12($10), $5
-	i32.store	8($10), $1
-	i32.const	$push135=, 8
-	i32.add 	$push136=, $10, $pop135
-	copy_local	$1=, $pop136
-	i32.const	$push137=, 12
-	i32.add 	$push138=, $10, $pop137
-	copy_local	$10=, $pop138
-# BB#80:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 16
-	br      	40              # 40: up to label15
-.LBB0_81:                               # %do.body.i170.i
+	i32.const	$push51=, 16
+	i32.add 	$1=, $9, $pop51
+	i32.const	$push210=, 16
+	i32.add 	$7=, $10, $pop210
+	br      	19              # 19: down to label36
+.LBB0_79:                               # %if.then.i24
                                         #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label55:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push212=, 1
-	i32.add 	$push23=, $1, $pop212
-	copy_local	$1=, $pop23
-	i32.const	$push211=, 1
-	i32.add 	$push22=, $10, $pop211
-	copy_local	$10=, $pop22
-	i32.eq  	$push49=, $2, $0
-	br_if   	24, $pop49      # 24: down to label30
-# BB#82:                                #   in Loop: Header=BB0_23 Depth=1
-	i32.const	$11=, 17
-	br      	39              # 39: up to label15
-.LBB0_83:                               # %mymemcmp1.exit174.i
-	end_block                       # label54:
-	i32.sub 	$push95=, $2, $0
-	return  	$pop95
-.LBB0_84:                               # %if.then.i24
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label53:
-	i32.store	12($10), $4
-	i32.store	8($10), $7
+	i32.store	8($6), $8
+	i32.store	12($6), $4
 	i32.const	$push131=, 8
-	i32.add 	$push132=, $10, $pop131
+	i32.add 	$push132=, $6, $pop131
 	copy_local	$1=, $pop132
 	i32.const	$push133=, 12
-	i32.add 	$push134=, $10, $pop133
-	copy_local	$10=, $pop134
-# BB#85:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push134=, $6, $pop133
+	copy_local	$6=, $pop134
+# BB#80:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 2
-	br      	37              # 37: up to label15
-.LBB0_86:                               # %do.body.i.i30
+	br      	40              # 40: up to label14
+.LBB0_81:                               # %do.body.i.i30
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label52:
+	end_block                       # label54:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push214=, 1
-	i32.add 	$push16=, $1, $pop214
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push212=, 1
+	i32.add 	$push16=, $1, $pop212
 	copy_local	$1=, $pop16
-	i32.const	$push213=, 1
-	i32.add 	$push15=, $10, $pop213
-	copy_local	$10=, $pop15
+	i32.const	$push211=, 1
+	i32.add 	$push15=, $6, $pop211
+	copy_local	$6=, $pop15
 	i32.eq  	$push55=, $2, $0
-	br_if   	14, $pop55      # 14: down to label37
-# BB#87:                                #   in Loop: Header=BB0_23 Depth=1
+	br_if   	18, $pop55      # 18: down to label35
+# BB#82:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 3
-	br      	36              # 36: up to label15
-.LBB0_88:                               # %mymemcmp1.exit.i34
-	end_block                       # label51:
+	br      	39              # 39: up to label14
+.LBB0_83:                               # %mymemcmp1.exit.i34
+	end_block                       # label53:
 	i32.sub 	$push98=, $2, $0
 	return  	$pop98
-.LBB0_89:                               # %if.then34.i
+.LBB0_84:                               # %if.then34.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label50:
-	i32.store	12($10), $4
-	i32.store	8($10), $5
+	end_block                       # label52:
+	i32.store	8($6), $5
+	i32.store	12($6), $4
 	i32.const	$push143=, 8
-	i32.add 	$push144=, $10, $pop143
+	i32.add 	$push144=, $6, $pop143
 	copy_local	$1=, $pop144
 	i32.const	$push145=, 12
-	i32.add 	$push146=, $10, $pop145
-	copy_local	$10=, $pop146
-# BB#90:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push146=, $6, $pop145
+	copy_local	$6=, $pop146
+# BB#85:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 6
-	br      	34              # 34: up to label15
-.LBB0_91:                               # %do.body.i194.i
+	br      	37              # 37: up to label14
+.LBB0_86:                               # %do.body.i194.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label49:
+	end_block                       # label51:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push216=, 1
-	i32.add 	$push19=, $1, $pop216
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push214=, 1
+	i32.add 	$push19=, $1, $pop214
 	copy_local	$1=, $pop19
-	i32.const	$push215=, 1
-	i32.add 	$push18=, $10, $pop215
-	copy_local	$10=, $pop18
+	i32.const	$push213=, 1
+	i32.add 	$push18=, $6, $pop213
+	copy_local	$6=, $pop18
 	i32.eq  	$push60=, $2, $0
-	br_if   	13, $pop60      # 13: down to label35
-# BB#92:                                #   in Loop: Header=BB0_23 Depth=1
+	br_if   	17, $pop60      # 17: down to label33
+# BB#87:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 7
-	br      	33              # 33: up to label15
-.LBB0_93:                               # %mymemcmp1.exit198.i
-	end_block                       # label48:
+	br      	36              # 36: up to label14
+.LBB0_88:                               # %mymemcmp1.exit198.i
+	end_block                       # label50:
 	i32.sub 	$push97=, $2, $0
 	return  	$pop97
-.LBB0_94:                               # %if.then43.i51
+.LBB0_89:                               # %if.then43.i51
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label47:
-	i32.store	12($10), $6
-	i32.store	8($10), $1
+	end_block                       # label49:
+	i32.store	8($6), $1
+	i32.store	12($6), $7
 	i32.const	$push139=, 8
-	i32.add 	$push140=, $10, $pop139
+	i32.add 	$push140=, $6, $pop139
 	copy_local	$1=, $pop140
 	i32.const	$push141=, 12
-	i32.add 	$push142=, $10, $pop141
-	copy_local	$10=, $pop142
-# BB#95:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$push142=, $6, $pop141
+	copy_local	$6=, $pop142
+# BB#90:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 11
-	br      	31              # 31: up to label15
-.LBB0_96:                               # %do.body.i182.i
+	br      	34              # 34: up to label14
+.LBB0_91:                               # %do.body.i182.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label46:
+	end_block                       # label48:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
-	i32.const	$push218=, 1
-	i32.add 	$push21=, $1, $pop218
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push216=, 1
+	i32.add 	$push21=, $1, $pop216
 	copy_local	$1=, $pop21
-	i32.const	$push217=, 1
-	i32.add 	$push20=, $10, $pop217
-	copy_local	$10=, $pop20
-	i32.eq  	$push65=, $2, $0
-	br_if   	12, $pop65      # 12: down to label33
-# BB#97:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push215=, 1
+	i32.add 	$push20=, $6, $pop215
+	copy_local	$6=, $pop20
+	i32.eq  	$push64=, $2, $0
+	br_if   	16, $pop64      # 16: down to label31
+# BB#92:                                #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 12
-	br      	30              # 30: up to label15
-.LBB0_98:                               # %mymemcmp1.exit186.i
-	end_block                       # label45:
+	br      	33              # 33: up to label14
+.LBB0_93:                               # %mymemcmp1.exit186.i
+	end_block                       # label47:
 	i32.sub 	$push96=, $2, $0
 	return  	$pop96
-.LBB0_99:                               # %do0.i57
+.LBB0_94:                               # %if.then52.i
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label46:
+	i32.store	8($6), $1
+	i32.store	12($6), $5
+	i32.const	$push135=, 8
+	i32.add 	$push136=, $6, $pop135
+	copy_local	$1=, $pop136
+	i32.const	$push137=, 12
+	i32.add 	$push138=, $6, $pop137
+	copy_local	$6=, $pop138
+# BB#95:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 16
+	br      	31              # 31: up to label14
+.LBB0_96:                               # %do.body.i170.i
                                         #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label45:
+	i32.load8_u	$0=, 0($1)
+	i32.load8_u	$2=, 0($6)
+	i32.const	$push218=, 1
+	i32.add 	$push23=, $1, $pop218
+	copy_local	$1=, $pop23
+	i32.const	$push217=, 1
+	i32.add 	$push22=, $6, $pop217
+	copy_local	$6=, $pop22
+	i32.eq  	$push49=, $2, $0
+	br_if   	15, $pop49      # 15: down to label29
+# BB#97:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 17
+	br      	30              # 30: up to label14
+.LBB0_98:                               # %mymemcmp1.exit174.i
 	end_block                       # label44:
+	i32.sub 	$push95=, $2, $0
+	return  	$pop95
+.LBB0_99:                               # %do0.i57
+                                        #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label43:
 	i32.const	$1=, 0
 	i32.shl 	$push67=, $5, $3
 	i32.shr_u	$push66=, $4, $0
 	i32.or  	$push220=, $pop67, $pop66
 	tee_local	$push219=, $0=, $pop220
-	i32.eq  	$push68=, $pop219, $7
-	br_if   	15, $pop68      # 15: down to label28
+	i32.eq  	$push68=, $pop219, $8
+	br_if   	15, $pop68      # 15: down to label27
 # BB#100:                               #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 21
-	br      	28              # 28: up to label15
+	br      	28              # 28: up to label14
 .LBB0_101:                              # %if.then63.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label43:
-	i32.store	12($10), $0
-	i32.store	8($10), $7
+	end_block                       # label42:
+	i32.store	8($6), $8
+	i32.store	12($6), $0
 	i32.const	$push127=, 8
-	i32.add 	$push128=, $10, $pop127
+	i32.add 	$push128=, $6, $pop127
 	copy_local	$1=, $pop128
 	i32.const	$push129=, 12
-	i32.add 	$push130=, $10, $pop129
-	copy_local	$10=, $pop130
+	i32.add 	$push130=, $6, $pop129
+	copy_local	$6=, $pop130
 # BB#102:                               #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 22
-	br      	27              # 27: up to label15
+	br      	27              # 27: up to label14
 .LBB0_103:                              # %do.body.i158.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label42:
+	end_block                       # label41:
 	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($10)
+	i32.load8_u	$2=, 0($6)
 	i32.const	$push222=, 1
 	i32.add 	$push25=, $1, $pop222
 	copy_local	$1=, $pop25
 	i32.const	$push221=, 1
-	i32.add 	$push24=, $10, $pop221
-	copy_local	$10=, $pop24
+	i32.add 	$push24=, $6, $pop221
+	copy_local	$6=, $pop24
 	i32.eq  	$push69=, $2, $0
-	br_if   	14, $pop69      # 14: down to label27
+	br_if   	14, $pop69      # 14: down to label26
 # BB#104:                               #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 23
-	br      	26              # 26: up to label15
+	br      	26              # 26: up to label14
 .LBB0_105:                              # %mymemcmp1.exit162.i
                                         #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label41:
+	end_block                       # label40:
 	i32.sub 	$1=, $2, $0
 # BB#106:                               #   in Loop: Header=BB0_23 Depth=1
 	i32.const	$11=, 24
-	br      	25              # 25: up to label15
+	br      	25              # 25: up to label14
 .LBB0_107:                              # %cleanup
-	end_block                       # label40:
+	end_block                       # label39:
 	return  	$1
 .LBB0_108:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label39:
-	i32.const	$11=, 26
-	br      	23              # 23: up to label15
-.LBB0_109:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label38:
+	i32.const	$11=, 29
+	br      	23              # 23: up to label14
+.LBB0_109:                              #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label37:
 	i32.const	$11=, 1
-	br      	22              # 22: up to label15
+	br      	22              # 22: up to label14
 .LBB0_110:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label37:
-	i32.const	$11=, 2
-	br      	21              # 21: up to label15
-.LBB0_111:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label36:
-	i32.const	$11=, 5
-	br      	20              # 20: up to label15
-.LBB0_112:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 0
+	br      	21              # 21: up to label14
+.LBB0_111:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label35:
-	i32.const	$11=, 6
-	br      	19              # 19: up to label15
-.LBB0_113:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 2
+	br      	20              # 20: up to label14
+.LBB0_112:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label34:
-	i32.const	$11=, 10
-	br      	18              # 18: up to label15
-.LBB0_114:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 5
+	br      	19              # 19: up to label14
+.LBB0_113:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label33:
-	i32.const	$11=, 11
-	br      	17              # 17: up to label15
-.LBB0_115:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 6
+	br      	18              # 18: up to label14
+.LBB0_114:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label32:
-	i32.const	$11=, 14
-	br      	16              # 16: up to label15
-.LBB0_116:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 10
+	br      	17              # 17: up to label14
+.LBB0_115:                              #   in Loop: Header=BB0_23 Depth=1
 	end_block                       # label31:
+	i32.const	$11=, 11
+	br      	16              # 16: up to label14
+.LBB0_116:                              #   in Loop: Header=BB0_23 Depth=1
+	end_block                       # label30:
 	i32.const	$11=, 15
-	br      	15              # 15: up to label15
+	br      	15              # 15: up to label14
 .LBB0_117:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label30:
+	end_block                       # label29:
 	i32.const	$11=, 16
-	br      	14              # 14: up to label15
+	br      	14              # 14: up to label14
 .LBB0_118:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label29:
+	end_block                       # label28:
 	i32.const	$11=, 20
-	br      	13              # 13: up to label15
+	br      	13              # 13: up to label14
 .LBB0_119:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label28:
+	end_block                       # label27:
 	i32.const	$11=, 24
-	br      	12              # 12: up to label15
+	br      	12              # 12: up to label14
 .LBB0_120:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label27:
+	end_block                       # label26:
 	i32.const	$11=, 22
-	br      	11              # 11: up to label15
+	br      	11              # 11: up to label14
 .LBB0_121:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label26:
+	end_block                       # label25:
 	i32.const	$11=, 24
-	br      	10              # 10: up to label15
+	br      	10              # 10: up to label14
 .LBB0_122:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label25:
+	end_block                       # label24:
 	i32.const	$11=, 44
-	br      	9               # 9: up to label15
+	br      	9               # 9: up to label14
 .LBB0_123:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label24:
+	end_block                       # label23:
 	i32.const	$11=, 27
-	br      	8               # 8: up to label15
+	br      	8               # 8: up to label14
 .LBB0_124:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label23:
+	end_block                       # label22:
 	i32.const	$11=, 30
-	br      	7               # 7: up to label15
+	br      	7               # 7: up to label14
 .LBB0_125:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label22:
+	end_block                       # label21:
 	i32.const	$11=, 31
-	br      	6               # 6: up to label15
+	br      	6               # 6: up to label14
 .LBB0_126:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label21:
+	end_block                       # label20:
 	i32.const	$11=, 35
-	br      	5               # 5: up to label15
+	br      	5               # 5: up to label14
 .LBB0_127:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label20:
+	end_block                       # label19:
 	i32.const	$11=, 36
-	br      	4               # 4: up to label15
+	br      	4               # 4: up to label14
 .LBB0_128:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label19:
+	end_block                       # label18:
 	i32.const	$11=, 39
-	br      	3               # 3: up to label15
+	br      	3               # 3: up to label14
 .LBB0_129:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label18:
+	end_block                       # label17:
 	i32.const	$11=, 40
-	br      	2               # 2: up to label15
+	br      	2               # 2: up to label14
 .LBB0_130:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label17:
+	end_block                       # label16:
 	i32.const	$11=, 41
-	br      	1               # 1: up to label15
+	br      	1               # 1: up to label14
 .LBB0_131:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label16:
+	end_block                       # label15:
 	i32.const	$11=, 46
-	br      	0               # 0: up to label15
+	br      	0               # 0: up to label14
 .LBB0_132:
 	end_loop
 	.endfunc
 .Lfunc_end0:
 	.size	mymemcmp, .Lfunc_end0-mymemcmp
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.load8_u	$push0=, .L.str+14($pop28)
-	i32.store8	buf+39($pop29), $pop0
-	i32.const	$push27=, 0
-	i32.const	$push26=, 0
-	i32.load16_u	$push1=, .L.str+12($pop26):p2align=0
-	i32.store16	buf+37($pop27):p2align=0, $pop1
-	i32.const	$push25=, 0
-	i32.const	$push24=, 0
-	i32.load	$push2=, .L.str+8($pop24):p2align=0
-	i32.store	buf+33($pop25):p2align=0, $pop2
-	i32.const	$push23=, 0
-	i32.const	$push22=, 0
-	i64.load	$push3=, .L.str($pop22):p2align=0
-	i64.store	buf+25($pop23):p2align=0, $pop3
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.load8_u	$push4=, .L.str.1+14($pop20)
-	i32.store8	buf+182($pop21), $pop4
-	i32.const	$push19=, 0
-	i32.const	$push18=, 0
-	i32.load16_u	$push5=, .L.str.1+12($pop18):p2align=0
-	i32.store16	buf+180($pop19), $pop5
 	i32.const	$push17=, 0
 	i32.const	$push16=, 0
-	i32.load	$push6=, .L.str.1+8($pop16):p2align=0
-	i32.store	buf+176($pop17), $pop6
+	i64.load	$push0=, .L.str+7($pop16):p2align=0
+	i64.store	buf+32($pop17):p2align=0, $pop0
 	i32.const	$push15=, 0
 	i32.const	$push14=, 0
-	i64.load	$push7=, .L.str.1($pop14):p2align=0
-	i64.store	buf+168($pop15), $pop7
-	block   	
-	i32.const	$push10=, buf+25
-	i32.const	$push9=, buf+168
-	i32.const	$push8=, 33
-	i32.call	$push11=, mymemcmp@FUNCTION, $pop10, $pop9, $pop8
-	i32.const	$push12=, -51
-	i32.ne  	$push13=, $pop11, $pop12
-	br_if   	0, $pop13       # 0: down to label88
+	i64.load	$push1=, .L.str($pop14):p2align=0
+	i64.store	buf+25($pop15):p2align=0, $pop1
+	i32.const	$push13=, 0
+	i32.const	$push12=, 0
+	i64.load	$push2=, .L.str.1($pop12):p2align=0
+	i64.store	buf+168($pop13), $pop2
+	i32.const	$push11=, 0
+	i32.const	$push10=, 0
+	i64.load	$push3=, .L.str.1+7($pop10):p2align=0
+	i64.store	buf+175($pop11):p2align=0, $pop3
+	block   	
+	i32.const	$push6=, buf+25
+	i32.const	$push5=, buf+168
+	i32.const	$push4=, 33
+	i32.call	$push7=, mymemcmp@FUNCTION, $pop6, $pop5, $pop4
+	i32.const	$push8=, -51
+	i32.ne  	$push9=, $pop7, $pop8
+	br_if   	0, $pop9        # 0: down to label87
 # BB#1:                                 # %cleanup
-	i32.const	$push30=, 0
-	return  	$pop30
+	i32.const	$push18=, 0
+	return  	$pop18
 .LBB1_2:                                # %if.then26
-	end_block                       # label88:
+	end_block                       # label87:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -1027,5 +1010,5 @@ buf:
 	.size	.L.str.1, 16
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38151.c.s b/test/torture-s/pr38151.c.s
index 99395a6ae..6c437f564 100644
--- a/test/torture-s/pr38151.c.s
+++ b/test/torture-s/pr38151.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38151.c"
+	.file	"pr38151.c"
 	.section	.text.check2848va,"ax",@progbits
-	.hidden	check2848va
+	.hidden	check2848va             # -- Begin function check2848va
 	.globl	check2848va
 	.type	check2848va,@function
 check2848va:                            # @check2848va
 	.param  	i32, i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
+	i32.const	$push20=, 0
+	i32.load	$push19=, __stack_pointer($pop20)
 	i32.const	$push21=, 16
-	i32.sub 	$push26=, $pop20, $pop21
+	i32.sub 	$push26=, $pop19, $pop21
 	tee_local	$push25=, $3=, $pop26
 	i32.store	12($pop25), $1
 	i32.const	$push0=, 15
@@ -40,84 +40,79 @@ check2848va:                            # @check2848va
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
-	block   	
 	i32.const	$push29=, 0
 	i32.load	$push12=, s2848+4($pop29)
 	i32.ne  	$push13=, $pop12, $3
-	br_if   	0, $pop13       # 0: down to label2
+	br_if   	0, $pop13       # 0: down to label1
 # BB#3:                                 # %if.end
 	i32.const	$push30=, 0
 	i32.load	$push11=, s2848+8($pop30)
-	i32.eq  	$push14=, $pop11, $2
-	br_if   	1, $pop14       # 1: down to label1
-.LBB0_4:                                # %if.then2
-	end_block                       # label2:
+	i32.ne  	$push14=, $pop11, $2
+	br_if   	0, $pop14       # 0: down to label1
+# BB#4:                                 # %if.end4
+	return
+.LBB0_5:                                # %if.then2
+	end_block                       # label1:
 	i32.const	$push15=, 0
 	i32.const	$push31=, 0
 	i32.load	$push16=, fails($pop31)
 	i32.const	$push17=, 1
 	i32.add 	$push18=, $pop16, $pop17
 	i32.store	fails($pop15), $pop18
-.LBB0_5:                                # %if.end4
-	end_block                       # label1:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	check2848va, .Lfunc_end0-check2848va
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 32
-	i32.sub 	$push21=, $pop7, $pop8
-	tee_local	$push20=, $0=, $pop21
-	i32.store	__stack_pointer($pop9), $pop20
-	i32.const	$push19=, 0
-	i64.const	$push0=, 3107062874477850347
-	i64.store	s2848($pop19), $pop0
-	i32.const	$push18=, 0
-	i32.const	$push1=, -218144346
-	i32.store	s2848+8($pop18), $pop1
-	i32.const	$push2=, -267489557
-	i32.store	16($0), $pop2
-	i32.const	$push17=, -218144346
-	i32.store	24($0), $pop17
-	i32.const	$push3=, 723419448
-	i32.store	20($0), $pop3
+	i32.const	$push7=, 0
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 32
+	i32.sub 	$push19=, $pop4, $pop6
+	tee_local	$push18=, $0=, $pop19
+	i32.store	__stack_pointer($pop7), $pop18
+	i32.const	$push17=, 0
+	i32.const	$push0=, -218144346
+	i32.store	s2848+8($pop17), $pop0
 	i32.const	$push16=, 0
-	i32.load	$push4=, s2848+12($pop16)
-	i32.store	28($0), $pop4
-	i32.const	$push13=, 16
-	i32.add 	$push14=, $0, $pop13
-	i32.store	0($0), $pop14
+	i64.const	$push1=, 3107062874477850347
+	i64.store	s2848($pop16), $pop1
+	i64.const	$push15=, 3107062874477850347
+	i64.store	16($0), $pop15
+	i32.const	$push14=, 0
+	i64.load	$push2=, s2848+8($pop14)
+	i64.store	24($0), $pop2
+	i32.const	$push11=, 16
+	i32.add 	$push12=, $0, $pop11
+	i32.store	0($0), $pop12
 	call    	check2848va@FUNCTION, $0, $0
 	block   	
-	i32.const	$push15=, 0
-	i32.load	$push5=, fails($pop15)
-	br_if   	0, $pop5        # 0: down to label3
+	i32.const	$push13=, 0
+	i32.load	$push3=, fails($pop13)
+	br_if   	0, $pop3        # 0: down to label2
 # BB#1:                                 # %if.end
-	i32.const	$push12=, 0
-	i32.const	$push10=, 32
-	i32.add 	$push11=, $0, $pop10
-	i32.store	__stack_pointer($pop12), $pop11
-	i32.const	$push22=, 0
-	return  	$pop22
+	i32.const	$push10=, 0
+	i32.const	$push8=, 32
+	i32.add 	$push9=, $0, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
+	i32.const	$push20=, 0
+	return  	$pop20
 .LBB1_2:                                # %if.then
-	end_block                       # label3:
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s2848                   # @s2848
 	.type	s2848,@object
 	.section	.bss.s2848,"aw",@nobits
@@ -137,5 +132,5 @@ fails:
 	.size	fails, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38212.c.s b/test/torture-s/pr38212.c.s
index 6212ebe89..2370a364e 100644
--- a/test/torture-s/pr38212.c.s
+++ b/test/torture-s/pr38212.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38212.c"
+	.file	"pr38212.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,10 +34,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push15=, $pop4, $pop5
+	i32.sub 	$push15=, $pop3, $pop5
 	tee_local	$push14=, $0=, $pop15
 	i32.store	__stack_pointer($pop6), $pop14
 	i32.const	$push13=, 0
@@ -64,7 +64,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38236.c.s b/test/torture-s/pr38236.c.s
index 8d41da18f..166bc8080 100644
--- a/test/torture-s/pr38236.c.s
+++ b/test/torture-s/pr38236.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38236.c"
+	.file	"pr38236.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,10 +9,10 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop5, $pop6
+	i32.sub 	$push14=, $pop4, $pop6
 	tee_local	$push13=, $4=, $pop14
 	i32.const	$push7=, 12
 	i32.add 	$push8=, $pop13, $pop7
@@ -29,9 +29,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38422.c.s b/test/torture-s/pr38422.c.s
index 740436bb6..e85ccaef8 100644
--- a/test/torture-s/pr38422.c.s
+++ b/test/torture-s/pr38422.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38422.c"
+	.file	"pr38422.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -23,9 +23,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -55,4 +55,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr38533.c.s b/test/torture-s/pr38533.c.s
index f6c945761..646c4346f 100644
--- a/test/torture-s/pr38533.c.s
+++ b/test/torture-s/pr38533.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38533.c"
+	.file	"pr38533.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -1223,9 +1223,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1244,7 +1244,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38819.c.s b/test/torture-s/pr38819.c.s
index 5e3ed84b3..b15884b0a 100644
--- a/test/torture-s/pr38819.c.s
+++ b/test/torture-s/pr38819.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38819.c"
+	.file	"pr38819.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -67,5 +67,5 @@ r:
 	.size	r, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr38969.c.s b/test/torture-s/pr38969.c.s
index 412e508cb..a908864e3 100644
--- a/test/torture-s/pr38969.c.s
+++ b/test/torture-s/pr38969.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr38969.c"
+	.file	"pr38969.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -23,16 +23,16 @@ bar:                                    # @bar
 	.local  	i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 32
-	i32.sub 	$push15=, $pop2, $pop3
+	i32.sub 	$push15=, $pop1, $pop3
 	tee_local	$push14=, $3=, $pop15
 	i32.store	__stack_pointer($pop4), $pop14
 	i64.load	$push13=, 0($1):p2align=2
 	tee_local	$push12=, $2=, $pop13
-	i64.store	16($3), $pop12
-	i64.store	8($3):p2align=2, $2
+	i64.store	8($3), $pop12
+	i64.store	16($3), $2
 	i32.const	$push8=, 24
 	i32.add 	$push9=, $3, $pop8
 	i32.const	$push10=, 8
@@ -48,9 +48,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,16 +58,16 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 32
-	i32.sub 	$push21=, $pop9, $pop10
+	i32.sub 	$push21=, $pop8, $pop10
 	tee_local	$push20=, $0=, $pop21
 	i32.store	__stack_pointer($pop11), $pop20
 	i64.const	$push1=, 4767060206663237632
-	i64.store	16($0), $pop1
+	i64.store	8($0), $pop1
 	i64.const	$push19=, 4767060206663237632
-	i64.store	8($0):p2align=2, $pop19
+	i64.store	16($0), $pop19
 	i32.const	$push15=, 24
 	i32.add 	$push16=, $0, $pop15
 	i32.const	$push17=, 8
@@ -97,7 +97,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39100.c.s b/test/torture-s/pr39100.c.s
index c761eb4e2..1a9d0774b 100644
--- a/test/torture-s/pr39100.c.s
+++ b/test/torture-s/pr39100.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39100.c"
+	.file	"pr39100.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,10 +9,10 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push22=, $pop9, $pop10
+	i32.sub 	$push22=, $pop8, $pop10
 	tee_local	$push21=, $8=, $pop22
 	i32.const	$push20=, 0
 	i32.store	12($pop21), $pop20
@@ -95,74 +95,72 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
-	i32.const	$push15=, 32
-	i32.sub 	$push30=, $pop14, $pop15
-	tee_local	$push29=, $2=, $pop30
-	i32.store	__stack_pointer($pop16), $pop29
+	i32.const	$push17=, 0
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
+	i32.const	$push16=, 32
+	i32.sub 	$push29=, $pop14, $pop16
+	tee_local	$push28=, $2=, $pop29
+	i32.store	__stack_pointer($pop17), $pop28
 	i64.const	$push0=, 0
 	i64.store	24($2), $pop0
 	i32.const	$push1=, 8
-	i32.or  	$push28=, $2, $pop1
-	tee_local	$push27=, $0=, $pop28
-	i32.store	4($2), $pop27
+	i32.or  	$push27=, $2, $pop1
+	tee_local	$push26=, $0=, $pop27
+	i32.store	4($2), $pop26
 	i32.const	$push2=, 0
 	i32.store	0($2), $pop2
-	i32.const	$push26=, 0
-	i32.store	12($2), $pop26
-	i32.const	$push25=, 1
-	i32.store	8($2), $pop25
+	i64.const	$push3=, 1
+	i64.store	8($2), $pop3
 	block   	
-	i32.const	$push20=, 24
-	i32.add 	$push21=, $2, $pop20
-	i32.call	$push24=, foo@FUNCTION, $pop21, $2
-	tee_local	$push23=, $1=, $pop24
-	i32.load16_u	$push3=, 4($pop23)
-	i32.const	$push22=, 1
-	i32.ne  	$push4=, $pop3, $pop22
-	br_if   	0, $pop4        # 0: down to label5
+	i32.const	$push21=, 24
+	i32.add 	$push22=, $2, $pop21
+	i32.call	$push25=, foo@FUNCTION, $pop22, $2
+	tee_local	$push24=, $1=, $pop25
+	i32.load16_u	$push4=, 4($pop24)
+	i32.const	$push23=, 1
+	i32.ne  	$push5=, $pop4, $pop23
+	br_if   	0, $pop5        # 0: down to label5
 # BB#1:                                 # %lor.lhs.false
-	i32.load16_u	$push5=, 6($1)
-	i32.const	$push31=, 1
-	i32.ne  	$push6=, $pop5, $pop31
-	br_if   	0, $pop6        # 0: down to label5
+	i32.load16_u	$push6=, 6($1)
+	i32.const	$push30=, 1
+	i32.ne  	$push7=, $pop6, $pop30
+	br_if   	0, $pop7        # 0: down to label5
 # BB#2:                                 # %if.end
-	i32.load	$push7=, 24($2)
-	i32.ne  	$push8=, $pop7, $0
-	br_if   	0, $pop8        # 0: down to label5
+	i32.load	$push8=, 24($2)
+	i32.ne  	$push9=, $pop8, $0
+	br_if   	0, $pop9        # 0: down to label5
 # BB#3:                                 # %if.end13
-	i32.load	$push9=, 12($2)
-	i32.ne  	$push10=, $pop9, $2
-	br_if   	0, $pop10       # 0: down to label5
-# BB#4:                                 # %if.end20
-	i32.load	$push11=, 4($2)
+	i32.load	$push10=, 12($2)
+	i32.ne  	$push11=, $pop10, $2
 	br_if   	0, $pop11       # 0: down to label5
+# BB#4:                                 # %if.end20
+	i32.load	$push12=, 4($2)
+	br_if   	0, $pop12       # 0: down to label5
 # BB#5:                                 # %if.end24
-	i32.const	$push19=, 0
-	i32.const	$push17=, 32
-	i32.add 	$push18=, $2, $pop17
-	i32.store	__stack_pointer($pop19), $pop18
-	i32.const	$push12=, 0
-	return  	$pop12
-.LBB1_6:                                # %if.then23
+	i32.const	$push20=, 0
+	i32.const	$push18=, 32
+	i32.add 	$push19=, $2, $pop18
+	i32.store	__stack_pointer($pop20), $pop19
+	i32.const	$push13=, 0
+	return  	$pop13
+.LBB1_6:                                # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39120.c.s b/test/torture-s/pr39120.c.s
index 9ec04c7c8..13b9e3b2d 100644
--- a/test/torture-s/pr39120.c.s
+++ b/test/torture-s/pr39120.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39120.c"
+	.file	"pr39120.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,9 +28,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,10 +38,10 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push17=, $pop4, $pop5
+	i32.sub 	$push17=, $pop3, $pop5
 	tee_local	$push16=, $1=, $pop17
 	i32.store	__stack_pointer($pop6), $pop16
 	i32.const	$push15=, 0
@@ -72,7 +72,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -83,5 +83,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39228.c.s b/test/torture-s/pr39228.c.s
index 4c56efd33..dfe9b3c04 100644
--- a/test/torture-s/pr39228.c.s
+++ b/test/torture-s/pr39228.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39228.c"
+	.file	"pr39228.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,33 +10,29 @@ main:                                   # @main
 	block   	
 	f64.const	$push0=, infinity
 	i32.call	$push1=, __builtin_isinff@FUNCTION, $pop0
-	i32.const	$push2=, 0
-	i32.le_s	$push3=, $pop1, $pop2
-	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push4=, 1
-	i32.eqz 	$push11=, $pop4
-	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.end4
-	i64.const	$push6=, 0
-	i64.const	$push5=, 9223090561878065152
-	i32.call	$push7=, __builtin_isinfl@FUNCTION, $pop6, $pop5
+	i32.const	$push8=, 0
+	i32.le_s	$push2=, $pop1, $pop8
+	br_if   	0, $pop2        # 0: down to label0
+# BB#1:                                 # %if.end4
+	i64.const	$push4=, 0
+	i64.const	$push3=, 9223090561878065152
+	i32.call	$push5=, __builtin_isinfl@FUNCTION, $pop4, $pop3
 	i32.const	$push9=, 0
-	i32.le_s	$push8=, $pop7, $pop9
-	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end8
-	i32.const	$push10=, 0
-	return  	$pop10
-.LBB0_4:                                # %if.then7
+	i32.le_s	$push6=, $pop5, $pop9
+	br_if   	0, $pop6        # 0: down to label0
+# BB#2:                                 # %if.end8
+	i32.const	$push7=, 0
+	return  	$pop7
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	__builtin_isinff, i32
 	.functype	__builtin_isinfl, i32
diff --git a/test/torture-s/pr39233.c.s b/test/torture-s/pr39233.c.s
index 77649bf35..5bb1fa276 100644
--- a/test/torture-s/pr39233.c.s
+++ b/test/torture-s/pr39233.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39233.c"
+	.file	"pr39233.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39240.c.s b/test/torture-s/pr39240.c.s
index da46e58f7..51dc453f1 100644
--- a/test/torture-s/pr39240.c.s
+++ b/test/torture-s/pr39240.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39240.c"
+	.file	"pr39240.c"
 	.section	.text.bar1,"ax",@progbits
-	.hidden	bar1
+	.hidden	bar1                    # -- Begin function bar1
 	.globl	bar1
 	.type	bar1,@function
 bar1:                                   # @bar1
@@ -15,9 +15,9 @@ bar1:                                   # @bar1
 	.endfunc
 .Lfunc_end0:
 	.size	bar1, .Lfunc_end0-bar1
-
+                                        # -- End function
 	.section	.text.foo1,"ax",@progbits
-	.type	foo1,@function
+	.type	foo1,@function          # -- Begin function foo1
 foo1:                                   # @foo1
 	.param  	i32
 	.result 	i32
@@ -27,9 +27,9 @@ foo1:                                   # @foo1
 	.endfunc
 .Lfunc_end1:
 	.size	foo1, .Lfunc_end1-foo1
-
+                                        # -- End function
 	.section	.text.bar2,"ax",@progbits
-	.hidden	bar2
+	.hidden	bar2                    # -- Begin function bar2
 	.globl	bar2
 	.type	bar2,@function
 bar2:                                   # @bar2
@@ -45,9 +45,9 @@ bar2:                                   # @bar2
 	.endfunc
 .Lfunc_end2:
 	.size	bar2, .Lfunc_end2-bar2
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.type	foo2,@function
+	.type	foo2,@function          # -- Begin function foo2
 foo2:                                   # @foo2
 	.param  	i32
 	.result 	i32
@@ -60,9 +60,9 @@ foo2:                                   # @foo2
 	.endfunc
 .Lfunc_end3:
 	.size	foo2, .Lfunc_end3-foo2
-
+                                        # -- End function
 	.section	.text.bar3,"ax",@progbits
-	.hidden	bar3
+	.hidden	bar3                    # -- Begin function bar3
 	.globl	bar3
 	.type	bar3,@function
 bar3:                                   # @bar3
@@ -78,9 +78,9 @@ bar3:                                   # @bar3
 	.endfunc
 .Lfunc_end4:
 	.size	bar3, .Lfunc_end4-bar3
-
+                                        # -- End function
 	.section	.text.foo3,"ax",@progbits
-	.type	foo3,@function
+	.type	foo3,@function          # -- Begin function foo3
 foo3:                                   # @foo3
 	.param  	i32
 	.result 	i32
@@ -93,9 +93,9 @@ foo3:                                   # @foo3
 	.endfunc
 .Lfunc_end5:
 	.size	foo3, .Lfunc_end5-foo3
-
+                                        # -- End function
 	.section	.text.bar4,"ax",@progbits
-	.hidden	bar4
+	.hidden	bar4                    # -- Begin function bar4
 	.globl	bar4
 	.type	bar4,@function
 bar4:                                   # @bar4
@@ -109,9 +109,9 @@ bar4:                                   # @bar4
 	.endfunc
 .Lfunc_end6:
 	.size	bar4, .Lfunc_end6-bar4
-
+                                        # -- End function
 	.section	.text.foo4,"ax",@progbits
-	.type	foo4,@function
+	.type	foo4,@function          # -- Begin function foo4
 foo4:                                   # @foo4
 	.param  	i32
 	.result 	i32
@@ -121,9 +121,9 @@ foo4:                                   # @foo4
 	.endfunc
 .Lfunc_end7:
 	.size	foo4, .Lfunc_end7-foo4
-
+                                        # -- End function
 	.section	.text.bar5,"ax",@progbits
-	.hidden	bar5
+	.hidden	bar5                    # -- Begin function bar5
 	.globl	bar5
 	.type	bar5,@function
 bar5:                                   # @bar5
@@ -141,9 +141,9 @@ bar5:                                   # @bar5
 	.endfunc
 .Lfunc_end8:
 	.size	bar5, .Lfunc_end8-bar5
-
+                                        # -- End function
 	.section	.text.foo5,"ax",@progbits
-	.type	foo5,@function
+	.type	foo5,@function          # -- Begin function foo5
 foo5:                                   # @foo5
 	.param  	i32
 	.result 	i32
@@ -154,9 +154,9 @@ foo5:                                   # @foo5
 	.endfunc
 .Lfunc_end9:
 	.size	foo5, .Lfunc_end9-foo5
-
+                                        # -- End function
 	.section	.text.bar6,"ax",@progbits
-	.hidden	bar6
+	.hidden	bar6                    # -- Begin function bar6
 	.globl	bar6
 	.type	bar6,@function
 bar6:                                   # @bar6
@@ -174,9 +174,9 @@ bar6:                                   # @bar6
 	.endfunc
 .Lfunc_end10:
 	.size	bar6, .Lfunc_end10-bar6
-
+                                        # -- End function
 	.section	.text.foo6,"ax",@progbits
-	.type	foo6,@function
+	.type	foo6,@function          # -- Begin function foo6
 foo6:                                   # @foo6
 	.param  	i32
 	.result 	i32
@@ -187,9 +187,9 @@ foo6:                                   # @foo6
 	.endfunc
 .Lfunc_end11:
 	.size	foo6, .Lfunc_end11-foo6
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -203,18 +203,18 @@ main:                                   # @main
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push22=, -10
-	i32.call	$push3=, bar2@FUNCTION, $pop22
-	i32.const	$push21=, 0
-	i32.load	$push4=, l2($pop21)
-	i32.ne  	$push5=, $pop3, $pop4
+	i32.const	$push22=, 0
+	i32.load	$push4=, l2($pop22)
+	i32.const	$push21=, -10
+	i32.call	$push3=, bar2@FUNCTION, $pop21
+	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label0
 # BB#2:                                 # %if.end5
-	i32.const	$push24=, -10
-	i32.call	$push6=, bar3@FUNCTION, $pop24
-	i32.const	$push23=, 0
-	i32.load	$push7=, l3($pop23)
-	i32.ne  	$push8=, $pop6, $pop7
+	i32.const	$push24=, 0
+	i32.load	$push7=, l3($pop24)
+	i32.const	$push23=, -10
+	i32.call	$push6=, bar3@FUNCTION, $pop23
+	i32.ne  	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label0
 # BB#3:                                 # %if.end11
 	i32.const	$push26=, -10
@@ -224,30 +224,30 @@ main:                                   # @main
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
 # BB#4:                                 # %if.end16
-	i32.const	$push28=, -10
-	i32.call	$push12=, bar5@FUNCTION, $pop28
-	i32.const	$push27=, 0
-	i32.load	$push13=, l5($pop27)
-	i32.ne  	$push14=, $pop12, $pop13
+	i32.const	$push28=, 0
+	i32.load	$push13=, l5($pop28)
+	i32.const	$push27=, -10
+	i32.call	$push12=, bar5@FUNCTION, $pop27
+	i32.ne  	$push14=, $pop13, $pop12
 	br_if   	0, $pop14       # 0: down to label0
 # BB#5:                                 # %if.end22
-	i32.const	$push30=, -10
-	i32.call	$push15=, bar6@FUNCTION, $pop30
-	i32.const	$push29=, 0
-	i32.load	$push16=, l6($pop29)
-	i32.ne  	$push17=, $pop15, $pop16
+	i32.const	$push30=, 0
+	i32.load	$push16=, l6($pop30)
+	i32.const	$push29=, -10
+	i32.call	$push15=, bar6@FUNCTION, $pop29
+	i32.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label0
 # BB#6:                                 # %if.end28
 	i32.const	$push18=, 0
 	return  	$pop18
-.LBB12_7:                               # %if.then27
+.LBB12_7:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
-
+                                        # -- End function
 	.hidden	l1                      # @l1
 	.type	l1,@object
 	.section	.data.l1,"aw",@progbits
@@ -303,5 +303,5 @@ l6:
 	.size	l6, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39339.c.s b/test/torture-s/pr39339.c.s
index b935b270d..3960f8b16 100644
--- a/test/torture-s/pr39339.c.s
+++ b/test/torture-s/pr39339.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39339.c"
+	.file	"pr39339.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -62,9 +62,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -72,19 +72,19 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push22=, 0
-	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
+	i32.const	$push20=, 0
+	i32.load	$push19=, __stack_pointer($pop20)
 	i32.const	$push21=, 64
-	i32.sub 	$push40=, $pop20, $pop21
-	tee_local	$push39=, $0=, $pop40
-	i32.store	__stack_pointer($pop22), $pop39
+	i32.sub 	$push38=, $pop19, $pop21
+	tee_local	$push37=, $0=, $pop38
+	i32.store	__stack_pointer($pop22), $pop37
 	i32.const	$push2=, 56
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.e+8($pop0):p2align=2
 	i64.store	0($pop3), $pop1
-	i32.const	$push38=, 0
-	i64.load	$push4=, .Lmain.e($pop38):p2align=2
+	i32.const	$push36=, 0
+	i64.load	$push4=, .Lmain.e($pop36):p2align=2
 	i64.store	48($0), $pop4
 	i32.const	$push5=, 4
 	i32.store	12($0), $pop5
@@ -97,21 +97,17 @@ main:                                   # @main
 	i64.store	0($pop7), $pop8
 	i32.const	$push9=, 32
 	i32.add 	$push10=, $0, $pop9
-	i64.const	$push37=, 0
-	i64.store	0($pop10), $pop37
-	i32.const	$push36=, 0
-	i32.store	28($0), $pop36
-	i32.const	$push35=, 0
-	i32.store	24($0), $pop35
-	i32.const	$push34=, 0
-	i32.store	20($0), $pop34
+	i64.const	$push35=, 0
+	i64.store	0($pop10), $pop35
 	i32.const	$push11=, 255
 	i32.store8	4($0), $pop11
+	i64.const	$push34=, 0
+	i64.store	24($0), $pop34
+	i64.const	$push33=, 0
+	i64.store	16($0), $pop33
 	i32.const	$push28=, 8
 	i32.add 	$push29=, $0, $pop28
 	i32.store	0($0), $pop29
-	i32.const	$push33=, 0
-	i32.store	16($0), $pop33
 	i32.const	$push30=, 48
 	i32.add 	$push31=, $0, $pop30
 	i32.const	$push13=, 65
@@ -124,8 +120,8 @@ main:                                   # @main
 	br_if   	0, $pop15       # 0: down to label2
 # BB#1:                                 # %if.end
 	i32.load	$push16=, 28($0)
-	i32.const	$push41=, 1434451954
-	i32.ne  	$push17=, $pop16, $pop41
+	i32.const	$push39=, 1434451954
+	i32.ne  	$push17=, $pop16, $pop39
 	br_if   	0, $pop17       # 0: down to label2
 # BB#2:                                 # %if.end13
 	i32.const	$push25=, 0
@@ -134,14 +130,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop25), $pop24
 	i32.const	$push18=, 0
 	return  	$pop18
-.LBB1_3:                                # %if.then12
+.LBB1_3:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.e,@object        # @main.e
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	2
@@ -156,5 +152,5 @@ main:                                   # @main
 	.size	.Lmain.e, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39501.c.s b/test/torture-s/pr39501.c.s
index 09f34982d..7fd03c10d 100644
--- a/test/torture-s/pr39501.c.s
+++ b/test/torture-s/pr39501.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr39501.c"
+	.file	"pr39501.c"
 	.section	.text.float_min1,"ax",@progbits
-	.hidden	float_min1
+	.hidden	float_min1              # -- Begin function float_min1
 	.globl	float_min1
 	.type	float_min1,@function
 float_min1:                             # @float_min1
@@ -14,9 +14,9 @@ float_min1:                             # @float_min1
 	.endfunc
 .Lfunc_end0:
 	.size	float_min1, .Lfunc_end0-float_min1
-
+                                        # -- End function
 	.section	.text.float_min2,"ax",@progbits
-	.hidden	float_min2
+	.hidden	float_min2              # -- Begin function float_min2
 	.globl	float_min2
 	.type	float_min2,@function
 float_min2:                             # @float_min2
@@ -29,9 +29,9 @@ float_min2:                             # @float_min2
 	.endfunc
 .Lfunc_end1:
 	.size	float_min2, .Lfunc_end1-float_min2
-
+                                        # -- End function
 	.section	.text.float_max1,"ax",@progbits
-	.hidden	float_max1
+	.hidden	float_max1              # -- Begin function float_max1
 	.globl	float_max1
 	.type	float_max1,@function
 float_max1:                             # @float_max1
@@ -44,9 +44,9 @@ float_max1:                             # @float_max1
 	.endfunc
 .Lfunc_end2:
 	.size	float_max1, .Lfunc_end2-float_max1
-
+                                        # -- End function
 	.section	.text.float_max2,"ax",@progbits
-	.hidden	float_max2
+	.hidden	float_max2              # -- Begin function float_max2
 	.globl	float_max2
 	.type	float_max2,@function
 float_max2:                             # @float_max2
@@ -59,9 +59,9 @@ float_max2:                             # @float_max2
 	.endfunc
 .Lfunc_end3:
 	.size	float_max2, .Lfunc_end3-float_max2
-
+                                        # -- End function
 	.section	.text.double_min1,"ax",@progbits
-	.hidden	double_min1
+	.hidden	double_min1             # -- Begin function double_min1
 	.globl	double_min1
 	.type	double_min1,@function
 double_min1:                            # @double_min1
@@ -74,9 +74,9 @@ double_min1:                            # @double_min1
 	.endfunc
 .Lfunc_end4:
 	.size	double_min1, .Lfunc_end4-double_min1
-
+                                        # -- End function
 	.section	.text.double_min2,"ax",@progbits
-	.hidden	double_min2
+	.hidden	double_min2             # -- Begin function double_min2
 	.globl	double_min2
 	.type	double_min2,@function
 double_min2:                            # @double_min2
@@ -89,9 +89,9 @@ double_min2:                            # @double_min2
 	.endfunc
 .Lfunc_end5:
 	.size	double_min2, .Lfunc_end5-double_min2
-
+                                        # -- End function
 	.section	.text.double_max1,"ax",@progbits
-	.hidden	double_max1
+	.hidden	double_max1             # -- Begin function double_max1
 	.globl	double_max1
 	.type	double_max1,@function
 double_max1:                            # @double_max1
@@ -104,9 +104,9 @@ double_max1:                            # @double_max1
 	.endfunc
 .Lfunc_end6:
 	.size	double_max1, .Lfunc_end6-double_max1
-
+                                        # -- End function
 	.section	.text.double_max2,"ax",@progbits
-	.hidden	double_max2
+	.hidden	double_max2             # -- Begin function double_max2
 	.globl	double_max2
 	.type	double_max2,@function
 double_max2:                            # @double_max2
@@ -119,9 +119,9 @@ double_max2:                            # @double_max2
 	.endfunc
 .Lfunc_end7:
 	.size	double_max2, .Lfunc_end7-double_max2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -464,7 +464,7 @@ main:                                   # @main
 	f64.const	$push238=, 0x1p0
 	f64.eq  	$push95=, $pop94, $pop238
 	br_if   	1, $pop95       # 1: down to label0
-.LBB8_48:                               # %if.then187
+.LBB8_48:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
@@ -476,8 +476,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end8:
 	.size	main, .Lfunc_end8-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40022.c.s b/test/torture-s/pr40022.c.s
index 083bc739e..d8bcf2ffb 100644
--- a/test/torture-s/pr40022.c.s
+++ b/test/torture-s/pr40022.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40022.c"
+	.file	"pr40022.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,24 +9,22 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push5=, $pop1, $pop2
-	tee_local	$push4=, $1=, $pop5
-	i32.store	12($pop4), $0
-	i32.const	$push3=, 12
-	i32.add 	$1=, $1, $pop3
+	i32.sub 	$push4=, $pop0, $pop2
+	tee_local	$push3=, $1=, $pop4
+	i32.store	12($pop3), $0
 	#APP
 	#NO_APP
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	copy_local	$push5=, $0
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -38,7 +36,7 @@ bar:                                    # @bar
 	block   	
 	i32.eqz 	$push13=, $1
 	br_if   	0, $pop13       # 0: down to label0
-.LBB1_1:                                # %while.cond.while.cond_crit_edge
+.LBB1_1:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	copy_local	$push6=, $1
@@ -55,7 +53,7 @@ bar:                                    # @bar
 	block   	
 	i32.eqz 	$push14=, $1
 	br_if   	0, $pop14       # 0: down to label2
-.LBB1_3:                                # %while.cond2.while.cond2_crit_edge
+.LBB1_3:                                # %while.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	copy_local	$push12=, $1
@@ -72,9 +70,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -118,7 +116,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	g                       # @g
 	.type	g,@object
 	.section	.bss.g,"aw",@nobits
@@ -156,5 +154,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40057.c.s b/test/torture-s/pr40057.c.s
index b60181f49..94027ca55 100644
--- a/test/torture-s/pr40057.c.s
+++ b/test/torture-s/pr40057.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40057.c"
+	.file	"pr40057.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -31,9 +31,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,14 +60,14 @@ main:                                   # @main
 # BB#4:                                 # %if.end12
 	i32.const	$push8=, 0
 	return  	$pop8
-.LBB2_5:                                # %if.then11
+.LBB2_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40386.c.s b/test/torture-s/pr40386.c.s
index be0438b8c..595d62c94 100644
--- a/test/torture-s/pr40386.c.s
+++ b/test/torture-s/pr40386.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40386.c"
+	.file	"pr40386.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -219,14 +219,14 @@ main:                                   # @main
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
-.LBB0_22:                               # %if.then187
+.LBB0_22:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -290,6 +290,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40404.c.s b/test/torture-s/pr40404.c.s
index a3105a799..31069acd5 100644
--- a/test/torture-s/pr40404.c.s
+++ b/test/torture-s/pr40404.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40404.c"
+	.file	"pr40404.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -18,7 +18,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -29,4 +29,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr40493.c.s b/test/torture-s/pr40493.c.s
index 5a5d7f553..eeed901d6 100644
--- a/test/torture-s/pr40493.c.s
+++ b/test/torture-s/pr40493.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40493.c"
+	.file	"pr40493.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,7 +25,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x00                     # @x00
 	.type	x00,@object
 	.section	.bss.x00,"aw",@nobits
@@ -63,4 +63,4 @@ y01:
 	.size	y01, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr40579.c.s b/test/torture-s/pr40579.c.s
index f9cd9b372..d3b29768e 100644
--- a/test/torture-s/pr40579.c.s
+++ b/test/torture-s/pr40579.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40579.c"
+	.file	"pr40579.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -20,9 +20,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
 # BB#0:                                 # %entry
@@ -39,7 +39,7 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40657.c.s b/test/torture-s/pr40657.c.s
index ac394722d..d90699a48 100644
--- a/test/torture-s/pr40657.c.s
+++ b/test/torture-s/pr40657.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40657.c"
+	.file	"pr40657.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.load	$push1=, __stack_pointer($pop0)
+	i32.const	$push1=, 0
+	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push5=, $pop1, $pop2
+	i32.sub 	$push5=, $pop0, $pop2
 	tee_local	$push4=, $1=, $pop5
 	i32.store	12($pop4), $0
 	i32.const	$push3=, 12
@@ -22,9 +22,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -32,10 +32,10 @@ foo:                                    # @foo
 	.local  	i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push11=, $pop2, $pop3
+	i32.sub 	$push11=, $pop1, $pop3
 	tee_local	$push10=, $1=, $pop11
 	i32.store	__stack_pointer($pop4), $pop10
 	i32.const	$push8=, 12
@@ -52,9 +52,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +77,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -88,6 +88,6 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40668.c.s b/test/torture-s/pr40668.c.s
index 19218b776..7458e3b68 100644
--- a/test/torture-s/pr40668.c.s
+++ b/test/torture-s/pr40668.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40668.c"
+	.file	"pr40668.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -26,7 +26,7 @@ bar:                                    # @bar
 # BB#2:                                 # %switch.lookup
 	i32.const	$push9=, 2
 	i32.shl 	$push10=, $0, $pop9
-	i32.const	$push11=, .Lswitch.table
+	i32.const	$push11=, .Lswitch.table.bar
 	i32.add 	$push12=, $pop10, $pop11
 	i32.load	$push13=, 0($pop12)
 	i32.store	0($1):p2align=0, $pop13
@@ -36,9 +36,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,11 +49,11 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
-	.type	.Lswitch.table,@object  # @switch.table
-	.section	.rodata..Lswitch.table,"a",@progbits
+                                        # -- End function
+	.type	.Lswitch.table.bar,@object # @switch.table.bar
+	.section	.rodata..Lswitch.table.bar,"a",@progbits
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.bar:
 	.int32	305419896               # 0x12345678
 	.int32	305419896               # 0x12345678
 	.int32	305419896               # 0x12345678
@@ -63,7 +63,7 @@ main:                                   # @main
 	.int32	0                       # 0x0
 	.int32	0                       # 0x0
 	.int32	0                       # 0x0
-	.size	.Lswitch.table, 36
+	.size	.Lswitch.table.bar, 36
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr40747.c.s b/test/torture-s/pr40747.c.s
index 40fae5b96..457d2d1f8 100644
--- a/test/torture-s/pr40747.c.s
+++ b/test/torture-s/pr40747.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr40747.c"
+	.file	"pr40747.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,6 +29,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr41239.c.s b/test/torture-s/pr41239.c.s
index d7c54f5b9..542518ae1 100644
--- a/test/torture-s/pr41239.c.s
+++ b/test/torture-s/pr41239.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41239.c"
+	.file	"pr41239.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -10,10 +10,10 @@ test:                                   # @test
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push21=, $pop12, $pop13
+	i32.sub 	$push21=, $pop11, $pop13
 	tee_local	$push20=, $3=, $pop21
 	i32.store	__stack_pointer($pop14), $pop20
 	i32.load	$1=, 4($0)
@@ -51,9 +51,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.fn1,"ax",@progbits
-	.hidden	fn1
+	.hidden	fn1                     # -- Begin function fn1
 	.globl	fn1
 	.type	fn1,@function
 fn1:                                    # @fn1
@@ -72,9 +72,9 @@ fn1:                                    # @fn1
 	.endfunc
 .Lfunc_end1:
 	.size	fn1, .Lfunc_end1-fn1
-
+                                        # -- End function
 	.section	.text.fn2,"ax",@progbits
-	.hidden	fn2
+	.hidden	fn2                     # -- Begin function fn2
 	.globl	fn2
 	.type	fn2,@function
 fn2:                                    # @fn2
@@ -94,9 +94,9 @@ fn2:                                    # @fn2
 	.endfunc
 .Lfunc_end2:
 	.size	fn2, .Lfunc_end2-fn2
-
+                                        # -- End function
 	.section	.text.fn3,"ax",@progbits
-	.hidden	fn3
+	.hidden	fn3                     # -- Begin function fn3
 	.globl	fn3
 	.type	fn3,@function
 fn3:                                    # @fn3
@@ -110,9 +110,9 @@ fn3:                                    # @fn3
 	.endfunc
 .Lfunc_end3:
 	.size	fn3, .Lfunc_end3-fn3
-
+                                        # -- End function
 	.section	.text.fn4,"ax",@progbits
-	.hidden	fn4
+	.hidden	fn4                     # -- Begin function fn4
 	.globl	fn4
 	.type	fn4,@function
 fn4:                                    # @fn4
@@ -126,9 +126,9 @@ fn4:                                    # @fn4
 	.endfunc
 .Lfunc_end4:
 	.size	fn4, .Lfunc_end4-fn4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -136,10 +136,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push11=, $pop6, $pop7
+	i32.sub 	$push11=, $pop5, $pop7
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop8), $pop10
 	i32.const	$push2=, 8
@@ -156,7 +156,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end5:
 	.size	main, .Lfunc_end5-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -184,6 +184,6 @@ main:                                   # @main
 	.size	.Lmain.s, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr41317.c.s b/test/torture-s/pr41317.c.s
index f2fe35211..4e4fbe137 100644
--- a/test/torture-s/pr41317.c.s
+++ b/test/torture-s/pr41317.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41317.c"
+	.file	"pr41317.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr41395-1.c.s b/test/torture-s/pr41395-1.c.s
index 85c3cdee3..946080246 100644
--- a/test/torture-s/pr41395-1.c.s
+++ b/test/torture-s/pr41395-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41395-1.c"
+	.file	"pr41395-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,8 +51,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr41395-2.c.s b/test/torture-s/pr41395-2.c.s
index c5e71ab9a..101a2bb69 100644
--- a/test/torture-s/pr41395-2.c.s
+++ b/test/torture-s/pr41395-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41395-2.c"
+	.file	"pr41395-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,8 +51,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr41463.c.s b/test/torture-s/pr41463.c.s
index 86ea98943..ff66657c9 100644
--- a/test/torture-s/pr41463.c.s
+++ b/test/torture-s/pr41463.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41463.c"
+	.file	"pr41463.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	global                  # @global
 	.type	global,@object
 	.section	.bss.global,"aw",@nobits
@@ -62,6 +62,6 @@ global:
 	.size	global, 76
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr41750.c.s b/test/torture-s/pr41750.c.s
index 2faa01883..fe4ed891d 100644
--- a/test/torture-s/pr41750.c.s
+++ b/test/torture-s/pr41750.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41750.c"
+	.file	"pr41750.c"
 	.section	.text.foo_create_got_section,"ax",@progbits
-	.hidden	foo_create_got_section
+	.hidden	foo_create_got_section  # -- Begin function foo_create_got_section
 	.globl	foo_create_got_section
 	.type	foo_create_got_section,@function
 foo_create_got_section:                 # @foo_create_got_section
@@ -15,9 +15,9 @@ foo_create_got_section:                 # @foo_create_got_section
 	.endfunc
 .Lfunc_end0:
 	.size	foo_create_got_section, .Lfunc_end0-foo_create_got_section
-
+                                        # -- End function
 	.section	.text.elf64_ia64_check_relocs,"ax",@progbits
-	.hidden	elf64_ia64_check_relocs
+	.hidden	elf64_ia64_check_relocs # -- Begin function elf64_ia64_check_relocs
 	.globl	elf64_ia64_check_relocs
 	.type	elf64_ia64_check_relocs,@function
 elf64_ia64_check_relocs:                # @elf64_ia64_check_relocs
@@ -26,37 +26,38 @@ elf64_ia64_check_relocs:                # @elf64_ia64_check_relocs
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	block   	
-	i32.load	$push7=, 0($1)
-	tee_local	$push6=, $2=, $pop7
-	i32.load	$push5=, 8($pop6)
-	tee_local	$push4=, $3=, $pop5
-	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.then.i
+	i32.load	$push8=, 0($1)
+	tee_local	$push7=, $2=, $pop8
+	i32.load	$push6=, 8($pop7)
+	tee_local	$push5=, $3=, $pop6
+	i32.eqz 	$push11=, $pop5
+	br_if   	0, $pop11       # 0: down to label0
+# BB#1:                                 # %get_got.exit
+	return  	$3
+.LBB1_2:                                # %if.then.i
+	end_block                       # label0:
 	block   	
-	i32.load	$push9=, 4($2)
-	tee_local	$push8=, $3=, $pop9
-	br_if   	0, $pop8        # 0: down to label1
-# BB#2:                                 # %if.then3.i
+	i32.load	$push10=, 4($2)
+	tee_local	$push9=, $3=, $pop10
+	br_if   	0, $pop9        # 0: down to label1
+# BB#3:                                 # %if.then3.i
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $2, $pop0
 	i32.store	0($pop1), $0
 	copy_local	$3=, $0
-.LBB1_3:                                # %if.end.i
+.LBB1_4:                                # %if.end.i
 	end_block                       # label1:
 	i32.call	$drop=, foo_create_got_section@FUNCTION, $3, $1
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $2, $pop2
-	i32.load	$3=, 0($pop3)
-.LBB1_4:                                # %get_got.exit
-	end_block                       # label0:
-	copy_local	$push10=, $3
-                                        # fallthrough-return: $pop10
+	i32.load	$push4=, 0($pop3)
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	elf64_ia64_check_relocs, .Lfunc_end1-elf64_ia64_check_relocs
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -82,7 +83,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	hash                    # @hash
 	.type	hash,@object
 	.section	.bss.hash,"aw",@nobits
@@ -111,5 +112,5 @@ abfd:
 	.size	abfd, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr41917.c.s b/test/torture-s/pr41917.c.s
index e75cb9ba8..bf592a462 100644
--- a/test/torture-s/pr41917.c.s
+++ b/test/torture-s/pr41917.c.s
@@ -1,33 +1,18 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41917.c"
+	.file	"pr41917.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
-	block   	
-	i32.const	$push3=, -942519458
-	i32.const	$push7=, 0
-	i32.load	$push0=, a($pop7)
-	i32.const	$push1=, -2
-	i32.or  	$push2=, $pop0, $pop1
-	i32.rem_u	$push4=, $pop3, $pop2
-	i32.const	$push6=, -942519458
-	i32.ne  	$push5=, $pop4, $pop6
-	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	return  	$pop8
-.LBB0_2:                                # %if.then
-	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -38,5 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
-	.functype	abort, void
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr41919.c.s b/test/torture-s/pr41919.c.s
index 9ba2334be..5307ae6e1 100644
--- a/test/torture-s/pr41919.c.s
+++ b/test/torture-s/pr41919.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr41919.c"
+	.file	"pr41919.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	g_23                    # @g_23
 	.type	g_23,@object
 	.section	.bss.g_23,"aw",@nobits
@@ -23,4 +23,4 @@ g_23:
 	.size	g_23, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr42006.c.s b/test/torture-s/pr42006.c.s
index 5d8af6698..63e6d43c8 100644
--- a/test/torture-s/pr42006.c.s
+++ b/test/torture-s/pr42006.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42006.c"
+	.file	"pr42006.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr42142.c.s b/test/torture-s/pr42142.c.s
index 35d4e0192..daef2e162 100644
--- a/test/torture-s/pr42142.c.s
+++ b/test/torture-s/pr42142.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42142.c"
+	.file	"pr42142.c"
 	.section	.text.sort,"ax",@progbits
-	.hidden	sort
+	.hidden	sort                    # -- Begin function sort
 	.globl	sort
 	.type	sort,@function
 sort:                                   # @sort
@@ -21,9 +21,9 @@ sort:                                   # @sort
 	.endfunc
 .Lfunc_end0:
 	.size	sort, .Lfunc_end0-sort
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42154.c.s b/test/torture-s/pr42154.c.s
index d6f3b8618..0ceeb873b 100644
--- a/test/torture-s/pr42154.c.s
+++ b/test/torture-s/pr42154.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42154.c"
+	.file	"pr42154.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -37,7 +37,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42231.c.s b/test/torture-s/pr42231.c.s
index 6b5464766..c89ca4464 100644
--- a/test/torture-s/pr42231.c.s
+++ b/test/torture-s/pr42231.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42231.c"
+	.file	"pr42231.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,9 +33,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.CallFunctionRec,"ax",@progbits
-	.type	CallFunctionRec,@function
+	.type	CallFunctionRec,@function # -- Begin function CallFunctionRec
 CallFunctionRec:                        # @CallFunctionRec
 	.param  	i32
 	.result 	i32
@@ -67,9 +67,9 @@ CallFunctionRec:                        # @CallFunctionRec
 	.endfunc
 .Lfunc_end1:
 	.size	CallFunctionRec, .Lfunc_end1-CallFunctionRec
-
+                                        # -- End function
 	.section	.text.storemax,"ax",@progbits
-	.type	storemax,@function
+	.type	storemax,@function      # -- Begin function storemax
 storemax:                               # @storemax
 	.param  	i32
 # BB#0:                                 # %entry
@@ -87,7 +87,7 @@ storemax:                               # @storemax
 	.endfunc
 .Lfunc_end2:
 	.size	storemax, .Lfunc_end2-storemax
-
+                                        # -- End function
 	.type	max,@object             # @max
 	.section	.bss.max,"aw",@nobits
 	.p2align	2
@@ -96,5 +96,5 @@ max:
 	.size	max, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42248.c.s b/test/torture-s/pr42248.c.s
index 9d28358eb..61cecfcc2 100644
--- a/test/torture-s/pr42248.c.s
+++ b/test/torture-s/pr42248.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42248.c"
+	.file	"pr42248.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
@@ -26,9 +26,9 @@ check:                                  # @check
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.init,"ax",@progbits
-	.hidden	init
+	.hidden	init                    # -- Begin function init
 	.globl	init
 	.type	init,@function
 init:                                   # @init
@@ -42,9 +42,9 @@ init:                                   # @init
 	.endfunc
 .Lfunc_end1:
 	.size	init, .Lfunc_end1-init
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	g1s                     # @g1s
 	.type	g1s,@object
 	.section	.bss.g1s,"aw",@nobits
@@ -72,5 +72,5 @@ g1s:
 	.size	g1s, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42269-2.c.s b/test/torture-s/pr42269-2.c.s
index 3e36b42ec..ae9c5532f 100644
--- a/test/torture-s/pr42269-2.c.s
+++ b/test/torture-s/pr42269-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42269-2.c"
+	.file	"pr42269-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,9 +16,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
 	.result 	i64
@@ -32,7 +32,7 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -43,4 +43,4 @@ s:
 	.size	s, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr42512.c.s b/test/torture-s/pr42512.c.s
index 6f12c0326..cec5461e4 100644
--- a/test/torture-s/pr42512.c.s
+++ b/test/torture-s/pr42512.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42512.c"
+	.file	"pr42512.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,7 +16,7 @@ main:                                   # @main
 	loop    	                # label0:
 	i32.const	$push10=, 65535
 	i32.and 	$push2=, $2, $pop10
-	i32.or  	$2=, $pop2, $1
+	i32.or  	$2=, $1, $pop2
 	i32.const	$push9=, 255
 	i32.add 	$push1=, $1, $pop9
 	i32.const	$push8=, 255
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	g_3                     # @g_3
 	.type	g_3,@object
 	.section	.bss.g_3,"aw",@nobits
@@ -55,5 +55,5 @@ g_3:
 	.size	g_3, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42544.c.s b/test/torture-s/pr42544.c.s
index 0523223f5..e1bd754eb 100644
--- a/test/torture-s/pr42544.c.s
+++ b/test/torture-s/pr42544.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42544.c"
+	.file	"pr42544.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr42570.c.s b/test/torture-s/pr42570.c.s
index c4b604890..27ec75977 100644
--- a/test/torture-s/pr42570.c.s
+++ b/test/torture-s/pr42570.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42570.c"
+	.file	"pr42570.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	foo                     # @foo
 	.type	foo,@object
 	.section	.bss.foo,"aw",@nobits
@@ -21,4 +21,4 @@ foo:
 	.size	foo, 0
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr42614.c.s b/test/torture-s/pr42614.c.s
index e82f1db3b..5ddbf4519 100644
--- a/test/torture-s/pr42614.c.s
+++ b/test/torture-s/pr42614.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42614.c"
+	.file	"pr42614.c"
 	.section	.text.init,"ax",@progbits
-	.hidden	init
+	.hidden	init                    # -- Begin function init
 	.globl	init
 	.type	init,@function
 init:                                   # @init
@@ -13,9 +13,9 @@ init:                                   # @init
 	.endfunc
 .Lfunc_end0:
 	.size	init, .Lfunc_end0-init
-
+                                        # -- End function
 	.section	.text.expect_func,"ax",@progbits
-	.hidden	expect_func
+	.hidden	expect_func             # -- Begin function expect_func
 	.globl	expect_func
 	.type	expect_func,@function
 expect_func:                            # @expect_func
@@ -29,16 +29,16 @@ expect_func:                            # @expect_func
 	br_if   	0, $pop1        # 0: down to label0
 # BB#2:                                 # %if.end6
 	return
-.LBB1_3:                                # %if.then5
+.LBB1_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	expect_func, .Lfunc_end1-expect_func
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,10 +46,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push13=, $pop3, $pop4
+	i32.sub 	$push13=, $pop2, $pop4
 	tee_local	$push12=, $0=, $pop13
 	i32.store	__stack_pointer($pop5), $pop12
 	i32.const	$push0=, 0
@@ -67,8 +67,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr42691.c.s b/test/torture-s/pr42691.c.s
index c4e1dad12..a8f507e5a 100644
--- a/test/torture-s/pr42691.c.s
+++ b/test/torture-s/pr42691.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42691.c"
+	.file	"pr42691.c"
 	.section	.text.add,"ax",@progbits
-	.hidden	add
+	.hidden	add                     # -- Begin function add
 	.globl	add
 	.type	add,@function
 add:                                    # @add
@@ -46,20 +46,20 @@ add:                                    # @add
 	.endfunc
 .Lfunc_end0:
 	.size	add, .Lfunc_end0-add
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, f64, i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end.lr.ph.i
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
+	i32.sub 	$push15=, $pop6, $pop8
 	tee_local	$push14=, $2=, $pop15
 	i32.store	__stack_pointer($pop9), $pop14
 	i64.const	$push1=, 4627167142146473984
@@ -100,7 +100,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42721.c.s b/test/torture-s/pr42721.c.s
index db324bced..b860977b4 100644
--- a/test/torture-s/pr42721.c.s
+++ b/test/torture-s/pr42721.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42721.c"
+	.file	"pr42721.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	b,@object               # @b
 	.section	.bss.b,"aw",@nobits
 	.p2align	2
@@ -36,5 +36,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42833.c.s b/test/torture-s/pr42833.c.s
index 79e030f6d..c86c40b97 100644
--- a/test/torture-s/pr42833.c.s
+++ b/test/torture-s/pr42833.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr42833.c"
+	.file	"pr42833.c"
 	.section	.text.helper_neon_rshl_s8,"ax",@progbits
-	.hidden	helper_neon_rshl_s8
+	.hidden	helper_neon_rshl_s8     # -- Begin function helper_neon_rshl_s8
 	.globl	helper_neon_rshl_s8
 	.type	helper_neon_rshl_s8,@function
 helper_neon_rshl_s8:                    # @helper_neon_rshl_s8
@@ -12,216 +12,226 @@ helper_neon_rshl_s8:                    # @helper_neon_rshl_s8
 	i32.const	$5=, 0
 	i32.const	$4=, 0
 	block   	
-	i32.const	$push75=, 24
-	i32.shl 	$push74=, $1, $pop75
-	tee_local	$push73=, $6=, $pop74
-	i32.const	$push0=, 117440512
-	i32.gt_s	$push1=, $pop73, $pop0
-	br_if   	0, $pop1        # 0: down to label0
+	i32.const	$push88=, 24
+	i32.shl 	$push87=, $1, $pop88
+	tee_local	$push86=, $6=, $pop87
+	i32.const	$push1=, 117440512
+	i32.gt_s	$push2=, $pop86, $pop1
+	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.else
-	i32.const	$push76=, 24
-	i32.shl 	$7=, $0, $pop76
 	block   	
-	i32.const	$push2=, -134217729
-	i32.gt_s	$push3=, $6, $pop2
-	br_if   	0, $pop3        # 0: down to label1
+	i32.const	$push3=, -134217729
+	i32.gt_s	$push4=, $6, $pop3
+	br_if   	0, $pop4        # 0: down to label1
 # BB#2:                                 # %if.then13
-	i32.const	$push13=, 31
-	i32.shr_s	$4=, $7, $pop13
+	i32.const	$push16=, 24
+	i32.shl 	$push17=, $0, $pop16
+	i32.const	$push18=, 31
+	i32.shr_s	$4=, $pop17, $pop18
 	br      	1               # 1: down to label0
 .LBB0_3:                                # %if.else18
 	end_block                       # label1:
 	i32.const	$4=, 0
-	i32.const	$push79=, 24
-	i32.shr_s	$push78=, $6, $pop79
-	tee_local	$push77=, $2=, $pop78
-	i32.const	$push4=, -8
-	i32.eq  	$push5=, $pop77, $pop4
-	br_if   	0, $pop5        # 0: down to label0
+	i32.const	$push91=, 24
+	i32.shr_s	$push90=, $6, $pop91
+	tee_local	$push89=, $7=, $pop90
+	i32.const	$push5=, -8
+	i32.eq  	$push6=, $pop89, $pop5
+	br_if   	0, $pop6        # 0: down to label0
 # BB#4:                                 # %if.else34
-	i32.const	$push81=, 24
-	i32.shr_s	$4=, $7, $pop81
+	i32.const	$push7=, 24
+	i32.shl 	$push8=, $0, $pop7
+	i32.const	$push93=, 24
+	i32.shr_s	$4=, $pop8, $pop93
 	block   	
-	i32.const	$push80=, -1
-	i32.le_s	$push6=, $6, $pop80
-	br_if   	0, $pop6        # 0: down to label2
+	i32.const	$push92=, -1
+	i32.le_s	$push9=, $6, $pop92
+	br_if   	0, $pop9        # 0: down to label2
 # BB#5:                                 # %if.else48
-	i32.shl 	$4=, $4, $2
+	i32.shl 	$4=, $4, $7
 	br      	1               # 1: down to label0
 .LBB0_6:                                # %if.then38
 	end_block                       # label2:
-	i32.const	$push10=, 1
-	i32.const	$push82=, -1
-	i32.xor 	$push9=, $2, $pop82
-	i32.shl 	$push11=, $pop10, $pop9
-	i32.add 	$push12=, $pop11, $4
-	i32.const	$push7=, 0
-	i32.sub 	$push8=, $pop7, $2
-	i32.shr_s	$4=, $pop12, $pop8
+	i32.const	$push13=, 1
+	i32.const	$push94=, -1
+	i32.xor 	$push12=, $7, $pop94
+	i32.shl 	$push14=, $pop13, $pop12
+	i32.add 	$push15=, $pop14, $4
+	i32.const	$push10=, 0
+	i32.sub 	$push11=, $pop10, $7
+	i32.shr_s	$4=, $pop15, $pop11
 .LBB0_7:                                # %if.end57
 	end_block                       # label0:
 	block   	
-	i32.const	$push87=, 16
-	i32.shl 	$push14=, $1, $pop87
-	i32.const	$push86=, 24
-	i32.shr_s	$push85=, $pop14, $pop86
-	tee_local	$push84=, $6=, $pop85
-	i32.const	$push83=, 7
-	i32.gt_s	$push15=, $pop84, $pop83
-	br_if   	0, $pop15       # 0: down to label3
-# BB#8:                                 # %if.else68
-	i32.const	$push88=, 16
-	i32.shl 	$7=, $0, $pop88
+	i32.const	$push99=, 16
+	i32.shl 	$push19=, $1, $pop99
+	i32.const	$push98=, 24
+	i32.shr_s	$push97=, $pop19, $pop98
+	tee_local	$push96=, $6=, $pop97
+	i32.const	$push95=, 7
+	i32.gt_s	$push20=, $pop96, $pop95
+	br_if   	0, $pop20       # 0: down to label3
+# BB#8:                                 # %if.else67
+	i32.const	$push0=, 8
+	i32.shr_u	$7=, $0, $pop0
 	block   	
-	i32.const	$push17=, -9
-	i32.gt_s	$push18=, $6, $pop17
-	br_if   	0, $pop18       # 0: down to label4
-# BB#9:                                 # %if.then72
-	i32.const	$push28=, 31
-	i32.shr_s	$5=, $7, $pop28
+	i32.const	$push21=, -9
+	i32.gt_s	$push22=, $6, $pop21
+	br_if   	0, $pop22       # 0: down to label4
+# BB#9:                                 # %if.then71
+	i32.const	$push34=, 24
+	i32.shl 	$push35=, $7, $pop34
+	i32.const	$push36=, 31
+	i32.shr_s	$5=, $pop35, $pop36
 	br      	1               # 1: down to label3
-.LBB0_10:                               # %if.else78
+.LBB0_10:                               # %if.else77
 	end_block                       # label4:
-	i32.const	$push19=, -8
-	i32.eq  	$push20=, $6, $pop19
-	br_if   	0, $pop20       # 0: down to label3
-# BB#11:                                # %if.else96
-	i32.const	$push16=, 24
-	i32.shr_s	$5=, $7, $pop16
+	i32.const	$push23=, -8
+	i32.eq  	$push24=, $6, $pop23
+	br_if   	0, $pop24       # 0: down to label3
+# BB#11:                                # %if.else95
+	i32.const	$push25=, 24
+	i32.shl 	$push26=, $7, $pop25
+	i32.const	$push101=, 24
+	i32.shr_s	$5=, $pop26, $pop101
 	block   	
-	i32.const	$push89=, -1
-	i32.le_s	$push21=, $6, $pop89
-	br_if   	0, $pop21       # 0: down to label5
-# BB#12:                                # %if.else112
+	i32.const	$push100=, -1
+	i32.le_s	$push27=, $6, $pop100
+	br_if   	0, $pop27       # 0: down to label5
+# BB#12:                                # %if.else111
 	i32.shl 	$5=, $5, $6
 	br      	1               # 1: down to label3
-.LBB0_13:                               # %if.then100
+.LBB0_13:                               # %if.then99
 	end_block                       # label5:
-	i32.const	$push25=, 1
-	i32.const	$push90=, -1
-	i32.xor 	$push24=, $6, $pop90
-	i32.shl 	$push26=, $pop25, $pop24
-	i32.add 	$push27=, $pop26, $5
-	i32.const	$push22=, 0
-	i32.sub 	$push23=, $pop22, $6
-	i32.shr_s	$5=, $pop27, $pop23
-.LBB0_14:                               # %if.end122
+	i32.const	$push31=, 1
+	i32.const	$push102=, -1
+	i32.xor 	$push30=, $6, $pop102
+	i32.shl 	$push32=, $pop31, $pop30
+	i32.add 	$push33=, $pop32, $5
+	i32.const	$push28=, 0
+	i32.sub 	$push29=, $pop28, $6
+	i32.shr_s	$5=, $pop33, $pop29
+.LBB0_14:                               # %if.end121
 	end_block                       # label3:
 	i32.const	$7=, 0
 	i32.const	$6=, 0
 	block   	
-	i32.const	$push95=, 8
-	i32.shl 	$push29=, $1, $pop95
-	i32.const	$push94=, 24
-	i32.shr_s	$push93=, $pop29, $pop94
-	tee_local	$push92=, $2=, $pop93
-	i32.const	$push91=, 7
-	i32.gt_s	$push30=, $pop92, $pop91
-	br_if   	0, $pop30       # 0: down to label6
-# BB#15:                                # %if.else133
-	i32.const	$push96=, 8
-	i32.shl 	$3=, $0, $pop96
+	i32.const	$push37=, 8
+	i32.shl 	$push38=, $1, $pop37
+	i32.const	$push106=, 24
+	i32.shr_s	$push105=, $pop38, $pop106
+	tee_local	$push104=, $3=, $pop105
+	i32.const	$push103=, 7
+	i32.gt_s	$push39=, $pop104, $pop103
+	br_if   	0, $pop39       # 0: down to label6
+# BB#15:                                # %if.else131
+	i32.const	$push107=, 16
+	i32.shr_u	$2=, $0, $pop107
 	block   	
-	i32.const	$push31=, -9
-	i32.gt_s	$push32=, $2, $pop31
-	br_if   	0, $pop32       # 0: down to label7
-# BB#16:                                # %if.then137
-	i32.const	$push42=, 31
-	i32.shr_s	$6=, $3, $pop42
+	i32.const	$push40=, -9
+	i32.gt_s	$push41=, $3, $pop40
+	br_if   	0, $pop41       # 0: down to label7
+# BB#16:                                # %if.then135
+	i32.const	$push53=, 24
+	i32.shl 	$push54=, $2, $pop53
+	i32.const	$push55=, 31
+	i32.shr_s	$6=, $pop54, $pop55
 	br      	1               # 1: down to label6
-.LBB0_17:                               # %if.else143
+.LBB0_17:                               # %if.else141
 	end_block                       # label7:
 	i32.const	$6=, 0
-	i32.const	$push33=, -8
-	i32.eq  	$push34=, $2, $pop33
-	br_if   	0, $pop34       # 0: down to label6
-# BB#18:                                # %if.else161
-	i32.const	$push98=, 24
-	i32.shr_s	$6=, $3, $pop98
+	i32.const	$push42=, -8
+	i32.eq  	$push43=, $3, $pop42
+	br_if   	0, $pop43       # 0: down to label6
+# BB#18:                                # %if.else159
+	i32.const	$push44=, 24
+	i32.shl 	$push45=, $2, $pop44
+	i32.const	$push109=, 24
+	i32.shr_s	$6=, $pop45, $pop109
 	block   	
-	i32.const	$push97=, -1
-	i32.le_s	$push35=, $2, $pop97
-	br_if   	0, $pop35       # 0: down to label8
-# BB#19:                                # %if.else177
-	i32.shl 	$6=, $6, $2
+	i32.const	$push108=, -1
+	i32.le_s	$push46=, $3, $pop108
+	br_if   	0, $pop46       # 0: down to label8
+# BB#19:                                # %if.else175
+	i32.shl 	$6=, $6, $3
 	br      	1               # 1: down to label6
-.LBB0_20:                               # %if.then165
+.LBB0_20:                               # %if.then163
 	end_block                       # label8:
-	i32.const	$push39=, 1
-	i32.const	$push99=, -1
-	i32.xor 	$push38=, $2, $pop99
-	i32.shl 	$push40=, $pop39, $pop38
-	i32.add 	$push41=, $pop40, $6
-	i32.const	$push36=, 0
-	i32.sub 	$push37=, $pop36, $2
-	i32.shr_s	$6=, $pop41, $pop37
-.LBB0_21:                               # %if.end187
+	i32.const	$push50=, 1
+	i32.const	$push110=, -1
+	i32.xor 	$push49=, $3, $pop110
+	i32.shl 	$push51=, $pop50, $pop49
+	i32.add 	$push52=, $pop51, $6
+	i32.const	$push47=, 0
+	i32.sub 	$push48=, $pop47, $3
+	i32.shr_s	$6=, $pop52, $pop48
+.LBB0_21:                               # %if.end185
 	end_block                       # label6:
 	block   	
-	i32.const	$push102=, 24
-	i32.shr_s	$push101=, $1, $pop102
-	tee_local	$push100=, $1=, $pop101
-	i32.const	$push43=, 7
-	i32.gt_s	$push44=, $pop100, $pop43
-	br_if   	0, $pop44       # 0: down to label9
-# BB#22:                                # %if.else199
+	i32.const	$push113=, 24
+	i32.shr_s	$push112=, $1, $pop113
+	tee_local	$push111=, $1=, $pop112
+	i32.const	$push56=, 7
+	i32.gt_s	$push57=, $pop111, $pop56
+	br_if   	0, $pop57       # 0: down to label9
+# BB#22:                                # %if.else196
 	block   	
-	i32.const	$push46=, -9
-	i32.gt_s	$push47=, $1, $pop46
-	br_if   	0, $pop47       # 0: down to label10
-# BB#23:                                # %if.then203
-	i32.const	$push57=, 31
-	i32.shr_s	$7=, $0, $pop57
+	i32.const	$push58=, -9
+	i32.gt_s	$push59=, $1, $pop58
+	br_if   	0, $pop59       # 0: down to label10
+# BB#23:                                # %if.then200
+	i32.const	$push70=, 31
+	i32.shr_s	$7=, $0, $pop70
 	br      	1               # 1: down to label9
-.LBB0_24:                               # %if.else209
+.LBB0_24:                               # %if.else206
 	end_block                       # label10:
-	i32.const	$push48=, -8
-	i32.eq  	$push49=, $1, $pop48
-	br_if   	0, $pop49       # 0: down to label9
-# BB#25:                                # %if.else227
-	i32.const	$push45=, 24
-	i32.shr_s	$0=, $0, $pop45
+	i32.const	$push60=, -8
+	i32.eq  	$push61=, $1, $pop60
+	br_if   	0, $pop61       # 0: down to label9
+# BB#25:                                # %if.else224
+	i32.const	$push62=, 24
+	i32.shr_s	$0=, $0, $pop62
 	block   	
-	i32.const	$push103=, -1
-	i32.le_s	$push50=, $1, $pop103
-	br_if   	0, $pop50       # 0: down to label11
-# BB#26:                                # %if.else243
+	i32.const	$push114=, -1
+	i32.le_s	$push63=, $1, $pop114
+	br_if   	0, $pop63       # 0: down to label11
+# BB#26:                                # %if.else240
 	i32.shl 	$7=, $0, $1
 	br      	1               # 1: down to label9
-.LBB0_27:                               # %if.then231
+.LBB0_27:                               # %if.then228
 	end_block                       # label11:
-	i32.const	$push54=, 1
-	i32.const	$push104=, -1
-	i32.xor 	$push53=, $1, $pop104
-	i32.shl 	$push55=, $pop54, $pop53
-	i32.add 	$push56=, $pop55, $0
-	i32.const	$push51=, 0
-	i32.sub 	$push52=, $pop51, $1
-	i32.shr_s	$7=, $pop56, $pop52
-.LBB0_28:                               # %if.end253
+	i32.const	$push67=, 1
+	i32.const	$push115=, -1
+	i32.xor 	$push66=, $1, $pop115
+	i32.shl 	$push68=, $pop67, $pop66
+	i32.add 	$push69=, $pop68, $0
+	i32.const	$push64=, 0
+	i32.sub 	$push65=, $pop64, $1
+	i32.shr_s	$7=, $pop69, $pop65
+.LBB0_28:                               # %if.end250
 	end_block                       # label9:
-	i32.const	$push60=, 8
-	i32.shl 	$push61=, $5, $pop60
-	i32.const	$push62=, 65280
-	i32.and 	$push63=, $pop61, $pop62
-	i32.const	$push58=, 255
-	i32.and 	$push59=, $4, $pop58
-	i32.or  	$push64=, $pop63, $pop59
-	i32.const	$push65=, 16
-	i32.shl 	$push66=, $6, $pop65
-	i32.const	$push67=, 16711680
-	i32.and 	$push68=, $pop66, $pop67
-	i32.or  	$push69=, $pop64, $pop68
-	i32.const	$push70=, 24
-	i32.shl 	$push71=, $7, $pop70
-	i32.or  	$push72=, $pop69, $pop71
-                                        # fallthrough-return: $pop72
+	i32.const	$push73=, 8
+	i32.shl 	$push74=, $5, $pop73
+	i32.const	$push75=, 65280
+	i32.and 	$push76=, $pop74, $pop75
+	i32.const	$push71=, 255
+	i32.and 	$push72=, $4, $pop71
+	i32.or  	$push77=, $pop76, $pop72
+	i32.const	$push78=, 16
+	i32.shl 	$push79=, $6, $pop78
+	i32.const	$push80=, 16711680
+	i32.and 	$push81=, $pop79, $pop80
+	i32.or  	$push82=, $pop77, $pop81
+	i32.const	$push83=, 24
+	i32.shl 	$push84=, $7, $pop83
+	i32.or  	$push85=, $pop82, $pop84
+                                        # fallthrough-return: $pop85
 	.endfunc
 .Lfunc_end0:
 	.size	helper_neon_rshl_s8, .Lfunc_end0-helper_neon_rshl_s8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -232,6 +242,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr43008.c.s b/test/torture-s/pr43008.c.s
index 04f003761..8b30f7322 100644
--- a/test/torture-s/pr43008.c.s
+++ b/test/torture-s/pr43008.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43008.c"
+	.file	"pr43008.c"
 	.section	.text.my_alloc,"ax",@progbits
-	.hidden	my_alloc
+	.hidden	my_alloc                # -- Begin function my_alloc
 	.globl	my_alloc
 	.type	my_alloc,@function
 my_alloc:                               # @my_alloc
@@ -18,9 +18,9 @@ my_alloc:                               # @my_alloc
 	.endfunc
 .Lfunc_end0:
 	.size	my_alloc, .Lfunc_end0-my_alloc
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,7 +56,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -67,6 +67,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	__builtin_malloc, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr43220.c.s b/test/torture-s/pr43220.c.s
index 64dbbe472..7369bee1e 100644
--- a/test/torture-s/pr43220.c.s
+++ b/test/torture-s/pr43220.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43220.c"
+	.file	"pr43220.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,57 +16,57 @@ main:                                   # @main
 .LBB0_1:                                # %lab
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push44=, 1000
-	i32.rem_s	$push0=, $2, $pop44
-	i32.const	$push43=, 2
-	i32.shl 	$push42=, $pop0, $pop43
-	tee_local	$push41=, $0=, $pop42
-	i32.const	$push40=, 19
-	i32.add 	$push1=, $pop41, $pop40
-	i32.const	$push39=, -16
-	i32.and 	$push2=, $pop1, $pop39
-	i32.sub 	$push38=, $3, $pop2
-	tee_local	$push37=, $1=, $pop38
-	copy_local	$drop=, $pop37
-	i32.const	$push36=, 1
-	i32.store	0($1), $pop36
-	i32.const	$push35=, 0
-	i32.store	p($pop35), $1
-	i32.add 	$push4=, $1, $0
-	i32.const	$push34=, 2
-	i32.store	0($pop4), $pop34
-	copy_local	$push3=, $3
-	copy_local	$push33=, $pop3
-	tee_local	$push32=, $3=, $pop33
-	i32.const	$push31=, 1
-	i32.add 	$push5=, $2, $pop31
-	i32.const	$push30=, 1000
-	i32.rem_s	$push6=, $pop5, $pop30
-	i32.const	$push29=, 2
-	i32.shl 	$push28=, $pop6, $pop29
-	tee_local	$push27=, $0=, $pop28
-	i32.const	$push26=, 19
-	i32.add 	$push7=, $pop27, $pop26
-	i32.const	$push25=, -16
-	i32.and 	$push8=, $pop7, $pop25
-	i32.sub 	$push24=, $pop32, $pop8
-	tee_local	$push23=, $1=, $pop24
-	copy_local	$drop=, $pop23
-	i32.const	$push22=, 1
-	i32.store	0($1), $pop22
-	i32.const	$push21=, 0
-	i32.store	p($pop21), $1
-	i32.add 	$push10=, $1, $0
-	i32.const	$push20=, 2
-	i32.store	0($pop10), $pop20
-	copy_local	$push9=, $3
-	copy_local	$3=, $pop9
-	i32.const	$push19=, 2
-	i32.add 	$push18=, $2, $pop19
-	tee_local	$push17=, $2=, $pop18
-	i32.const	$push16=, 1000000
-	i32.lt_s	$push11=, $pop17, $pop16
-	br_if   	0, $pop11       # 0: up to label0
+	i32.const	$push42=, 1000
+	i32.rem_s	$push1=, $2, $pop42
+	i32.const	$push41=, 2
+	i32.shl 	$push40=, $pop1, $pop41
+	tee_local	$push39=, $0=, $pop40
+	i32.const	$push38=, 19
+	i32.add 	$push2=, $pop39, $pop38
+	i32.const	$push37=, -16
+	i32.and 	$push3=, $pop2, $pop37
+	i32.sub 	$push36=, $3, $pop3
+	tee_local	$push35=, $1=, $pop36
+	copy_local	$drop=, $pop35
+	i32.const	$push34=, 1
+	i32.store	0($1), $pop34
+	i32.const	$push33=, 0
+	i32.store	p($pop33), $1
+	i32.add 	$push5=, $1, $0
+	i32.const	$push32=, 2
+	i32.store	0($pop5), $pop32
+	copy_local	$push4=, $3
+	copy_local	$push31=, $pop4
+	tee_local	$push30=, $3=, $pop31
+	i32.const	$push29=, 1
+	i32.add 	$push6=, $2, $pop29
+	i32.const	$push28=, 1000
+	i32.rem_s	$push7=, $pop6, $pop28
+	i32.const	$push27=, 2
+	i32.shl 	$push26=, $pop7, $pop27
+	tee_local	$push25=, $0=, $pop26
+	i32.const	$push24=, 19
+	i32.add 	$push8=, $pop25, $pop24
+	i32.const	$push23=, -16
+	i32.and 	$push9=, $pop8, $pop23
+	i32.sub 	$push22=, $pop30, $pop9
+	tee_local	$push21=, $1=, $pop22
+	copy_local	$drop=, $pop21
+	i32.const	$push20=, 1
+	i32.store	0($1), $pop20
+	i32.const	$push19=, 0
+	i32.store	p($pop19), $1
+	i32.add 	$push11=, $1, $0
+	i32.const	$push18=, 2
+	i32.store	0($pop11), $pop18
+	i32.const	$push17=, 999998
+	i32.lt_u	$1=, $2, $pop17
+	copy_local	$push10=, $3
+	copy_local	$3=, $pop10
+	i32.const	$push16=, 2
+	i32.add 	$push0=, $2, $pop16
+	copy_local	$2=, $pop0
+	br_if   	0, $1           # 0: up to label0
 # BB#2:                                 # %if.end
 	end_loop
 	i32.const	$push12=, 0
@@ -74,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -85,4 +85,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr43236.c.s b/test/torture-s/pr43236.c.s
index 88b43a5d6..834e122ae 100644
--- a/test/torture-s/pr43236.c.s
+++ b/test/torture-s/pr43236.c.s
@@ -1,121 +1,105 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43236.c"
+	.file	"pr43236.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
-	i32.const	$push26=, 96
-	i32.sub 	$push77=, $pop25, $pop26
-	tee_local	$push76=, $0=, $pop77
-	i32.store	__stack_pointer($pop27), $pop76
-	i32.const	$push31=, 64
+	i32.const	$push21=, 0
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 96
+	i32.sub 	$push64=, $pop18, $pop20
+	tee_local	$push63=, $0=, $pop64
+	i32.store	__stack_pointer($pop21), $pop63
+	i32.const	$push25=, 64
+	i32.add 	$push26=, $0, $pop25
+	i32.const	$push0=, 16
+	i32.add 	$push1=, $pop26, $pop0
+	i64.const	$push2=, 72340172838076673
+	i64.store	0($pop1), $pop2
+	i32.const	$push27=, 32
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push62=, 16
+	i32.add 	$push3=, $pop28, $pop62
+	i64.const	$push61=, 72340172838076673
+	i64.store	0($pop3), $pop61
+	i32.const	$push60=, 16
+	i32.add 	$push4=, $0, $pop60
+	i64.const	$push59=, 72340172838076673
+	i64.store	0($pop4), $pop59
+	i32.const	$push29=, 64
+	i32.add 	$push30=, $0, $pop29
+	i32.const	$push5=, 22
+	i32.add 	$push6=, $pop30, $pop5
+	i64.const	$push58=, 72340172838076673
+	i64.store	0($pop6):p2align=1, $pop58
+	i32.const	$push31=, 32
 	i32.add 	$push32=, $0, $pop31
-	i32.const	$push0=, 28
-	i32.add 	$push1=, $pop32, $pop0
-	i32.const	$push2=, 257
-	i32.store16	0($pop1), $pop2
+	i32.const	$push57=, 22
+	i32.add 	$push7=, $pop32, $pop57
+	i64.const	$push56=, 72340172838076673
+	i64.store	0($pop7):p2align=1, $pop56
+	i32.const	$push55=, 22
+	i32.add 	$push8=, $0, $pop55
+	i64.const	$push54=, 72340172838076673
+	i64.store	0($pop8):p2align=1, $pop54
 	i32.const	$push33=, 64
 	i32.add 	$push34=, $0, $pop33
-	i32.const	$push3=, 24
-	i32.add 	$push4=, $pop34, $pop3
-	i32.const	$push5=, 16843009
-	i32.store	0($pop4), $pop5
-	i32.const	$push35=, 64
+	i32.const	$push9=, 18
+	i32.add 	$push10=, $pop34, $pop9
+	i32.const	$push11=, 0
+	i32.store16	0($pop10), $pop11
+	i32.const	$push35=, 32
 	i32.add 	$push36=, $0, $pop35
-	i32.const	$push6=, 16
-	i32.add 	$push7=, $pop36, $pop6
-	i64.const	$push8=, 72340172838076673
-	i64.store	0($pop7), $pop8
-	i32.const	$push37=, 32
+	i32.const	$push53=, 18
+	i32.add 	$push12=, $pop36, $pop53
+	i32.const	$push52=, 0
+	i32.store16	0($pop12), $pop52
+	i32.const	$push51=, 18
+	i32.add 	$push13=, $0, $pop51
+	i32.const	$push50=, 0
+	i32.store16	0($pop13), $pop50
+	i64.const	$push49=, 72340172838076673
+	i64.store	72($0), $pop49
+	i64.const	$push48=, 72340172838076673
+	i64.store	40($0), $pop48
+	i64.const	$push47=, 72340172838076673
+	i64.store	8($0), $pop47
+	i64.const	$push46=, 72340172838076673
+	i64.store	64($0), $pop46
+	i64.const	$push45=, 72340172838076673
+	i64.store	32($0), $pop45
+	i64.const	$push44=, 72340172838076673
+	i64.store	0($0), $pop44
+	i64.const	$push14=, 0
+	i64.store	74($0):p2align=1, $pop14
+	i64.const	$push43=, 0
+	i64.store	42($0):p2align=1, $pop43
+	i64.const	$push42=, 0
+	i64.store	10($0):p2align=1, $pop42
+	block   	
+	i32.const	$push37=, 64
 	i32.add 	$push38=, $0, $pop37
-	i32.const	$push75=, 28
-	i32.add 	$push9=, $pop38, $pop75
-	i32.const	$push74=, 257
-	i32.store16	0($pop9), $pop74
+	i32.const	$push41=, 30
+	i32.call	$push15=, memcmp@FUNCTION, $pop38, $0, $pop41
+	br_if   	0, $pop15       # 0: down to label0
+# BB#1:                                 # %lor.lhs.false
 	i32.const	$push39=, 32
 	i32.add 	$push40=, $0, $pop39
-	i32.const	$push73=, 24
-	i32.add 	$push10=, $pop40, $pop73
-	i32.const	$push72=, 16843009
-	i32.store	0($pop10), $pop72
-	i32.const	$push41=, 32
-	i32.add 	$push42=, $0, $pop41
-	i32.const	$push71=, 16
-	i32.add 	$push11=, $pop42, $pop71
-	i64.const	$push70=, 72340172838076673
-	i64.store	0($pop11), $pop70
-	i64.const	$push69=, 72340172838076673
-	i64.store	64($0), $pop69
-	i64.const	$push68=, 72340172838076673
-	i64.store	72($0), $pop68
-	i64.const	$push67=, 72340172838076673
-	i64.store	40($0), $pop67
-	i64.const	$push66=, 72340172838076673
-	i64.store	32($0), $pop66
-	i32.const	$push43=, 64
-	i32.add 	$push44=, $0, $pop43
-	i32.const	$push12=, 18
-	i32.add 	$push13=, $pop44, $pop12
-	i32.const	$push14=, 0
-	i32.store16	0($pop13), $pop14
-	i64.const	$push15=, 0
-	i64.store	74($0):p2align=1, $pop15
-	i32.const	$push45=, 32
-	i32.add 	$push46=, $0, $pop45
-	i32.const	$push65=, 18
-	i32.add 	$push16=, $pop46, $pop65
-	i32.const	$push64=, 0
-	i32.store16	0($pop16), $pop64
-	i64.const	$push63=, 0
-	i64.store	42($0):p2align=1, $pop63
-	i32.const	$push62=, 28
-	i32.add 	$push17=, $0, $pop62
-	i32.const	$push61=, 257
-	i32.store16	0($pop17), $pop61
-	i32.const	$push60=, 24
-	i32.add 	$push18=, $0, $pop60
-	i32.const	$push59=, 16843009
-	i32.store	0($pop18), $pop59
-	i32.const	$push58=, 16
-	i32.add 	$push19=, $0, $pop58
-	i64.const	$push57=, 72340172838076673
-	i64.store	0($pop19), $pop57
-	i64.const	$push56=, 72340172838076673
-	i64.store	8($0), $pop56
-	i64.const	$push55=, 72340172838076673
-	i64.store	0($0), $pop55
-	i32.const	$push54=, 18
-	i32.add 	$push20=, $0, $pop54
-	i32.const	$push53=, 0
-	i32.store16	0($pop20), $pop53
-	i64.const	$push52=, 0
-	i64.store	10($0):p2align=1, $pop52
-	block   	
-	i32.const	$push47=, 64
-	i32.add 	$push48=, $0, $pop47
-	i32.const	$push51=, 30
-	i32.call	$push21=, memcmp@FUNCTION, $pop48, $0, $pop51
-	br_if   	0, $pop21       # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push49=, 32
-	i32.add 	$push50=, $0, $pop49
-	i32.const	$push78=, 30
-	i32.call	$push22=, memcmp@FUNCTION, $pop50, $0, $pop78
-	br_if   	0, $pop22       # 0: down to label0
+	i32.const	$push65=, 30
+	i32.call	$push16=, memcmp@FUNCTION, $pop40, $0, $pop65
+	br_if   	0, $pop16       # 0: down to label0
 # BB#2:                                 # %if.end
-	i32.const	$push30=, 0
-	i32.const	$push28=, 96
-	i32.add 	$push29=, $0, $pop28
-	i32.store	__stack_pointer($pop30), $pop29
-	i32.const	$push23=, 0
-	return  	$pop23
+	i32.const	$push24=, 0
+	i32.const	$push22=, 96
+	i32.add 	$push23=, $0, $pop22
+	i32.store	__stack_pointer($pop24), $pop23
+	i32.const	$push17=, 0
+	return  	$pop17
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -123,8 +107,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr43269.c.s b/test/torture-s/pr43269.c.s
index 63a4276b3..840ed9bf8 100644
--- a/test/torture-s/pr43269.c.s
+++ b/test/torture-s/pr43269.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43269.c"
+	.file	"pr43269.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,9 +24,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.func_32,"ax",@progbits
-	.type	func_32,@function
+	.type	func_32,@function       # -- Begin function func_32
 func_32:                                # @func_32
 # BB#0:                                 # %entry
 	i32.const	$push1=, 0
@@ -50,7 +50,7 @@ func_32:                                # @func_32
 	.endfunc
 .Lfunc_end1:
 	.size	func_32, .Lfunc_end1-func_32
-
+                                        # -- End function
 	.hidden	g_261                   # @g_261
 	.type	g_261,@object
 	.section	.bss.g_261,"aw",@nobits
@@ -79,5 +79,5 @@ g_211:
 	.size	g_211, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43385.c.s b/test/torture-s/pr43385.c.s
index dc0c54376..99168bdde 100644
--- a/test/torture-s/pr43385.c.s
+++ b/test/torture-s/pr43385.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43385.c"
+	.file	"pr43385.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,9 +26,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -44,9 +44,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -129,14 +129,14 @@ main:                                   # @main
 # BB#12:                                # %if.end51
 	i32.const	$push23=, 0
 	return  	$pop23
-.LBB2_13:                               # %if.then50
+.LBB2_13:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	e                       # @e
 	.type	e,@object
 	.section	.bss.e,"aw",@nobits
@@ -147,5 +147,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43438.c.s b/test/torture-s/pr43438.c.s
index 95065d70d..7b187bc7b 100644
--- a/test/torture-s/pr43438.c.s
+++ b/test/torture-s/pr43438.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43438.c"
+	.file	"pr43438.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	g_9,@object             # @g_9
 	.section	.bss.g_9,"aw",@nobits
 	.p2align	2
@@ -24,4 +24,4 @@ g_9:
 	.size	g_9, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr43560.c.s b/test/torture-s/pr43560.c.s
index 1a8faf348..945cf2a7b 100644
--- a/test/torture-s/pr43560.c.s
+++ b/test/torture-s/pr43560.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43560.c"
+	.file	"pr43560.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -48,9 +48,9 @@ test:                                   # @test
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,7 +66,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.rodata.s,"a",@progbits
@@ -77,4 +77,4 @@ s:
 	.size	s, 20
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr43629.c.s b/test/torture-s/pr43629.c.s
index e1320e75b..cf22a33de 100644
--- a/test/torture-s/pr43629.c.s
+++ b/test/torture-s/pr43629.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43629.c"
+	.file	"pr43629.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -21,7 +21,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	flag                    # @flag
 	.type	flag,@object
 	.section	.bss.flag,"aw",@nobits
@@ -32,5 +32,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43783.c.s b/test/torture-s/pr43783.c.s
index c9370bb13..3706ffe53 100644
--- a/test/torture-s/pr43783.c.s
+++ b/test/torture-s/pr43783.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43783.c"
+	.file	"pr43783.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,10 +66,10 @@ main:                                   # @main
 	i64.store	bid_Kx192+440($pop31), $pop30
 	i32.const	$push29=, 0
 	i64.const	$push28=, 0
-	i64.store	bid_Kx192+464($pop29), $pop28
+	i64.store	bid_Kx192+488($pop29), $pop28
 	i32.const	$push27=, 0
 	i64.const	$push26=, 0
-	i64.store	bid_Kx192+488($pop27), $pop26
+	i64.store	bid_Kx192+464($pop27), $pop26
 	i32.const	$push25=, 0
 	i64.const	$push24=, 0
 	i64.store	bid_Kx192+512($pop25), $pop24
@@ -108,7 +108,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	bid_Kx192               # @bid_Kx192
 	.type	bid_Kx192,@object
 	.section	.bss.bid_Kx192,"aw",@nobits
@@ -119,4 +119,4 @@ bid_Kx192:
 	.size	bid_Kx192, 768
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr43784.c.s b/test/torture-s/pr43784.c.s
index a88b4aa13..dc9d30bbe 100644
--- a/test/torture-s/pr43784.c.s
+++ b/test/torture-s/pr43784.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43784.c"
+	.file	"pr43784.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 256
-	i32.sub 	$push17=, $pop10, $pop11
+	i32.sub 	$push17=, $pop9, $pop11
 	tee_local	$push16=, $2=, $pop17
 	i32.store	__stack_pointer($pop12), $pop16
 	i32.const	$1=, 0
@@ -33,23 +33,25 @@ main:                                   # @main
 	call    	rp@FUNCTION, $2
 	i32.const	$push3=, v+4
 	i32.const	$push2=, 256
-	i32.call	$0=, memcpy@FUNCTION, $pop3, $2, $pop2
-	i32.const	$1=, 0
+	i32.call	$drop=, memcpy@FUNCTION, $pop3, $2, $pop2
+	i32.const	$1=, -1
 .LBB0_3:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
-	i32.add 	$push4=, $1, $0
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $1, $pop26
+	tee_local	$push24=, $0=, $pop25
+	i32.const	$push23=, v+5
+	i32.add 	$push4=, $1, $pop23
 	i32.load8_u	$push5=, 0($pop4)
-	i32.ne  	$push6=, $1, $pop5
+	i32.ne  	$push6=, $pop24, $pop5
 	br_if   	1, $pop6        # 1: down to label1
 # BB#4:                                 # %for.cond1
                                         #   in Loop: Header=BB0_3 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$push25=, $1, $pop26
-	tee_local	$push24=, $1=, $pop25
-	i32.const	$push23=, 255
-	i32.le_s	$push7=, $pop24, $pop23
+	copy_local	$1=, $0
+	i32.const	$push27=, 254
+	i32.le_u	$push7=, $0, $pop27
 	br_if   	0, $pop7        # 0: up to label2
 # BB#5:                                 # %for.end12
 	end_loop
@@ -66,9 +68,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.rp,"ax",@progbits
-	.type	rp,@function
+	.type	rp,@function            # -- Begin function rp
 rp:                                     # @rp
 	.param  	i32
 # BB#0:                                 # %entry
@@ -79,7 +81,7 @@ rp:                                     # @rp
 	.endfunc
 .Lfunc_end1:
 	.size	rp, .Lfunc_end1-rp
-
+                                        # -- End function
 	.type	v,@object               # @v
 	.section	.bss.v,"aw",@nobits
 	.p2align	2
@@ -88,5 +90,5 @@ v:
 	.size	v, 260
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43835.c.s b/test/torture-s/pr43835.c.s
index 40d72dd9f..530599654 100644
--- a/test/torture-s/pr43835.c.s
+++ b/test/torture-s/pr43835.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43835.c"
+	.file	"pr43835.c"
 	.section	.text.Parrot_gc_mark_PMC_alive_fun,"ax",@progbits
-	.hidden	Parrot_gc_mark_PMC_alive_fun
+	.hidden	Parrot_gc_mark_PMC_alive_fun # -- Begin function Parrot_gc_mark_PMC_alive_fun
 	.globl	Parrot_gc_mark_PMC_alive_fun
 	.type	Parrot_gc_mark_PMC_alive_fun,@function
 Parrot_gc_mark_PMC_alive_fun:           # @Parrot_gc_mark_PMC_alive_fun
@@ -12,9 +12,9 @@ Parrot_gc_mark_PMC_alive_fun:           # @Parrot_gc_mark_PMC_alive_fun
 	.endfunc
 .Lfunc_end0:
 	.size	Parrot_gc_mark_PMC_alive_fun, .Lfunc_end0-Parrot_gc_mark_PMC_alive_fun
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.mark_cell,"ax",@progbits
-	.type	mark_cell,@function
+	.type	mark_cell,@function     # -- Begin function mark_cell
 mark_cell:                              # @mark_cell
 	.param  	i32, i32
 # BB#0:                                 # %entry
@@ -60,9 +60,9 @@ mark_cell:                              # @mark_cell
 	.endfunc
 .Lfunc_end2:
 	.size	mark_cell, .Lfunc_end2-mark_cell
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,10 +70,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop4, $pop5
+	i32.sub 	$push13=, $pop3, $pop5
 	tee_local	$push12=, $0=, $pop13
 	i32.store	__stack_pointer($pop6), $pop12
 	i32.const	$push0=, 4
@@ -92,7 +92,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43987.c.s b/test/torture-s/pr43987.c.s
index 0c7ea1ed2..870e7d0a1 100644
--- a/test/torture-s/pr43987.c.s
+++ b/test/torture-s/pr43987.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr43987.c"
+	.file	"pr43987.c"
 	.section	.text.add_input_file,"ax",@progbits
-	.hidden	add_input_file
+	.hidden	add_input_file          # -- Begin function add_input_file
 	.globl	add_input_file
 	.type	add_input_file,@function
 add_input_file:                         # @add_input_file
@@ -14,19 +14,19 @@ add_input_file:                         # @add_input_file
 	.endfunc
 .Lfunc_end0:
 	.size	add_input_file, .Lfunc_end0-add_input_file
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
 	i32.const	$push0=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop2, $pop3
+	i32.sub 	$push6=, $pop1, $pop3
 	i32.const	$push4=, 12
 	i32.add 	$push5=, $pop6, $pop4
 	i32.store	B+4($pop0), $pop5
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	B                       # @B
 	.type	B,@object
 	.section	.bss.B,"aw",@nobits
@@ -46,4 +46,4 @@ B:
 	.size	B, 1024
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr44164.c.s b/test/torture-s/pr44164.c.s
index accc067c9..139a457df 100644
--- a/test/torture-s/pr44164.c.s
+++ b/test/torture-s/pr44164.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44164.c"
+	.file	"pr44164.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -19,9 +19,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -57,5 +57,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44202-1.c.s b/test/torture-s/pr44202-1.c.s
index 21aca8362..a8da094a0 100644
--- a/test/torture-s/pr44202-1.c.s
+++ b/test/torture-s/pr44202-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44202-1.c"
+	.file	"pr44202-1.c"
 	.section	.text.add512,"ax",@progbits
-	.hidden	add512
+	.hidden	add512                  # -- Begin function add512
 	.globl	add512
 	.type	add512,@function
 add512:                                 # @add512
@@ -24,9 +24,9 @@ add512:                                 # @add512
 	.endfunc
 .Lfunc_end0:
 	.size	add512, .Lfunc_end0-add512
-
+                                        # -- End function
 	.section	.text.add513,"ax",@progbits
-	.hidden	add513
+	.hidden	add513                  # -- Begin function add513
 	.globl	add513
 	.type	add513,@function
 add513:                                 # @add513
@@ -38,19 +38,21 @@ add513:                                 # @add513
 	i32.const	$push0=, 513
 	i32.add 	$push2=, $0, $pop0
 	tee_local	$push1=, $2=, $pop2
-	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.then
-	i32.store	0($1), $0
-.LBB1_2:                                # %if.end
+	i32.eqz 	$push3=, $pop1
+	br_if   	0, $pop3        # 0: down to label1
+# BB#1:                                 # %if.end
+	return  	$2
+.LBB1_2:                                # %if.then
 	end_block                       # label1:
-	copy_local	$push3=, $2
-                                        # fallthrough-return: $pop3
+	i32.store	0($1), $0
+	copy_local	$push4=, $2
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	add513, .Lfunc_end1-add513
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,10 +60,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push19=, $pop9, $pop10
+	i32.sub 	$push19=, $pop8, $pop10
 	tee_local	$push18=, $0=, $pop19
 	i32.store	__stack_pointer($pop11), $pop18
 	i32.const	$push17=, -1
@@ -101,8 +103,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr44468.c.s b/test/torture-s/pr44468.c.s
index 558ea3e19..86fc81ce8 100644
--- a/test/torture-s/pr44468.c.s
+++ b/test/torture-s/pr44468.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44468.c"
+	.file	"pr44468.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -19,9 +19,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -39,9 +39,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -59,9 +59,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -97,14 +97,14 @@ main:                                   # @main
 # BB#3:                                 # %if.end8
 	i32.const	$push18=, 0
 	return  	$pop18
-.LBB3_4:                                # %if.then7
+.LBB3_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -115,5 +115,5 @@ s:
 	.size	s, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44555.c.s b/test/torture-s/pr44555.c.s
index 714814259..0dddacc83 100644
--- a/test/torture-s/pr44555.c.s
+++ b/test/torture-s/pr44555.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44555.c"
+	.file	"pr44555.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,6 +27,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr44575.c.s b/test/torture-s/pr44575.c.s
index 7bf4d9138..8a13047e4 100644
--- a/test/torture-s/pr44575.c.s
+++ b/test/torture-s/pr44575.c.s
@@ -1,138 +1,140 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44575.c"
+	.file	"pr44575.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32
-	.local  	i32, f32, i32, i32
+	.local  	f32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push14=, $pop9, $pop10
-	tee_local	$push13=, $5=, $pop14
-	i32.store	12($pop13), $1
-	i32.const	$push12=, 4
-	i32.shl 	$2=, $0, $pop12
-	i32.const	$push11=, 0
-	f32.load	$3=, a+32($pop11)
-	i32.const	$0=, 3
-.LBB0_1:                                # %for.body
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label0:
+	i32.const	$push20=, 0
+	i32.load	$push19=, __stack_pointer($pop20)
+	i32.const	$push21=, 16
+	i32.sub 	$push26=, $pop19, $pop21
+	tee_local	$push25=, $4=, $pop26
+	i32.store	12($pop25), $1
+	i32.const	$push24=, 0
+	f32.load	$2=, a+32($pop24)
+	block   	
 	block   	
 	block   	
 	block   	
-	i32.const	$push17=, -1
-	i32.add 	$push1=, $0, $pop17
-	i32.const	$push16=, -2
-	i32.and 	$push2=, $pop1, $pop16
-	i32.or  	$push3=, $pop2, $2
-	i32.const	$push15=, 18
-	i32.ne  	$push4=, $pop3, $pop15
+	i32.const	$push0=, 4
+	i32.shl 	$push1=, $0, $pop0
+	i32.const	$push2=, 2
+	i32.or  	$push23=, $pop1, $pop2
+	tee_local	$push22=, $1=, $pop23
+	i32.const	$push3=, 18
+	i32.ne  	$push4=, $pop22, $pop3
 	br_if   	0, $pop4        # 0: down to label3
-# BB#2:                                 # %land.lhs.true
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.load	$push21=, 12($5)
-	tee_local	$push20=, $4=, $pop21
-	i32.const	$push19=, 12
-	i32.add 	$push5=, $pop20, $pop19
-	i32.store	12($5), $pop5
-	i32.const	$push18=, 0
-	i32.load	$1=, fails($pop18)
-	f32.load	$push6=, 8($4)
-	f32.ne  	$push7=, $3, $pop6
-	br_if   	1, $pop7        # 1: down to label2
+# BB#1:                                 # %land.lhs.true
+	i32.load	$push29=, 12($4)
+	tee_local	$push28=, $3=, $pop29
+	i32.const	$push5=, 12
+	i32.add 	$push6=, $pop28, $pop5
+	i32.store	12($4), $pop6
+	i32.const	$push27=, 0
+	i32.load	$0=, fails($pop27)
+	f32.load	$push7=, 8($3)
+	f32.ne  	$push8=, $2, $pop7
+	br_if   	1, $pop8        # 1: down to label2
+# BB#2:                                 # %if.end
+	br_if   	3, $0           # 3: down to label0
 	br      	2               # 2: down to label1
 .LBB0_3:                                # %sw.epilog.thread
-                                        #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label3:
-	i32.const	$push22=, 0
-	i32.load	$1=, fails($pop22)
+	i32.const	$push30=, 0
+	i32.load	$0=, fails($pop30)
 .LBB0_4:                                # %if.end.sink.split
-                                        #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push26=, 0
-	i32.const	$push25=, 1
-	i32.add 	$push24=, $1, $pop25
-	tee_local	$push23=, $1=, $pop24
-	i32.store	fails($pop26), $pop23
-.LBB0_5:                                # %if.end
-                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push10=, 0
+	i32.const	$push9=, 1
+	i32.add 	$push32=, $0, $pop9
+	tee_local	$push31=, $0=, $pop32
+	i32.store	fails($pop10), $pop31
+	br_if   	1, $0           # 1: down to label0
+.LBB0_5:                                # %for.cond
 	end_block                       # label1:
 	block   	
-	br_if   	0, $1           # 0: down to label4
-# BB#6:                                 # %if.end
-                                        #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push28=, 4
-	i32.lt_s	$1=, $0, $pop28
-	i32.const	$push27=, 1
-	i32.add 	$push0=, $0, $pop27
-	copy_local	$0=, $pop0
-	br_if   	1, $1           # 1: up to label0
-.LBB0_7:                                # %for.end
+	i32.const	$push11=, 18
+	i32.ne  	$push12=, $1, $pop11
+	br_if   	0, $pop12       # 0: down to label4
+# BB#6:                                 # %land.lhs.true.1
+	i32.load	$push34=, 12($4)
+	tee_local	$push33=, $0=, $pop34
+	i32.const	$push13=, 12
+	i32.add 	$push14=, $pop33, $pop13
+	i32.store	12($4), $pop14
+	f32.load	$push15=, 8($0)
+	f32.eq  	$push16=, $2, $pop15
+	br_if   	1, $pop16       # 1: down to label0
+.LBB0_7:                                # %if.end.1
 	end_block                       # label4:
-	end_loop
+	i32.const	$push18=, 0
+	i32.const	$push17=, 1
+	i32.store	fails($pop18), $pop17
+.LBB0_8:                                # %for.end
+	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
+	.local  	i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
-	i32.const	$push13=, 32
-	i32.sub 	$push29=, $pop12, $pop13
-	tee_local	$push28=, $0=, $pop29
-	i32.store	__stack_pointer($pop14), $pop28
-	i32.const	$push27=, 0
+	i32.const	$push9=, 0
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 48
+	i32.sub 	$push30=, $pop6, $pop8
+	tee_local	$push29=, $1=, $pop30
+	i32.store	__stack_pointer($pop9), $pop29
+	i32.const	$push28=, 0
 	i32.const	$push0=, -952139264
-	i32.store	a+32($pop27), $pop0
-	i32.const	$push1=, 24
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push26=, 0
-	i64.load	$push3=, a+28($pop26):p2align=2
-	i64.store	0($pop2):p2align=2, $pop3
-	i32.const	$push25=, 0
-	i32.load	$push4=, a+24($pop25)
-	i32.store	20($0), $pop4
-	i32.const	$push5=, 16
-	i32.add 	$push6=, $0, $pop5
+	i32.store	a+32($pop28), $pop0
+	i32.const	$push13=, 32
+	i32.add 	$push14=, $1, $pop13
+	i32.const	$push1=, 8
+	i32.add 	$push2=, $pop14, $pop1
+	i32.const	$push27=, -952139264
+	i32.store	0($pop2), $pop27
+	i32.const	$push15=, 16
+	i32.add 	$push16=, $1, $pop15
+	i32.const	$push26=, 8
+	i32.add 	$push3=, $pop16, $pop26
+	i32.const	$push25=, -952139264
+	i32.store	0($pop3), $pop25
 	i32.const	$push24=, 0
-	i32.load	$push7=, a+32($pop24)
-	i32.store	0($pop6), $pop7
-	i32.const	$push23=, 0
-	i64.load	$push8=, a+24($pop23)
-	i64.store	8($0):p2align=2, $pop8
-	i32.const	$push18=, 20
-	i32.add 	$push19=, $0, $pop18
-	i32.store	0($0), $pop19
-	i32.const	$push20=, 8
-	i32.add 	$push21=, $0, $pop20
-	i32.store	4($0), $pop21
-	i32.const	$push9=, 1
-	call    	check@FUNCTION, $pop9, $0
+	i64.load	$push23=, a+24($pop24)
+	tee_local	$push22=, $0=, $pop23
+	i64.store	32($1), $pop22
+	i64.store	16($1), $0
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $1, $pop17
+	i32.store	4($1), $pop18
+	i32.const	$push19=, 32
+	i32.add 	$push20=, $1, $pop19
+	i32.store	0($1), $pop20
+	i32.const	$push4=, 1
+	call    	check@FUNCTION, $pop4, $1
 	block   	
-	i32.const	$push22=, 0
-	i32.load	$push10=, fails($pop22)
-	br_if   	0, $pop10       # 0: down to label5
+	i32.const	$push21=, 0
+	i32.load	$push5=, fails($pop21)
+	br_if   	0, $pop5        # 0: down to label5
 # BB#1:                                 # %if.end
-	i32.const	$push17=, 0
-	i32.const	$push15=, 32
-	i32.add 	$push16=, $0, $pop15
-	i32.store	__stack_pointer($pop17), $pop16
-	i32.const	$push30=, 0
-	return  	$pop30
+	i32.const	$push12=, 0
+	i32.const	$push10=, 48
+	i32.add 	$push11=, $1, $pop10
+	i32.store	__stack_pointer($pop12), $pop11
+	i32.const	$push31=, 0
+	return  	$pop31
 .LBB1_2:                                # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
@@ -140,7 +142,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	fails                   # @fails
 	.type	fails,@object
 	.section	.bss.fails,"aw",@nobits
@@ -160,5 +162,5 @@ a:
 	.size	a, 60
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44683.c.s b/test/torture-s/pr44683.c.s
index a69aa0ced..6d1880a9b 100644
--- a/test/torture-s/pr44683.c.s
+++ b/test/torture-s/pr44683.c.s
@@ -1,44 +1,41 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44683.c"
+	.file	"pr44683.c"
 	.section	.text.copysign_bug,"ax",@progbits
-	.hidden	copysign_bug
+	.hidden	copysign_bug            # -- Begin function copysign_bug
 	.globl	copysign_bug
 	.type	copysign_bug,@function
 copysign_bug:                           # @copysign_bug
 	.param  	f64
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	block   	
-	f64.const	$push9=, 0x0p0
-	f64.eq  	$push2=, $0, $pop9
-	br_if   	0, $pop2        # 0: down to label1
+	f64.const	$push10=, 0x0p0
+	f64.eq  	$push2=, $0, $pop10
+	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %entry
-	i32.const	$1=, 1
 	f64.const	$push1=, 0x1p-1
 	f64.mul 	$push0=, $0, $pop1
-	f64.eq  	$push3=, $pop0, $0
-	br_if   	1, $pop3        # 1: down to label0
-.LBB0_2:                                # %if.end
-	end_block                       # label1:
+	f64.ne  	$push3=, $pop0, $0
+	br_if   	0, $pop3        # 0: down to label0
+# BB#2:                                 # %return
+	i32.const	$push11=, 1
+	return  	$pop11
+.LBB0_3:                                # %if.end
+	end_block                       # label0:
 	i32.const	$push8=, 2
 	i32.const	$push7=, 3
 	f64.const	$push4=, 0x1p0
 	f64.copysign	$push5=, $pop4, $0
-	f64.const	$push10=, 0x0p0
-	f64.lt  	$push6=, $pop5, $pop10
-	i32.select	$1=, $pop8, $pop7, $pop6
-.LBB0_3:                                # %return
-	end_block                       # label0:
-	copy_local	$push11=, $1
-                                        # fallthrough-return: $pop11
+	f64.const	$push12=, 0x0p0
+	f64.lt  	$push6=, $pop5, $pop12
+	i32.select	$push9=, $pop8, $pop7, $pop6
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	copysign_bug, .Lfunc_end0-copysign_bug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,18 +46,18 @@ main:                                   # @main
 	i32.call	$push1=, copysign_bug@FUNCTION, $pop0
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $pop1, $pop2
-	br_if   	0, $pop3        # 0: down to label2
+	br_if   	0, $pop3        # 0: down to label1
 # BB#1:                                 # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
-	end_block                       # label2:
+	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44828.c.s b/test/torture-s/pr44828.c.s
index bc4023c03..c97130071 100644
--- a/test/torture-s/pr44828.c.s
+++ b/test/torture-s/pr44828.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44828.c"
+	.file	"pr44828.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -38,5 +38,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44852.c.s b/test/torture-s/pr44852.c.s
index 1272ee6ab..72fd9f8d8 100644
--- a/test/torture-s/pr44852.c.s
+++ b/test/torture-s/pr44852.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44852.c"
+	.file	"pr44852.c"
 	.section	.text.sf,"ax",@progbits
-	.hidden	sf
+	.hidden	sf                      # -- Begin function sf
 	.globl	sf
 	.type	sf,@function
 sf:                                     # @sf
@@ -11,46 +11,60 @@ sf:                                     # @sf
 # BB#0:                                 # %entry
 	#APP
 	#NO_APP
-.LBB0_1:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
 	block   	
-	loop    	                # label1:
-	copy_local	$push15=, $0
-	tee_local	$push14=, $2=, $pop15
-	i32.const	$push13=, -1
-	i32.add 	$push12=, $pop14, $pop13
-	tee_local	$push11=, $0=, $pop12
-	i32.load8_u	$push10=, 0($pop11)
-	tee_local	$push9=, $3=, $pop10
-	i32.const	$push8=, 57
-	i32.ne  	$push0=, $pop9, $pop8
-	br_if   	1, $pop0        # 1: down to label0
-# BB#2:                                 # %while.body
+	block   	
+	block   	
+	i32.const	$push12=, -1
+	i32.add 	$push11=, $0, $pop12
+	tee_local	$push10=, $2=, $pop11
+	i32.load8_u	$push9=, 0($pop10)
+	tee_local	$push8=, $3=, $pop9
+	i32.const	$push7=, 57
+	i32.ne  	$push0=, $pop8, $pop7
+	br_if   	0, $pop0        # 0: down to label2
+.LBB0_1:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label3:
+	i32.eq  	$push1=, $1, $2
+	br_if   	2, $pop1        # 2: down to label1
+# BB#2:                                 # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.ne  	$push3=, $1, $0
-	br_if   	0, $pop3        # 0: up to label1
-# BB#3:                                 # %if.then
+	i32.const	$push18=, -1
+	i32.add 	$push17=, $2, $pop18
+	tee_local	$push16=, $2=, $pop17
+	i32.load8_u	$push15=, 0($pop16)
+	tee_local	$push14=, $3=, $pop15
+	i32.const	$push13=, 57
+	i32.eq  	$push2=, $pop14, $pop13
+	br_if   	0, $pop2        # 0: up to label3
+# BB#3:                                 # %while.end.loopexit
 	end_loop
-	i32.const	$push4=, 48
-	i32.store8	0($1), $pop4
-	i32.const	$push6=, 49
-	i32.store8	0($1), $pop6
-	return  	$2
-.LBB0_4:                                # %while.end.loopexit
+	i32.const	$push3=, 1
+	i32.add 	$0=, $2, $pop3
+.LBB0_4:                                # %while.end
+	end_block                       # label2:
+	copy_local	$1=, $2
+	br      	1               # 1: down to label0
+.LBB0_5:                                # %if.then
+	end_block                       # label1:
+	i32.const	$3=, 48
+	i32.const	$push19=, 48
+	i32.store8	0($1), $pop19
+	i32.const	$push4=, 1
+	i32.add 	$0=, $2, $pop4
+.LBB0_6:                                # %while.end
 	end_block                       # label0:
-	i32.const	$push1=, -1
-	i32.add 	$push7=, $2, $pop1
-	i32.const	$push2=, 1
-	i32.add 	$push5=, $3, $pop2
-	i32.store8	0($pop7), $pop5
-	copy_local	$push16=, $2
-                                        # fallthrough-return: $pop16
+	i32.const	$push5=, 1
+	i32.add 	$push6=, $3, $pop5
+	i32.store8	0($1), $pop6
+	copy_local	$push20=, $0
+                                        # fallthrough-return: $pop20
 	.endfunc
 .Lfunc_end0:
 	.size	sf, .Lfunc_end0-sf
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,10 +72,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push35=, $pop18, $pop19
+	i32.sub 	$push35=, $pop17, $pop19
 	tee_local	$push34=, $0=, $pop35
 	i32.store	__stack_pointer($pop20), $pop34
 	i32.const	$push2=, 14
@@ -90,13 +104,13 @@ main:                                   # @main
 	i32.const	$push8=, 1
 	i32.or  	$push9=, $pop25, $pop8
 	i32.ne  	$push13=, $pop12, $pop9
-	br_if   	0, $pop13       # 0: down to label2
+	br_if   	0, $pop13       # 0: down to label4
 # BB#1:                                 # %lor.lhs.false
 	i32.const	$push30=, 8
 	i32.add 	$push31=, $0, $pop30
 	i32.const	$push14=, .L.str
 	i32.call	$push15=, strcmp@FUNCTION, $pop31, $pop14
-	br_if   	0, $pop15       # 0: down to label2
+	br_if   	0, $pop15       # 0: down to label4
 # BB#2:                                 # %if.end
 	i32.const	$push23=, 0
 	i32.const	$push21=, 16
@@ -105,13 +119,13 @@ main:                                   # @main
 	i32.const	$push16=, 0
 	return  	$pop16
 .LBB1_3:                                # %if.then
-	end_block                       # label2:
+	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.s,@object        # @main.s
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .Lmain.s:
@@ -124,6 +138,6 @@ main:                                   # @main
 	.size	.L.str, 7
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr44858.c.s b/test/torture-s/pr44858.c.s
index 522bcbd11..472d98e1b 100644
--- a/test/torture-s/pr44858.c.s
+++ b/test/torture-s/pr44858.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44858.c"
+	.file	"pr44858.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -33,9 +33,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -78,5 +78,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44942.c.s b/test/torture-s/pr44942.c.s
index 5c7fb5a7f..23ea3355f 100644
--- a/test/torture-s/pr44942.c.s
+++ b/test/torture-s/pr44942.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr44942.c"
+	.file	"pr44942.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -9,13 +9,12 @@ test1:                                  # @test1
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop6, $pop7
+	i32.sub 	$push13=, $pop5, $pop7
 	tee_local	$push12=, $10=, $pop13
 	i32.store	__stack_pointer($pop8), $pop12
-	i32.store	12($10), $9
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $9, $pop0
 	i32.store	12($10), $pop1
@@ -37,9 +36,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -47,13 +46,12 @@ test2:                                  # @test2
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop6, $pop7
+	i32.sub 	$push13=, $pop5, $pop7
 	tee_local	$push12=, $19=, $pop13
 	i32.store	__stack_pointer($pop8), $pop12
-	i32.store	12($19), $18
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $18, $pop0
 	i32.store	12($19), $pop1
@@ -75,9 +73,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -85,13 +83,12 @@ test3:                                  # @test3
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop9, $pop10
+	i32.sub 	$push18=, $pop8, $pop10
 	tee_local	$push17=, $10=, $pop18
 	i32.store	__stack_pointer($pop11), $pop17
-	i32.store	12($10), $9
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $9, $pop0
 	i32.const	$push2=, -8
@@ -118,9 +115,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -128,13 +125,12 @@ test4:                                  # @test4
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop9, $pop10
+	i32.sub 	$push18=, $pop8, $pop10
 	tee_local	$push17=, $19=, $pop18
 	i32.store	__stack_pointer($pop11), $pop17
-	i32.store	12($19), $18
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $18, $pop0
 	i32.const	$push2=, -8
@@ -161,9 +157,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -171,10 +167,10 @@ main:                                   # @main
 	.local  	f64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 128
-	i32.sub 	$push25=, $pop7, $pop8
+	i32.sub 	$push25=, $pop6, $pop8
 	tee_local	$push24=, $2=, $pop25
 	i32.store	__stack_pointer($pop9), $pop24
 	i32.const	$push0=, 1234
@@ -210,7 +206,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45034.c.s b/test/torture-s/pr45034.c.s
index cd36dd109..b4d431ea3 100644
--- a/test/torture-s/pr45034.c.s
+++ b/test/torture-s/pr45034.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr45034.c"
+	.file	"pr45034.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,123 +22,103 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.test_neg,"ax",@progbits
-	.hidden	test_neg
+	.hidden	test_neg                # -- Begin function test_neg
 	.globl	test_neg
 	.type	test_neg,@function
 test_neg:                               # @test_neg
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$3=, 128
+	i32.const	$1=, -128
+	i32.const	$0=, -2147483648
 .LBB1_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push14=, 0
-	i32.const	$push13=, 255
-	i32.and 	$push12=, $3, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.sub 	$push10=, $pop14, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i32.const	$push8=, 24
-	i32.shl 	$0=, $pop9, $pop8
 	block   	
-	block   	
-	i32.const	$push7=, 128
-	i32.and 	$push0=, $2, $pop7
-	i32.const	$push6=, 127
-	i32.gt_u	$push1=, $pop0, $pop6
-	br_if   	0, $pop1        # 0: down to label3
+	i32.const	$push10=, 0
+	i32.sub 	$push0=, $pop10, $1
+	i32.const	$push9=, 24
+	i32.shl 	$push1=, $pop0, $pop9
+	i32.const	$push8=, 24
+	i32.shr_s	$push7=, $pop1, $pop8
+	tee_local	$push6=, $2=, $pop7
+	i32.const	$push5=, 0
+	i32.lt_s	$push2=, $pop6, $pop5
+	br_if   	0, $pop2        # 0: down to label2
 # BB#2:                                 # %cond.true.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push15=, 24
-	i32.shr_s	$2=, $0, $pop15
-	br      	1               # 1: down to label2
-.LBB1_3:                                # %cond.false.i
-                                        #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label3:
-	i32.const	$push18=, -16777216
-	i32.xor 	$push2=, $0, $pop18
-	i32.const	$push17=, 24
-	i32.shr_s	$push3=, $pop2, $pop17
-	i32.const	$push16=, -1
-	i32.xor 	$2=, $pop3, $pop16
-.LBB1_4:                                # %fixnum_neg.exit
+	i32.const	$push11=, 24
+	i32.shr_s	$2=, $0, $pop11
+.LBB1_3:                                # %fixnum_neg.exit
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label2:
-	call    	foo@FUNCTION, $3, $2, $3
-	i32.const	$push20=, 1
-	i32.add 	$3=, $3, $pop20
-	i32.const	$push19=, 127
-	i32.ne  	$push4=, $1, $pop19
-	br_if   	0, $pop4        # 0: up to label1
-# BB#5:                                 # %for.end
+	call    	foo@FUNCTION, $1, $2, $1
+	i32.const	$push16=, -16777216
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$push14=, $1, $pop15
+	tee_local	$push13=, $1=, $pop14
+	i32.const	$push12=, 128
+	i32.ne  	$push3=, $pop13, $pop12
+	br_if   	0, $pop3        # 0: up to label1
+# BB#4:                                 # %for.end
 	end_loop
-	i32.const	$push5=, 0
-                                        # fallthrough-return: $pop5
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	test_neg, .Lfunc_end1-test_neg
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$3=, 128
+	i32.const	$1=, -128
+	i32.const	$0=, -2147483648
 .LBB2_1:                                # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label4:
-	i32.const	$push14=, 0
-	i32.const	$push13=, 255
-	i32.and 	$push12=, $3, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.sub 	$push10=, $pop14, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i32.const	$push8=, 24
-	i32.shl 	$0=, $pop9, $pop8
-	block   	
+	loop    	                # label3:
 	block   	
-	i32.const	$push7=, 128
-	i32.and 	$push0=, $2, $pop7
-	i32.const	$push6=, 127
-	i32.gt_u	$push1=, $pop0, $pop6
-	br_if   	0, $pop1        # 0: down to label6
+	i32.const	$push10=, 0
+	i32.sub 	$push0=, $pop10, $1
+	i32.const	$push9=, 24
+	i32.shl 	$push1=, $pop0, $pop9
+	i32.const	$push8=, 24
+	i32.shr_s	$push7=, $pop1, $pop8
+	tee_local	$push6=, $2=, $pop7
+	i32.const	$push5=, 0
+	i32.lt_s	$push2=, $pop6, $pop5
+	br_if   	0, $pop2        # 0: down to label4
 # BB#2:                                 # %cond.true.i.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push15=, 24
-	i32.shr_s	$2=, $0, $pop15
-	br      	1               # 1: down to label5
-.LBB2_3:                                # %cond.false.i.i
+	i32.const	$push11=, 24
+	i32.shr_s	$2=, $0, $pop11
+.LBB2_3:                                # %fixnum_neg.exit.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label6:
-	i32.const	$push18=, -16777216
-	i32.xor 	$push2=, $0, $pop18
-	i32.const	$push17=, 24
-	i32.shr_s	$push3=, $pop2, $pop17
-	i32.const	$push16=, -1
-	i32.xor 	$2=, $pop3, $pop16
-.LBB2_4:                                # %fixnum_neg.exit.i
-                                        #   in Loop: Header=BB2_1 Depth=1
-	end_block                       # label5:
-	call    	foo@FUNCTION, $3, $2, $3
-	i32.const	$push20=, 1
-	i32.add 	$3=, $3, $pop20
-	i32.const	$push19=, 127
-	i32.ne  	$push4=, $1, $pop19
-	br_if   	0, $pop4        # 0: up to label4
-# BB#5:                                 # %if.end
+	end_block                       # label4:
+	call    	foo@FUNCTION, $1, $2, $1
+	i32.const	$push16=, -16777216
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$push14=, $1, $pop15
+	tee_local	$push13=, $1=, $pop14
+	i32.const	$push12=, 128
+	i32.ne  	$push3=, $pop13, $pop12
+	br_if   	0, $pop3        # 0: up to label3
+# BB#4:                                 # %if.end
 	end_loop
-	i32.const	$push5=, 0
-                                        # fallthrough-return: $pop5
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45070.c.s b/test/torture-s/pr45070.c.s
index 7a8c1f00c..2040eb22c 100644
--- a/test/torture-s/pr45070.c.s
+++ b/test/torture-s/pr45070.c.s
@@ -1,68 +1,70 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr45070.c"
+	.file	"pr45070.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
-	tee_local	$push15=, $2=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
-	i32.const	$1=, 0
-	i32.const	$push14=, 0
-	i32.store	8($2), $pop14
-	i64.const	$push0=, 0
-	i64.store	0($2), $pop0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $2=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.const	$push0=, 0
+	i32.store	8($2), $pop0
+	i64.const	$push1=, 0
+	i64.store	0($2), $pop1
+	i32.const	$1=, -1
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
 	i32.call	$0=, next@FUNCTION, $2
 	block   	
-	br_if   	0, $1           # 0: down to label2
+	i32.const	$push18=, -1
+	i32.ne  	$push2=, $1, $pop18
+	br_if   	0, $pop2        # 0: down to label2
 # BB#2:                                 # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push18=, 65535
-	i32.and 	$push1=, $0, $pop18
-	i32.const	$push17=, 65535
-	i32.ne  	$push2=, $pop1, $pop17
-	br_if   	2, $pop2        # 2: down to label0
+	i32.const	$push20=, 65535
+	i32.and 	$push3=, $0, $pop20
+	i32.const	$push19=, 65535
+	i32.ne  	$push4=, $pop3, $pop19
+	br_if   	2, $pop4        # 2: down to label0
 .LBB0_3:                                # %lor.lhs.false
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
 	block   	
-	i32.const	$push19=, 1
-	i32.lt_s	$push3=, $1, $pop19
-	br_if   	0, $pop3        # 0: down to label3
+	i32.const	$push21=, -1
+	i32.eq  	$push5=, $1, $pop21
+	br_if   	0, $pop5        # 0: down to label3
 # BB#4:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push20=, 65535
-	i32.and 	$push4=, $0, $pop20
-	br_if   	2, $pop4        # 2: down to label0
+	i32.const	$push22=, 65535
+	i32.and 	$push6=, $0, $pop22
+	br_if   	2, $pop6        # 2: down to label0
 .LBB0_5:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label3:
-	i32.const	$push24=, 1
-	i32.add 	$push23=, $1, $pop24
-	tee_local	$push22=, $1=, $pop23
-	i32.const	$push21=, 15
-	i32.le_s	$push5=, $pop22, $pop21
-	br_if   	0, $pop5        # 0: up to label1
+	i32.const	$push26=, 1
+	i32.add 	$push25=, $1, $pop26
+	tee_local	$push24=, $1=, $pop25
+	i32.const	$push23=, 14
+	i32.le_u	$push7=, $pop24, $pop23
+	br_if   	0, $pop7        # 0: up to label1
 # BB#6:                                 # %for.end
 	end_loop
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $2, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
-	i32.const	$push6=, 0
-	return  	$pop6
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $2, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
+	i32.const	$push8=, 0
+	return  	$pop8
 .LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -70,9 +72,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.next,"ax",@progbits
-	.type	next,@function
+	.type	next,@function          # -- Begin function next
 next:                                   # @next
 	.param  	i32
 	.result 	i32
@@ -80,10 +82,11 @@ next:                                   # @next
 # BB#0:                                 # %entry
 	i32.const	$3=, 0
 	block   	
+	block   	
 	i32.load	$push1=, 0($0)
 	i32.load	$push0=, 4($0)
 	i32.lt_s	$push2=, $pop1, $pop0
-	br_if   	0, $pop2        # 0: down to label4
+	br_if   	0, $pop2        # 0: down to label5
 # BB#1:                                 # %if.then.lr.ph
 	i32.const	$push3=, 8
 	i32.add 	$1=, $0, $pop3
@@ -91,40 +94,38 @@ next:                                   # @next
 	i32.add 	$2=, $0, $pop5
 .LBB1_2:                                # %if.then
                                         # =>This Inner Loop Header: Depth=1
-	block   	
 	loop    	                # label6:
 	i32.load	$push4=, 0($1)
-	i32.eqz 	$push13=, $pop4
-	br_if   	1, $pop13       # 1: down to label5
+	i32.eqz 	$push14=, $pop4
+	br_if   	2, $pop14       # 2: down to label4
 # BB#3:                                 # %if.then1
                                         #   in Loop: Header=BB1_2 Depth=1
 	i32.const	$3=, 0
-	i32.const	$push12=, 0
-	i32.store	0($1), $pop12
+	i32.const	$push13=, 0
+	i32.store	0($1), $pop13
 	call    	fetch@FUNCTION, $0
 	i32.load	$push7=, 0($0)
 	i32.load	$push6=, 0($2)
 	i32.ge_s	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: up to label6
-	br      	2               # 2: down to label4
-.LBB1_4:                                # %if.end
+.LBB1_4:                                # %cleanup
 	end_loop
 	end_block                       # label5:
+	return  	$3
+.LBB1_5:                                # %if.end
+	end_block                       # label4:
 	i32.const	$push9=, 8
 	i32.add 	$push10=, $0, $pop9
 	i32.const	$push11=, 1
 	i32.store	0($pop10), $pop11
-	i32.const	$3=, 65535
-.LBB1_5:                                # %cleanup
-	end_block                       # label4:
-	copy_local	$push14=, $3
-                                        # fallthrough-return: $pop14
+	i32.const	$push12=, 65535
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end1:
 	.size	next, .Lfunc_end1-next
-
+                                        # -- End function
 	.section	.text.fetch,"ax",@progbits
-	.type	fetch,@function
+	.type	fetch,@function         # -- Begin function fetch
 fetch:                                  # @fetch
 	.param  	i32
 # BB#0:                                 # %entry
@@ -134,7 +135,7 @@ fetch:                                  # @fetch
 	.endfunc
 .Lfunc_end2:
 	.size	fetch, .Lfunc_end2-fetch
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45262.c.s b/test/torture-s/pr45262.c.s
index 6e49e3f02..cd7ffc091 100644
--- a/test/torture-s/pr45262.c.s
+++ b/test/torture-s/pr45262.c.s
@@ -1,43 +1,49 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr45262.c"
+	.file	"pr45262.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
+	i32.const	$push5=, 1
 	i32.const	$push0=, 0
-	i32.sub 	$push1=, $pop0, $0
-	i32.or  	$push2=, $0, $pop1
+	i32.sub 	$push2=, $pop0, $0
 	i32.const	$push3=, 31
 	i32.shr_u	$push4=, $pop2, $pop3
-                                        # fallthrough-return: $pop4
+	i32.const	$push7=, 0
+	i32.lt_s	$push1=, $0, $pop7
+	i32.select	$push6=, $pop5, $pop4, $pop1
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
+	i32.const	$push5=, 1
 	i32.const	$push0=, 0
-	i32.sub 	$push1=, $pop0, $0
-	i32.or  	$push2=, $0, $pop1
+	i32.sub 	$push2=, $pop0, $0
 	i32.const	$push3=, 31
 	i32.shr_u	$push4=, $pop2, $pop3
-                                        # fallthrough-return: $pop4
+	i32.const	$push7=, 0
+	i32.lt_s	$push1=, $0, $pop7
+	i32.select	$push6=, $pop5, $pop4, $pop1
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,6 +54,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr45695.c.s b/test/torture-s/pr45695.c.s
index cb54d8d93..fc3ca2ce1 100644
--- a/test/torture-s/pr45695.c.s
+++ b/test/torture-s/pr45695.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr45695.c"
+	.file	"pr45695.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -13,9 +13,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -31,9 +31,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -62,14 +62,14 @@ main:                                   # @main
 # BB#2:                                 # %if.end9
 	i32.const	$push6=, 0
 	return  	$pop6
-.LBB2_3:                                # %if.then8
+.LBB2_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46019.c.s b/test/torture-s/pr46019.c.s
index 018122100..fa03a56f9 100644
--- a/test/torture-s/pr46019.c.s
+++ b/test/torture-s/pr46019.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr46019.c"
+	.file	"pr46019.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr46309.c.s b/test/torture-s/pr46309.c.s
index a0b8eefe6..7816e04bf 100644
--- a/test/torture-s/pr46309.c.s
+++ b/test/torture-s/pr46309.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr46309.c"
+	.file	"pr46309.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -37,9 +37,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,10 +47,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push26=, $pop5, $pop6
+	i32.sub 	$push26=, $pop4, $pop6
 	tee_local	$push25=, $0=, $pop26
 	i32.store	__stack_pointer($pop7), $pop25
 	#APP
@@ -65,21 +65,21 @@ main:                                   # @main
 	i32.const	$push13=, 12
 	i32.add 	$push14=, $0, $pop13
 	call    	bar@FUNCTION, $pop14
-	i32.const	$push2=, 1
-	i32.store	8($0), $pop2
-	i32.const	$push3=, 0
+	i32.const	$push2=, 0
+	i32.store	12($0), $pop2
+	i32.const	$push3=, 1
+	i32.store	8($0), $pop3
+	i32.const	$push24=, 0
 	i32.const	$push15=, 8
 	i32.add 	$push16=, $0, $pop15
-	i32.store	q($pop3), $pop16
-	i32.const	$push24=, 0
-	i32.store	12($0), $pop24
+	i32.store	q($pop24), $pop16
 	i32.const	$push17=, 12
 	i32.add 	$push18=, $0, $pop17
 	call    	bar@FUNCTION, $pop18
-	i32.const	$push23=, 0
-	i32.store	8($0), $pop23
-	i32.const	$push22=, 1
-	i32.store	12($0), $pop22
+	i32.const	$push23=, 1
+	i32.store	12($0), $pop23
+	i32.const	$push22=, 0
+	i32.store	8($0), $pop22
 	i32.const	$push19=, 12
 	i32.add 	$push20=, $0, $pop19
 	call    	bar@FUNCTION, $pop20
@@ -92,7 +92,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	q                       # @q
 	.type	q,@object
 	.section	.bss.q,"aw",@nobits
@@ -103,5 +103,5 @@ q:
 	.size	q, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46316.c.s b/test/torture-s/pr46316.c.s
index cb5bdf992..b30f4f27d 100644
--- a/test/torture-s/pr46316.c.s
+++ b/test/torture-s/pr46316.c.s
@@ -1,32 +1,34 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr46316.c"
+	.file	"pr46316.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i64
 	.result 	i64
+	.local  	i64
 # BB#0:                                 # %entry
-	i64.const	$push0=, -4
-	i64.const	$push11=, -4
-	i64.lt_s	$push1=, $0, $pop11
-	i64.select	$push2=, $0, $pop0, $pop1
-	i64.const	$push3=, -1
-	i64.xor 	$push4=, $pop2, $pop3
-	i64.add 	$push5=, $0, $pop4
-	i64.const	$push6=, 2
-	i64.add 	$push7=, $pop5, $pop6
-	i64.const	$push8=, -2
-	i64.and 	$push9=, $pop7, $pop8
-	i64.sub 	$push10=, $0, $pop9
-                                        # fallthrough-return: $pop10
+	i64.const	$push0=, -1
+	i64.xor 	$push12=, $0, $pop0
+	tee_local	$push11=, $1=, $pop12
+	i64.const	$push1=, 3
+	i64.const	$push10=, 3
+	i64.gt_s	$push2=, $1, $pop10
+	i64.select	$push3=, $pop11, $pop1, $pop2
+	i64.add 	$push4=, $pop3, $0
+	i64.const	$push5=, 2
+	i64.add 	$push6=, $pop4, $pop5
+	i64.const	$push7=, -2
+	i64.and 	$push8=, $pop6, $pop7
+	i64.sub 	$push9=, $0, $pop8
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46909-1.c.s b/test/torture-s/pr46909-1.c.s
index efa8060ae..e63dd1ee4 100644
--- a/test/torture-s/pr46909-1.c.s
+++ b/test/torture-s/pr46909-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr46909-1.c"
+	.file	"pr46909-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,29 +40,27 @@ main:                                   # @main
 	block   	
 	loop    	                # label1:
 	i32.const	$push11=, 4
-	i32.add 	$push4=, $1, $pop11
-	i32.call	$push5=, foo@FUNCTION, $pop4
-	i32.const	$push10=, 1
-	i32.eqz 	$push1=, $1
-	i32.const	$push9=, 1
-	i32.shl 	$push2=, $pop1, $pop9
-	i32.sub 	$push3=, $pop10, $pop2
-	i32.ne  	$push6=, $pop5, $pop3
-	br_if   	1, $pop6        # 1: down to label0
+	i32.add 	$push10=, $1, $pop11
+	tee_local	$push9=, $0=, $pop10
+	i32.call	$push3=, foo@FUNCTION, $pop9
+	i32.const	$push8=, 1
+	i32.eqz 	$push0=, $1
+	i32.const	$push7=, 1
+	i32.shl 	$push1=, $pop0, $pop7
+	i32.sub 	$push2=, $pop8, $pop1
+	i32.ne  	$push4=, $pop3, $pop2
+	br_if   	1, $pop4        # 1: down to label0
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push14=, 5
-	i32.add 	$0=, $1, $pop14
 	i32.const	$push13=, 1
-	i32.add 	$push0=, $1, $pop13
-	copy_local	$1=, $pop0
-	i32.const	$push12=, 9
-	i32.le_s	$push7=, $0, $pop12
-	br_if   	0, $pop7        # 0: up to label1
+	i32.add 	$1=, $1, $pop13
+	i32.const	$push12=, 8
+	i32.le_s	$push5=, $0, $pop12
+	br_if   	0, $pop5        # 0: up to label1
 # BB#3:                                 # %for.end
 	end_loop
-	i32.const	$push8=, 0
-	return  	$pop8
+	i32.const	$push6=, 0
+	return  	$pop6
 .LBB1_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -70,7 +68,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46909-2.c.s b/test/torture-s/pr46909-2.c.s
index bce6f2013..a9bfbc509 100644
--- a/test/torture-s/pr46909-2.c.s
+++ b/test/torture-s/pr46909-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr46909-2.c"
+	.file	"pr46909-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -27,45 +27,46 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$0=, -10
+	i32.const	$2=, -11
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.call	$push6=, foo@FUNCTION, $0
+	i32.const	$push15=, 12
+	i32.eq  	$0=, $2, $pop15
+	i32.const	$push14=, -1
+	i32.eq  	$1=, $2, $pop14
 	i32.const	$push13=, 1
-	i32.eqz 	$push2=, $0
-	i32.const	$push12=, 1
-	i32.shl 	$push3=, $pop2, $pop12
-	i32.sub 	$push4=, $pop13, $pop3
-	i32.const	$push11=, 13
-	i32.eq  	$push0=, $0, $pop11
+	i32.add 	$push12=, $2, $pop13
+	tee_local	$push11=, $2=, $pop12
+	i32.call	$push4=, foo@FUNCTION, $pop11
 	i32.const	$push10=, 1
-	i32.shl 	$push1=, $pop0, $pop10
-	i32.sub 	$push5=, $pop4, $pop1
-	i32.ne  	$push7=, $pop6, $pop5
-	br_if   	1, $pop7        # 1: down to label2
+	i32.const	$push9=, 1
+	i32.shl 	$push1=, $1, $pop9
+	i32.sub 	$push2=, $pop10, $pop1
+	i32.const	$push8=, 1
+	i32.shl 	$push0=, $0, $pop8
+	i32.sub 	$push3=, $pop2, $pop0
+	i32.ne  	$push5=, $pop4, $pop3
+	br_if   	1, $pop5        # 1: down to label2
 # BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push17=, 1
-	i32.add 	$push16=, $0, $pop17
-	tee_local	$push15=, $0=, $pop16
-	i32.const	$push14=, 29
-	i32.le_s	$push8=, $pop15, $pop14
-	br_if   	0, $pop8        # 0: up to label3
+	i32.const	$push16=, 28
+	i32.le_s	$push6=, $2, $pop16
+	br_if   	0, $pop6        # 0: up to label3
 # BB#3:                                 # %for.end
 	end_loop
-	i32.const	$push9=, 0
-	return  	$pop9
+	i32.const	$push7=, 0
+	return  	$pop7
 .LBB1_4:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -73,7 +74,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47148.c.s b/test/torture-s/pr47148.c.s
index 8e6439f38..67d2c6acf 100644
--- a/test/torture-s/pr47148.c.s
+++ b/test/torture-s/pr47148.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47148.c"
+	.file	"pr47148.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	b,@object               # @b
 	.section	.data.b,"aw",@progbits
 	.p2align	2
@@ -24,4 +24,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr47155.c.s b/test/torture-s/pr47155.c.s
index 32d7098a3..9b7b637ca 100644
--- a/test/torture-s/pr47155.c.s
+++ b/test/torture-s/pr47155.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47155.c"
+	.file	"pr47155.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -35,4 +35,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr47237.c.s b/test/torture-s/pr47237.c.s
index 89a379e9f..0f9829a0d 100644
--- a/test/torture-s/pr47237.c.s
+++ b/test/torture-s/pr47237.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47237.c"
+	.file	"pr47237.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -16,9 +16,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
 # BB#0:                                 # %entry
@@ -35,9 +35,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	__builtin_apply, i32
 	.functype	__builtin_apply_args, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr47299.c.s b/test/torture-s/pr47299.c.s
index dee0a91c1..d093f8eba 100644
--- a/test/torture-s/pr47299.c.s
+++ b/test/torture-s/pr47299.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47299.c"
+	.file	"pr47299.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47337.c.s b/test/torture-s/pr47337.c.s
index a76efb9c4..a1a1030b4 100644
--- a/test/torture-s/pr47337.c.s
+++ b/test/torture-s/pr47337.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47337.c"
+	.file	"pr47337.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	i32.const	$push2=, .L.str.1
 	i32.call	$0=, strcmp@FUNCTION, $pop1, $pop2
 	i32.const	$1=, -1024
-.LBB0_1:                                # %for.cond2.preheader
+.LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	i32.const	$push44=, a+1024
@@ -24,7 +24,7 @@ main:                                   # @main
 	i32.add 	$push41=, $1, $pop42
 	tee_local	$push40=, $1=, $pop41
 	br_if   	0, $pop40       # 0: up to label0
-# BB#2:                                 # %for.body9.preheader
+# BB#2:                                 # %for.end6
 	end_loop
 	i32.const	$push46=, 0
 	i32.const	$push45=, 0
@@ -32,7 +32,7 @@ main:                                   # @main
 	block   	
 	i32.eqz 	$push71=, $0
 	br_if   	0, $pop71       # 0: down to label1
-# BB#3:                                 # %fnx.exit
+# BB#3:                                 # %if.then.i
 	i32.const	$push69=, 0
 	i32.const	$push68=, 0
 	i32.load	$push4=, b($pop68)
@@ -100,7 +100,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -144,5 +144,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/pr47538.c.s b/test/torture-s/pr47538.c.s
index 17a11cd2d..49f6923c4 100644
--- a/test/torture-s/pr47538.c.s
+++ b/test/torture-s/pr47538.c.s
@@ -1,376 +1,379 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47538.c"
+	.file	"pr47538.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32, f64, i32, i32, i32, f64, i32, f64, f64
 # BB#0:                                 # %entry
-	f64.load	$push34=, 0($1)
-	tee_local	$push33=, $11=, $pop34
-	f64.store	0($0), $pop33
-	f64.load	$push32=, 8($1)
-	tee_local	$push31=, $10=, $pop32
-	f64.store	8($0), $pop31
-	i32.load	$5=, 16($0)
+	f64.load	$push42=, 0($1)
+	tee_local	$push41=, $11=, $pop42
+	f64.store	0($0), $pop41
+	f64.load	$push40=, 8($1)
+	tee_local	$push39=, $10=, $pop40
+	f64.store	8($0), $pop39
 	block   	
 	block   	
-	i32.load	$push30=, 20($1)
-	tee_local	$push29=, $2=, $pop30
-	i32.eqz 	$push55=, $pop29
-	br_if   	0, $pop55       # 0: down to label1
+	i32.load	$push38=, 20($1)
+	tee_local	$push37=, $2=, $pop38
+	i32.eqz 	$push72=, $pop37
+	br_if   	0, $pop72       # 0: down to label1
 # BB#1:                                 # %if.else
 	f64.sub 	$push1=, $10, $11
 	f64.const	$push2=, 0x1p-2
 	f64.mul 	$4=, $pop1, $pop2
-	i32.load	$6=, 16($1)
 	i32.const	$push0=, 1
-	i32.add 	$push36=, $2, $pop0
-	tee_local	$push35=, $3=, $pop36
+	i32.add 	$push44=, $2, $pop0
+	tee_local	$push43=, $3=, $pop44
 	i32.const	$push3=, 2
-	i32.ne  	$push4=, $pop35, $pop3
+	i32.ne  	$push4=, $pop43, $pop3
 	br_if   	1, $pop4        # 1: down to label0
 # BB#2:                                 # %if.then6
-	f64.load	$push25=, 0($6)
-	f64.mul 	$push38=, $4, $pop25
-	tee_local	$push37=, $11=, $pop38
-	f64.store	8($5), $pop37
-	f64.add 	$push26=, $11, $11
-	f64.store	0($5), $pop26
+	i32.load	$push48=, 16($0)
+	tee_local	$push47=, $0=, $pop48
+	i32.load	$push32=, 16($1)
+	f64.load	$push33=, 0($pop32)
+	f64.mul 	$push46=, $4, $pop33
+	tee_local	$push45=, $11=, $pop46
+	f64.store	8($pop47), $pop45
+	f64.add 	$push34=, $11, $11
+	f64.store	0($0), $pop34
 	return
-.LBB0_3:
+.LBB0_3:                                # %if.then
 	end_block                       # label1:
-	f64.const	$push27=, 0x0p0
-	f64.store	0($5), $pop27
+	i32.load	$push35=, 16($0)
+	i64.const	$push36=, 0
+	i64.store	0($pop35), $pop36
 	return
-.LBB0_4:                                # %for.cond.preheader
+.LBB0_4:                                # %for.body.lr.ph
 	end_block                       # label0:
+	i32.load	$push57=, 16($0)
+	tee_local	$push56=, $7=, $pop57
+	i32.load	$push55=, 16($1)
+	tee_local	$push54=, $6=, $pop55
+	f64.load	$push6=, 0($pop54)
+	f64.load	$push5=, 16($6)
+	f64.sub 	$push7=, $pop6, $pop5
+	f64.mul 	$push53=, $4, $pop7
+	tee_local	$push52=, $11=, $pop53
+	f64.store	8($pop56), $pop52
+	f64.const	$push8=, 0x0p0
+	f64.add 	$10=, $11, $pop8
 	block   	
 	block   	
-	i32.const	$push5=, -1
-	i32.add 	$push40=, $2, $pop5
-	tee_local	$push39=, $7=, $pop40
-	i32.eqz 	$push56=, $pop39
-	br_if   	0, $pop56       # 0: down to label3
-# BB#5:                                 # %for.body.preheader
-	i32.const	$push41=, 8
-	i32.add 	$0=, $5, $pop41
-	f64.const	$10=, 0x0p0
-	f64.const	$11=, 0x1p0
-	copy_local	$1=, $6
-	i32.const	$9=, 1
-.LBB0_6:                                # %for.body
+	i32.const	$push9=, -1
+	i32.add 	$push51=, $2, $pop9
+	tee_local	$push50=, $5=, $pop51
+	i32.const	$push49=, 1
+	i32.ne  	$push10=, $pop50, $pop49
+	br_if   	0, $pop10       # 0: down to label3
+# BB#5:
+	f64.const	$11=, -0x1p0
+	br      	1               # 1: down to label2
+.LBB0_6:                                # %for.body.preheader
+	end_block                       # label3:
+	i32.const	$push11=, 16
+	i32.add 	$0=, $7, $pop11
+	i32.const	$push12=, 24
+	i32.add 	$1=, $6, $pop12
+	f64.const	$11=, -0x1p0
+	i32.const	$9=, 2
+.LBB0_7:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
-	f64.load	$push8=, 0($1)
-	i32.const	$push49=, 16
-	i32.add 	$push6=, $1, $pop49
-	f64.load	$push7=, 0($pop6)
-	f64.sub 	$push9=, $pop8, $pop7
-	f64.mul 	$push10=, $4, $pop9
-	f64.convert_u/i32	$push11=, $9
-	f64.div 	$push48=, $pop10, $pop11
-	tee_local	$push47=, $8=, $pop48
-	f64.store	0($0), $pop47
-	i32.const	$push46=, 8
-	i32.add 	$0=, $0, $pop46
-	i32.const	$push45=, 8
-	i32.add 	$1=, $1, $pop45
-	f64.mul 	$push12=, $11, $8
-	f64.add 	$10=, $10, $pop12
+	i32.const	$push65=, -16
+	i32.add 	$push13=, $1, $pop65
+	f64.load	$push14=, 0($pop13)
+	f64.load	$push15=, 0($1)
+	f64.sub 	$push16=, $pop14, $pop15
+	f64.mul 	$push17=, $4, $pop16
+	f64.convert_u/i32	$push18=, $9
+	f64.div 	$push64=, $pop17, $pop18
+	tee_local	$push63=, $8=, $pop64
+	f64.store	0($0), $pop63
+	i32.const	$push62=, 8
+	i32.add 	$0=, $0, $pop62
+	i32.const	$push61=, 8
+	i32.add 	$1=, $1, $pop61
+	f64.mul 	$push19=, $11, $8
+	f64.add 	$10=, $10, $pop19
 	f64.neg 	$11=, $11
-	i32.const	$push44=, 1
-	i32.add 	$push43=, $9, $pop44
-	tee_local	$push42=, $9=, $pop43
-	i32.le_u	$push13=, $pop42, $7
-	br_if   	0, $pop13       # 0: up to label4
-	br      	2               # 2: down to label2
-.LBB0_7:
-	end_loop
-	end_block                       # label3:
-	f64.const	$11=, 0x1p0
-	f64.const	$10=, 0x0p0
+	i32.const	$push60=, 1
+	i32.add 	$push59=, $9, $pop60
+	tee_local	$push58=, $9=, $pop59
+	i32.le_u	$push20=, $pop58, $5
+	br_if   	0, $pop20       # 0: up to label4
 .LBB0_8:                                # %for.end
+	end_loop
 	end_block                       # label2:
-	i32.const	$push17=, 3
-	i32.shl 	$push22=, $2, $pop17
-	i32.add 	$push23=, $5, $pop22
-	i32.const	$push54=, 3
-	i32.shl 	$push18=, $7, $pop54
-	i32.add 	$push19=, $6, $pop18
-	f64.load	$push20=, 0($pop19)
-	f64.mul 	$push21=, $4, $pop20
-	f64.convert_u/i32	$push14=, $3
-	f64.const	$push15=, -0x1p0
-	f64.add 	$push16=, $pop14, $pop15
-	f64.div 	$push53=, $pop21, $pop16
-	tee_local	$push52=, $8=, $pop53
-	f64.store	0($pop23), $pop52
-	f64.mul 	$push24=, $11, $8
-	f64.add 	$push51=, $10, $pop24
-	tee_local	$push50=, $11=, $pop51
-	f64.add 	$push28=, $pop50, $11
-	f64.store	0($5), $pop28
+	i32.const	$push23=, 3
+	i32.shl 	$push28=, $2, $pop23
+	i32.add 	$push29=, $7, $pop28
+	i32.const	$push71=, 3
+	i32.shl 	$push24=, $5, $pop71
+	i32.add 	$push25=, $6, $pop24
+	f64.load	$push26=, 0($pop25)
+	f64.mul 	$push27=, $4, $pop26
+	f64.convert_u/i32	$push21=, $3
+	f64.const	$push70=, -0x1p0
+	f64.add 	$push22=, $pop21, $pop70
+	f64.div 	$push69=, $pop27, $pop22
+	tee_local	$push68=, $8=, $pop69
+	f64.store	0($pop29), $pop68
+	f64.mul 	$push30=, $11, $8
+	f64.add 	$push67=, $10, $pop30
+	tee_local	$push66=, $11=, $pop67
+	f64.add 	$push31=, $pop66, $11
+	f64.store	0($7), $pop31
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push100=, 0
-	i32.const	$push97=, 0
-	i32.load	$push98=, __stack_pointer($pop97)
-	i32.const	$push99=, 112
-	i32.sub 	$push139=, $pop98, $pop99
-	tee_local	$push138=, $2=, $pop139
-	i32.store	__stack_pointer($pop100), $pop138
-	i32.const	$push104=, 32
-	i32.add 	$push105=, $2, $pop104
+	i32.const	$push95=, 0
+	i32.const	$push93=, 0
+	i32.load	$push92=, __stack_pointer($pop93)
+	i32.const	$push94=, 112
+	i32.sub 	$push131=, $pop92, $pop94
+	tee_local	$push130=, $2=, $pop131
+	i32.store	__stack_pointer($pop95), $pop130
+	i32.const	$push99=, 32
+	i32.add 	$push100=, $2, $pop99
 	i32.const	$push0=, 24
-	i32.add 	$push1=, $pop105, $pop0
+	i32.add 	$push1=, $pop100, $pop0
 	i32.const	$push2=, 0
 	i64.load	$push3=, .Lmain.c+24($pop2)
 	i64.store	0($pop1), $pop3
-	i32.const	$push106=, 32
-	i32.add 	$push107=, $2, $pop106
+	i32.const	$push101=, 32
+	i32.add 	$push102=, $2, $pop101
 	i32.const	$push4=, 16
-	i32.add 	$push5=, $pop107, $pop4
-	i32.const	$push137=, 0
-	i64.load	$push6=, .Lmain.c+16($pop137)
+	i32.add 	$push5=, $pop102, $pop4
+	i32.const	$push129=, 0
+	i64.load	$push6=, .Lmain.c+16($pop129)
 	i64.store	0($pop5), $pop6
-	i32.const	$push136=, 0
-	i64.load	$push7=, .Lmain.c+8($pop136)
+	i32.const	$push128=, 0
+	i64.load	$push7=, .Lmain.c+8($pop128)
 	i64.store	40($2), $pop7
-	i32.const	$push135=, 0
-	i64.load	$push8=, .Lmain.c($pop135)
+	i32.const	$push127=, 0
+	i64.load	$push8=, .Lmain.c($pop127)
 	i64.store	32($2), $pop8
-	i32.const	$push134=, 24
-	i32.add 	$push9=, $2, $pop134
-	i32.const	$push133=, 0
-	i64.load	$push10=, .Lmain.e+24($pop133)
+	i32.const	$push126=, 16
+	i32.add 	$push9=, $2, $pop126
+	i32.const	$push125=, 0
+	i64.load	$push10=, .Lmain.e+16($pop125)
 	i64.store	0($pop9), $pop10
-	i32.const	$push11=, 3
-	i32.store	84($2), $pop11
-	i32.const	$push12=, 20
-	i32.add 	$push13=, $2, $pop12
-	i32.const	$push132=, 0
-	i32.load	$push14=, .Lmain.e+20($pop132)
-	i32.store	0($pop13), $pop14
-	i32.const	$push108=, 32
-	i32.add 	$push109=, $2, $pop108
-	i32.store	80($2), $pop109
+	i32.const	$push124=, 24
+	i32.add 	$push11=, $2, $pop124
+	i32.const	$push123=, 0
+	i64.load	$push12=, .Lmain.e+24($pop123)
+	i64.store	0($pop11), $pop12
+	i64.const	$push13=, 4618441417868443648
+	i64.store	72($2), $pop13
+	i64.const	$push14=, 4621819117588971520
+	i64.store	64($2), $pop14
+	i32.const	$push15=, 3
+	i32.store	84($2), $pop15
+	i32.const	$push122=, 0
+	i64.load	$push16=, .Lmain.e($pop122)
+	i64.store	0($2), $pop16
+	i32.const	$push121=, 0
+	i64.load	$push17=, .Lmain.e+8($pop121)
+	i64.store	8($2), $pop17
+	i32.const	$push103=, 32
+	i32.add 	$push104=, $2, $pop103
+	i32.store	80($2), $pop104
 	i32.store	104($2), $2
-	i32.const	$push131=, 16
-	i32.add 	$push15=, $2, $pop131
-	i32.const	$push130=, 0
-	i32.load	$push16=, .Lmain.e+16($pop130)
-	i32.store	0($pop15), $pop16
-	i64.const	$push17=, 4621819117588971520
-	i64.store	64($2), $pop17
-	i64.const	$push18=, 4618441417868443648
-	i64.store	72($2), $pop18
-	i32.const	$push129=, 0
-	i32.load	$push19=, .Lmain.e+4($pop129)
-	i32.store	4($2), $pop19
-	i32.const	$push128=, 0
-	i32.load	$push20=, .Lmain.e($pop128)
-	i32.store	0($2), $pop20
-	i32.const	$push127=, 0
-	i32.load	$push21=, .Lmain.e+8($pop127)
-	i32.store	8($2), $pop21
-	i32.const	$push126=, 0
-	i32.load	$push22=, .Lmain.e+12($pop126)
-	i32.store	12($2), $pop22
-	i32.const	$push110=, 88
-	i32.add 	$push111=, $2, $pop110
-	i32.const	$push112=, 64
-	i32.add 	$push113=, $2, $pop112
-	call    	foo@FUNCTION, $pop111, $pop113
+	i32.const	$push105=, 88
+	i32.add 	$push106=, $2, $pop105
+	i32.const	$push107=, 64
+	i32.add 	$push108=, $2, $pop107
+	call    	foo@FUNCTION, $pop106, $pop108
 	block   	
-	f64.load	$push24=, 0($2)
-	f64.const	$push23=, 0x0p0
-	f64.ne  	$push25=, $pop24, $pop23
-	br_if   	0, $pop25       # 0: down to label5
+	f64.load	$push19=, 0($2)
+	f64.const	$push18=, 0x0p0
+	f64.ne  	$push20=, $pop19, $pop18
+	br_if   	0, $pop20       # 0: down to label5
 # BB#1:                                 # %lor.lhs.false
-	f64.load	$push27=, 8($2)
-	f64.const	$push26=, 0x1.4p4
-	f64.ne  	$push28=, $pop27, $pop26
-	br_if   	0, $pop28       # 0: down to label5
+	f64.load	$push22=, 8($2)
+	f64.const	$push21=, 0x1.4p4
+	f64.ne  	$push23=, $pop22, $pop21
+	br_if   	0, $pop23       # 0: down to label5
 # BB#2:                                 # %lor.lhs.false9
-	f64.load	$push30=, 16($2)
-	f64.const	$push29=, 0x1.4p3
-	f64.ne  	$push31=, $pop30, $pop29
-	br_if   	0, $pop31       # 0: down to label5
+	f64.load	$push25=, 16($2)
+	f64.const	$push24=, 0x1.4p3
+	f64.ne  	$push26=, $pop25, $pop24
+	br_if   	0, $pop26       # 0: down to label5
 # BB#3:                                 # %lor.lhs.false12
-	f64.load	$push33=, 24($2)
-	f64.const	$push32=, -0x1.4p3
-	f64.ne  	$push34=, $pop33, $pop32
-	br_if   	0, $pop34       # 0: down to label5
+	f64.load	$push28=, 24($2)
+	f64.const	$push27=, -0x1.4p3
+	f64.ne  	$push29=, $pop28, $pop27
+	br_if   	0, $pop29       # 0: down to label5
 # BB#4:                                 # %if.end
-	i32.const	$push38=, 84
-	i32.add 	$push39=, $2, $pop38
-	i32.const	$push40=, 2
-	i32.store	0($pop39), $pop40
-	i32.const	$push43=, 24
-	i32.add 	$push146=, $2, $pop43
-	tee_local	$push145=, $0=, $pop146
-	i32.const	$push41=, 0
-	i64.load	$push42=, .Lmain.e+24($pop41)
-	i64.store	0($pop145), $pop42
-	i32.const	$push45=, 16
-	i32.add 	$push144=, $2, $pop45
-	tee_local	$push143=, $1=, $pop144
-	i32.const	$push142=, 0
-	i64.load	$push44=, .Lmain.e+16($pop142)
-	i64.store	0($pop143), $pop44
-	i32.const	$push141=, 0
-	i64.load	$push46=, .Lmain.e($pop141)
-	i64.store	0($2), $pop46
-	i32.const	$push140=, 0
-	i64.load	$push47=, .Lmain.e+8($pop140)
-	i64.store	8($2), $pop47
-	i32.const	$push114=, 88
-	i32.add 	$push115=, $2, $pop114
-	i32.const	$push116=, 64
-	i32.add 	$push117=, $2, $pop116
-	call    	foo@FUNCTION, $pop115, $pop117
-	f64.load	$push49=, 0($2)
-	f64.const	$push48=, 0x1.ep5
-	f64.ne  	$push50=, $pop49, $pop48
-	br_if   	0, $pop50       # 0: down to label5
+	i32.const	$push33=, 84
+	i32.add 	$push34=, $2, $pop33
+	i32.const	$push35=, 2
+	i32.store	0($pop34), $pop35
+	i32.const	$push38=, 16
+	i32.add 	$push138=, $2, $pop38
+	tee_local	$push137=, $0=, $pop138
+	i32.const	$push36=, 0
+	i64.load	$push37=, .Lmain.e+16($pop36)
+	i64.store	0($pop137), $pop37
+	i32.const	$push40=, 24
+	i32.add 	$push136=, $2, $pop40
+	tee_local	$push135=, $1=, $pop136
+	i32.const	$push134=, 0
+	i64.load	$push39=, .Lmain.e+24($pop134)
+	i64.store	0($pop135), $pop39
+	i32.const	$push133=, 0
+	i64.load	$push41=, .Lmain.e($pop133)
+	i64.store	0($2), $pop41
+	i32.const	$push132=, 0
+	i64.load	$push42=, .Lmain.e+8($pop132)
+	i64.store	8($2), $pop42
+	i32.const	$push109=, 88
+	i32.add 	$push110=, $2, $pop109
+	i32.const	$push111=, 64
+	i32.add 	$push112=, $2, $pop111
+	call    	foo@FUNCTION, $pop110, $pop112
+	f64.load	$push44=, 0($2)
+	f64.const	$push43=, 0x1.ep5
+	f64.ne  	$push45=, $pop44, $pop43
+	br_if   	0, $pop45       # 0: down to label5
 # BB#5:                                 # %if.end
-	f64.load	$push35=, 8($2)
-	f64.const	$push51=, 0x1.4p4
-	f64.ne  	$push52=, $pop35, $pop51
-	br_if   	0, $pop52       # 0: down to label5
+	f64.load	$push30=, 8($2)
+	f64.const	$push46=, 0x1.4p4
+	f64.ne  	$push47=, $pop30, $pop46
+	br_if   	0, $pop47       # 0: down to label5
 # BB#6:                                 # %if.end
-	f64.load	$push36=, 0($1)
-	f64.const	$push53=, -0x1.4p3
-	f64.ne  	$push54=, $pop36, $pop53
-	br_if   	0, $pop54       # 0: down to label5
+	f64.load	$push31=, 0($0)
+	f64.const	$push48=, -0x1.4p3
+	f64.ne  	$push49=, $pop31, $pop48
+	br_if   	0, $pop49       # 0: down to label5
 # BB#7:                                 # %if.end
-	f64.load	$push37=, 0($0)
-	f64.const	$push55=, 0x1.d8p6
-	f64.ne  	$push56=, $pop37, $pop55
-	br_if   	0, $pop56       # 0: down to label5
+	f64.load	$push32=, 0($1)
+	f64.const	$push50=, 0x1.d8p6
+	f64.ne  	$push51=, $pop32, $pop50
+	br_if   	0, $pop51       # 0: down to label5
 # BB#8:                                 # %if.end30
-	i32.const	$push60=, 84
-	i32.add 	$push61=, $2, $pop60
-	i32.const	$push62=, 1
-	i32.store	0($pop61), $pop62
-	i32.const	$push65=, 24
-	i32.add 	$push153=, $2, $pop65
-	tee_local	$push152=, $1=, $pop153
-	i32.const	$push63=, 0
-	i64.load	$push64=, .Lmain.e+24($pop63)
-	i64.store	0($pop152), $pop64
-	i32.const	$push67=, 16
-	i32.add 	$push151=, $2, $pop67
-	tee_local	$push150=, $0=, $pop151
-	i32.const	$push149=, 0
-	i64.load	$push66=, .Lmain.e+16($pop149)
-	i64.store	0($pop150), $pop66
-	i32.const	$push148=, 0
-	i64.load	$push68=, .Lmain.e($pop148)
-	i64.store	0($2), $pop68
-	i32.const	$push147=, 0
-	i64.load	$push69=, .Lmain.e+8($pop147)
-	i64.store	8($2), $pop69
-	i32.const	$push118=, 88
-	i32.add 	$push119=, $2, $pop118
-	i32.const	$push120=, 64
-	i32.add 	$push121=, $2, $pop120
-	call    	foo@FUNCTION, $pop119, $pop121
-	f64.load	$push71=, 0($2)
-	f64.const	$push70=, -0x1.4p4
-	f64.ne  	$push72=, $pop71, $pop70
-	br_if   	0, $pop72       # 0: down to label5
+	i32.const	$push55=, 84
+	i32.add 	$push56=, $2, $pop55
+	i32.const	$push57=, 1
+	i32.store	0($pop56), $pop57
+	i32.const	$push60=, 16
+	i32.add 	$push145=, $2, $pop60
+	tee_local	$push144=, $0=, $pop145
+	i32.const	$push58=, 0
+	i64.load	$push59=, .Lmain.e+16($pop58)
+	i64.store	0($pop144), $pop59
+	i32.const	$push62=, 24
+	i32.add 	$push143=, $2, $pop62
+	tee_local	$push142=, $1=, $pop143
+	i32.const	$push141=, 0
+	i64.load	$push61=, .Lmain.e+24($pop141)
+	i64.store	0($pop142), $pop61
+	i32.const	$push140=, 0
+	i64.load	$push63=, .Lmain.e($pop140)
+	i64.store	0($2), $pop63
+	i32.const	$push139=, 0
+	i64.load	$push64=, .Lmain.e+8($pop139)
+	i64.store	8($2), $pop64
+	i32.const	$push113=, 88
+	i32.add 	$push114=, $2, $pop113
+	i32.const	$push115=, 64
+	i32.add 	$push116=, $2, $pop115
+	call    	foo@FUNCTION, $pop114, $pop116
+	f64.load	$push66=, 0($2)
+	f64.const	$push65=, -0x1.4p4
+	f64.ne  	$push67=, $pop66, $pop65
+	br_if   	0, $pop67       # 0: down to label5
 # BB#9:                                 # %if.end30
-	f64.load	$push57=, 8($2)
-	f64.const	$push73=, -0x1.4p3
-	f64.ne  	$push74=, $pop57, $pop73
-	br_if   	0, $pop74       # 0: down to label5
+	f64.load	$push52=, 8($2)
+	f64.const	$push68=, -0x1.4p3
+	f64.ne  	$push69=, $pop52, $pop68
+	br_if   	0, $pop69       # 0: down to label5
 # BB#10:                                # %if.end30
-	f64.load	$push58=, 0($0)
-	f64.const	$push154=, 0x1.d8p6
-	f64.ne  	$push75=, $pop58, $pop154
-	br_if   	0, $pop75       # 0: down to label5
+	f64.load	$push53=, 0($0)
+	f64.const	$push146=, 0x1.d8p6
+	f64.ne  	$push70=, $pop53, $pop146
+	br_if   	0, $pop70       # 0: down to label5
 # BB#11:                                # %if.end30
-	f64.load	$push59=, 0($1)
-	f64.const	$push155=, 0x1.d8p6
-	f64.ne  	$push76=, $pop59, $pop155
-	br_if   	0, $pop76       # 0: down to label5
+	f64.load	$push54=, 0($1)
+	f64.const	$push147=, 0x1.d8p6
+	f64.ne  	$push71=, $pop54, $pop147
+	br_if   	0, $pop71       # 0: down to label5
 # BB#12:                                # %if.end46
-	i32.const	$push80=, 84
-	i32.add 	$push81=, $2, $pop80
-	i32.const	$push82=, 0
-	i32.store	0($pop81), $pop82
-	i32.const	$push84=, 24
-	i32.add 	$push163=, $2, $pop84
-	tee_local	$push162=, $1=, $pop163
-	i32.const	$push161=, 0
-	i64.load	$push83=, .Lmain.e+24($pop161)
-	i64.store	0($pop162), $pop83
-	i32.const	$push86=, 16
-	i32.add 	$push160=, $2, $pop86
-	tee_local	$push159=, $0=, $pop160
-	i32.const	$push158=, 0
-	i64.load	$push85=, .Lmain.e+16($pop158)
-	i64.store	0($pop159), $pop85
-	i32.const	$push157=, 0
-	i64.load	$push87=, .Lmain.e($pop157)
-	i64.store	0($2), $pop87
-	i32.const	$push156=, 0
-	i64.load	$push88=, .Lmain.e+8($pop156)
-	i64.store	8($2), $pop88
-	i32.const	$push122=, 88
-	i32.add 	$push123=, $2, $pop122
-	i32.const	$push124=, 64
-	i32.add 	$push125=, $2, $pop124
-	call    	foo@FUNCTION, $pop123, $pop125
-	f64.load	$push90=, 0($2)
-	f64.const	$push89=, 0x0p0
-	f64.ne  	$push91=, $pop90, $pop89
-	br_if   	0, $pop91       # 0: down to label5
+	i32.const	$push75=, 84
+	i32.add 	$push76=, $2, $pop75
+	i32.const	$push77=, 0
+	i32.store	0($pop76), $pop77
+	i32.const	$push79=, 16
+	i32.add 	$push155=, $2, $pop79
+	tee_local	$push154=, $0=, $pop155
+	i32.const	$push153=, 0
+	i64.load	$push78=, .Lmain.e+16($pop153)
+	i64.store	0($pop154), $pop78
+	i32.const	$push81=, 24
+	i32.add 	$push152=, $2, $pop81
+	tee_local	$push151=, $1=, $pop152
+	i32.const	$push150=, 0
+	i64.load	$push80=, .Lmain.e+24($pop150)
+	i64.store	0($pop151), $pop80
+	i32.const	$push149=, 0
+	i64.load	$push82=, .Lmain.e($pop149)
+	i64.store	0($2), $pop82
+	i32.const	$push148=, 0
+	i64.load	$push83=, .Lmain.e+8($pop148)
+	i64.store	8($2), $pop83
+	i32.const	$push117=, 88
+	i32.add 	$push118=, $2, $pop117
+	i32.const	$push119=, 64
+	i32.add 	$push120=, $2, $pop119
+	call    	foo@FUNCTION, $pop118, $pop120
+	f64.load	$push85=, 0($2)
+	f64.const	$push84=, 0x0p0
+	f64.ne  	$push86=, $pop85, $pop84
+	br_if   	0, $pop86       # 0: down to label5
 # BB#13:                                # %if.end46
-	f64.load	$push77=, 8($2)
-	f64.const	$push164=, 0x1.d8p6
-	f64.ne  	$push92=, $pop77, $pop164
-	br_if   	0, $pop92       # 0: down to label5
+	f64.load	$push72=, 8($2)
+	f64.const	$push156=, 0x1.d8p6
+	f64.ne  	$push87=, $pop72, $pop156
+	br_if   	0, $pop87       # 0: down to label5
 # BB#14:                                # %if.end46
-	f64.load	$push78=, 0($0)
-	f64.const	$push165=, 0x1.d8p6
-	f64.ne  	$push93=, $pop78, $pop165
-	br_if   	0, $pop93       # 0: down to label5
+	f64.load	$push73=, 0($0)
+	f64.const	$push157=, 0x1.d8p6
+	f64.ne  	$push88=, $pop73, $pop157
+	br_if   	0, $pop88       # 0: down to label5
 # BB#15:                                # %if.end46
-	f64.load	$push79=, 0($1)
-	f64.const	$push94=, 0x1.d8p6
-	f64.ne  	$push95=, $pop79, $pop94
-	br_if   	0, $pop95       # 0: down to label5
+	f64.load	$push74=, 0($1)
+	f64.const	$push89=, 0x1.d8p6
+	f64.ne  	$push90=, $pop74, $pop89
+	br_if   	0, $pop90       # 0: down to label5
 # BB#16:                                # %if.end62
-	i32.const	$push103=, 0
-	i32.const	$push101=, 112
-	i32.add 	$push102=, $2, $pop101
-	i32.store	__stack_pointer($pop103), $pop102
-	i32.const	$push96=, 0
-	return  	$pop96
-.LBB1_17:                               # %if.then61
+	i32.const	$push98=, 0
+	i32.const	$push96=, 112
+	i32.add 	$push97=, $2, $pop96
+	i32.store	__stack_pointer($pop98), $pop97
+	i32.const	$push91=, 0
+	return  	$pop91
+.LBB1_17:                               # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.c,@object        # @main.c
 	.section	.rodata.cst32,"aM",@progbits,32
 	.p2align	4
@@ -391,5 +394,5 @@ main:                                   # @main
 	.size	.Lmain.e, 32
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47925.c.s b/test/torture-s/pr47925.c.s
index bce54834d..872f6f6ad 100644
--- a/test/torture-s/pr47925.c.s
+++ b/test/torture-s/pr47925.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr47925.c"
+	.file	"pr47925.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,9 +13,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -44,9 +44,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,10 +54,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop3, $pop4
+	i32.sub 	$push14=, $pop2, $pop4
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop5), $pop13
 	i32.const	$push9=, 8
@@ -76,6 +76,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr48197.c.s b/test/torture-s/pr48197.c.s
index 5265fa377..1c3247719 100644
--- a/test/torture-s/pr48197.c.s
+++ b/test/torture-s/pr48197.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48197.c"
+	.file	"pr48197.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr48571-1.c.s b/test/torture-s/pr48571-1.c.s
index 774186c91..3b84465cc 100644
--- a/test/torture-s/pr48571-1.c.s
+++ b/test/torture-s/pr48571-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48571-1.c"
+	.file	"pr48571-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -31,9 +31,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -88,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -99,5 +99,5 @@ c:
 	.size	c, 2496
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48717.c.s b/test/torture-s/pr48717.c.s
index 3bf739c6e..e4c139b2e 100644
--- a/test/torture-s/pr48717.c.s
+++ b/test/torture-s/pr48717.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48717.c"
+	.file	"pr48717.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -37,9 +37,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -71,7 +71,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -91,5 +91,5 @@ w:
 	.size	w, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48809.c.s b/test/torture-s/pr48809.c.s
index a869347b8..17c2f0937 100644
--- a/test/torture-s/pr48809.c.s
+++ b/test/torture-s/pr48809.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48809.c"
+	.file	"pr48809.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -228,9 +228,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -241,6 +241,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr48814-1.c.s b/test/torture-s/pr48814-1.c.s
index fadf81a31..886ab0f63 100644
--- a/test/torture-s/pr48814-1.c.s
+++ b/test/torture-s/pr48814-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48814-1.c"
+	.file	"pr48814-1.c"
 	.section	.text.incr,"ax",@progbits
-	.hidden	incr
+	.hidden	incr                    # -- Begin function incr
 	.globl	incr
 	.type	incr,@function
 incr:                                   # @incr
@@ -20,9 +20,9 @@ incr:                                   # @incr
 	.endfunc
 .Lfunc_end0:
 	.size	incr, .Lfunc_end0-incr
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -63,7 +63,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.data.arr,"aw",@progbits
@@ -86,5 +86,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48814-2.c.s b/test/torture-s/pr48814-2.c.s
index d1a3f3e65..fc5a1d07a 100644
--- a/test/torture-s/pr48814-2.c.s
+++ b/test/torture-s/pr48814-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48814-2.c"
+	.file	"pr48814-2.c"
 	.section	.text.incr,"ax",@progbits
-	.hidden	incr
+	.hidden	incr                    # -- Begin function incr
 	.globl	incr
 	.type	incr,@function
 incr:                                   # @incr
@@ -20,9 +20,9 @@ incr:                                   # @incr
 	.endfunc
 .Lfunc_end0:
 	.size	incr, .Lfunc_end0-incr
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,7 +66,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.data.arr,"aw",@progbits
@@ -89,5 +89,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48973-1.c.s b/test/torture-s/pr48973-1.c.s
index 0f87fa21b..09c77f0d1 100644
--- a/test/torture-s/pr48973-1.c.s
+++ b/test/torture-s/pr48973-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48973-1.c"
+	.file	"pr48973-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,7 +54,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -74,5 +74,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48973-2.c.s b/test/torture-s/pr48973-2.c.s
index eaaea9f25..5c52ec9a3 100644
--- a/test/torture-s/pr48973-2.c.s
+++ b/test/torture-s/pr48973-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr48973-2.c"
+	.file	"pr48973-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -34,7 +34,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -54,5 +54,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49039.c.s b/test/torture-s/pr49039.c.s
index 46146f215..88dcc8793 100644
--- a/test/torture-s/pr49039.c.s
+++ b/test/torture-s/pr49039.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49039.c"
+	.file	"pr49039.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -50,9 +50,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +77,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	cnt                     # @cnt
 	.type	cnt,@object
 	.section	.bss.cnt,"aw",@nobits
@@ -88,5 +88,5 @@ cnt:
 	.size	cnt, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49073.c.s b/test/torture-s/pr49073.c.s
index 9d3b3b058..6df203f13 100644
--- a/test/torture-s/pr49073.c.s
+++ b/test/torture-s/pr49073.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49073.c"
+	.file	"pr49073.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,7 +66,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -92,5 +92,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49123.c.s b/test/torture-s/pr49123.c.s
index 5f2542210..627f99f9f 100644
--- a/test/torture-s/pr49123.c.s
+++ b/test/torture-s/pr49123.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49123.c"
+	.file	"pr49123.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -18,7 +18,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	s.0,@object             # @s.0
 	.section	.bss.s.0,"aw",@nobits
 	.p2align	2
@@ -27,4 +27,4 @@ s.0:
 	.size	s.0, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49161.c.s b/test/torture-s/pr49161.c.s
index b875b3789..7cbfd3be2 100644
--- a/test/torture-s/pr49161.c.s
+++ b/test/torture-s/pr49161.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49161.c"
+	.file	"pr49161.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -27,9 +27,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -80,9 +80,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -106,7 +106,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -117,5 +117,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49186.c.s b/test/torture-s/pr49186.c.s
index 496dd83ca..96e227392 100644
--- a/test/torture-s/pr49186.c.s
+++ b/test/torture-s/pr49186.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49186.c"
+	.file	"pr49186.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49218.c.s b/test/torture-s/pr49218.c.s
index 53d6805e6..ec468b20a 100644
--- a/test/torture-s/pr49218.c.s
+++ b/test/torture-s/pr49218.c.s
@@ -1,34 +1,34 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49218.c"
+	.file	"pr49218.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32, i64, i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$push28=, $pop15, $pop16
-	tee_local	$push27=, $4=, $pop28
-	i32.store	__stack_pointer($pop17), $pop27
-	i32.const	$push26=, 0
-	f32.load	$push0=, f($pop26)
+	i32.const	$push15=, 0
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
+	i32.const	$push14=, 16
+	i32.sub 	$push26=, $pop12, $pop14
+	tee_local	$push25=, $4=, $pop26
+	i32.store	__stack_pointer($pop15), $pop25
+	i32.const	$push24=, 0
+	f32.load	$push0=, f($pop24)
 	call    	__fixsfti@FUNCTION, $4, $pop0
 	block   	
-	i64.load	$push25=, 0($4)
-	tee_local	$push24=, $2=, $pop25
+	i64.load	$push23=, 0($4)
+	tee_local	$push22=, $2=, $pop23
 	i64.const	$push4=, 10
-	i64.gt_u	$push5=, $pop24, $pop4
+	i64.gt_u	$push5=, $pop22, $pop4
 	i32.const	$push1=, 8
 	i32.add 	$push2=, $4, $pop1
-	i64.load	$push23=, 0($pop2)
-	tee_local	$push22=, $3=, $pop23
-	i64.const	$push21=, 0
-	i64.gt_s	$push3=, $pop22, $pop21
+	i64.load	$push21=, 0($pop2)
+	tee_local	$push20=, $3=, $pop21
+	i64.const	$push19=, 0
+	i64.gt_s	$push3=, $pop20, $pop19
 	i64.eqz 	$push6=, $3
 	i32.select	$push7=, $pop5, $pop3, $pop6
 	br_if   	0, $pop7        # 0: down to label0
@@ -36,38 +36,35 @@ main:                                   # @main
 .LBB0_2:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.const	$push36=, 1
-	i64.add 	$push35=, $2, $pop36
-	tee_local	$push34=, $0=, $pop35
-	i64.lt_u	$1=, $pop34, $2
+	i64.const	$push33=, 1
+	i64.add 	$push32=, $2, $pop33
+	tee_local	$push31=, $0=, $pop32
+	i64.lt_u	$1=, $pop31, $2
 	#APP
 	#NO_APP
 	copy_local	$2=, $0
-	i64.const	$push33=, 11
-	i64.xor 	$push11=, $0, $pop33
-	i64.const	$push32=, 1
+	i64.const	$push30=, 11
+	i64.xor 	$push8=, $0, $pop30
 	i64.extend_u/i32	$push9=, $1
-	i64.eqz 	$push8=, $0
-	i64.select	$push10=, $pop32, $pop9, $pop8
-	i64.add 	$push31=, $3, $pop10
-	tee_local	$push30=, $3=, $pop31
-	i64.or  	$push12=, $pop11, $pop30
-	i64.const	$push29=, 0
-	i64.ne  	$push13=, $pop12, $pop29
-	br_if   	0, $pop13       # 0: up to label1
+	i64.add 	$push29=, $3, $pop9
+	tee_local	$push28=, $3=, $pop29
+	i64.or  	$push10=, $pop8, $pop28
+	i64.const	$push27=, 0
+	i64.ne  	$push11=, $pop10, $pop27
+	br_if   	0, $pop11       # 0: up to label1
 .LBB0_3:                                # %if.end
 	end_loop
 	end_block                       # label0:
-	i32.const	$push20=, 0
-	i32.const	$push18=, 16
-	i32.add 	$push19=, $4, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
-	i32.const	$push37=, 0
-                                        # fallthrough-return: $pop37
+	i32.const	$push18=, 0
+	i32.const	$push16=, 16
+	i32.add 	$push17=, $4, $pop16
+	i32.store	__stack_pointer($pop18), $pop17
+	i32.const	$push34=, 0
+                                        # fallthrough-return: $pop34
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	f                       # @f
 	.type	f,@object
 	.section	.bss.f,"aw",@nobits
@@ -78,4 +75,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49279.c.s b/test/torture-s/pr49279.c.s
index b879936dd..34991167c 100644
--- a/test/torture-s/pr49279.c.s
+++ b/test/torture-s/pr49279.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49279.c"
+	.file	"pr49279.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -15,9 +15,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,10 +26,10 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push16=, $pop4, $pop5
+	i32.sub 	$push16=, $pop3, $pop5
 	tee_local	$push15=, $2=, $pop16
 	i32.store	__stack_pointer($pop6), $pop15
 	i32.store	12($2), $0
@@ -55,9 +55,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,10 +65,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	block   	
@@ -94,7 +94,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49281.c.s b/test/torture-s/pr49281.c.s
index 9f9d5e8c5..e8c480799 100644
--- a/test/torture-s/pr49281.c.s
+++ b/test/torture-s/pr49281.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49281.c"
+	.file	"pr49281.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -33,9 +33,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -80,14 +80,14 @@ main:                                   # @main
 # BB#6:                                 # %if.end15
 	i32.const	$push24=, 0
 	return  	$pop24
-.LBB2_7:                                # %if.then14
+.LBB2_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49390.c.s b/test/torture-s/pr49390.c.s
index 056855524..e864f737b 100644
--- a/test/torture-s/pr49390.c.s
+++ b/test/torture-s/pr49390.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49390.c"
+	.file	"pr49390.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -30,9 +30,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -48,9 +48,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -74,71 +74,72 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
 	.param  	i32
 	.local  	i32, i32, i32, i32, i64, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push53=, 0
-	i32.const	$push50=, 0
-	i32.load	$push51=, __stack_pointer($pop50)
-	i32.const	$push52=, 16
-	i32.sub 	$push62=, $pop51, $pop52
-	tee_local	$push61=, $7=, $pop62
-	i32.store	__stack_pointer($pop53), $pop61
+	i32.const	$push51=, 0
+	i32.const	$push49=, 0
+	i32.load	$push48=, __stack_pointer($pop49)
+	i32.const	$push50=, 16
+	i32.sub 	$push60=, $pop48, $pop50
+	tee_local	$push59=, $7=, $pop60
+	i32.store	__stack_pointer($pop51), $pop59
 	i32.const	$push1=, 0
-	i64.load	$push60=, a($pop1)
-	tee_local	$push59=, $5=, $pop60
-	i64.store	8($7), $pop59
-	block   	
+	i64.load	$push58=, a($pop1)
+	tee_local	$push57=, $5=, $pop58
+	i64.store	8($7), $pop57
 	block   	
 	block   	
 	block   	
 	i32.eqz 	$push83=, $0
-	br_if   	0, $pop83       # 0: down to label4
+	br_if   	0, $pop83       # 0: down to label3
 # BB#1:                                 # %if.else
 	block   	
-	i32.load	$push66=, 4($0)
-	tee_local	$push65=, $6=, $pop66
+	block   	
+	i32.load	$push64=, 4($0)
+	tee_local	$push63=, $6=, $pop64
 	i32.const	$push5=, 8191
-	i32.and 	$push64=, $pop65, $pop5
-	tee_local	$push63=, $3=, $pop64
+	i32.and 	$push62=, $pop63, $pop5
+	tee_local	$push61=, $3=, $pop62
 	i32.const	$push7=, 16
-	i32.lt_u	$push8=, $pop63, $pop7
+	i32.lt_u	$push8=, $pop61, $pop7
 	br_if   	0, $pop8        # 0: down to label5
 # BB#2:                                 # %if.else
 	i32.const	$push6=, 8192
 	i32.sub 	$push4=, $pop6, $3
 	i32.const	$push9=, 31
 	i32.gt_u	$push10=, $pop4, $pop9
-	br_if   	2, $pop10       # 2: down to label3
+	br_if   	1, $pop10       # 1: down to label4
 .LBB3_3:                                # %if.then5
 	end_block                       # label5:
 	i32.const	$push13=, 1
 	i32.const	$push12=, 0
 	i32.load	$push11=, 0($0)
 	call    	foo@FUNCTION, $pop13, $pop12, $pop11, $6
-	i32.call	$push14=, baz@FUNCTION, $0
-	br_if   	2, $pop14       # 2: down to label2
-	br      	3               # 3: down to label1
-.LBB3_4:
+.LBB3_4:                                # %if.end7
 	end_block                       # label4:
-	i32.const	$push57=, 8
-	i32.add 	$push58=, $7, $pop57
-	copy_local	$0=, $pop58
-.LBB3_5:                                # %if.end7
-	end_block                       # label3:
 	i32.call	$push15=, baz@FUNCTION, $0
-	i32.eqz 	$push84=, $pop15
+	br_if   	1, $pop15       # 1: down to label2
+	br      	2               # 2: down to label1
+.LBB3_5:
+	end_block                       # label3:
+	i32.const	$push55=, 8
+	i32.add 	$push56=, $7, $pop55
+	copy_local	$push66=, $pop56
+	tee_local	$push65=, $0=, $pop66
+	i32.call	$push14=, baz@FUNCTION, $pop65
+	i32.eqz 	$push84=, $pop14
 	br_if   	1, $pop84       # 1: down to label1
 .LBB3_6:                                # %if.end9
 	end_block                       # label2:
-	i32.const	$push22=, 32
-	i32.const	$push21=, 4
+	i32.const	$push20=, 32
+	i32.const	$push19=, 4
 	i32.const	$push16=, 0
 	i32.load	$push74=, b($pop16)
 	tee_local	$push73=, $1=, $pop74
@@ -146,100 +147,98 @@ test:                                   # @test
 	tee_local	$push71=, $2=, $pop72
 	i32.const	$push17=, 2
 	i32.and 	$push18=, $pop71, $pop17
-	i32.const	$push19=, 1
-	i32.shr_u	$push20=, $pop18, $pop19
-	i32.select	$3=, $pop22, $pop21, $pop20
+	i32.select	$3=, $pop20, $pop19, $pop18
 	block   	
 	block   	
 	i32.load	$push70=, 4($0)
 	tee_local	$push69=, $4=, $pop70
-	i32.const	$push23=, 8191
-	i32.and 	$push68=, $pop69, $pop23
+	i32.const	$push21=, 8191
+	i32.and 	$push68=, $pop69, $pop21
 	tee_local	$push67=, $6=, $pop68
 	i32.eqz 	$push85=, $pop67
 	br_if   	0, $pop85       # 0: down to label7
 # BB#7:                                 # %if.else17
-	i32.ge_u	$push24=, $6, $3
-	br_if   	1, $pop24       # 1: down to label6
+	i32.ge_u	$push22=, $6, $3
+	br_if   	1, $pop22       # 1: down to label6
 # BB#8:                                 # %if.then20
-	i32.const	$push27=, 2
-	i32.const	$push26=, 0
-	i32.load	$push25=, 0($0)
-	call    	foo@FUNCTION, $pop27, $pop26, $pop25, $4
+	i32.const	$push25=, 2
+	i32.const	$push24=, 0
+	i32.load	$push23=, 0($0)
+	call    	foo@FUNCTION, $pop25, $pop24, $pop23, $4
 	br      	2               # 2: down to label1
 .LBB3_9:                                # %if.then15
 	end_block                       # label7:
 	i64.const	$push2=, 32
 	i64.shr_u	$push3=, $5, $pop2
 	i32.wrap/i64	$push0=, $pop3
-	i32.add 	$push28=, $pop0, $3
-	i32.store	12($7), $pop28
+	i32.add 	$push26=, $3, $pop0
+	i32.store	12($7), $pop26
 	copy_local	$6=, $3
 .LBB3_10:                               # %if.end24
 	end_block                       # label6:
 	block   	
-	i32.const	$push29=, 1
-	i32.and 	$push30=, $2, $pop29
-	i32.eqz 	$push86=, $pop30
+	i32.const	$push27=, 1
+	i32.and 	$push28=, $2, $pop27
+	i32.eqz 	$push86=, $pop28
 	br_if   	0, $pop86       # 0: down to label8
 # BB#11:                                # %if.end24
-	i32.ne  	$push31=, $6, $3
-	br_if   	0, $pop31       # 0: down to label8
+	i32.ne  	$push29=, $6, $3
+	br_if   	0, $pop29       # 0: down to label8
 # BB#12:                                # %if.then31
-	i64.load	$push43=, 0($0):p2align=2
-	i64.store	0($7):p2align=2, $pop43
+	i64.load	$push41=, 0($0):p2align=2
+	i64.store	0($7), $pop41
 	call    	bar@FUNCTION, $7
-	i32.const	$push49=, 3
-	i32.const	$push48=, 0
-	i32.load	$push47=, 0($0)
-	i32.const	$push44=, 4
-	i32.add 	$push45=, $0, $pop44
-	i32.load	$push46=, 0($pop45)
-	call    	foo@FUNCTION, $pop49, $pop48, $pop47, $pop46
+	i32.const	$push47=, 3
+	i32.const	$push46=, 0
+	i32.load	$push45=, 0($0)
+	i32.const	$push42=, 4
+	i32.add 	$push43=, $0, $pop42
+	i32.load	$push44=, 0($pop43)
+	call    	foo@FUNCTION, $pop47, $pop46, $pop45, $pop44
 	br      	1               # 1: down to label1
 .LBB3_13:                               # %if.end34
 	end_block                       # label8:
-	i32.const	$push32=, 4
-	i32.add 	$push33=, $0, $pop32
-	i32.load	$push82=, 0($pop33)
+	i32.const	$push30=, 4
+	i32.add 	$push31=, $0, $pop30
+	i32.load	$push82=, 0($pop31)
 	tee_local	$push81=, $3=, $pop82
-	i32.const	$push34=, 8191
-	i32.and 	$push35=, $pop81, $pop34
-	i32.add 	$push80=, $1, $pop35
+	i32.const	$push32=, 8191
+	i32.and 	$push33=, $pop81, $pop32
+	i32.add 	$push80=, $1, $pop33
 	tee_local	$push79=, $6=, $pop80
 	i32.load	$push78=, 4($pop79)
 	tee_local	$push77=, $2=, $pop78
 	i32.load	$push76=, 0($0)
 	tee_local	$push75=, $0=, $pop76
-	i32.lt_u	$push36=, $pop77, $pop75
-	br_if   	0, $pop36       # 0: down to label1
+	i32.lt_u	$push34=, $pop77, $pop75
+	br_if   	0, $pop34       # 0: down to label1
 # BB#14:                                # %land.lhs.true41
 	block   	
-	i32.ne  	$push37=, $2, $0
-	br_if   	0, $pop37       # 0: down to label9
+	i32.ne  	$push35=, $2, $0
+	br_if   	0, $pop35       # 0: down to label9
 # BB#15:                                # %lor.lhs.false47
-	i32.const	$push38=, 8
-	i32.add 	$push39=, $6, $pop38
-	i32.load	$push40=, 0($pop39)
-	i32.lt_u	$push41=, $pop40, $3
-	br_if   	1, $pop41       # 1: down to label1
+	i32.const	$push36=, 8
+	i32.add 	$push37=, $6, $pop36
+	i32.load	$push38=, 0($pop37)
+	i32.lt_u	$push39=, $pop38, $3
+	br_if   	1, $pop39       # 1: down to label1
 .LBB3_16:                               # %if.then53
 	end_block                       # label9:
-	i32.const	$push42=, 4
-	call    	foo@FUNCTION, $pop42, $6, $0, $3
+	i32.const	$push40=, 4
+	call    	foo@FUNCTION, $pop40, $6, $0, $3
 .LBB3_17:                               # %cleanup
 	end_block                       # label1:
-	i32.const	$push56=, 0
-	i32.const	$push54=, 16
-	i32.add 	$push55=, $7, $pop54
-	i32.store	__stack_pointer($pop56), $pop55
+	i32.const	$push54=, 0
+	i32.const	$push52=, 16
+	i32.add 	$push53=, $7, $pop52
+	i32.store	__stack_pointer($pop54), $pop53
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
 	.size	test, .Lfunc_end3-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -273,7 +272,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.bss.u,"aw",@nobits
@@ -311,5 +310,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49419.c.s b/test/torture-s/pr49419.c.s
index 11410a884..511d703a6 100644
--- a/test/torture-s/pr49419.c.s
+++ b/test/torture-s/pr49419.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49419.c"
+	.file	"pr49419.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,249 +14,153 @@ foo:                                    # @foo
 	i32.const	$push0=, -1
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %for.cond.preheader
+# BB#1:                                 # %if.end
 	i32.const	$5=, 0
-	i32.const	$push25=, 0
-	i32.load	$4=, t($pop25)
+	i32.const	$push34=, 0
+	i32.load	$4=, t($pop34)
 	block   	
 	i32.const	$push3=, 1
 	i32.lt_s	$push4=, $3, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#2:                                 # %for.cond.preheader
+# BB#2:                                 # %if.end
 	i32.const	$push5=, 12
 	i32.mul 	$push6=, $0, $pop5
 	i32.add 	$push7=, $4, $pop6
 	i32.load	$push2=, 0($pop7)
 	i32.ne  	$push8=, $pop2, $1
 	br_if   	0, $pop8        # 0: down to label2
-# BB#3:                                 # %for.body.preheader
-	i32.const	$5=, 0
-	copy_local	$6=, $0
-.LBB0_4:                                # %for.body
+# BB#3:                                 # %for.body.lr.ph
+	i32.const	$5=, 1
+	i32.const	$push10=, 2
+	i32.lt_s	$push11=, $3, $pop10
+	br_if   	0, $pop11       # 0: down to label2
+# BB#4:                                 # %for.body.lr.ph
+	i32.const	$push12=, 12
+	i32.mul 	$push13=, $0, $pop12
+	i32.add 	$push14=, $4, $pop13
+	i32.load	$push37=, 4($pop14)
+	tee_local	$push36=, $6=, $pop37
+	i32.const	$push35=, 12
+	i32.mul 	$push15=, $pop36, $pop35
+	i32.add 	$push16=, $4, $pop15
+	i32.load	$push9=, 0($pop16)
+	i32.ne  	$push17=, $pop9, $1
+	br_if   	0, $pop17       # 0: down to label2
+# BB#5:                                 # %for.body.preheader
+	i32.const	$5=, 1
+.LBB0_6:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push28=, 1
-	i32.add 	$push27=, $5, $pop28
-	tee_local	$push26=, $5=, $pop27
-	i32.ge_s	$push10=, $pop26, $3
-	br_if   	1, $pop10       # 1: down to label2
-# BB#5:                                 # %for.body
-                                        #   in Loop: Header=BB0_4 Depth=1
-	i32.const	$push32=, 12
-	i32.mul 	$push11=, $6, $pop32
-	i32.add 	$push12=, $4, $pop11
-	i32.load	$push31=, 4($pop12)
-	tee_local	$push30=, $6=, $pop31
-	i32.const	$push29=, 12
-	i32.mul 	$push13=, $pop30, $pop29
-	i32.add 	$push14=, $4, $pop13
-	i32.load	$push9=, 0($pop14)
-	i32.eq  	$push15=, $pop9, $1
-	br_if   	0, $pop15       # 0: up to label3
-.LBB0_6:                                # %for.end
+	i32.const	$push40=, 1
+	i32.add 	$push39=, $5, $pop40
+	tee_local	$push38=, $5=, $pop39
+	i32.ge_s	$push19=, $pop38, $3
+	br_if   	1, $pop19       # 1: down to label2
+# BB#7:                                 # %for.body
+                                        #   in Loop: Header=BB0_6 Depth=1
+	i32.const	$push44=, 12
+	i32.mul 	$push20=, $6, $pop44
+	i32.add 	$push21=, $4, $pop20
+	i32.load	$push43=, 4($pop21)
+	tee_local	$push42=, $6=, $pop43
+	i32.const	$push41=, 12
+	i32.mul 	$push22=, $pop42, $pop41
+	i32.add 	$push23=, $4, $pop22
+	i32.load	$push18=, 0($pop23)
+	i32.eq  	$push24=, $pop18, $1
+	br_if   	0, $pop24       # 0: up to label3
+.LBB0_8:                                # %for.end
 	end_loop
 	end_block                       # label2:
-	i32.eq  	$push16=, $5, $3
-	br_if   	1, $pop16       # 1: down to label0
-# BB#7:                                 # %if.end7
+	i32.eq  	$push25=, $5, $3
+	br_if   	1, $pop25       # 1: down to label0
+# BB#9:                                 # %if.end7
 	block   	
-	i32.const	$push33=, 1
-	i32.lt_s	$push17=, $5, $pop33
-	br_if   	0, $pop17       # 0: down to label4
-# BB#8:                                 # %for.body10.preheader
-	i32.const	$push34=, 1
-	i32.add 	$3=, $5, $pop34
-	i32.const	$push18=, 2
-	i32.shl 	$push19=, $5, $pop18
-	i32.add 	$6=, $2, $pop19
-.LBB0_9:                                # %for.body10
+	i32.const	$push45=, 1
+	i32.lt_s	$push26=, $5, $pop45
+	br_if   	0, $pop26       # 0: down to label4
+# BB#10:                                # %for.body10.preheader
+	i32.const	$push46=, 1
+	i32.add 	$3=, $5, $pop46
+	i32.const	$push27=, 2
+	i32.shl 	$push28=, $5, $pop27
+	i32.add 	$6=, $2, $pop28
+.LBB0_11:                               # %for.body10
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push42=, 12
-	i32.mul 	$push20=, $0, $pop42
-	i32.add 	$push41=, $4, $pop20
-	tee_local	$push40=, $0=, $pop41
-	i32.load	$push21=, 8($pop40)
-	i32.store	0($6), $pop21
-	i32.const	$push39=, -4
-	i32.add 	$6=, $6, $pop39
+	i32.const	$push54=, 12
+	i32.mul 	$push29=, $0, $pop54
+	i32.add 	$push53=, $4, $pop29
+	tee_local	$push52=, $0=, $pop53
+	i32.load	$push30=, 8($pop52)
+	i32.store	0($6), $pop30
+	i32.const	$push51=, -4
+	i32.add 	$6=, $6, $pop51
 	i32.load	$0=, 4($0)
-	i32.const	$push38=, -1
-	i32.add 	$push37=, $3, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.const	$push35=, 1
-	i32.gt_s	$push22=, $pop36, $pop35
-	br_if   	0, $pop22       # 0: up to label5
-.LBB0_10:                               # %for.end16
+	i32.const	$push50=, -1
+	i32.add 	$push49=, $3, $pop50
+	tee_local	$push48=, $3=, $pop49
+	i32.const	$push47=, 1
+	i32.gt_s	$push31=, $pop48, $pop47
+	br_if   	0, $pop31       # 0: up to label5
+.LBB0_12:                               # %for.end16
 	end_loop
 	end_block                       # label4:
 	i32.store	0($2), $0
-	i32.const	$push43=, 1
-	i32.add 	$push24=, $5, $pop43
-	return  	$pop24
-.LBB0_11:
+	i32.const	$push55=, 1
+	i32.add 	$push33=, $5, $pop55
+	return  	$pop33
+.LBB0_13:
 	end_block                       # label1:
-	i32.const	$push23=, 0
-	return  	$pop23
-.LBB0_12:                               # %if.then6
+	i32.const	$push32=, 0
+	return  	$pop32
+.LBB0_14:                               # %if.then6
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %for.body.i.preheader
-	i32.const	$push31=, 0
-	i32.const	$push28=, 0
-	i32.load	$push29=, __stack_pointer($pop28)
-	i32.const	$push30=, 48
-	i32.sub 	$push44=, $pop29, $pop30
-	tee_local	$push43=, $0=, $pop44
-	i32.store	__stack_pointer($pop31), $pop43
-	i32.const	$1=, 0
-	i32.const	$push42=, 0
-	i32.const	$push0=, 36
-	i32.call	$push41=, memset@FUNCTION, $0, $pop42, $pop0
-	tee_local	$push40=, $0=, $pop41
-	i32.const	$push39=, 2
-	i32.store	8($pop40), $pop39
-	i64.const	$push1=, 4294967297
-	i64.store	0($0), $pop1
-	i32.const	$push38=, 0
-	i32.store	t($pop38), $0
-	i32.const	$3=, 1
-	block   	
-	i32.load	$push2=, 12($0)
-	i32.const	$push37=, 1
-	i32.ne  	$push3=, $pop2, $pop37
-	br_if   	0, $pop3        # 0: down to label6
-# BB#1:                                 # %for.body.i.for.body.i_crit_edge.preheader
-	i32.const	$4=, 0
-	i32.const	$3=, 1
-.LBB1_2:                                # %for.body.i.for.body.i_crit_edge
-                                        # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label8:
-	i32.const	$push47=, 1
-	i32.add 	$1=, $4, $pop47
-	i32.const	$push46=, 2
-	i32.add 	$push5=, $4, $pop46
-	i32.const	$push45=, 2
-	i32.gt_s	$push6=, $pop5, $pop45
-	br_if   	1, $pop6        # 1: down to label7
-# BB#3:                                 # %for.body.i.for.body.i_crit_edge
-                                        #   in Loop: Header=BB1_2 Depth=1
-	copy_local	$4=, $1
-	i32.const	$push52=, 12
-	i32.mul 	$push7=, $3, $pop52
-	i32.add 	$push8=, $0, $pop7
-	i32.load	$push51=, 4($pop8)
-	tee_local	$push50=, $3=, $pop51
-	i32.const	$push49=, 12
-	i32.mul 	$push9=, $pop50, $pop49
-	i32.add 	$push10=, $0, $pop9
-	i32.load	$push4=, 0($pop10)
-	i32.const	$push48=, 1
-	i32.eq  	$push11=, $pop4, $pop48
-	br_if   	0, $pop11       # 0: up to label8
-.LBB1_4:                                # %for.end.i.loopexit
-	end_loop
-	end_block                       # label7:
-	i32.const	$push12=, 1
-	i32.add 	$3=, $1, $pop12
-.LBB1_5:                                # %for.end.i
-	end_block                       # label6:
-	block   	
-	block   	
-	block   	
-	i32.const	$push13=, 3
-	i32.eq  	$push14=, $3, $pop13
-	br_if   	0, $pop14       # 0: down to label11
-# BB#6:                                 # %if.end7.i
-	i32.const	$push53=, 0
-	i32.lt_s	$push15=, $1, $pop53
-	br_if   	1, $pop15       # 1: down to label10
-# BB#7:                                 # %for.body10.i.preheader
-	i32.const	$push35=, 36
-	i32.add 	$push36=, $0, $pop35
-	i32.const	$push16=, 2
-	i32.shl 	$push17=, $3, $pop16
-	i32.add 	$push57=, $pop36, $pop17
-	tee_local	$push56=, $4=, $pop57
-	i32.const	$push55=, 2
-	i32.store	0($pop56), $pop55
-	i32.const	$5=, 1
-	block   	
-	i32.const	$push54=, 2
-	i32.lt_s	$push18=, $3, $pop54
-	br_if   	0, $pop18       # 0: down to label12
-# BB#8:                                 # %for.body10.i.for.body10.i_crit_edge.preheader
-	i32.const	$push58=, -4
-	i32.add 	$4=, $4, $pop58
-	i32.const	$5=, 1
-.LBB1_9:                                # %for.body10.i.for.body10.i_crit_edge
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label13:
-	i32.const	$push66=, 12
-	i32.mul 	$push19=, $5, $pop66
-	i32.add 	$push65=, $0, $pop19
-	tee_local	$push64=, $2=, $pop65
-	i32.load	$5=, 4($pop64)
-	i32.load	$push20=, 8($2)
-	i32.store	0($4), $pop20
-	i32.const	$push63=, -4
-	i32.add 	$4=, $4, $pop63
-	i32.const	$push62=, -1
-	i32.add 	$push61=, $3, $pop62
-	tee_local	$push60=, $3=, $pop61
-	i32.const	$push59=, 1
-	i32.gt_s	$push21=, $pop60, $pop59
-	br_if   	0, $pop21       # 0: up to label13
-.LBB1_10:                               # %foo.exit
-	end_loop
-	end_block                       # label12:
-	i32.store	36($0), $5
-	br_if   	2, $1           # 2: down to label9
-# BB#11:                                # %if.end
-	i32.const	$push22=, 1
-	i32.ne  	$push23=, $5, $pop22
-	br_if   	2, $pop23       # 2: down to label9
-# BB#12:                                # %lor.lhs.false
-	i32.load	$push25=, 40($0)
-	i32.const	$push24=, 2
-	i32.ne  	$push26=, $pop25, $pop24
-	br_if   	2, $pop26       # 2: down to label9
-# BB#13:                                # %if.end6
-	i32.const	$push34=, 0
-	i32.const	$push32=, 48
-	i32.add 	$push33=, $0, $pop32
-	i32.store	__stack_pointer($pop34), $pop33
-	i32.const	$push27=, 0
-	return  	$pop27
-.LBB1_14:                               # %if.then6.i
-	end_block                       # label11:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_15:                               # %foo.exit.thread
-	end_block                       # label10:
-	i32.const	$push67=, 0
-	i32.store	36($0), $pop67
-.LBB1_16:                               # %if.then5
-	end_block                       # label9:
-	call    	abort@FUNCTION
-	unreachable
+	.local  	i32
+# BB#0:                                 # %lor.lhs.false
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
+	i32.const	$push12=, 48
+	i32.sub 	$push18=, $pop10, $pop12
+	tee_local	$push17=, $0=, $pop18
+	i32.const	$push0=, 32
+	i32.add 	$push1=, $pop17, $pop0
+	i32.const	$push2=, 0
+	i32.store	0($pop1), $pop2
+	i32.const	$push3=, 24
+	i32.add 	$push4=, $0, $pop3
+	i64.const	$push5=, 0
+	i64.store	0($pop4), $pop5
+	i32.const	$push6=, 16
+	i32.add 	$push7=, $0, $pop6
+	i64.const	$push16=, 0
+	i64.store	0($pop7), $pop16
+	i64.const	$push15=, 0
+	i64.store	8($0), $pop15
+	i64.const	$push8=, 4294967297
+	i64.store	0($0), $pop8
+	i32.const	$push14=, 0
+	i32.store	t($pop14), $0
+	i32.const	$push9=, 2
+	i32.store	8($0), $pop9
+	i32.const	$push13=, 0
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -267,5 +171,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49644.c.s b/test/torture-s/pr49644.c.s
index 9598ee73e..db5e25618 100644
--- a/test/torture-s/pr49644.c.s
+++ b/test/torture-s/pr49644.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49644.c"
+	.file	"pr49644.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49712.c.s b/test/torture-s/pr49712.c.s
index e8f0922a0..b6308ef66 100644
--- a/test/torture-s/pr49712.c.s
+++ b/test/torture-s/pr49712.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49712.c"
+	.file	"pr49712.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -11,9 +11,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -23,76 +23,64 @@ bar:                                    # @bar
 	i32.const	$push4=, 0
 	i32.load	$push0=, d($pop4)
 	i32.const	$push3=, 0
-	i32.gt_s	$push1=, $pop0, $pop3
+	i32.le_s	$push1=, $pop0, $pop3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.cond4.preheader
-	i32.const	$push7=, 0
-	i32.const	$push2=, 1
-	i32.store	d($pop7), $pop2
-	i32.const	$push6=, 0
+# BB#1:                                 # %for.end9
 	i32.const	$push5=, 0
-	i32.store	e($pop6), $pop5
-.LBB1_2:                                # %for.end9
+	return  	$pop5
+.LBB1_2:                                # %for.body
 	end_block                       # label0:
+	i32.const	$push9=, 0
+	i32.const	$push2=, 1
+	i32.store	d($pop9), $pop2
 	i32.const	$push8=, 0
-                                        # fallthrough-return: $pop8
+	i32.const	$push7=, 0
+	i32.store	e($pop8), $pop7
+	i32.const	$push6=, 0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push6=, 0
 	i32.const	$push5=, 0
-	i32.store	b($pop6), $pop5
-	block   	
 	i32.const	$push4=, 0
-	i32.load	$push0=, c($pop4)
-	i32.eqz 	$push18=, $pop0
-	br_if   	0, $pop18       # 0: down to label1
-# BB#1:                                 # %while.body.preheader
-	i32.const	$push8=, 0
-	i32.load	$push1=, d($pop8)
-	i32.const	$push7=, 1
-	i32.lt_s	$0=, $pop1, $pop7
+	i32.store	b($pop5), $pop4
+	block   	
+	i32.const	$push3=, 0
+	i32.load	$push0=, c($pop3)
+	i32.eqz 	$push11=, $pop0
+	br_if   	0, $pop11       # 0: down to label1
+# BB#1:                                 # %while.body.lr.ph
+	i32.const	$push6=, 0
+	i32.load	$0=, d($pop6)
 .LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push15=, 1
-	i32.and 	$push2=, $0, $pop15
-	i32.eqz 	$push19=, $pop2
-	br_if   	0, $pop19       # 0: up to label2
-# BB#3:                                 # %for.cond4.preheader.i
-                                        #   in Loop: Header=BB2_2 Depth=1
-	i32.const	$0=, 0
-	i32.const	$push14=, 0
-	i32.const	$push13=, 1
-	i32.store	d($pop14), $pop13
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.store	e($pop12), $pop11
-	i32.const	$push10=, 0
-	i32.const	$push9=, 0
-	i32.store	a($pop10), $pop9
+	i32.const	$push8=, 1
+	i32.const	$push7=, 1
+	i32.gt_s	$push1=, $0, $pop7
+	i32.select	$0=, $0, $pop8, $pop1
 	br      	0               # 0: up to label2
-.LBB2_4:                                # %for.inc.1
+.LBB2_3:                                # %for.inc.1
 	end_loop
 	end_block                       # label1:
-	i32.const	$push17=, 0
-	i32.const	$push3=, 2
-	i32.store	b($pop17), $pop3
-	i32.const	$push16=, 0
-                                        # fallthrough-return: $pop16
+	i32.const	$push10=, 0
+	i32.const	$push2=, 2
+	i32.store	b($pop10), $pop2
+	i32.const	$push9=, 0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.bss.d,"aw",@nobits
@@ -139,4 +127,4 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49768.c.s b/test/torture-s/pr49768.c.s
index d7b33f2c1..a10da59b4 100644
--- a/test/torture-s/pr49768.c.s
+++ b/test/torture-s/pr49768.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49768.c"
+	.file	"pr49768.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr49886.c.s b/test/torture-s/pr49886.c.s
index b2fdf3154..75dc29744 100644
--- a/test/torture-s/pr49886.c.s
+++ b/test/torture-s/pr49886.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr49886.c"
+	.file	"pr49886.c"
 	.section	.text.never_ever,"ax",@progbits
-	.hidden	never_ever
+	.hidden	never_ever              # -- Begin function never_ever
 	.globl	never_ever
 	.type	never_ever,@function
 never_ever:                             # @never_ever
@@ -12,9 +12,9 @@ never_ever:                             # @never_ever
 	.endfunc
 .Lfunc_end0:
 	.size	never_ever, .Lfunc_end0-never_ever
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,9 +28,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.section	.text.bar_1,"ax",@progbits
-	.hidden	bar_1
+	.hidden	bar_1                   # -- Begin function bar_1
 	.globl	bar_1
 	.type	bar_1,@function
 bar_1:                                  # @bar_1
@@ -45,9 +45,9 @@ bar_1:                                  # @bar_1
 	.endfunc
 .Lfunc_end2:
 	.size	bar_1, .Lfunc_end2-bar_1
-
+                                        # -- End function
 	.section	.text.mark_cell,"ax",@progbits
-	.type	mark_cell,@function
+	.type	mark_cell,@function     # -- Begin function mark_cell
 mark_cell:                              # @mark_cell
 	.param  	i32
 	.local  	i32
@@ -190,9 +190,9 @@ mark_cell:                              # @mark_cell
 	.endfunc
 .Lfunc_end3:
 	.size	mark_cell, .Lfunc_end3-mark_cell
-
+                                        # -- End function
 	.section	.text.bar_2,"ax",@progbits
-	.hidden	bar_2
+	.hidden	bar_2                   # -- Begin function bar_2
 	.globl	bar_2
 	.type	bar_2,@function
 bar_2:                                  # @bar_2
@@ -207,7 +207,7 @@ bar_2:                                  # @bar_2
 	.endfunc
 .Lfunc_end4:
 	.size	bar_2, .Lfunc_end4-bar_2
-
+                                        # -- End function
 	.hidden	cond                    # @cond
 	.type	cond,@object
 	.section	.bss.cond,"aw",@nobits
@@ -227,5 +227,5 @@ gi:
 	.size	gi, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51023.c.s b/test/torture-s/pr51023.c.s
index d5f42a3da..07ea4c49a 100644
--- a/test/torture-s/pr51023.c.s
+++ b/test/torture-s/pr51023.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51023.c"
+	.file	"pr51023.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,6 +29,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr51323.c.s b/test/torture-s/pr51323.c.s
index 06c5794e5..f54490d44 100644
--- a/test/torture-s/pr51323.c.s
+++ b/test/torture-s/pr51323.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51323.c"
+	.file	"pr51323.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -27,9 +27,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -42,70 +42,66 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
-	i32.const	$push15=, 48
-	i32.sub 	$push35=, $pop14, $pop15
-	tee_local	$push34=, $0=, $pop35
-	i32.store	__stack_pointer($pop16), $pop34
+	i32.const	$push14=, 0
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
+	i32.const	$push13=, 48
+	i32.sub 	$push31=, $pop11, $pop13
+	tee_local	$push30=, $0=, $pop31
+	i32.store	__stack_pointer($pop14), $pop30
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	v($pop1), $pop0
-	i32.const	$push2=, 4
-	i32.store	40($0), $pop2
-	i32.const	$push20=, 20
-	i32.add 	$push21=, $0, $pop20
-	i32.const	$push3=, 8
-	i32.add 	$push4=, $pop21, $pop3
-	i32.const	$push33=, 4
-	i32.store	0($pop4), $pop33
+	i32.const	$push18=, 16
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push2=, 8
+	i32.add 	$push3=, $pop19, $pop2
+	i32.const	$push4=, 4
+	i32.store	0($pop3), $pop4
 	i64.const	$push5=, 12884901890
 	i64.store	32($0), $pop5
-	i64.load	$push6=, 32($0)
-	i64.store	20($0):p2align=2, $pop6
-	i32.const	$push7=, 9
-	i32.const	$push22=, 20
-	i32.add 	$push23=, $0, $pop22
-	call    	bar@FUNCTION, $pop7, $pop23
-	i32.const	$push32=, 0
-	i32.const	$push8=, 17
-	i32.store	v($pop32), $pop8
-	i32.const	$push9=, 18
-	i32.store	40($0), $pop9
-	i32.const	$push24=, 8
-	i32.add 	$push25=, $0, $pop24
-	i32.const	$push31=, 8
-	i32.add 	$push10=, $pop25, $pop31
-	i32.const	$push30=, 18
-	i32.store	0($pop10), $pop30
-	i64.const	$push11=, 73014444048
-	i64.store	32($0), $pop11
-	i64.load	$push12=, 32($0)
-	i64.store	8($0):p2align=2, $pop12
-	i32.const	$push29=, 9
+	i32.const	$push29=, 4
+	i32.store	40($0), $pop29
+	i64.const	$push28=, 12884901890
+	i64.store	16($0), $pop28
+	i32.const	$push6=, 9
+	i32.const	$push20=, 16
+	i32.add 	$push21=, $0, $pop20
+	call    	bar@FUNCTION, $pop6, $pop21
+	i32.const	$push27=, 0
+	i32.const	$push7=, 17
+	i32.store	v($pop27), $pop7
 	i32.const	$push26=, 8
-	i32.add 	$push27=, $0, $pop26
-	call    	bar@FUNCTION, $pop29, $pop27
-	i32.const	$push19=, 0
-	i32.const	$push17=, 48
-	i32.add 	$push18=, $0, $pop17
-	i32.store	__stack_pointer($pop19), $pop18
-	i32.const	$push28=, 0
-                                        # fallthrough-return: $pop28
+	i32.add 	$push8=, $0, $pop26
+	i32.const	$push9=, 18
+	i32.store	0($pop8), $pop9
+	i64.const	$push10=, 73014444048
+	i64.store	32($0), $pop10
+	i32.const	$push25=, 18
+	i32.store	40($0), $pop25
+	i64.const	$push24=, 73014444048
+	i64.store	0($0), $pop24
+	i32.const	$push23=, 9
+	call    	bar@FUNCTION, $pop23, $0
+	i32.const	$push17=, 0
+	i32.const	$push15=, 48
+	i32.add 	$push16=, $0, $pop15
+	i32.store	__stack_pointer($pop17), $pop16
+	i32.const	$push22=, 0
+                                        # fallthrough-return: $pop22
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -116,5 +112,5 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51466.c.s b/test/torture-s/pr51466.c.s
index ca2f13181..33c08b4e1 100644
--- a/test/torture-s/pr51466.c.s
+++ b/test/torture-s/pr51466.c.s
@@ -1,17 +1,17 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51466.c"
+	.file	"pr51466.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push7=, $pop5, $pop6
+	i32.sub 	$push7=, $pop4, $pop6
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.add 	$push2=, $pop7, $pop1
@@ -22,19 +22,19 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push8=, $pop6, $pop7
+	i32.sub 	$push8=, $pop5, $pop7
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.add 	$push10=, $pop8, $pop1
@@ -48,9 +48,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -58,10 +58,10 @@ baz:                                    # @baz
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push11=, $pop6, $pop7
+	i32.sub 	$push11=, $pop5, $pop7
 	tee_local	$push10=, $1=, $pop11
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
@@ -76,9 +76,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -114,7 +114,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51581-1.c.s b/test/torture-s/pr51581-1.c.s
index 66d7e4018..c75bb3dba 100644
--- a/test/torture-s/pr51581-1.c.s
+++ b/test/torture-s/pr51581-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51581-1.c"
+	.file	"pr51581-1.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -29,9 +29,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -59,9 +59,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -89,9 +89,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -119,9 +119,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -149,9 +149,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -179,9 +179,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -217,9 +217,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end6:
 	.size	f7, .Lfunc_end6-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -249,9 +249,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end7:
 	.size	f8, .Lfunc_end7-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
@@ -287,9 +287,9 @@ f9:                                     # @f9
 	.endfunc
 .Lfunc_end8:
 	.size	f9, .Lfunc_end8-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
@@ -319,9 +319,9 @@ f10:                                    # @f10
 	.endfunc
 .Lfunc_end9:
 	.size	f10, .Lfunc_end9-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
@@ -357,9 +357,9 @@ f11:                                    # @f11
 	.endfunc
 .Lfunc_end10:
 	.size	f11, .Lfunc_end10-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
@@ -399,9 +399,9 @@ f12:                                    # @f12
 	.endfunc
 .Lfunc_end11:
 	.size	f12, .Lfunc_end11-f12
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -415,20 +415,20 @@ main:                                   # @main
 	loop    	                # label12:
 	#APP
 	#NO_APP
-	i32.const	$push91=, b+16384
-	i32.add 	$push0=, $0, $pop91
+	i32.const	$push90=, b+16384
+	i32.add 	$push0=, $0, $pop90
 	i32.store	0($pop0), $1
-	i32.const	$push90=, a+16384
-	i32.add 	$push2=, $0, $pop90
-	i32.const	$push89=, -2048
-	i32.add 	$push1=, $1, $pop89
+	i32.const	$push89=, a+16384
+	i32.add 	$push2=, $0, $pop89
+	i32.const	$push88=, -2048
+	i32.add 	$push1=, $1, $pop88
 	i32.store	0($pop2), $pop1
-	i32.const	$push88=, 1
-	i32.add 	$1=, $1, $pop88
-	i32.const	$push87=, 4
-	i32.add 	$push86=, $0, $pop87
-	tee_local	$push85=, $0=, $pop86
-	br_if   	0, $pop85       # 0: up to label12
+	i32.const	$push87=, 1
+	i32.add 	$1=, $1, $pop87
+	i32.const	$push86=, 4
+	i32.add 	$push85=, $0, $pop86
+	tee_local	$push84=, $0=, $pop85
+	br_if   	0, $pop84       # 0: up to label12
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$1=, 0
@@ -438,43 +438,38 @@ main:                                   # @main
 	i32.const	$push93=, 0
 	i64.const	$push4=, -9223372030412324864
 	i64.store	a($pop93), $pop4
+	i32.const	$0=, -1
 	i32.const	$push92=, 0
-	i32.const	$push5=, -1
-	i32.store	b+16380($pop92), $pop5
+	i32.const	$push91=, -1
+	i32.store	b+16380($pop92), $pop91
 	call    	f1@FUNCTION
 	call    	f2@FUNCTION
-	i32.const	$0=, 0
 .LBB12_3:                               # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	loop    	                # label19:
+	loop    	                # label14:
 	i32.const	$push97=, c
-	i32.add 	$push9=, $1, $pop97
-	i32.load	$push10=, 0($pop9)
+	i32.add 	$push8=, $1, $pop97
+	i32.load	$push9=, 0($pop8)
 	i32.const	$push96=, a
-	i32.add 	$push6=, $1, $pop96
-	i32.load	$push7=, 0($pop6)
+	i32.add 	$push5=, $1, $pop96
+	i32.load	$push6=, 0($pop5)
 	i32.const	$push95=, 3
-	i32.div_s	$push8=, $pop7, $pop95
-	i32.ne  	$push11=, $pop10, $pop8
-	br_if   	1, $pop11       # 1: down to label18
+	i32.div_s	$push7=, $pop6, $pop95
+	i32.ne  	$push10=, $pop9, $pop7
+	br_if   	1, $pop10       # 1: down to label13
 # BB#4:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB12_3 Depth=1
 	i32.const	$push100=, d
-	i32.add 	$push15=, $1, $pop100
-	i32.load	$push16=, 0($pop15)
+	i32.add 	$push14=, $1, $pop100
+	i32.load	$push15=, 0($pop14)
 	i32.const	$push99=, b
-	i32.add 	$push12=, $1, $pop99
-	i32.load	$push13=, 0($pop12)
+	i32.add 	$push11=, $1, $pop99
+	i32.load	$push12=, 0($pop11)
 	i32.const	$push98=, 3
-	i32.div_u	$push14=, $pop13, $pop98
-	i32.ne  	$push17=, $pop16, $pop14
-	br_if   	1, $pop17       # 1: down to label18
+	i32.div_u	$push13=, $pop12, $pop98
+	i32.ne  	$push16=, $pop15, $pop13
+	br_if   	1, $pop16       # 1: down to label13
 # BB#5:                                 # %for.cond2
                                         #   in Loop: Header=BB12_3 Depth=1
 	i32.const	$push105=, 4
@@ -482,40 +477,40 @@ main:                                   # @main
 	i32.const	$push104=, 1
 	i32.add 	$push103=, $0, $pop104
 	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 4095
-	i32.le_s	$push18=, $pop102, $pop101
-	br_if   	0, $pop18       # 0: up to label19
+	i32.const	$push101=, 4094
+	i32.le_u	$push17=, $pop102, $pop101
+	br_if   	0, $pop17       # 0: up to label14
 # BB#6:                                 # %for.end14
 	end_loop
 	call    	f3@FUNCTION
 	call    	f4@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_7:                               # %for.body17
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label20:
+	loop    	                # label15:
 	i32.const	$push108=, c
-	i32.add 	$push22=, $1, $pop108
-	i32.load	$push23=, 0($pop22)
+	i32.add 	$push21=, $1, $pop108
+	i32.load	$push22=, 0($pop21)
 	i32.const	$push107=, a
-	i32.add 	$push19=, $1, $pop107
-	i32.load	$push20=, 0($pop19)
+	i32.add 	$push18=, $1, $pop107
+	i32.load	$push19=, 0($pop18)
 	i32.const	$push106=, 18
-	i32.div_s	$push21=, $pop20, $pop106
-	i32.ne  	$push24=, $pop23, $pop21
-	br_if   	2, $pop24       # 2: down to label17
+	i32.div_s	$push20=, $pop19, $pop106
+	i32.ne  	$push23=, $pop22, $pop20
+	br_if   	1, $pop23       # 1: down to label13
 # BB#8:                                 # %lor.lhs.false22
                                         #   in Loop: Header=BB12_7 Depth=1
 	i32.const	$push111=, d
-	i32.add 	$push28=, $1, $pop111
-	i32.load	$push29=, 0($pop28)
+	i32.add 	$push27=, $1, $pop111
+	i32.load	$push28=, 0($pop27)
 	i32.const	$push110=, b
-	i32.add 	$push25=, $1, $pop110
-	i32.load	$push26=, 0($pop25)
+	i32.add 	$push24=, $1, $pop110
+	i32.load	$push25=, 0($pop24)
 	i32.const	$push109=, 18
-	i32.div_u	$push27=, $pop26, $pop109
-	i32.ne  	$push30=, $pop29, $pop27
-	br_if   	2, $pop30       # 2: down to label17
+	i32.div_u	$push26=, $pop25, $pop109
+	i32.ne  	$push29=, $pop28, $pop26
+	br_if   	1, $pop29       # 1: down to label13
 # BB#9:                                 # %for.cond15
                                         #   in Loop: Header=BB12_7 Depth=1
 	i32.const	$push116=, 4
@@ -523,40 +518,40 @@ main:                                   # @main
 	i32.const	$push115=, 1
 	i32.add 	$push114=, $0, $pop115
 	tee_local	$push113=, $0=, $pop114
-	i32.const	$push112=, 4095
-	i32.le_s	$push31=, $pop113, $pop112
-	br_if   	0, $pop31       # 0: up to label20
+	i32.const	$push112=, 4094
+	i32.le_u	$push30=, $pop113, $pop112
+	br_if   	0, $pop30       # 0: up to label15
 # BB#10:                                # %for.end31
 	end_loop
 	call    	f5@FUNCTION
 	call    	f6@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_11:                              # %for.body34
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label21:
+	loop    	                # label16:
 	i32.const	$push119=, c
-	i32.add 	$push35=, $1, $pop119
-	i32.load	$push36=, 0($pop35)
+	i32.add 	$push34=, $1, $pop119
+	i32.load	$push35=, 0($pop34)
 	i32.const	$push118=, a
-	i32.add 	$push32=, $1, $pop118
-	i32.load	$push33=, 0($pop32)
+	i32.add 	$push31=, $1, $pop118
+	i32.load	$push32=, 0($pop31)
 	i32.const	$push117=, 19
-	i32.div_s	$push34=, $pop33, $pop117
-	i32.ne  	$push37=, $pop36, $pop34
-	br_if   	3, $pop37       # 3: down to label16
+	i32.div_s	$push33=, $pop32, $pop117
+	i32.ne  	$push36=, $pop35, $pop33
+	br_if   	1, $pop36       # 1: down to label13
 # BB#12:                                # %lor.lhs.false39
                                         #   in Loop: Header=BB12_11 Depth=1
 	i32.const	$push122=, d
-	i32.add 	$push41=, $1, $pop122
-	i32.load	$push42=, 0($pop41)
+	i32.add 	$push40=, $1, $pop122
+	i32.load	$push41=, 0($pop40)
 	i32.const	$push121=, b
-	i32.add 	$push38=, $1, $pop121
-	i32.load	$push39=, 0($pop38)
+	i32.add 	$push37=, $1, $pop121
+	i32.load	$push38=, 0($pop37)
 	i32.const	$push120=, 19
-	i32.div_u	$push40=, $pop39, $pop120
-	i32.ne  	$push43=, $pop42, $pop40
-	br_if   	3, $pop43       # 3: down to label16
+	i32.div_u	$push39=, $pop38, $pop120
+	i32.ne  	$push42=, $pop41, $pop39
+	br_if   	1, $pop42       # 1: down to label13
 # BB#13:                                # %for.cond32
                                         #   in Loop: Header=BB12_11 Depth=1
 	i32.const	$push127=, 4
@@ -564,40 +559,40 @@ main:                                   # @main
 	i32.const	$push126=, 1
 	i32.add 	$push125=, $0, $pop126
 	tee_local	$push124=, $0=, $pop125
-	i32.const	$push123=, 4095
-	i32.le_s	$push44=, $pop124, $pop123
-	br_if   	0, $pop44       # 0: up to label21
+	i32.const	$push123=, 4094
+	i32.le_u	$push43=, $pop124, $pop123
+	br_if   	0, $pop43       # 0: up to label16
 # BB#14:                                # %for.end48
 	end_loop
 	call    	f7@FUNCTION
 	call    	f8@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_15:                              # %for.body51
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label22:
+	loop    	                # label17:
 	i32.const	$push130=, c
-	i32.add 	$push48=, $1, $pop130
-	i32.load	$push49=, 0($pop48)
+	i32.add 	$push47=, $1, $pop130
+	i32.load	$push48=, 0($pop47)
 	i32.const	$push129=, a
-	i32.add 	$push45=, $1, $pop129
-	i32.load	$push46=, 0($pop45)
+	i32.add 	$push44=, $1, $pop129
+	i32.load	$push45=, 0($pop44)
 	i32.const	$push128=, 3
-	i32.div_s	$push47=, $pop46, $pop128
-	i32.ne  	$push50=, $pop49, $pop47
-	br_if   	4, $pop50       # 4: down to label15
+	i32.div_s	$push46=, $pop45, $pop128
+	i32.ne  	$push49=, $pop48, $pop46
+	br_if   	1, $pop49       # 1: down to label13
 # BB#16:                                # %lor.lhs.false56
                                         #   in Loop: Header=BB12_15 Depth=1
 	i32.const	$push133=, d
-	i32.add 	$push54=, $1, $pop133
-	i32.load	$push55=, 0($pop54)
+	i32.add 	$push53=, $1, $pop133
+	i32.load	$push54=, 0($pop53)
 	i32.const	$push132=, b
-	i32.add 	$push51=, $1, $pop132
-	i32.load	$push52=, 0($pop51)
+	i32.add 	$push50=, $1, $pop132
+	i32.load	$push51=, 0($pop50)
 	i32.const	$push131=, 3
-	i32.div_u	$push53=, $pop52, $pop131
-	i32.ne  	$push56=, $pop55, $pop53
-	br_if   	4, $pop56       # 4: down to label15
+	i32.div_u	$push52=, $pop51, $pop131
+	i32.ne  	$push55=, $pop54, $pop52
+	br_if   	1, $pop55       # 1: down to label13
 # BB#17:                                # %for.cond49
                                         #   in Loop: Header=BB12_15 Depth=1
 	i32.const	$push138=, 4
@@ -605,40 +600,40 @@ main:                                   # @main
 	i32.const	$push137=, 1
 	i32.add 	$push136=, $0, $pop137
 	tee_local	$push135=, $0=, $pop136
-	i32.const	$push134=, 4095
-	i32.le_s	$push57=, $pop135, $pop134
-	br_if   	0, $pop57       # 0: up to label22
+	i32.const	$push134=, 4094
+	i32.le_u	$push56=, $pop135, $pop134
+	br_if   	0, $pop56       # 0: up to label17
 # BB#18:                                # %for.end65
 	end_loop
 	call    	f9@FUNCTION
 	call    	f10@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_19:                              # %for.body68
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label23:
+	loop    	                # label18:
 	i32.const	$push141=, c
-	i32.add 	$push61=, $1, $pop141
-	i32.load	$push62=, 0($pop61)
+	i32.add 	$push60=, $1, $pop141
+	i32.load	$push61=, 0($pop60)
 	i32.const	$push140=, a
-	i32.add 	$push58=, $1, $pop140
-	i32.load	$push59=, 0($pop58)
+	i32.add 	$push57=, $1, $pop140
+	i32.load	$push58=, 0($pop57)
 	i32.const	$push139=, 18
-	i32.div_s	$push60=, $pop59, $pop139
-	i32.ne  	$push63=, $pop62, $pop60
-	br_if   	5, $pop63       # 5: down to label14
+	i32.div_s	$push59=, $pop58, $pop139
+	i32.ne  	$push62=, $pop61, $pop59
+	br_if   	1, $pop62       # 1: down to label13
 # BB#20:                                # %lor.lhs.false73
                                         #   in Loop: Header=BB12_19 Depth=1
 	i32.const	$push144=, d
-	i32.add 	$push67=, $1, $pop144
-	i32.load	$push68=, 0($pop67)
+	i32.add 	$push66=, $1, $pop144
+	i32.load	$push67=, 0($pop66)
 	i32.const	$push143=, b
-	i32.add 	$push64=, $1, $pop143
-	i32.load	$push65=, 0($pop64)
+	i32.add 	$push63=, $1, $pop143
+	i32.load	$push64=, 0($pop63)
 	i32.const	$push142=, 18
-	i32.div_u	$push66=, $pop65, $pop142
-	i32.ne  	$push69=, $pop68, $pop66
-	br_if   	5, $pop69       # 5: down to label14
+	i32.div_u	$push65=, $pop64, $pop142
+	i32.ne  	$push68=, $pop67, $pop65
+	br_if   	1, $pop68       # 1: down to label13
 # BB#21:                                # %for.cond66
                                         #   in Loop: Header=BB12_19 Depth=1
 	i32.const	$push149=, 4
@@ -646,40 +641,40 @@ main:                                   # @main
 	i32.const	$push148=, 1
 	i32.add 	$push147=, $0, $pop148
 	tee_local	$push146=, $0=, $pop147
-	i32.const	$push145=, 4095
-	i32.le_s	$push70=, $pop146, $pop145
-	br_if   	0, $pop70       # 0: up to label23
+	i32.const	$push145=, 4094
+	i32.le_u	$push69=, $pop146, $pop145
+	br_if   	0, $pop69       # 0: up to label18
 # BB#22:                                # %for.end82
 	end_loop
 	call    	f11@FUNCTION
 	call    	f12@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_23:                              # %for.body85
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label24:
+	loop    	                # label19:
 	i32.const	$push152=, c
-	i32.add 	$push74=, $1, $pop152
-	i32.load	$push75=, 0($pop74)
+	i32.add 	$push73=, $1, $pop152
+	i32.load	$push74=, 0($pop73)
 	i32.const	$push151=, a
-	i32.add 	$push71=, $1, $pop151
-	i32.load	$push72=, 0($pop71)
+	i32.add 	$push70=, $1, $pop151
+	i32.load	$push71=, 0($pop70)
 	i32.const	$push150=, 19
-	i32.div_s	$push73=, $pop72, $pop150
-	i32.ne  	$push76=, $pop75, $pop73
-	br_if   	6, $pop76       # 6: down to label13
+	i32.div_s	$push72=, $pop71, $pop150
+	i32.ne  	$push75=, $pop74, $pop72
+	br_if   	1, $pop75       # 1: down to label13
 # BB#24:                                # %lor.lhs.false90
                                         #   in Loop: Header=BB12_23 Depth=1
 	i32.const	$push155=, d
-	i32.add 	$push80=, $1, $pop155
-	i32.load	$push81=, 0($pop80)
+	i32.add 	$push79=, $1, $pop155
+	i32.load	$push80=, 0($pop79)
 	i32.const	$push154=, b
-	i32.add 	$push77=, $1, $pop154
-	i32.load	$push78=, 0($pop77)
+	i32.add 	$push76=, $1, $pop154
+	i32.load	$push77=, 0($pop76)
 	i32.const	$push153=, 19
-	i32.div_u	$push79=, $pop78, $pop153
-	i32.ne  	$push82=, $pop81, $pop79
-	br_if   	6, $pop82       # 6: down to label13
+	i32.div_u	$push78=, $pop77, $pop153
+	i32.ne  	$push81=, $pop80, $pop78
+	br_if   	1, $pop81       # 1: down to label13
 # BB#25:                                # %for.cond83
                                         #   in Loop: Header=BB12_23 Depth=1
 	i32.const	$push160=, 4
@@ -687,41 +682,21 @@ main:                                   # @main
 	i32.const	$push159=, 1
 	i32.add 	$push158=, $0, $pop159
 	tee_local	$push157=, $0=, $pop158
-	i32.const	$push156=, 4095
-	i32.le_s	$push83=, $pop157, $pop156
-	br_if   	0, $pop83       # 0: up to label24
+	i32.const	$push156=, 4094
+	i32.le_u	$push82=, $pop157, $pop156
+	br_if   	0, $pop82       # 0: up to label19
 # BB#26:                                # %for.end99
 	end_loop
-	i32.const	$push84=, 0
-	return  	$pop84
+	i32.const	$push83=, 0
+	return  	$pop83
 .LBB12_27:                              # %if.then
-	end_block                       # label18:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_28:                              # %if.then27
-	end_block                       # label17:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_29:                              # %if.then44
-	end_block                       # label16:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_30:                              # %if.then61
-	end_block                       # label15:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_31:                              # %if.then78
-	end_block                       # label14:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_32:                              # %if.then95
 	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -759,5 +734,5 @@ d:
 	.size	d, 16384
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51581-2.c.s b/test/torture-s/pr51581-2.c.s
index d8a5872b3..af293be3f 100644
--- a/test/torture-s/pr51581-2.c.s
+++ b/test/torture-s/pr51581-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51581-2.c"
+	.file	"pr51581-2.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -29,9 +29,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -59,9 +59,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -89,9 +89,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -119,9 +119,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -149,9 +149,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end4:
 	.size	f5, .Lfunc_end4-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -179,9 +179,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end5:
 	.size	f6, .Lfunc_end5-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -220,9 +220,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end6:
 	.size	f7, .Lfunc_end6-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -258,9 +258,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end7:
 	.size	f8, .Lfunc_end7-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
@@ -299,9 +299,9 @@ f9:                                     # @f9
 	.endfunc
 .Lfunc_end8:
 	.size	f9, .Lfunc_end8-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
@@ -337,9 +337,9 @@ f10:                                    # @f10
 	.endfunc
 .Lfunc_end9:
 	.size	f10, .Lfunc_end9-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
@@ -378,9 +378,9 @@ f11:                                    # @f11
 	.endfunc
 .Lfunc_end10:
 	.size	f11, .Lfunc_end10-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
@@ -423,9 +423,9 @@ f12:                                    # @f12
 	.endfunc
 .Lfunc_end11:
 	.size	f12, .Lfunc_end11-f12
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -439,20 +439,20 @@ main:                                   # @main
 	loop    	                # label12:
 	#APP
 	#NO_APP
-	i32.const	$push91=, b+16384
-	i32.add 	$push0=, $0, $pop91
+	i32.const	$push90=, b+16384
+	i32.add 	$push0=, $0, $pop90
 	i32.store	0($pop0), $1
-	i32.const	$push90=, a+16384
-	i32.add 	$push2=, $0, $pop90
-	i32.const	$push89=, -2048
-	i32.add 	$push1=, $1, $pop89
+	i32.const	$push89=, a+16384
+	i32.add 	$push2=, $0, $pop89
+	i32.const	$push88=, -2048
+	i32.add 	$push1=, $1, $pop88
 	i32.store	0($pop2), $pop1
-	i32.const	$push88=, 1
-	i32.add 	$1=, $1, $pop88
-	i32.const	$push87=, 4
-	i32.add 	$push86=, $0, $pop87
-	tee_local	$push85=, $0=, $pop86
-	br_if   	0, $pop85       # 0: up to label12
+	i32.const	$push87=, 1
+	i32.add 	$1=, $1, $pop87
+	i32.const	$push86=, 4
+	i32.add 	$push85=, $0, $pop86
+	tee_local	$push84=, $0=, $pop85
+	br_if   	0, $pop84       # 0: up to label12
 # BB#2:                                 # %for.end
 	end_loop
 	i32.const	$1=, 0
@@ -462,43 +462,38 @@ main:                                   # @main
 	i32.const	$push93=, 0
 	i64.const	$push4=, -9223372030412324864
 	i64.store	a($pop93), $pop4
+	i32.const	$0=, -1
 	i32.const	$push92=, 0
-	i32.const	$push5=, -1
-	i32.store	b+16380($pop92), $pop5
+	i32.const	$push91=, -1
+	i32.store	b+16380($pop92), $pop91
 	call    	f1@FUNCTION
 	call    	f2@FUNCTION
-	i32.const	$0=, 0
 .LBB12_3:                               # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	loop    	                # label19:
+	loop    	                # label14:
 	i32.const	$push97=, c
-	i32.add 	$push9=, $1, $pop97
-	i32.load	$push10=, 0($pop9)
+	i32.add 	$push8=, $1, $pop97
+	i32.load	$push9=, 0($pop8)
 	i32.const	$push96=, a
-	i32.add 	$push6=, $1, $pop96
-	i32.load	$push7=, 0($pop6)
+	i32.add 	$push5=, $1, $pop96
+	i32.load	$push6=, 0($pop5)
 	i32.const	$push95=, 3
-	i32.rem_s	$push8=, $pop7, $pop95
-	i32.ne  	$push11=, $pop10, $pop8
-	br_if   	1, $pop11       # 1: down to label18
+	i32.rem_s	$push7=, $pop6, $pop95
+	i32.ne  	$push10=, $pop9, $pop7
+	br_if   	1, $pop10       # 1: down to label13
 # BB#4:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB12_3 Depth=1
 	i32.const	$push100=, d
-	i32.add 	$push15=, $1, $pop100
-	i32.load	$push16=, 0($pop15)
+	i32.add 	$push14=, $1, $pop100
+	i32.load	$push15=, 0($pop14)
 	i32.const	$push99=, b
-	i32.add 	$push12=, $1, $pop99
-	i32.load	$push13=, 0($pop12)
+	i32.add 	$push11=, $1, $pop99
+	i32.load	$push12=, 0($pop11)
 	i32.const	$push98=, 3
-	i32.rem_u	$push14=, $pop13, $pop98
-	i32.ne  	$push17=, $pop16, $pop14
-	br_if   	1, $pop17       # 1: down to label18
+	i32.rem_u	$push13=, $pop12, $pop98
+	i32.ne  	$push16=, $pop15, $pop13
+	br_if   	1, $pop16       # 1: down to label13
 # BB#5:                                 # %for.cond2
                                         #   in Loop: Header=BB12_3 Depth=1
 	i32.const	$push105=, 4
@@ -506,40 +501,40 @@ main:                                   # @main
 	i32.const	$push104=, 1
 	i32.add 	$push103=, $0, $pop104
 	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 4095
-	i32.le_s	$push18=, $pop102, $pop101
-	br_if   	0, $pop18       # 0: up to label19
+	i32.const	$push101=, 4094
+	i32.le_u	$push17=, $pop102, $pop101
+	br_if   	0, $pop17       # 0: up to label14
 # BB#6:                                 # %for.end14
 	end_loop
 	call    	f3@FUNCTION
 	call    	f4@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_7:                               # %for.body17
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label20:
+	loop    	                # label15:
 	i32.const	$push108=, c
-	i32.add 	$push22=, $1, $pop108
-	i32.load	$push23=, 0($pop22)
+	i32.add 	$push21=, $1, $pop108
+	i32.load	$push22=, 0($pop21)
 	i32.const	$push107=, a
-	i32.add 	$push19=, $1, $pop107
-	i32.load	$push20=, 0($pop19)
+	i32.add 	$push18=, $1, $pop107
+	i32.load	$push19=, 0($pop18)
 	i32.const	$push106=, 18
-	i32.rem_s	$push21=, $pop20, $pop106
-	i32.ne  	$push24=, $pop23, $pop21
-	br_if   	2, $pop24       # 2: down to label17
+	i32.rem_s	$push20=, $pop19, $pop106
+	i32.ne  	$push23=, $pop22, $pop20
+	br_if   	1, $pop23       # 1: down to label13
 # BB#8:                                 # %lor.lhs.false22
                                         #   in Loop: Header=BB12_7 Depth=1
 	i32.const	$push111=, d
-	i32.add 	$push28=, $1, $pop111
-	i32.load	$push29=, 0($pop28)
+	i32.add 	$push27=, $1, $pop111
+	i32.load	$push28=, 0($pop27)
 	i32.const	$push110=, b
-	i32.add 	$push25=, $1, $pop110
-	i32.load	$push26=, 0($pop25)
+	i32.add 	$push24=, $1, $pop110
+	i32.load	$push25=, 0($pop24)
 	i32.const	$push109=, 18
-	i32.rem_u	$push27=, $pop26, $pop109
-	i32.ne  	$push30=, $pop29, $pop27
-	br_if   	2, $pop30       # 2: down to label17
+	i32.rem_u	$push26=, $pop25, $pop109
+	i32.ne  	$push29=, $pop28, $pop26
+	br_if   	1, $pop29       # 1: down to label13
 # BB#9:                                 # %for.cond15
                                         #   in Loop: Header=BB12_7 Depth=1
 	i32.const	$push116=, 4
@@ -547,40 +542,40 @@ main:                                   # @main
 	i32.const	$push115=, 1
 	i32.add 	$push114=, $0, $pop115
 	tee_local	$push113=, $0=, $pop114
-	i32.const	$push112=, 4095
-	i32.le_s	$push31=, $pop113, $pop112
-	br_if   	0, $pop31       # 0: up to label20
+	i32.const	$push112=, 4094
+	i32.le_u	$push30=, $pop113, $pop112
+	br_if   	0, $pop30       # 0: up to label15
 # BB#10:                                # %for.end31
 	end_loop
 	call    	f5@FUNCTION
 	call    	f6@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_11:                              # %for.body34
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label21:
+	loop    	                # label16:
 	i32.const	$push119=, c
-	i32.add 	$push35=, $1, $pop119
-	i32.load	$push36=, 0($pop35)
+	i32.add 	$push34=, $1, $pop119
+	i32.load	$push35=, 0($pop34)
 	i32.const	$push118=, a
-	i32.add 	$push32=, $1, $pop118
-	i32.load	$push33=, 0($pop32)
+	i32.add 	$push31=, $1, $pop118
+	i32.load	$push32=, 0($pop31)
 	i32.const	$push117=, 19
-	i32.rem_s	$push34=, $pop33, $pop117
-	i32.ne  	$push37=, $pop36, $pop34
-	br_if   	3, $pop37       # 3: down to label16
+	i32.rem_s	$push33=, $pop32, $pop117
+	i32.ne  	$push36=, $pop35, $pop33
+	br_if   	1, $pop36       # 1: down to label13
 # BB#12:                                # %lor.lhs.false39
                                         #   in Loop: Header=BB12_11 Depth=1
 	i32.const	$push122=, d
-	i32.add 	$push41=, $1, $pop122
-	i32.load	$push42=, 0($pop41)
+	i32.add 	$push40=, $1, $pop122
+	i32.load	$push41=, 0($pop40)
 	i32.const	$push121=, b
-	i32.add 	$push38=, $1, $pop121
-	i32.load	$push39=, 0($pop38)
+	i32.add 	$push37=, $1, $pop121
+	i32.load	$push38=, 0($pop37)
 	i32.const	$push120=, 19
-	i32.rem_u	$push40=, $pop39, $pop120
-	i32.ne  	$push43=, $pop42, $pop40
-	br_if   	3, $pop43       # 3: down to label16
+	i32.rem_u	$push39=, $pop38, $pop120
+	i32.ne  	$push42=, $pop41, $pop39
+	br_if   	1, $pop42       # 1: down to label13
 # BB#13:                                # %for.cond32
                                         #   in Loop: Header=BB12_11 Depth=1
 	i32.const	$push127=, 4
@@ -588,40 +583,40 @@ main:                                   # @main
 	i32.const	$push126=, 1
 	i32.add 	$push125=, $0, $pop126
 	tee_local	$push124=, $0=, $pop125
-	i32.const	$push123=, 4095
-	i32.le_s	$push44=, $pop124, $pop123
-	br_if   	0, $pop44       # 0: up to label21
+	i32.const	$push123=, 4094
+	i32.le_u	$push43=, $pop124, $pop123
+	br_if   	0, $pop43       # 0: up to label16
 # BB#14:                                # %for.end48
 	end_loop
 	call    	f7@FUNCTION
 	call    	f8@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_15:                              # %for.body51
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label22:
+	loop    	                # label17:
 	i32.const	$push130=, c
-	i32.add 	$push48=, $1, $pop130
-	i32.load	$push49=, 0($pop48)
+	i32.add 	$push47=, $1, $pop130
+	i32.load	$push48=, 0($pop47)
 	i32.const	$push129=, a
-	i32.add 	$push45=, $1, $pop129
-	i32.load	$push46=, 0($pop45)
+	i32.add 	$push44=, $1, $pop129
+	i32.load	$push45=, 0($pop44)
 	i32.const	$push128=, 3
-	i32.rem_s	$push47=, $pop46, $pop128
-	i32.ne  	$push50=, $pop49, $pop47
-	br_if   	4, $pop50       # 4: down to label15
+	i32.rem_s	$push46=, $pop45, $pop128
+	i32.ne  	$push49=, $pop48, $pop46
+	br_if   	1, $pop49       # 1: down to label13
 # BB#16:                                # %lor.lhs.false56
                                         #   in Loop: Header=BB12_15 Depth=1
 	i32.const	$push133=, d
-	i32.add 	$push54=, $1, $pop133
-	i32.load	$push55=, 0($pop54)
+	i32.add 	$push53=, $1, $pop133
+	i32.load	$push54=, 0($pop53)
 	i32.const	$push132=, b
-	i32.add 	$push51=, $1, $pop132
-	i32.load	$push52=, 0($pop51)
+	i32.add 	$push50=, $1, $pop132
+	i32.load	$push51=, 0($pop50)
 	i32.const	$push131=, 3
-	i32.rem_u	$push53=, $pop52, $pop131
-	i32.ne  	$push56=, $pop55, $pop53
-	br_if   	4, $pop56       # 4: down to label15
+	i32.rem_u	$push52=, $pop51, $pop131
+	i32.ne  	$push55=, $pop54, $pop52
+	br_if   	1, $pop55       # 1: down to label13
 # BB#17:                                # %for.cond49
                                         #   in Loop: Header=BB12_15 Depth=1
 	i32.const	$push138=, 4
@@ -629,40 +624,40 @@ main:                                   # @main
 	i32.const	$push137=, 1
 	i32.add 	$push136=, $0, $pop137
 	tee_local	$push135=, $0=, $pop136
-	i32.const	$push134=, 4095
-	i32.le_s	$push57=, $pop135, $pop134
-	br_if   	0, $pop57       # 0: up to label22
+	i32.const	$push134=, 4094
+	i32.le_u	$push56=, $pop135, $pop134
+	br_if   	0, $pop56       # 0: up to label17
 # BB#18:                                # %for.end65
 	end_loop
 	call    	f9@FUNCTION
 	call    	f10@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_19:                              # %for.body68
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label23:
+	loop    	                # label18:
 	i32.const	$push141=, c
-	i32.add 	$push61=, $1, $pop141
-	i32.load	$push62=, 0($pop61)
+	i32.add 	$push60=, $1, $pop141
+	i32.load	$push61=, 0($pop60)
 	i32.const	$push140=, a
-	i32.add 	$push58=, $1, $pop140
-	i32.load	$push59=, 0($pop58)
+	i32.add 	$push57=, $1, $pop140
+	i32.load	$push58=, 0($pop57)
 	i32.const	$push139=, 18
-	i32.rem_s	$push60=, $pop59, $pop139
-	i32.ne  	$push63=, $pop62, $pop60
-	br_if   	5, $pop63       # 5: down to label14
+	i32.rem_s	$push59=, $pop58, $pop139
+	i32.ne  	$push62=, $pop61, $pop59
+	br_if   	1, $pop62       # 1: down to label13
 # BB#20:                                # %lor.lhs.false73
                                         #   in Loop: Header=BB12_19 Depth=1
 	i32.const	$push144=, d
-	i32.add 	$push67=, $1, $pop144
-	i32.load	$push68=, 0($pop67)
+	i32.add 	$push66=, $1, $pop144
+	i32.load	$push67=, 0($pop66)
 	i32.const	$push143=, b
-	i32.add 	$push64=, $1, $pop143
-	i32.load	$push65=, 0($pop64)
+	i32.add 	$push63=, $1, $pop143
+	i32.load	$push64=, 0($pop63)
 	i32.const	$push142=, 18
-	i32.rem_u	$push66=, $pop65, $pop142
-	i32.ne  	$push69=, $pop68, $pop66
-	br_if   	5, $pop69       # 5: down to label14
+	i32.rem_u	$push65=, $pop64, $pop142
+	i32.ne  	$push68=, $pop67, $pop65
+	br_if   	1, $pop68       # 1: down to label13
 # BB#21:                                # %for.cond66
                                         #   in Loop: Header=BB12_19 Depth=1
 	i32.const	$push149=, 4
@@ -670,40 +665,40 @@ main:                                   # @main
 	i32.const	$push148=, 1
 	i32.add 	$push147=, $0, $pop148
 	tee_local	$push146=, $0=, $pop147
-	i32.const	$push145=, 4095
-	i32.le_s	$push70=, $pop146, $pop145
-	br_if   	0, $pop70       # 0: up to label23
+	i32.const	$push145=, 4094
+	i32.le_u	$push69=, $pop146, $pop145
+	br_if   	0, $pop69       # 0: up to label18
 # BB#22:                                # %for.end82
 	end_loop
 	call    	f11@FUNCTION
 	call    	f12@FUNCTION
+	i32.const	$0=, -1
 	i32.const	$1=, 0
-	i32.const	$0=, 0
 .LBB12_23:                              # %for.body85
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label24:
+	loop    	                # label19:
 	i32.const	$push152=, c
-	i32.add 	$push74=, $1, $pop152
-	i32.load	$push75=, 0($pop74)
+	i32.add 	$push73=, $1, $pop152
+	i32.load	$push74=, 0($pop73)
 	i32.const	$push151=, a
-	i32.add 	$push71=, $1, $pop151
-	i32.load	$push72=, 0($pop71)
+	i32.add 	$push70=, $1, $pop151
+	i32.load	$push71=, 0($pop70)
 	i32.const	$push150=, 19
-	i32.rem_s	$push73=, $pop72, $pop150
-	i32.ne  	$push76=, $pop75, $pop73
-	br_if   	6, $pop76       # 6: down to label13
+	i32.rem_s	$push72=, $pop71, $pop150
+	i32.ne  	$push75=, $pop74, $pop72
+	br_if   	1, $pop75       # 1: down to label13
 # BB#24:                                # %lor.lhs.false90
                                         #   in Loop: Header=BB12_23 Depth=1
 	i32.const	$push155=, d
-	i32.add 	$push80=, $1, $pop155
-	i32.load	$push81=, 0($pop80)
+	i32.add 	$push79=, $1, $pop155
+	i32.load	$push80=, 0($pop79)
 	i32.const	$push154=, b
-	i32.add 	$push77=, $1, $pop154
-	i32.load	$push78=, 0($pop77)
+	i32.add 	$push76=, $1, $pop154
+	i32.load	$push77=, 0($pop76)
 	i32.const	$push153=, 19
-	i32.rem_u	$push79=, $pop78, $pop153
-	i32.ne  	$push82=, $pop81, $pop79
-	br_if   	6, $pop82       # 6: down to label13
+	i32.rem_u	$push78=, $pop77, $pop153
+	i32.ne  	$push81=, $pop80, $pop78
+	br_if   	1, $pop81       # 1: down to label13
 # BB#25:                                # %for.cond83
                                         #   in Loop: Header=BB12_23 Depth=1
 	i32.const	$push160=, 4
@@ -711,41 +706,21 @@ main:                                   # @main
 	i32.const	$push159=, 1
 	i32.add 	$push158=, $0, $pop159
 	tee_local	$push157=, $0=, $pop158
-	i32.const	$push156=, 4095
-	i32.le_s	$push83=, $pop157, $pop156
-	br_if   	0, $pop83       # 0: up to label24
+	i32.const	$push156=, 4094
+	i32.le_u	$push82=, $pop157, $pop156
+	br_if   	0, $pop82       # 0: up to label19
 # BB#26:                                # %for.end99
 	end_loop
-	i32.const	$push84=, 0
-	return  	$pop84
+	i32.const	$push83=, 0
+	return  	$pop83
 .LBB12_27:                              # %if.then
-	end_block                       # label18:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_28:                              # %if.then27
-	end_block                       # label17:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_29:                              # %if.then44
-	end_block                       # label16:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_30:                              # %if.then61
-	end_block                       # label15:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_31:                              # %if.then78
-	end_block                       # label14:
-	call    	abort@FUNCTION
-	unreachable
-.LBB12_32:                              # %if.then95
 	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	main, .Lfunc_end12-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -783,5 +758,5 @@ d:
 	.size	d, 16384
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51877.c.s b/test/torture-s/pr51877.c.s
index a31c82f10..7a19293f8 100644
--- a/test/torture-s/pr51877.c.s
+++ b/test/torture-s/pr51877.c.s
@@ -1,33 +1,44 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51877.c"
+	.file	"pr51877.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
 # BB#0:                                 # %entry
 	i32.store8	4($0), $1
-	i32.const	$push0=, 0
-	i32.load	$push1=, bar.n($pop0)
-	i32.const	$push2=, 1
-	i32.add 	$push9=, $pop1, $pop2
-	tee_local	$push8=, $1=, $pop9
-	i32.store	0($0), $pop8
-	i32.const	$push7=, 0
-	i32.store	bar.n($pop7), $1
-	i32.const	$push3=, 5
+	i32.const	$push0=, 28
+	i32.add 	$push1=, $0, $pop0
+	i64.const	$push2=, 0
+	i64.store	0($pop1):p2align=0, $pop2
+	i32.const	$push3=, 21
 	i32.add 	$push4=, $0, $pop3
-	i32.const	$push6=, 0
-	i32.const	$push5=, 31
-	i32.call	$drop=, memset@FUNCTION, $pop4, $pop6, $pop5
+	i64.const	$push17=, 0
+	i64.store	0($pop4):p2align=0, $pop17
+	i32.const	$push5=, 13
+	i32.add 	$push6=, $0, $pop5
+	i64.const	$push16=, 0
+	i64.store	0($pop6):p2align=0, $pop16
+	i32.const	$push7=, 5
+	i32.add 	$push8=, $0, $pop7
+	i64.const	$push15=, 0
+	i64.store	0($pop8):p2align=0, $pop15
+	i32.const	$push9=, 0
+	i32.load	$push10=, bar.n($pop9)
+	i32.const	$push11=, 1
+	i32.add 	$push14=, $pop10, $pop11
+	tee_local	$push13=, $1=, $pop14
+	i32.store	0($0), $pop13
+	i32.const	$push12=, 0
+	i32.store	bar.n($pop12), $1
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -38,184 +49,272 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 80
-	i32.sub 	$push19=, $pop8, $pop9
-	tee_local	$push18=, $2=, $pop19
-	i32.store	__stack_pointer($pop10), $pop18
+	i32.const	$push38=, 0
+	i32.const	$push36=, 0
+	i32.load	$push35=, __stack_pointer($pop36)
+	i32.const	$push37=, 80
+	i32.sub 	$push45=, $pop35, $pop37
+	tee_local	$push44=, $2=, $pop45
+	i32.store	__stack_pointer($pop38), $pop44
 	block   	
 	block   	
 	i32.const	$push0=, 6
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %if.then
-	i32.const	$push14=, 40
-	i32.add 	$push15=, $2, $pop14
-	i32.const	$push4=, 7
-	call    	bar@FUNCTION, $pop15, $pop4
-	i32.const	$push6=, a
-	i32.const	$push16=, 40
-	i32.add 	$push17=, $2, $pop16
-	i32.const	$push5=, 36
-	i32.call	$drop=, memcpy@FUNCTION, $pop6, $pop17, $pop5
+	i32.const	$push42=, 40
+	i32.add 	$push43=, $2, $pop42
+	i32.const	$push20=, 7
+	call    	bar@FUNCTION, $pop43, $pop20
+	i32.const	$push24=, 0
+	i32.const	$push21=, 72
+	i32.add 	$push22=, $2, $pop21
+	i32.load	$push23=, 0($pop22)
+	i32.store	a+32($pop24), $pop23
+	i32.const	$push49=, 0
+	i32.const	$push25=, 64
+	i32.add 	$push26=, $2, $pop25
+	i64.load	$push27=, 0($pop26)
+	i64.store	a+24($pop49):p2align=2, $pop27
+	i32.const	$push48=, 0
+	i32.const	$push28=, 56
+	i32.add 	$push29=, $2, $pop28
+	i64.load	$push30=, 0($pop29)
+	i64.store	a+16($pop48):p2align=2, $pop30
+	i32.const	$push47=, 0
+	i32.const	$push31=, 48
+	i32.add 	$push32=, $2, $pop31
+	i64.load	$push33=, 0($pop32)
+	i64.store	a+8($pop47):p2align=2, $pop33
+	i32.const	$push46=, 0
+	i64.load	$push34=, 40($2)
+	i64.store	a($pop46):p2align=2, $pop34
 	br      	1               # 1: down to label0
 .LBB2_2:                                # %if.else
 	end_block                       # label1:
 	i32.const	$push2=, 7
 	call    	bar@FUNCTION, $2, $pop2
-	i32.const	$push3=, 36
-	i32.call	$drop=, memcpy@FUNCTION, $0, $2, $pop3
+	i32.const	$push3=, 32
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push53=, 32
+	i32.add 	$push5=, $2, $pop53
+	i32.load	$push6=, 0($pop5)
+	i32.store	0($pop4), $pop6
+	i32.const	$push7=, 24
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push52=, 24
+	i32.add 	$push9=, $2, $pop52
+	i64.load	$push10=, 0($pop9)
+	i64.store	0($pop8):p2align=2, $pop10
+	i32.const	$push11=, 16
+	i32.add 	$push12=, $0, $pop11
+	i32.const	$push51=, 16
+	i32.add 	$push13=, $2, $pop51
+	i64.load	$push14=, 0($pop13)
+	i64.store	0($pop12):p2align=2, $pop14
+	i32.const	$push15=, 8
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push50=, 8
+	i32.add 	$push17=, $2, $pop50
+	i64.load	$push18=, 0($pop17)
+	i64.store	0($pop16):p2align=2, $pop18
+	i64.load	$push19=, 0($2)
+	i64.store	0($0):p2align=2, $pop19
 .LBB2_3:                                # %if.end
 	end_block                       # label0:
 	call    	baz@FUNCTION
-	i32.const	$push13=, 0
-	i32.const	$push11=, 80
-	i32.add 	$push12=, $2, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push41=, 0
+	i32.const	$push39=, 80
+	i32.add 	$push40=, $2, $pop39
+	i32.store	__stack_pointer($pop41), $pop40
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	foo, .Lfunc_end2-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push50=, 0
-	i32.const	$push47=, 0
-	i32.load	$push48=, __stack_pointer($pop47)
-	i32.const	$push49=, 80
-	i32.sub 	$push62=, $pop48, $pop49
-	tee_local	$push61=, $0=, $pop62
-	i32.store	__stack_pointer($pop50), $pop61
-	i32.const	$push54=, 40
-	i32.add 	$push55=, $0, $pop54
-	i32.const	$push60=, 3
-	call    	bar@FUNCTION, $pop55, $pop60
-	i32.const	$push1=, a
-	i32.const	$push56=, 40
-	i32.add 	$push57=, $0, $pop56
-	i32.const	$push0=, 36
-	i32.call	$drop=, memcpy@FUNCTION, $pop1, $pop57, $pop0
-	i32.const	$push2=, 4
-	call    	bar@FUNCTION, $0, $pop2
-	i32.const	$push3=, b
-	i32.const	$push59=, 36
-	i32.call	$drop=, memcpy@FUNCTION, $pop3, $0, $pop59
+	i32.const	$push69=, 0
+	i32.const	$push67=, 0
+	i32.load	$push66=, __stack_pointer($pop67)
+	i32.const	$push68=, 80
+	i32.sub 	$push100=, $pop66, $pop68
+	tee_local	$push99=, $0=, $pop100
+	i32.store	__stack_pointer($pop69), $pop99
+	i32.const	$push73=, 40
+	i32.add 	$push74=, $0, $pop73
+	i32.const	$push98=, 3
+	call    	bar@FUNCTION, $pop74, $pop98
+	i32.const	$push97=, 0
+	i32.const	$push75=, 40
+	i32.add 	$push76=, $0, $pop75
+	i32.const	$push0=, 32
+	i32.add 	$push1=, $pop76, $pop0
+	i32.load	$push2=, 0($pop1)
+	i32.store	a+32($pop97), $pop2
+	i32.const	$push96=, 0
+	i32.const	$push77=, 40
+	i32.add 	$push78=, $0, $pop77
+	i32.const	$push3=, 24
+	i32.add 	$push4=, $pop78, $pop3
+	i64.load	$push5=, 0($pop4)
+	i64.store	a+24($pop96):p2align=2, $pop5
+	i32.const	$push95=, 0
+	i32.const	$push79=, 40
+	i32.add 	$push80=, $0, $pop79
+	i32.const	$push6=, 16
+	i32.add 	$push7=, $pop80, $pop6
+	i64.load	$push8=, 0($pop7)
+	i64.store	a+16($pop95):p2align=2, $pop8
+	i32.const	$push94=, 0
+	i32.const	$push81=, 40
+	i32.add 	$push82=, $0, $pop81
+	i32.const	$push9=, 8
+	i32.add 	$push10=, $pop82, $pop9
+	i64.load	$push11=, 0($pop10)
+	i64.store	a+8($pop94):p2align=2, $pop11
+	i32.const	$push93=, 0
+	i64.load	$push12=, 40($0)
+	i64.store	a($pop93):p2align=2, $pop12
+	i32.const	$push13=, 4
+	call    	bar@FUNCTION, $0, $pop13
+	i32.const	$push92=, 0
+	i32.const	$push91=, 32
+	i32.add 	$push14=, $0, $pop91
+	i32.load	$push15=, 0($pop14)
+	i32.store	b+32($pop92), $pop15
+	i32.const	$push90=, 0
+	i32.const	$push89=, 24
+	i32.add 	$push16=, $0, $pop89
+	i64.load	$push17=, 0($pop16)
+	i64.store	b+24($pop90):p2align=2, $pop17
+	i32.const	$push88=, 0
+	i32.const	$push87=, 16
+	i32.add 	$push18=, $0, $pop87
+	i64.load	$push19=, 0($pop18)
+	i64.store	b+16($pop88):p2align=2, $pop19
+	i32.const	$push86=, 0
+	i32.const	$push85=, 8
+	i32.add 	$push20=, $0, $pop85
+	i64.load	$push21=, 0($pop20)
+	i64.store	b+8($pop86):p2align=2, $pop21
+	i32.const	$push84=, 0
+	i64.load	$push22=, 0($0)
+	i64.store	b($pop84):p2align=2, $pop22
 	block   	
-	i32.const	$push58=, 0
-	i32.load	$push4=, a($pop58)
-	i32.const	$push5=, 1
-	i32.ne  	$push6=, $pop4, $pop5
-	br_if   	0, $pop6        # 0: down to label2
+	i32.const	$push83=, 0
+	i32.load	$push23=, a($pop83)
+	i32.const	$push24=, 1
+	i32.ne  	$push25=, $pop23, $pop24
+	br_if   	0, $pop25       # 0: down to label2
 # BB#1:                                 # %lor.lhs.false
-	i32.const	$push64=, 0
-	i32.load8_u	$push9=, a+4($pop64)
-	i32.const	$push63=, 3
-	i32.ne  	$push10=, $pop9, $pop63
-	br_if   	0, $pop10       # 0: down to label2
+	i32.const	$push102=, 0
+	i32.load8_u	$push28=, a+4($pop102)
+	i32.const	$push101=, 3
+	i32.ne  	$push29=, $pop28, $pop101
+	br_if   	0, $pop29       # 0: down to label2
 # BB#2:                                 # %lor.lhs.false
-	i32.const	$push65=, 0
-	i32.load	$push7=, b($pop65)
-	i32.const	$push11=, 2
-	i32.ne  	$push12=, $pop7, $pop11
-	br_if   	0, $pop12       # 0: down to label2
+	i32.const	$push103=, 0
+	i32.load	$push26=, b($pop103)
+	i32.const	$push30=, 2
+	i32.ne  	$push31=, $pop26, $pop30
+	br_if   	0, $pop31       # 0: down to label2
 # BB#3:                                 # %lor.lhs.false
-	i32.const	$push66=, 0
-	i32.load8_u	$push8=, b+4($pop66)
-	i32.const	$push13=, 255
-	i32.and 	$push14=, $pop8, $pop13
-	i32.const	$push15=, 4
-	i32.ne  	$push16=, $pop14, $pop15
-	br_if   	0, $pop16       # 0: down to label2
+	i32.const	$push104=, 0
+	i32.load8_u	$push27=, b+4($pop104)
+	i32.const	$push32=, 255
+	i32.and 	$push33=, $pop27, $pop32
+	i32.const	$push34=, 4
+	i32.ne  	$push35=, $pop33, $pop34
+	br_if   	0, $pop35       # 0: down to label2
 # BB#4:                                 # %if.end
-	i32.const	$push17=, b
-	i32.const	$push68=, 0
-	call    	foo@FUNCTION, $pop17, $pop68
-	i32.const	$push67=, 0
-	i32.load	$push18=, a($pop67)
-	i32.const	$push19=, 1
-	i32.ne  	$push20=, $pop18, $pop19
-	br_if   	0, $pop20       # 0: down to label2
+	i32.const	$push36=, b
+	i32.const	$push106=, 0
+	call    	foo@FUNCTION, $pop36, $pop106
+	i32.const	$push105=, 0
+	i32.load	$push37=, a($pop105)
+	i32.const	$push38=, 1
+	i32.ne  	$push39=, $pop37, $pop38
+	br_if   	0, $pop39       # 0: down to label2
 # BB#5:                                 # %lor.lhs.false13
-	i32.const	$push70=, 0
-	i32.load8_u	$push23=, a+4($pop70)
-	i32.const	$push69=, 3
-	i32.ne  	$push24=, $pop23, $pop69
-	br_if   	0, $pop24       # 0: down to label2
+	i32.const	$push108=, 0
+	i32.load8_u	$push42=, a+4($pop108)
+	i32.const	$push107=, 3
+	i32.ne  	$push43=, $pop42, $pop107
+	br_if   	0, $pop43       # 0: down to label2
 # BB#6:                                 # %lor.lhs.false13
-	i32.const	$push72=, 0
-	i32.load	$push21=, b($pop72)
-	i32.const	$push71=, 3
-	i32.ne  	$push25=, $pop21, $pop71
-	br_if   	0, $pop25       # 0: down to label2
+	i32.const	$push110=, 0
+	i32.load	$push40=, b($pop110)
+	i32.const	$push109=, 3
+	i32.ne  	$push44=, $pop40, $pop109
+	br_if   	0, $pop44       # 0: down to label2
 # BB#7:                                 # %lor.lhs.false13
-	i32.const	$push73=, 0
-	i32.load8_u	$push22=, b+4($pop73)
-	i32.const	$push26=, 255
-	i32.and 	$push27=, $pop22, $pop26
-	i32.const	$push28=, 7
-	i32.ne  	$push29=, $pop27, $pop28
-	br_if   	0, $pop29       # 0: down to label2
+	i32.const	$push111=, 0
+	i32.load8_u	$push41=, b+4($pop111)
+	i32.const	$push45=, 255
+	i32.and 	$push46=, $pop41, $pop45
+	i32.const	$push47=, 7
+	i32.ne  	$push48=, $pop46, $pop47
+	br_if   	0, $pop48       # 0: down to label2
 # BB#8:                                 # %if.end25
-	i32.const	$push31=, b
-	i32.const	$push30=, 6
-	call    	foo@FUNCTION, $pop31, $pop30
-	i32.const	$push74=, 0
-	i32.load	$push32=, a($pop74)
-	i32.const	$push33=, 4
-	i32.ne  	$push34=, $pop32, $pop33
-	br_if   	0, $pop34       # 0: down to label2
+	i32.const	$push50=, b
+	i32.const	$push49=, 6
+	call    	foo@FUNCTION, $pop50, $pop49
+	i32.const	$push112=, 0
+	i32.load	$push51=, a($pop112)
+	i32.const	$push52=, 4
+	i32.ne  	$push53=, $pop51, $pop52
+	br_if   	0, $pop53       # 0: down to label2
 # BB#9:                                 # %lor.lhs.false28
-	i32.const	$push75=, 0
-	i32.load8_u	$push37=, a+4($pop75)
-	i32.const	$push38=, 7
-	i32.ne  	$push39=, $pop37, $pop38
-	br_if   	0, $pop39       # 0: down to label2
+	i32.const	$push113=, 0
+	i32.load8_u	$push56=, a+4($pop113)
+	i32.const	$push57=, 7
+	i32.ne  	$push58=, $pop56, $pop57
+	br_if   	0, $pop58       # 0: down to label2
 # BB#10:                                # %lor.lhs.false28
-	i32.const	$push76=, 0
-	i32.load	$push35=, b($pop76)
-	i32.const	$push40=, 3
-	i32.ne  	$push41=, $pop35, $pop40
-	br_if   	0, $pop41       # 0: down to label2
+	i32.const	$push114=, 0
+	i32.load	$push54=, b($pop114)
+	i32.const	$push59=, 3
+	i32.ne  	$push60=, $pop54, $pop59
+	br_if   	0, $pop60       # 0: down to label2
 # BB#11:                                # %lor.lhs.false28
-	i32.const	$push77=, 0
-	i32.load8_u	$push36=, b+4($pop77)
-	i32.const	$push42=, 255
-	i32.and 	$push43=, $pop36, $pop42
-	i32.const	$push44=, 7
-	i32.ne  	$push45=, $pop43, $pop44
-	br_if   	0, $pop45       # 0: down to label2
+	i32.const	$push115=, 0
+	i32.load8_u	$push55=, b+4($pop115)
+	i32.const	$push61=, 255
+	i32.and 	$push62=, $pop55, $pop61
+	i32.const	$push63=, 7
+	i32.ne  	$push64=, $pop62, $pop63
+	br_if   	0, $pop64       # 0: down to label2
 # BB#12:                                # %if.end40
-	i32.const	$push53=, 0
-	i32.const	$push51=, 80
-	i32.add 	$push52=, $0, $pop51
-	i32.store	__stack_pointer($pop53), $pop52
-	i32.const	$push46=, 0
-	return  	$pop46
-.LBB3_13:                               # %if.then39
+	i32.const	$push72=, 0
+	i32.const	$push70=, 80
+	i32.add 	$push71=, $0, $pop70
+	i32.store	__stack_pointer($pop72), $pop71
+	i32.const	$push65=, 0
+	return  	$pop65
+.LBB3_13:                               # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	bar.n,@object           # @bar.n
 	.section	.bss.bar.n,"aw",@nobits
 	.p2align	2
@@ -242,5 +341,5 @@ b:
 	.size	b, 36
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51933.c.s b/test/torture-s/pr51933.c.s
index c762d62cd..62c6d8c5f 100644
--- a/test/torture-s/pr51933.c.s
+++ b/test/torture-s/pr51933.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr51933.c"
+	.file	"pr51933.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -12,9 +12,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,7 +28,7 @@ bar:                                    # @bar
 	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %if.then
 	call    	foo@FUNCTION
-.LBB1_2:                                # %for.cond.preheader
+.LBB1_2:                                # %if.end
 	end_block                       # label0:
 	block   	
 	i32.const	$push11=, 1
@@ -72,90 +72,70 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push24=, 0
-	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
-	i32.const	$push23=, 80
-	i32.sub 	$push33=, $pop22, $pop23
-	tee_local	$push32=, $2=, $pop33
-	i32.store	__stack_pointer($pop24), $pop32
+	i32.const	$push16=, 0
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 80
+	i32.sub 	$push25=, $pop13, $pop15
+	tee_local	$push24=, $2=, $pop25
+	i32.store	__stack_pointer($pop16), $pop24
 	i32.const	$1=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push39=, v3
-	i32.add 	$push0=, $1, $pop39
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $1, $pop38
-	tee_local	$push36=, $0=, $pop37
-	i32.store8	0($pop0), $pop36
-	i32.const	$push35=, v2
-	i32.add 	$push1=, $1, $pop35
+	i32.const	$push31=, v3
+	i32.add 	$push0=, $1, $pop31
+	i32.const	$push30=, 1
+	i32.add 	$push29=, $1, $pop30
+	tee_local	$push28=, $0=, $pop29
+	i32.store8	0($pop0), $pop28
+	i32.const	$push27=, v2
+	i32.add 	$push1=, $1, $pop27
 	i32.store8	0($pop1), $1
 	copy_local	$1=, $0
-	i32.const	$push34=, 256
-	i32.ne  	$push2=, $0, $pop34
+	i32.const	$push26=, 256
+	i32.ne  	$push2=, $0, $pop26
 	br_if   	0, $pop2        # 0: up to label3
-# BB#2:                                 # %for.body6.preheader
+# BB#2:                                 # %for.end
 	end_loop
-	i32.const	$push3=, 101
-	i32.store16	8($2), $pop3
-	i64.const	$push4=, 28147922879250529
-	i64.store	0($2), $pop4
-	i32.const	$push5=, 104
-	i32.store16	14($2), $pop5
-	i32.const	$push6=, 105
-	i32.store16	16($2), $pop6
-	i32.const	$push7=, 106
-	i32.store16	18($2), $pop7
-	i32.const	$push8=, 107
-	i32.store16	20($2), $pop8
-	i32.const	$push9=, 109
-	i32.store16	24($2), $pop9
-	i32.const	$push10=, 110
-	i32.store16	26($2), $pop10
-	i32.const	$push11=, 111
-	i32.store16	28($2), $pop11
-	i32.const	$push12=, 113
-	i32.store16	32($2), $pop12
-	i32.const	$push40=, 0
-	i32.store16	34($2), $pop40
-	i32.const	$push13=, 1638
-	i32.store16	10($2), $pop13
-	i32.const	$push14=, 1383
-	i32.store16	12($2), $pop14
-	i32.const	$push15=, 8300
-	i32.store16	22($2), $pop15
-	i32.const	$push16=, 1392
-	i32.store16	30($2), $pop16
+	i64.const	$push3=, 28147922879250529
+	i64.store	0($2), $pop3
+	i32.const	$push4=, 113
+	i32.store	32($2), $pop4
+	i64.const	$push5=, 29279337625026661
+	i64.store	8($2), $pop5
+	i64.const	$push6=, 2336242766266892393
+	i64.store	16($2), $pop6
+	i64.const	$push7=, 391813644329812077
+	i64.store	24($2), $pop7
 	call    	foo@FUNCTION
-	i32.const	$push17=, 17
-	i32.const	$push28=, 48
-	i32.add 	$push29=, $2, $pop28
-	i32.call	$drop=, bar@FUNCTION, $pop17, $2, $pop29
+	i32.const	$push8=, 17
+	i32.const	$push20=, 48
+	i32.add 	$push21=, $2, $pop20
+	i32.call	$drop=, bar@FUNCTION, $pop8, $2, $pop21
 	block   	
-	i32.const	$push30=, 48
-	i32.add 	$push31=, $2, $pop30
-	i32.const	$push19=, .L.str
-	i32.const	$push18=, 18
-	i32.call	$push20=, memcmp@FUNCTION, $pop31, $pop19, $pop18
-	br_if   	0, $pop20       # 0: down to label4
+	i32.const	$push22=, 48
+	i32.add 	$push23=, $2, $pop22
+	i32.const	$push10=, .L.str
+	i32.const	$push9=, 18
+	i32.call	$push11=, memcmp@FUNCTION, $pop23, $pop10, $pop9
+	br_if   	0, $pop11       # 0: down to label4
 # BB#3:                                 # %if.end
-	i32.const	$push27=, 0
-	i32.const	$push25=, 80
-	i32.add 	$push26=, $2, $pop25
-	i32.store	__stack_pointer($pop27), $pop26
-	i32.const	$push41=, 0
-	return  	$pop41
+	i32.const	$push19=, 0
+	i32.const	$push17=, 80
+	i32.add 	$push18=, $2, $pop17
+	i32.store	__stack_pointer($pop19), $pop18
+	i32.const	$push12=, 0
+	return  	$pop12
 .LBB2_4:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
@@ -163,7 +143,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	v1,@object              # @v1
 	.section	.bss.v1,"aw",@nobits
 v1:
@@ -191,6 +171,6 @@ v3:
 	.size	.L.str, 18
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr52129.c.s b/test/torture-s/pr52129.c.s
index 973ee0821..8496969e3 100644
--- a/test/torture-s/pr52129.c.s
+++ b/test/torture-s/pr52129.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52129.c"
+	.file	"pr52129.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -40,9 +40,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -51,14 +51,14 @@ bar:                                    # @bar
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $6=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i64.load	$push0=, 0($3):p2align=2
-	i64.store	8($6):p2align=2, $pop0
+	i64.store	8($6), $pop0
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $6, $pop11
 	i32.add 	$push14=, $5, $4
@@ -75,9 +75,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -85,15 +85,15 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push16=, $pop6, $pop7
+	i32.sub 	$push16=, $pop5, $pop7
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop8), $pop15
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.s($pop0):p2align=2
-	i64.store	8($0):p2align=2, $pop1
+	i64.store	8($0), $pop1
 	i32.const	$push4=, t+2
 	i32.const	$push12=, 8
 	i32.add 	$push13=, $0, $pop12
@@ -109,7 +109,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -127,5 +127,5 @@ t:
 	.size	.Lmain.s, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52209.c.s b/test/torture-s/pr52209.c.s
index 8a2ea9f29..13c374a35 100644
--- a/test/torture-s/pr52209.c.s
+++ b/test/torture-s/pr52209.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52209.c"
+	.file	"pr52209.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -51,5 +51,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52286.c.s b/test/torture-s/pr52286.c.s
index 80ad54eea..ce9a705c1 100644
--- a/test/torture-s/pr52286.c.s
+++ b/test/torture-s/pr52286.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52286.c"
+	.file	"pr52286.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -25,7 +25,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52760.c.s b/test/torture-s/pr52760.c.s
index 6ebcd8b27..a37797521 100644
--- a/test/torture-s/pr52760.c.s
+++ b/test/torture-s/pr52760.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52760.c"
+	.file	"pr52760.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -86,9 +86,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -96,10 +96,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push18=, 0
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push25=, $pop16, $pop17
+	i32.sub 	$push25=, $pop15, $pop17
 	tee_local	$push24=, $0=, $pop25
 	i32.store	__stack_pointer($pop18), $pop24
 	i64.const	$push0=, 434320308619640833
@@ -142,7 +142,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52979-1.c.s b/test/torture-s/pr52979-1.c.s
index 56fab2040..55b5b5bee 100644
--- a/test/torture-s/pr52979-1.c.s
+++ b/test/torture-s/pr52979-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52979-1.c"
+	.file	"pr52979-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,9 +10,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -64,9 +64,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -126,9 +126,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -204,7 +204,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -256,5 +256,5 @@ b:
 	.size	b, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52979-2.c.s b/test/torture-s/pr52979-2.c.s
index f6c24eede..76635a470 100644
--- a/test/torture-s/pr52979-2.c.s
+++ b/test/torture-s/pr52979-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr52979-2.c"
+	.file	"pr52979-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,9 +10,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -64,9 +64,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -126,9 +126,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -204,7 +204,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -256,5 +256,5 @@ b:
 	.size	b, 5
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53084.c.s b/test/torture-s/pr53084.c.s
index 541b41f8e..8e82ee581 100644
--- a/test/torture-s/pr53084.c.s
+++ b/test/torture-s/pr53084.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53084.c"
+	.file	"pr53084.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -29,9 +29,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -52,5 +52,5 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53160.c.s b/test/torture-s/pr53160.c.s
index 0c9c54766..88ed0f2fa 100644
--- a/test/torture-s/pr53160.c.s
+++ b/test/torture-s/pr53160.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53160.c"
+	.file	"pr53160.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -30,7 +30,7 @@ main:                                   # @main
 # BB#1:                                 # %if.then
 	i32.const	$push5=, 0
 	i32.load	$drop=, b($pop5)
-.LBB1_2:                                # %for.end
+.LBB1_2:                                # %if.end
 	end_block                       # label0:
 	i32.const	$push18=, 0
 	i32.const	$push1=, -1
@@ -64,7 +64,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -146,5 +146,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53465.c.s b/test/torture-s/pr53465.c.s
index f985e5edf..455af7eac 100644
--- a/test/torture-s/pr53465.c.s
+++ b/test/torture-s/pr53465.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53465.c"
+	.file	"pr53465.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -56,9 +56,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,7 +69,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53645-2.c.s b/test/torture-s/pr53645-2.c.s
index 0a1060841..4cf8881ee 100644
--- a/test/torture-s/pr53645-2.c.s
+++ b/test/torture-s/pr53645-2.c.s
@@ -1,4409 +1,4395 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53645-2.c"
+	.file	"pr53645-2.c"
 	.section	.text.uq44444444,"ax",@progbits
-	.hidden	uq44444444
+	.hidden	uq44444444              # -- Begin function uq44444444
 	.globl	uq44444444
 	.type	uq44444444,@function
 uq44444444:                             # @uq44444444
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 2
+	i32.shr_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 2
+	i32.shr_u	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 2
+	i32.shr_u	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 2
+	i32.shr_u	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
 	i32.const	$push44=, 2
-	i32.shr_u	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
+	i32.shr_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
 	i32.const	$push42=, 2
-	i32.shr_u	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
+	i32.shr_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
 	i32.const	$push40=, 2
-	i32.shr_u	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
+	i32.shr_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push39=, 2
+	i32.add 	$push33=, $0, $pop39
 	i32.const	$push38=, 2
-	i32.shr_u	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 2
-	i32.shr_u	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 2
-	i32.shr_u	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 2
-	i32.shr_u	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 2
-	i32.shr_u	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_u	$push35=, 0($pop34)
+	i32.const	$push37=, 2
+	i32.shr_u	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	uq44444444, .Lfunc_end0-uq44444444
-
+                                        # -- End function
 	.section	.text.ur44444444,"ax",@progbits
-	.hidden	ur44444444
+	.hidden	ur44444444              # -- Begin function ur44444444
 	.globl	ur44444444
 	.type	ur44444444,@function
 ur44444444:                             # @ur44444444
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.const	$push15=, 3
-	i32.and 	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 3
-	i32.and 	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 3
-	i32.and 	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 3
-	i32.and 	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 3
-	i32.and 	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 3
-	i32.and 	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 3
-	i32.and 	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 3
-	i32.and 	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 3
+	i32.and 	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 3
+	i32.and 	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 3
+	i32.and 	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 3
+	i32.and 	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push44=, 3
+	i32.and 	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 3
+	i32.and 	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 3
+	i32.and 	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 3
+	i32.and 	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	ur44444444, .Lfunc_end1-ur44444444
-
+                                        # -- End function
 	.section	.text.sq44444444,"ax",@progbits
-	.hidden	sq44444444
+	.hidden	sq44444444              # -- Begin function sq44444444
 	.globl	sq44444444
 	.type	sq44444444,@function
 sq44444444:                             # @sq44444444
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 4
+	i32.div_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 4
+	i32.div_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 4
+	i32.div_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 4
+	i32.div_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
 	i32.const	$push44=, 4
-	i32.div_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
+	i32.div_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
 	i32.const	$push42=, 4
-	i32.div_s	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
+	i32.div_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push41=, 4
+	i32.add 	$push28=, $0, $pop41
 	i32.const	$push40=, 4
-	i32.div_s	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 4
-	i32.div_s	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 4
-	i32.div_s	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 4
-	i32.div_s	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 4
-	i32.div_s	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 4
-	i32.div_s	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_s	$push30=, 0($pop29)
+	i32.const	$push39=, 4
+	i32.div_s	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_s	$push35=, 0($pop34)
+	i32.const	$push37=, 4
+	i32.div_s	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	sq44444444, .Lfunc_end2-sq44444444
-
+                                        # -- End function
 	.section	.text.sr44444444,"ax",@progbits
-	.hidden	sr44444444
+	.hidden	sr44444444              # -- Begin function sr44444444
 	.globl	sr44444444
 	.type	sr44444444,@function
 sr44444444:                             # @sr44444444
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 4
+	i32.rem_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 4
+	i32.rem_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 4
+	i32.rem_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 4
+	i32.rem_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
 	i32.const	$push44=, 4
-	i32.rem_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
+	i32.rem_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
 	i32.const	$push42=, 4
-	i32.rem_s	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
+	i32.rem_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push41=, 4
+	i32.add 	$push28=, $0, $pop41
 	i32.const	$push40=, 4
-	i32.rem_s	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 4
-	i32.rem_s	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 4
-	i32.rem_s	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 4
-	i32.rem_s	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 4
-	i32.rem_s	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 4
-	i32.rem_s	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_s	$push30=, 0($pop29)
+	i32.const	$push39=, 4
+	i32.rem_s	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_s	$push35=, 0($pop34)
+	i32.const	$push37=, 4
+	i32.rem_s	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
 	.size	sr44444444, .Lfunc_end3-sr44444444
-
+                                        # -- End function
 	.section	.text.uq1428166432128,"ax",@progbits
-	.hidden	uq1428166432128
+	.hidden	uq1428166432128         # -- Begin function uq1428166432128
 	.globl	uq1428166432128
 	.type	uq1428166432128,@function
 uq1428166432128:                        # @uq1428166432128
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.store16	0($0), $pop14
-	i32.const	$push42=, 14
-	i32.add 	$push15=, $0, $pop42
-	i32.const	$push16=, 7
-	i32.shr_u	$push17=, $8, $pop16
-	i32.store16	0($pop15), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push19=, 5
-	i32.shr_u	$push20=, $7, $pop19
-	i32.store16	0($pop18), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 6
-	i32.shr_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 4
-	i32.shr_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push26=, 3
-	i32.shr_u	$push27=, $4, $pop26
-	i32.store16	0($pop25), $pop27
-	i32.const	$push35=, 4
-	i32.add 	$push28=, $0, $pop35
-	i32.const	$push29=, 1
-	i32.shr_u	$push30=, $3, $pop29
-	i32.store16	0($pop28), $pop30
-	i32.const	$push34=, 2
-	i32.add 	$push31=, $0, $pop34
-	i32.const	$push33=, 2
-	i32.shr_u	$push32=, $2, $pop33
-	i32.store16	0($pop31), $pop32
+	i32.load16_u	$push0=, 0($1)
+	i32.store16	0($0), $pop0
+	i32.const	$push1=, 14
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push49=, 14
+	i32.add 	$push3=, $1, $pop49
+	i32.load16_u	$push4=, 0($pop3)
+	i32.const	$push5=, 7
+	i32.shr_u	$push6=, $pop4, $pop5
+	i32.store16	0($pop2), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_u	$push10=, 0($pop9)
+	i32.const	$push11=, 5
+	i32.shr_u	$push12=, $pop10, $pop11
+	i32.store16	0($pop8), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push17=, 6
+	i32.shr_u	$push18=, $pop16, $pop17
+	i32.store16	0($pop14), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push23=, 4
+	i32.shr_u	$push24=, $pop22, $pop23
+	i32.store16	0($pop20), $pop24
+	i32.const	$push45=, 6
+	i32.add 	$push25=, $0, $pop45
+	i32.const	$push44=, 6
+	i32.add 	$push26=, $1, $pop44
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push28=, 3
+	i32.shr_u	$push29=, $pop27, $pop28
+	i32.store16	0($pop25), $pop29
+	i32.const	$push43=, 4
+	i32.add 	$push30=, $0, $pop43
+	i32.const	$push42=, 4
+	i32.add 	$push31=, $1, $pop42
+	i32.load16_u	$push32=, 0($pop31)
+	i32.const	$push33=, 1
+	i32.shr_u	$push34=, $pop32, $pop33
+	i32.store16	0($pop30), $pop34
+	i32.const	$push35=, 2
+	i32.add 	$push36=, $0, $pop35
+	i32.const	$push41=, 2
+	i32.add 	$push37=, $1, $pop41
+	i32.load16_u	$push38=, 0($pop37)
+	i32.const	$push40=, 2
+	i32.shr_u	$push39=, $pop38, $pop40
+	i32.store16	0($pop36), $pop39
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
 	.size	uq1428166432128, .Lfunc_end4-uq1428166432128
-
+                                        # -- End function
 	.section	.text.ur1428166432128,"ax",@progbits
-	.hidden	ur1428166432128
+	.hidden	ur1428166432128         # -- Begin function ur1428166432128
 	.globl	ur1428166432128
 	.type	ur1428166432128,@function
 ur1428166432128:                        # @ur1428166432128
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$1=, 0($pop13)
-	i32.const	$push14=, 0
-	i32.store16	0($0), $pop14
-	i32.const	$push42=, 14
-	i32.add 	$push15=, $0, $pop42
-	i32.const	$push16=, 127
-	i32.and 	$push17=, $1, $pop16
-	i32.store16	0($pop15), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push19=, 31
-	i32.and 	$push20=, $7, $pop19
-	i32.store16	0($pop18), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push22=, 63
-	i32.and 	$push23=, $6, $pop22
-	i32.store16	0($pop21), $pop23
-	i32.const	$push39=, 8
-	i32.add 	$push24=, $0, $pop39
-	i32.const	$push25=, 15
-	i32.and 	$push26=, $5, $pop25
-	i32.store16	0($pop24), $pop26
-	i32.const	$push38=, 6
-	i32.add 	$push27=, $0, $pop38
-	i32.const	$push28=, 7
-	i32.and 	$push29=, $4, $pop28
-	i32.store16	0($pop27), $pop29
-	i32.const	$push37=, 4
-	i32.add 	$push30=, $0, $pop37
-	i32.const	$push31=, 1
-	i32.and 	$push32=, $3, $pop31
-	i32.store16	0($pop30), $pop32
-	i32.const	$push36=, 2
-	i32.add 	$push33=, $0, $pop36
-	i32.const	$push34=, 3
-	i32.and 	$push35=, $2, $pop34
-	i32.store16	0($pop33), $pop35
+	i32.const	$push0=, 0
+	i32.store16	0($0), $pop0
+	i32.const	$push1=, 14
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push49=, 14
+	i32.add 	$push3=, $1, $pop49
+	i32.load16_u	$push4=, 0($pop3)
+	i32.const	$push5=, 127
+	i32.and 	$push6=, $pop4, $pop5
+	i32.store16	0($pop2), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_u	$push10=, 0($pop9)
+	i32.const	$push11=, 31
+	i32.and 	$push12=, $pop10, $pop11
+	i32.store16	0($pop8), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push17=, 63
+	i32.and 	$push18=, $pop16, $pop17
+	i32.store16	0($pop14), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push23=, 15
+	i32.and 	$push24=, $pop22, $pop23
+	i32.store16	0($pop20), $pop24
+	i32.const	$push25=, 6
+	i32.add 	$push26=, $0, $pop25
+	i32.const	$push45=, 6
+	i32.add 	$push27=, $1, $pop45
+	i32.load16_u	$push28=, 0($pop27)
+	i32.const	$push29=, 7
+	i32.and 	$push30=, $pop28, $pop29
+	i32.store16	0($pop26), $pop30
+	i32.const	$push31=, 4
+	i32.add 	$push32=, $0, $pop31
+	i32.const	$push44=, 4
+	i32.add 	$push33=, $1, $pop44
+	i32.load16_u	$push34=, 0($pop33)
+	i32.const	$push35=, 1
+	i32.and 	$push36=, $pop34, $pop35
+	i32.store16	0($pop32), $pop36
+	i32.const	$push37=, 2
+	i32.add 	$push38=, $0, $pop37
+	i32.const	$push43=, 2
+	i32.add 	$push39=, $1, $pop43
+	i32.load16_u	$push40=, 0($pop39)
+	i32.const	$push41=, 3
+	i32.and 	$push42=, $pop40, $pop41
+	i32.store16	0($pop38), $pop42
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
 	.size	ur1428166432128, .Lfunc_end5-ur1428166432128
-
+                                        # -- End function
 	.section	.text.sq1428166432128,"ax",@progbits
-	.hidden	sq1428166432128
+	.hidden	sq1428166432128         # -- Begin function sq1428166432128
 	.globl	sq1428166432128
 	.type	sq1428166432128,@function
 sq1428166432128:                        # @sq1428166432128
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.store16	0($0), $pop14
-	i32.const	$push42=, 14
-	i32.add 	$push15=, $0, $pop42
-	i32.const	$push16=, 128
-	i32.div_s	$push17=, $8, $pop16
-	i32.store16	0($pop15), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push19=, 32
-	i32.div_s	$push20=, $7, $pop19
-	i32.store16	0($pop18), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push22=, 64
-	i32.div_s	$push23=, $6, $pop22
-	i32.store16	0($pop21), $pop23
-	i32.const	$push39=, 8
-	i32.add 	$push24=, $0, $pop39
-	i32.const	$push25=, 16
-	i32.div_s	$push26=, $5, $pop25
-	i32.store16	0($pop24), $pop26
-	i32.const	$push38=, 6
-	i32.add 	$push27=, $0, $pop38
-	i32.const	$push37=, 8
-	i32.div_s	$push28=, $4, $pop37
-	i32.store16	0($pop27), $pop28
-	i32.const	$push36=, 4
-	i32.add 	$push29=, $0, $pop36
-	i32.const	$push35=, 2
-	i32.div_s	$push30=, $3, $pop35
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.store16	0($0), $pop0
+	i32.const	$push1=, 14
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push49=, 14
+	i32.add 	$push3=, $1, $pop49
+	i32.load16_s	$push4=, 0($pop3)
+	i32.const	$push5=, 128
+	i32.div_s	$push6=, $pop4, $pop5
+	i32.store16	0($pop2), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_s	$push10=, 0($pop9)
+	i32.const	$push11=, 32
+	i32.div_s	$push12=, $pop10, $pop11
+	i32.store16	0($pop8), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push17=, 64
+	i32.div_s	$push18=, $pop16, $pop17
+	i32.store16	0($pop14), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push23=, 16
+	i32.div_s	$push24=, $pop22, $pop23
+	i32.store16	0($pop20), $pop24
+	i32.const	$push25=, 6
+	i32.add 	$push26=, $0, $pop25
+	i32.const	$push45=, 6
+	i32.add 	$push27=, $1, $pop45
+	i32.load16_s	$push28=, 0($pop27)
+	i32.const	$push44=, 8
+	i32.div_s	$push29=, $pop28, $pop44
+	i32.store16	0($pop26), $pop29
+	i32.const	$push30=, 4
+	i32.add 	$push31=, $0, $pop30
+	i32.const	$push43=, 4
+	i32.add 	$push32=, $1, $pop43
+	i32.load16_s	$push33=, 0($pop32)
 	i32.const	$push34=, 2
-	i32.add 	$push31=, $0, $pop34
-	i32.const	$push33=, 4
-	i32.div_s	$push32=, $2, $pop33
-	i32.store16	0($pop31), $pop32
+	i32.div_s	$push35=, $pop33, $pop34
+	i32.store16	0($pop31), $pop35
+	i32.const	$push42=, 2
+	i32.add 	$push36=, $0, $pop42
+	i32.const	$push41=, 2
+	i32.add 	$push37=, $1, $pop41
+	i32.load16_s	$push38=, 0($pop37)
+	i32.const	$push40=, 4
+	i32.div_s	$push39=, $pop38, $pop40
+	i32.store16	0($pop36), $pop39
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
 	.size	sq1428166432128, .Lfunc_end6-sq1428166432128
-
+                                        # -- End function
 	.section	.text.sr1428166432128,"ax",@progbits
-	.hidden	sr1428166432128
+	.hidden	sr1428166432128         # -- Begin function sr1428166432128
 	.globl	sr1428166432128
 	.type	sr1428166432128,@function
 sr1428166432128:                        # @sr1428166432128
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$1=, 0($pop13)
-	i32.const	$push14=, 0
-	i32.store16	0($0), $pop14
-	i32.const	$push42=, 14
-	i32.add 	$push15=, $0, $pop42
-	i32.const	$push16=, 128
-	i32.rem_s	$push17=, $1, $pop16
-	i32.store16	0($pop15), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push19=, 32
-	i32.rem_s	$push20=, $7, $pop19
-	i32.store16	0($pop18), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push22=, 64
-	i32.rem_s	$push23=, $6, $pop22
-	i32.store16	0($pop21), $pop23
-	i32.const	$push39=, 8
-	i32.add 	$push24=, $0, $pop39
-	i32.const	$push25=, 16
-	i32.rem_s	$push26=, $5, $pop25
-	i32.store16	0($pop24), $pop26
-	i32.const	$push38=, 6
-	i32.add 	$push27=, $0, $pop38
-	i32.const	$push37=, 8
-	i32.rem_s	$push28=, $4, $pop37
-	i32.store16	0($pop27), $pop28
-	i32.const	$push36=, 4
-	i32.add 	$push29=, $0, $pop36
-	i32.const	$push35=, 2
-	i32.rem_s	$push30=, $3, $pop35
-	i32.store16	0($pop29), $pop30
+	i32.const	$push0=, 0
+	i32.store16	0($0), $pop0
+	i32.const	$push1=, 14
+	i32.add 	$push2=, $0, $pop1
+	i32.const	$push49=, 14
+	i32.add 	$push3=, $1, $pop49
+	i32.load16_s	$push4=, 0($pop3)
+	i32.const	$push5=, 128
+	i32.rem_s	$push6=, $pop4, $pop5
+	i32.store16	0($pop2), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_s	$push10=, 0($pop9)
+	i32.const	$push11=, 32
+	i32.rem_s	$push12=, $pop10, $pop11
+	i32.store16	0($pop8), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push17=, 64
+	i32.rem_s	$push18=, $pop16, $pop17
+	i32.store16	0($pop14), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push23=, 16
+	i32.rem_s	$push24=, $pop22, $pop23
+	i32.store16	0($pop20), $pop24
+	i32.const	$push25=, 6
+	i32.add 	$push26=, $0, $pop25
+	i32.const	$push45=, 6
+	i32.add 	$push27=, $1, $pop45
+	i32.load16_s	$push28=, 0($pop27)
+	i32.const	$push44=, 8
+	i32.rem_s	$push29=, $pop28, $pop44
+	i32.store16	0($pop26), $pop29
+	i32.const	$push30=, 4
+	i32.add 	$push31=, $0, $pop30
+	i32.const	$push43=, 4
+	i32.add 	$push32=, $1, $pop43
+	i32.load16_s	$push33=, 0($pop32)
 	i32.const	$push34=, 2
-	i32.add 	$push31=, $0, $pop34
-	i32.const	$push33=, 4
-	i32.rem_s	$push32=, $2, $pop33
-	i32.store16	0($pop31), $pop32
+	i32.rem_s	$push35=, $pop33, $pop34
+	i32.store16	0($pop31), $pop35
+	i32.const	$push42=, 2
+	i32.add 	$push36=, $0, $pop42
+	i32.const	$push41=, 2
+	i32.add 	$push37=, $1, $pop41
+	i32.load16_s	$push38=, 0($pop37)
+	i32.const	$push40=, 4
+	i32.rem_s	$push39=, $pop38, $pop40
+	i32.store16	0($pop36), $pop39
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
 	.size	sr1428166432128, .Lfunc_end7-sr1428166432128
-
+                                        # -- End function
 	.section	.text.uq33333333,"ax",@progbits
-	.hidden	uq33333333
+	.hidden	uq33333333              # -- Begin function uq33333333
 	.globl	uq33333333
 	.type	uq33333333,@function
 uq33333333:                             # @uq33333333
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.const	$push15=, 3
-	i32.div_u	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 3
-	i32.div_u	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 3
-	i32.div_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 3
-	i32.div_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 3
-	i32.div_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 3
-	i32.div_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 3
-	i32.div_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 3
-	i32.div_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 3
+	i32.div_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 3
+	i32.div_u	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 3
+	i32.div_u	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 3
+	i32.div_u	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push44=, 3
+	i32.div_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 3
+	i32.div_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 3
+	i32.div_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 3
+	i32.div_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end8:
 	.size	uq33333333, .Lfunc_end8-uq33333333
-
+                                        # -- End function
 	.section	.text.ur33333333,"ax",@progbits
-	.hidden	ur33333333
+	.hidden	ur33333333              # -- Begin function ur33333333
 	.globl	ur33333333
 	.type	ur33333333,@function
 ur33333333:                             # @ur33333333
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.const	$push15=, 3
-	i32.rem_u	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 3
-	i32.rem_u	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 3
-	i32.rem_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 3
-	i32.rem_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 3
-	i32.rem_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 3
-	i32.rem_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 3
-	i32.rem_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 3
-	i32.rem_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 3
+	i32.rem_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 3
+	i32.rem_u	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 3
+	i32.rem_u	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 3
+	i32.rem_u	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push44=, 3
+	i32.rem_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 3
+	i32.rem_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 3
+	i32.rem_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 3
+	i32.rem_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
 	.size	ur33333333, .Lfunc_end9-ur33333333
-
+                                        # -- End function
 	.section	.text.sq33333333,"ax",@progbits
-	.hidden	sq33333333
+	.hidden	sq33333333              # -- Begin function sq33333333
 	.globl	sq33333333
 	.type	sq33333333,@function
 sq33333333:                             # @sq33333333
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
-	i32.const	$push15=, 3
-	i32.div_s	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 3
-	i32.div_s	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 3
-	i32.div_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 3
-	i32.div_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 3
-	i32.div_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 3
-	i32.div_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 3
-	i32.div_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 3
-	i32.div_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 3
+	i32.div_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 3
+	i32.div_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 3
+	i32.div_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 3
+	i32.div_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push44=, 3
+	i32.div_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 3
+	i32.div_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 3
+	i32.div_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 3
+	i32.div_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
 	.size	sq33333333, .Lfunc_end10-sq33333333
-
+                                        # -- End function
 	.section	.text.sr33333333,"ax",@progbits
-	.hidden	sr33333333
+	.hidden	sr33333333              # -- Begin function sr33333333
 	.globl	sr33333333
 	.type	sr33333333,@function
 sr33333333:                             # @sr33333333
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
-	i32.const	$push15=, 3
-	i32.rem_s	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 3
-	i32.rem_s	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 3
-	i32.rem_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 3
-	i32.rem_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 3
-	i32.rem_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 3
-	i32.rem_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 3
-	i32.rem_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 3
-	i32.rem_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 3
+	i32.rem_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 3
+	i32.rem_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 3
+	i32.rem_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 3
+	i32.rem_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push44=, 3
+	i32.rem_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 3
+	i32.rem_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 3
+	i32.rem_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 3
+	i32.rem_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end11:
 	.size	sr33333333, .Lfunc_end11-sr33333333
-
+                                        # -- End function
 	.section	.text.uq65656565,"ax",@progbits
-	.hidden	uq65656565
+	.hidden	uq65656565              # -- Begin function uq65656565
 	.globl	uq65656565
 	.type	uq65656565,@function
 uq65656565:                             # @uq65656565
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 6
+	i32.div_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push7=, 5
+	i32.div_u	$push8=, $pop6, $pop7
+	i32.store16	0($pop4), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push50=, 12
+	i32.add 	$push11=, $1, $pop50
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push49=, 6
+	i32.div_u	$push13=, $pop12, $pop49
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 10
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push48=, 10
+	i32.add 	$push16=, $1, $pop48
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push47=, 5
+	i32.div_u	$push18=, $pop17, $pop47
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push45=, 6
+	i32.div_u	$push23=, $pop22, $pop45
+	i32.store16	0($pop20), $pop23
 	i32.const	$push44=, 6
-	i32.div_u	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push17=, 5
-	i32.div_u	$push18=, $8, $pop17
-	i32.store16	0($pop16), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 6
-	i32.div_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 5
-	i32.div_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 6
-	i32.div_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 5
-	i32.div_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 6
-	i32.div_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 5
-	i32.div_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.add 	$push24=, $0, $pop44
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 5
+	i32.div_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 6
+	i32.div_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 5
+	i32.div_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
 	.size	uq65656565, .Lfunc_end12-uq65656565
-
+                                        # -- End function
 	.section	.text.ur65656565,"ax",@progbits
-	.hidden	ur65656565
+	.hidden	ur65656565              # -- Begin function ur65656565
 	.globl	ur65656565
 	.type	ur65656565,@function
 ur65656565:                             # @ur65656565
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 6
+	i32.rem_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push7=, 5
+	i32.rem_u	$push8=, $pop6, $pop7
+	i32.store16	0($pop4), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push50=, 12
+	i32.add 	$push11=, $1, $pop50
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push49=, 6
+	i32.rem_u	$push13=, $pop12, $pop49
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 10
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push48=, 10
+	i32.add 	$push16=, $1, $pop48
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push47=, 5
+	i32.rem_u	$push18=, $pop17, $pop47
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push45=, 6
+	i32.rem_u	$push23=, $pop22, $pop45
+	i32.store16	0($pop20), $pop23
 	i32.const	$push44=, 6
-	i32.rem_u	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push17=, 5
-	i32.rem_u	$push18=, $8, $pop17
-	i32.store16	0($pop16), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 6
-	i32.rem_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 5
-	i32.rem_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 6
-	i32.rem_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 5
-	i32.rem_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 6
-	i32.rem_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 5
-	i32.rem_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.add 	$push24=, $0, $pop44
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 5
+	i32.rem_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 6
+	i32.rem_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 5
+	i32.rem_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
 	.size	ur65656565, .Lfunc_end13-ur65656565
-
+                                        # -- End function
 	.section	.text.sq65656565,"ax",@progbits
-	.hidden	sq65656565
+	.hidden	sq65656565              # -- Begin function sq65656565
 	.globl	sq65656565
 	.type	sq65656565,@function
 sq65656565:                             # @sq65656565
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 6
+	i32.div_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push7=, 5
+	i32.div_s	$push8=, $pop6, $pop7
+	i32.store16	0($pop4), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push50=, 12
+	i32.add 	$push11=, $1, $pop50
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push49=, 6
+	i32.div_s	$push13=, $pop12, $pop49
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 10
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push48=, 10
+	i32.add 	$push16=, $1, $pop48
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push47=, 5
+	i32.div_s	$push18=, $pop17, $pop47
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push45=, 6
+	i32.div_s	$push23=, $pop22, $pop45
+	i32.store16	0($pop20), $pop23
 	i32.const	$push44=, 6
-	i32.div_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push17=, 5
-	i32.div_s	$push18=, $8, $pop17
-	i32.store16	0($pop16), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 6
-	i32.div_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 5
-	i32.div_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 6
-	i32.div_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 5
-	i32.div_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 6
-	i32.div_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 5
-	i32.div_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.add 	$push24=, $0, $pop44
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 5
+	i32.div_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 6
+	i32.div_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 5
+	i32.div_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end14:
 	.size	sq65656565, .Lfunc_end14-sq65656565
-
+                                        # -- End function
 	.section	.text.sr65656565,"ax",@progbits
-	.hidden	sr65656565
+	.hidden	sr65656565              # -- Begin function sr65656565
 	.globl	sr65656565
 	.type	sr65656565,@function
 sr65656565:                             # @sr65656565
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 6
+	i32.rem_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push7=, 5
+	i32.rem_s	$push8=, $pop6, $pop7
+	i32.store16	0($pop4), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push50=, 12
+	i32.add 	$push11=, $1, $pop50
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push49=, 6
+	i32.rem_s	$push13=, $pop12, $pop49
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 10
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push48=, 10
+	i32.add 	$push16=, $1, $pop48
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push47=, 5
+	i32.rem_s	$push18=, $pop17, $pop47
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 8
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push46=, 8
+	i32.add 	$push21=, $1, $pop46
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push45=, 6
+	i32.rem_s	$push23=, $pop22, $pop45
+	i32.store16	0($pop20), $pop23
 	i32.const	$push44=, 6
-	i32.rem_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push17=, 5
-	i32.rem_s	$push18=, $8, $pop17
-	i32.store16	0($pop16), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 6
-	i32.rem_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 5
-	i32.rem_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 6
-	i32.rem_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 5
-	i32.rem_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 6
-	i32.rem_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 5
-	i32.rem_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.add 	$push24=, $0, $pop44
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 5
+	i32.rem_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 6
+	i32.rem_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 5
+	i32.rem_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end15:
 	.size	sr65656565, .Lfunc_end15-sr65656565
-
+                                        # -- End function
 	.section	.text.uq14141461461414,"ax",@progbits
-	.hidden	uq14141461461414
+	.hidden	uq14141461461414        # -- Begin function uq14141461461414
 	.globl	uq14141461461414
 	.type	uq14141461461414,@function
 uq14141461461414:                       # @uq14141461461414
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 14
+	i32.div_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push51=, 14
+	i32.add 	$push3=, $0, $pop51
+	i32.const	$push50=, 14
+	i32.add 	$push4=, $1, $pop50
+	i32.load16_u	$push5=, 0($pop4)
+	i32.const	$push49=, 14
+	i32.div_u	$push6=, $pop5, $pop49
+	i32.store16	0($pop3), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_u	$push10=, 0($pop9)
+	i32.const	$push47=, 14
+	i32.div_u	$push11=, $pop10, $pop47
+	i32.store16	0($pop8), $pop11
+	i32.const	$push12=, 10
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push46=, 10
+	i32.add 	$push14=, $1, $pop46
+	i32.load16_u	$push15=, 0($pop14)
+	i32.const	$push16=, 6
+	i32.div_u	$push17=, $pop15, $pop16
+	i32.store16	0($pop13), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
 	i32.const	$push44=, 14
-	i32.div_u	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push42=, 14
-	i32.div_u	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push40=, 14
-	i32.div_u	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 6
-	i32.div_u	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 14
-	i32.div_u	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 6
-	i32.div_u	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 14
-	i32.div_u	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 14
-	i32.div_u	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.div_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push43=, 6
+	i32.add 	$push23=, $0, $pop43
+	i32.const	$push42=, 6
+	i32.add 	$push24=, $1, $pop42
+	i32.load16_u	$push25=, 0($pop24)
+	i32.const	$push41=, 6
+	i32.div_u	$push26=, $pop25, $pop41
+	i32.store16	0($pop23), $pop26
+	i32.const	$push27=, 4
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push40=, 4
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_u	$push30=, 0($pop29)
+	i32.const	$push39=, 14
+	i32.div_u	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_u	$push35=, 0($pop34)
+	i32.const	$push37=, 14
+	i32.div_u	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end16:
 	.size	uq14141461461414, .Lfunc_end16-uq14141461461414
-
+                                        # -- End function
 	.section	.text.ur14141461461414,"ax",@progbits
-	.hidden	ur14141461461414
+	.hidden	ur14141461461414        # -- Begin function ur14141461461414
 	.globl	ur14141461461414
 	.type	ur14141461461414,@function
 ur14141461461414:                       # @ur14141461461414
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 14
+	i32.rem_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push51=, 14
+	i32.add 	$push3=, $0, $pop51
+	i32.const	$push50=, 14
+	i32.add 	$push4=, $1, $pop50
+	i32.load16_u	$push5=, 0($pop4)
+	i32.const	$push49=, 14
+	i32.rem_u	$push6=, $pop5, $pop49
+	i32.store16	0($pop3), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_u	$push10=, 0($pop9)
+	i32.const	$push47=, 14
+	i32.rem_u	$push11=, $pop10, $pop47
+	i32.store16	0($pop8), $pop11
+	i32.const	$push12=, 10
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push46=, 10
+	i32.add 	$push14=, $1, $pop46
+	i32.load16_u	$push15=, 0($pop14)
+	i32.const	$push16=, 6
+	i32.rem_u	$push17=, $pop15, $pop16
+	i32.store16	0($pop13), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
 	i32.const	$push44=, 14
-	i32.rem_u	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push42=, 14
-	i32.rem_u	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push40=, 14
-	i32.rem_u	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 6
-	i32.rem_u	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 14
-	i32.rem_u	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 6
-	i32.rem_u	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 14
-	i32.rem_u	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 14
-	i32.rem_u	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.rem_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push43=, 6
+	i32.add 	$push23=, $0, $pop43
+	i32.const	$push42=, 6
+	i32.add 	$push24=, $1, $pop42
+	i32.load16_u	$push25=, 0($pop24)
+	i32.const	$push41=, 6
+	i32.rem_u	$push26=, $pop25, $pop41
+	i32.store16	0($pop23), $pop26
+	i32.const	$push27=, 4
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push40=, 4
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_u	$push30=, 0($pop29)
+	i32.const	$push39=, 14
+	i32.rem_u	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_u	$push35=, 0($pop34)
+	i32.const	$push37=, 14
+	i32.rem_u	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end17:
 	.size	ur14141461461414, .Lfunc_end17-ur14141461461414
-
+                                        # -- End function
 	.section	.text.sq14141461461414,"ax",@progbits
-	.hidden	sq14141461461414
+	.hidden	sq14141461461414        # -- Begin function sq14141461461414
 	.globl	sq14141461461414
 	.type	sq14141461461414,@function
 sq14141461461414:                       # @sq14141461461414
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 14
+	i32.div_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push51=, 14
+	i32.add 	$push3=, $0, $pop51
+	i32.const	$push50=, 14
+	i32.add 	$push4=, $1, $pop50
+	i32.load16_s	$push5=, 0($pop4)
+	i32.const	$push49=, 14
+	i32.div_s	$push6=, $pop5, $pop49
+	i32.store16	0($pop3), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_s	$push10=, 0($pop9)
+	i32.const	$push47=, 14
+	i32.div_s	$push11=, $pop10, $pop47
+	i32.store16	0($pop8), $pop11
+	i32.const	$push12=, 10
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push46=, 10
+	i32.add 	$push14=, $1, $pop46
+	i32.load16_s	$push15=, 0($pop14)
+	i32.const	$push16=, 6
+	i32.div_s	$push17=, $pop15, $pop16
+	i32.store16	0($pop13), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
 	i32.const	$push44=, 14
-	i32.div_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push42=, 14
-	i32.div_s	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push40=, 14
-	i32.div_s	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 6
-	i32.div_s	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 14
-	i32.div_s	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 6
-	i32.div_s	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 14
-	i32.div_s	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 14
-	i32.div_s	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.div_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push43=, 6
+	i32.add 	$push23=, $0, $pop43
+	i32.const	$push42=, 6
+	i32.add 	$push24=, $1, $pop42
+	i32.load16_s	$push25=, 0($pop24)
+	i32.const	$push41=, 6
+	i32.div_s	$push26=, $pop25, $pop41
+	i32.store16	0($pop23), $pop26
+	i32.const	$push27=, 4
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push40=, 4
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_s	$push30=, 0($pop29)
+	i32.const	$push39=, 14
+	i32.div_s	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_s	$push35=, 0($pop34)
+	i32.const	$push37=, 14
+	i32.div_s	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
 	.size	sq14141461461414, .Lfunc_end18-sq14141461461414
-
+                                        # -- End function
 	.section	.text.sr14141461461414,"ax",@progbits
-	.hidden	sr14141461461414
+	.hidden	sr14141461461414        # -- Begin function sr14141461461414
 	.globl	sr14141461461414
 	.type	sr14141461461414,@function
 sr14141461461414:                       # @sr14141461461414
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 14
+	i32.rem_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push51=, 14
+	i32.add 	$push3=, $0, $pop51
+	i32.const	$push50=, 14
+	i32.add 	$push4=, $1, $pop50
+	i32.load16_s	$push5=, 0($pop4)
+	i32.const	$push49=, 14
+	i32.rem_s	$push6=, $pop5, $pop49
+	i32.store16	0($pop3), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push48=, 12
+	i32.add 	$push9=, $1, $pop48
+	i32.load16_s	$push10=, 0($pop9)
+	i32.const	$push47=, 14
+	i32.rem_s	$push11=, $pop10, $pop47
+	i32.store16	0($pop8), $pop11
+	i32.const	$push12=, 10
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push46=, 10
+	i32.add 	$push14=, $1, $pop46
+	i32.load16_s	$push15=, 0($pop14)
+	i32.const	$push16=, 6
+	i32.rem_s	$push17=, $pop15, $pop16
+	i32.store16	0($pop13), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
 	i32.const	$push44=, 14
-	i32.rem_s	$push15=, $pop14, $pop44
-	i32.store16	0($0), $pop15
-	i32.const	$push43=, 14
-	i32.add 	$push16=, $0, $pop43
-	i32.const	$push42=, 14
-	i32.rem_s	$push17=, $8, $pop42
-	i32.store16	0($pop16), $pop17
-	i32.const	$push41=, 12
-	i32.add 	$push18=, $0, $pop41
-	i32.const	$push40=, 14
-	i32.rem_s	$push19=, $7, $pop40
-	i32.store16	0($pop18), $pop19
-	i32.const	$push39=, 10
-	i32.add 	$push20=, $0, $pop39
-	i32.const	$push38=, 6
-	i32.rem_s	$push21=, $6, $pop38
-	i32.store16	0($pop20), $pop21
-	i32.const	$push37=, 8
-	i32.add 	$push22=, $0, $pop37
-	i32.const	$push36=, 14
-	i32.rem_s	$push23=, $5, $pop36
-	i32.store16	0($pop22), $pop23
-	i32.const	$push35=, 6
-	i32.add 	$push24=, $0, $pop35
-	i32.const	$push34=, 6
-	i32.rem_s	$push25=, $4, $pop34
-	i32.store16	0($pop24), $pop25
-	i32.const	$push33=, 4
-	i32.add 	$push26=, $0, $pop33
-	i32.const	$push32=, 14
-	i32.rem_s	$push27=, $3, $pop32
-	i32.store16	0($pop26), $pop27
-	i32.const	$push31=, 2
-	i32.add 	$push28=, $0, $pop31
-	i32.const	$push30=, 14
-	i32.rem_s	$push29=, $2, $pop30
-	i32.store16	0($pop28), $pop29
+	i32.rem_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push43=, 6
+	i32.add 	$push23=, $0, $pop43
+	i32.const	$push42=, 6
+	i32.add 	$push24=, $1, $pop42
+	i32.load16_s	$push25=, 0($pop24)
+	i32.const	$push41=, 6
+	i32.rem_s	$push26=, $pop25, $pop41
+	i32.store16	0($pop23), $pop26
+	i32.const	$push27=, 4
+	i32.add 	$push28=, $0, $pop27
+	i32.const	$push40=, 4
+	i32.add 	$push29=, $1, $pop40
+	i32.load16_s	$push30=, 0($pop29)
+	i32.const	$push39=, 14
+	i32.rem_s	$push31=, $pop30, $pop39
+	i32.store16	0($pop28), $pop31
+	i32.const	$push32=, 2
+	i32.add 	$push33=, $0, $pop32
+	i32.const	$push38=, 2
+	i32.add 	$push34=, $1, $pop38
+	i32.load16_s	$push35=, 0($pop34)
+	i32.const	$push37=, 14
+	i32.rem_s	$push36=, $pop35, $pop37
+	i32.store16	0($pop33), $pop36
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
 	.size	sr14141461461414, .Lfunc_end19-sr14141461461414
-
+                                        # -- End function
 	.section	.text.uq77777777,"ax",@progbits
-	.hidden	uq77777777
+	.hidden	uq77777777              # -- Begin function uq77777777
 	.globl	uq77777777
 	.type	uq77777777,@function
 uq77777777:                             # @uq77777777
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.const	$push15=, 7
-	i32.div_u	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 7
-	i32.div_u	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 7
-	i32.div_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 7
-	i32.div_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 7
-	i32.div_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 7
-	i32.div_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 7
-	i32.div_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 7
-	i32.div_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 7
+	i32.div_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 7
+	i32.div_u	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 7
+	i32.div_u	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 7
+	i32.div_u	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push44=, 7
+	i32.div_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 7
+	i32.div_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 7
+	i32.div_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 7
+	i32.div_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end20:
 	.size	uq77777777, .Lfunc_end20-uq77777777
-
+                                        # -- End function
 	.section	.text.ur77777777,"ax",@progbits
-	.hidden	ur77777777
+	.hidden	ur77777777              # -- Begin function ur77777777
 	.globl	ur77777777
 	.type	ur77777777,@function
 ur77777777:                             # @ur77777777
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_u	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_u	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_u	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_u	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_u	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_u	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_u	$8=, 0($pop13)
-	i32.load16_u	$push14=, 0($1)
-	i32.const	$push15=, 7
-	i32.rem_u	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 7
-	i32.rem_u	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 7
-	i32.rem_u	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 7
-	i32.rem_u	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 7
-	i32.rem_u	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 7
-	i32.rem_u	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 7
-	i32.rem_u	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 7
-	i32.rem_u	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_u	$push0=, 0($1)
+	i32.const	$push1=, 7
+	i32.rem_u	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_u	$push6=, 0($pop5)
+	i32.const	$push50=, 7
+	i32.rem_u	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push48=, 7
+	i32.rem_u	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push46=, 7
+	i32.rem_u	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push44=, 7
+	i32.rem_u	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push42=, 7
+	i32.rem_u	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push40=, 7
+	i32.rem_u	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_u	$push36=, 0($pop35)
+	i32.const	$push38=, 7
+	i32.rem_u	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
 	.size	ur77777777, .Lfunc_end21-ur77777777
-
+                                        # -- End function
 	.section	.text.sq77777777,"ax",@progbits
-	.hidden	sq77777777
+	.hidden	sq77777777              # -- Begin function sq77777777
 	.globl	sq77777777
 	.type	sq77777777,@function
 sq77777777:                             # @sq77777777
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
-	i32.const	$push15=, 7
-	i32.div_s	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 7
-	i32.div_s	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 7
-	i32.div_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 7
-	i32.div_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 7
-	i32.div_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 7
-	i32.div_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 7
-	i32.div_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 7
-	i32.div_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 7
+	i32.div_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 7
+	i32.div_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 7
+	i32.div_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 7
+	i32.div_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push44=, 7
+	i32.div_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 7
+	i32.div_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 7
+	i32.div_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 7
+	i32.div_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end22:
 	.size	sq77777777, .Lfunc_end22-sq77777777
-
+                                        # -- End function
 	.section	.text.sr77777777,"ax",@progbits
-	.hidden	sr77777777
+	.hidden	sr77777777              # -- Begin function sr77777777
 	.globl	sr77777777
 	.type	sr77777777,@function
 sr77777777:                             # @sr77777777
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 2
-	i32.add 	$push1=, $1, $pop0
-	i32.load16_s	$2=, 0($pop1)
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.load16_s	$3=, 0($pop3)
-	i32.const	$push4=, 6
-	i32.add 	$push5=, $1, $pop4
-	i32.load16_s	$4=, 0($pop5)
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $1, $pop6
-	i32.load16_s	$5=, 0($pop7)
-	i32.const	$push8=, 10
-	i32.add 	$push9=, $1, $pop8
-	i32.load16_s	$6=, 0($pop9)
-	i32.const	$push10=, 12
-	i32.add 	$push11=, $1, $pop10
-	i32.load16_s	$7=, 0($pop11)
-	i32.const	$push12=, 14
-	i32.add 	$push13=, $1, $pop12
-	i32.load16_s	$8=, 0($pop13)
-	i32.load16_s	$push14=, 0($1)
-	i32.const	$push15=, 7
-	i32.rem_s	$push16=, $pop14, $pop15
-	i32.store16	0($0), $pop16
-	i32.const	$push44=, 14
-	i32.add 	$push17=, $0, $pop44
-	i32.const	$push43=, 7
-	i32.rem_s	$push18=, $8, $pop43
-	i32.store16	0($pop17), $pop18
-	i32.const	$push42=, 12
-	i32.add 	$push19=, $0, $pop42
-	i32.const	$push41=, 7
-	i32.rem_s	$push20=, $7, $pop41
-	i32.store16	0($pop19), $pop20
-	i32.const	$push40=, 10
-	i32.add 	$push21=, $0, $pop40
-	i32.const	$push39=, 7
-	i32.rem_s	$push22=, $6, $pop39
-	i32.store16	0($pop21), $pop22
-	i32.const	$push38=, 8
-	i32.add 	$push23=, $0, $pop38
-	i32.const	$push37=, 7
-	i32.rem_s	$push24=, $5, $pop37
-	i32.store16	0($pop23), $pop24
-	i32.const	$push36=, 6
-	i32.add 	$push25=, $0, $pop36
-	i32.const	$push35=, 7
-	i32.rem_s	$push26=, $4, $pop35
-	i32.store16	0($pop25), $pop26
-	i32.const	$push34=, 4
-	i32.add 	$push27=, $0, $pop34
-	i32.const	$push33=, 7
-	i32.rem_s	$push28=, $3, $pop33
-	i32.store16	0($pop27), $pop28
-	i32.const	$push32=, 2
-	i32.add 	$push29=, $0, $pop32
-	i32.const	$push31=, 7
-	i32.rem_s	$push30=, $2, $pop31
-	i32.store16	0($pop29), $pop30
+	i32.load16_s	$push0=, 0($1)
+	i32.const	$push1=, 7
+	i32.rem_s	$push2=, $pop0, $pop1
+	i32.store16	0($0), $pop2
+	i32.const	$push3=, 14
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push51=, 14
+	i32.add 	$push5=, $1, $pop51
+	i32.load16_s	$push6=, 0($pop5)
+	i32.const	$push50=, 7
+	i32.rem_s	$push7=, $pop6, $pop50
+	i32.store16	0($pop4), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push49=, 12
+	i32.add 	$push10=, $1, $pop49
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push48=, 7
+	i32.rem_s	$push12=, $pop11, $pop48
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 10
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push47=, 10
+	i32.add 	$push15=, $1, $pop47
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push46=, 7
+	i32.rem_s	$push17=, $pop16, $pop46
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 8
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push45=, 8
+	i32.add 	$push20=, $1, $pop45
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push44=, 7
+	i32.rem_s	$push22=, $pop21, $pop44
+	i32.store16	0($pop19), $pop22
+	i32.const	$push23=, 6
+	i32.add 	$push24=, $0, $pop23
+	i32.const	$push43=, 6
+	i32.add 	$push25=, $1, $pop43
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push42=, 7
+	i32.rem_s	$push27=, $pop26, $pop42
+	i32.store16	0($pop24), $pop27
+	i32.const	$push28=, 4
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push41=, 4
+	i32.add 	$push30=, $1, $pop41
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push40=, 7
+	i32.rem_s	$push32=, $pop31, $pop40
+	i32.store16	0($pop29), $pop32
+	i32.const	$push33=, 2
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push39=, 2
+	i32.add 	$push35=, $1, $pop39
+	i32.load16_s	$push36=, 0($pop35)
+	i32.const	$push38=, 7
+	i32.rem_s	$push37=, $pop36, $pop38
+	i32.store16	0($pop34), $pop37
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end23:
 	.size	sr77777777, .Lfunc_end23-sr77777777
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push1067=, 0
-	i32.const	$push1064=, 0
-	i32.load	$push1065=, __stack_pointer($pop1064)
-	i32.const	$push1066=, 32
-	i32.sub 	$push1192=, $pop1065, $pop1066
-	tee_local	$push1191=, $10=, $pop1192
-	i32.store	__stack_pointer($pop1067), $pop1191
-	i32.const	$1=, 0
-	i32.const	$0=, u
+	i32.const	$push1071=, 0
+	i32.const	$push1069=, 0
+	i32.load	$push1068=, __stack_pointer($pop1069)
+	i32.const	$push1070=, 32
+	i32.sub 	$push1196=, $pop1068, $pop1070
+	tee_local	$push1195=, $10=, $pop1196
+	i32.store	__stack_pointer($pop1071), $pop1195
+	i32.const	$0=, 0
 .LBB24_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push1071=, 16
-	i32.add 	$push1072=, $10, $pop1071
-	call    	uq44444444@FUNCTION, $pop1072, $0
+	i32.const	$push1075=, 16
+	i32.add 	$push1076=, $10, $pop1075
+	i32.const	$push1203=, 4
+	i32.shl 	$push1202=, $0, $pop1203
+	tee_local	$push1201=, $2=, $pop1202
+	i32.const	$push1200=, u
+	i32.add 	$push1199=, $pop1201, $pop1200
+	tee_local	$push1198=, $1=, $pop1199
+	call    	uq44444444@FUNCTION, $pop1076, $pop1198
 	i32.load16_u	$push0=, 16($10)
-	i32.load16_u	$push2=, 0($0)
-	i32.const	$push1193=, 2
-	i32.shr_u	$push380=, $pop2, $pop1193
+	i32.load16_u	$push2=, 0($1)
+	i32.const	$push1197=, 2
+	i32.shr_u	$push380=, $pop2, $pop1197
 	i32.ne  	$push381=, $pop0, $pop380
 	br_if   	1, $pop381      # 1: down to label0
 # BB#2:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push1=, 22($10)
-	i32.const	$push1199=, 65535
-	i32.and 	$push382=, $pop1, $pop1199
-	i32.const	$push1198=, 6
-	i32.add 	$push1197=, $0, $pop1198
-	tee_local	$push1196=, $2=, $pop1197
-	i32.load16_u	$push3=, 0($pop1196)
-	i32.const	$push1195=, 65532
-	i32.and 	$push383=, $pop3, $pop1195
-	i32.const	$push1194=, 2
-	i32.shr_u	$push384=, $pop383, $pop1194
-	i32.ne  	$push385=, $pop382, $pop384
-	br_if   	1, $pop385      # 1: down to label0
+	i32.const	$push1207=, 65535
+	i32.and 	$push383=, $pop1, $pop1207
+	i32.const	$push1206=, u+6
+	i32.add 	$push382=, $2, $pop1206
+	i32.load16_u	$push3=, 0($pop382)
+	i32.const	$push1205=, 65532
+	i32.and 	$push384=, $pop3, $pop1205
+	i32.const	$push1204=, 2
+	i32.shr_u	$push385=, $pop384, $pop1204
+	i32.ne  	$push386=, $pop383, $pop385
+	br_if   	1, $pop386      # 1: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1073=, 16
-	i32.add 	$push1074=, $10, $pop1073
-	copy_local	$3=, $pop1074
+	i32.const	$push1077=, 16
+	i32.add 	$push1078=, $10, $pop1077
+	copy_local	$2=, $pop1078
 	#APP
 	#NO_APP
 	i32.load16_u	$push5=, 20($10)
-	i32.const	$push1203=, 4
-	i32.add 	$push1202=, $0, $pop1203
-	tee_local	$push1201=, $3=, $pop1202
-	i32.load16_u	$push7=, 0($pop1201)
-	i32.const	$push1200=, 2
-	i32.shr_u	$push386=, $pop7, $pop1200
-	i32.ne  	$push387=, $pop5, $pop386
-	br_if   	1, $pop387      # 1: down to label0
+	i32.const	$push1211=, 4
+	i32.add 	$push1210=, $1, $pop1211
+	tee_local	$push1209=, $2=, $pop1210
+	i32.load16_u	$push7=, 0($pop1209)
+	i32.const	$push1208=, 2
+	i32.shr_u	$push387=, $pop7, $pop1208
+	i32.ne  	$push388=, $pop5, $pop387
+	br_if   	1, $pop388      # 1: down to label0
 # BB#4:                                 # %lor.lhs.false21
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push4=, 18($10)
-	i32.const	$push1209=, 65535
-	i32.and 	$push388=, $pop4, $pop1209
-	i32.const	$push1208=, 2
-	i32.add 	$push1207=, $0, $pop1208
-	tee_local	$push1206=, $4=, $pop1207
-	i32.load16_u	$push6=, 0($pop1206)
-	i32.const	$push1205=, 65532
-	i32.and 	$push389=, $pop6, $pop1205
-	i32.const	$push1204=, 2
-	i32.shr_u	$push390=, $pop389, $pop1204
-	i32.ne  	$push391=, $pop388, $pop390
-	br_if   	1, $pop391      # 1: down to label0
+	i32.const	$push1217=, 65535
+	i32.and 	$push389=, $pop4, $pop1217
+	i32.const	$push1216=, 2
+	i32.add 	$push1215=, $1, $pop1216
+	tee_local	$push1214=, $3=, $pop1215
+	i32.load16_u	$push6=, 0($pop1214)
+	i32.const	$push1213=, 65532
+	i32.and 	$push390=, $pop6, $pop1213
+	i32.const	$push1212=, 2
+	i32.shr_u	$push391=, $pop390, $pop1212
+	i32.ne  	$push392=, $pop389, $pop391
+	br_if   	1, $pop392      # 1: down to label0
 # BB#5:                                 # %if.end31
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1075=, 16
-	i32.add 	$push1076=, $10, $pop1075
-	copy_local	$5=, $pop1076
+	i32.const	$push1079=, 16
+	i32.add 	$push1080=, $10, $pop1079
+	copy_local	$4=, $pop1080
 	#APP
 	#NO_APP
 	i32.load16_u	$push8=, 24($10)
-	i32.const	$push1213=, 8
-	i32.add 	$push1212=, $0, $pop1213
-	tee_local	$push1211=, $5=, $pop1212
-	i32.load16_u	$push10=, 0($pop1211)
-	i32.const	$push1210=, 2
-	i32.shr_u	$push392=, $pop10, $pop1210
-	i32.ne  	$push393=, $pop8, $pop392
-	br_if   	1, $pop393      # 1: down to label0
+	i32.const	$push1221=, 8
+	i32.add 	$push1220=, $1, $pop1221
+	tee_local	$push1219=, $4=, $pop1220
+	i32.load16_u	$push10=, 0($pop1219)
+	i32.const	$push1218=, 2
+	i32.shr_u	$push393=, $pop10, $pop1218
+	i32.ne  	$push394=, $pop8, $pop393
+	br_if   	1, $pop394      # 1: down to label0
 # BB#6:                                 # %lor.lhs.false40
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push9=, 30($10)
-	i32.const	$push1219=, 65535
-	i32.and 	$push394=, $pop9, $pop1219
-	i32.const	$push1218=, 14
-	i32.add 	$push1217=, $0, $pop1218
-	tee_local	$push1216=, $6=, $pop1217
-	i32.load16_u	$push11=, 0($pop1216)
-	i32.const	$push1215=, 65532
-	i32.and 	$push395=, $pop11, $pop1215
-	i32.const	$push1214=, 2
-	i32.shr_u	$push396=, $pop395, $pop1214
-	i32.ne  	$push397=, $pop394, $pop396
-	br_if   	1, $pop397      # 1: down to label0
+	i32.const	$push1227=, 65535
+	i32.and 	$push395=, $pop9, $pop1227
+	i32.const	$push1226=, 14
+	i32.add 	$push1225=, $1, $pop1226
+	tee_local	$push1224=, $5=, $pop1225
+	i32.load16_u	$push11=, 0($pop1224)
+	i32.const	$push1223=, 65532
+	i32.and 	$push396=, $pop11, $pop1223
+	i32.const	$push1222=, 2
+	i32.shr_u	$push397=, $pop396, $pop1222
+	i32.ne  	$push398=, $pop395, $pop397
+	br_if   	1, $pop398      # 1: down to label0
 # BB#7:                                 # %if.end50
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1077=, 16
-	i32.add 	$push1078=, $10, $pop1077
-	copy_local	$7=, $pop1078
+	i32.const	$push1081=, 16
+	i32.add 	$push1082=, $10, $pop1081
+	copy_local	$6=, $pop1082
 	#APP
 	#NO_APP
 	i32.load16_u	$push13=, 28($10)
-	i32.const	$push1223=, 12
-	i32.add 	$push1222=, $0, $pop1223
-	tee_local	$push1221=, $7=, $pop1222
-	i32.load16_u	$push15=, 0($pop1221)
-	i32.const	$push1220=, 2
-	i32.shr_u	$push398=, $pop15, $pop1220
-	i32.ne  	$push399=, $pop13, $pop398
-	br_if   	1, $pop399      # 1: down to label0
+	i32.const	$push1231=, 12
+	i32.add 	$push1230=, $1, $pop1231
+	tee_local	$push1229=, $6=, $pop1230
+	i32.load16_u	$push15=, 0($pop1229)
+	i32.const	$push1228=, 2
+	i32.shr_u	$push399=, $pop15, $pop1228
+	i32.ne  	$push400=, $pop13, $pop399
+	br_if   	1, $pop400      # 1: down to label0
 # BB#8:                                 # %lor.lhs.false59
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push12=, 26($10)
-	i32.const	$push1229=, 65535
-	i32.and 	$push400=, $pop12, $pop1229
-	i32.const	$push1228=, 10
-	i32.add 	$push1227=, $0, $pop1228
-	tee_local	$push1226=, $8=, $pop1227
-	i32.load16_u	$push14=, 0($pop1226)
-	i32.const	$push1225=, 65532
-	i32.and 	$push401=, $pop14, $pop1225
-	i32.const	$push1224=, 2
-	i32.shr_u	$push402=, $pop401, $pop1224
-	i32.ne  	$push403=, $pop400, $pop402
-	br_if   	1, $pop403      # 1: down to label0
+	i32.const	$push1237=, 65535
+	i32.and 	$push401=, $pop12, $pop1237
+	i32.const	$push1236=, 10
+	i32.add 	$push1235=, $1, $pop1236
+	tee_local	$push1234=, $7=, $pop1235
+	i32.load16_u	$push14=, 0($pop1234)
+	i32.const	$push1233=, 65532
+	i32.and 	$push402=, $pop14, $pop1233
+	i32.const	$push1232=, 2
+	i32.shr_u	$push403=, $pop402, $pop1232
+	i32.ne  	$push404=, $pop401, $pop403
+	br_if   	1, $pop404      # 1: down to label0
 # BB#9:                                 # %if.end69
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1079=, 16
-	i32.add 	$push1080=, $10, $pop1079
-	copy_local	$9=, $pop1080
+	i32.const	$push1083=, 16
+	i32.add 	$push1084=, $10, $pop1083
+	copy_local	$8=, $pop1084
 	#APP
 	#NO_APP
-	i32.const	$push1081=, 16
-	i32.add 	$push1082=, $10, $pop1081
-	call    	ur44444444@FUNCTION, $pop1082, $0
+	i32.const	$push1085=, 16
+	i32.add 	$push1086=, $10, $pop1085
+	call    	ur44444444@FUNCTION, $pop1086, $1
 	i32.load16_u	$push16=, 16($10)
-	i32.load16_u	$push18=, 0($0)
-	i32.const	$push1230=, 3
-	i32.and 	$push404=, $pop18, $pop1230
-	i32.ne  	$push405=, $pop16, $pop404
-	br_if   	1, $pop405      # 1: down to label0
+	i32.load16_u	$push18=, 0($1)
+	i32.const	$push1238=, 3
+	i32.and 	$push405=, $pop18, $pop1238
+	i32.ne  	$push406=, $pop16, $pop405
+	br_if   	1, $pop406      # 1: down to label0
 # BB#10:                                # %lor.lhs.false78
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push17=, 22($10)
-	i32.const	$push1232=, 65535
-	i32.and 	$push407=, $pop17, $pop1232
-	i32.load16_u	$push19=, 0($2)
-	i32.const	$push1231=, 3
-	i32.and 	$push406=, $pop19, $pop1231
-	i32.ne  	$push408=, $pop407, $pop406
-	br_if   	1, $pop408      # 1: down to label0
+	i32.const	$push1243=, 65535
+	i32.and 	$push408=, $pop17, $pop1243
+	i32.const	$push1242=, 6
+	i32.add 	$push1241=, $1, $pop1242
+	tee_local	$push1240=, $8=, $pop1241
+	i32.load16_u	$push19=, 0($pop1240)
+	i32.const	$push1239=, 3
+	i32.and 	$push407=, $pop19, $pop1239
+	i32.ne  	$push409=, $pop408, $pop407
+	br_if   	1, $pop409      # 1: down to label0
 # BB#11:                                # %if.end88
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1083=, 16
-	i32.add 	$push1084=, $10, $pop1083
-	copy_local	$9=, $pop1084
+	i32.const	$push1087=, 16
+	i32.add 	$push1088=, $10, $pop1087
+	copy_local	$9=, $pop1088
 	#APP
 	#NO_APP
 	i32.load16_u	$push21=, 20($10)
-	i32.load16_u	$push23=, 0($3)
-	i32.const	$push1233=, 3
-	i32.and 	$push409=, $pop23, $pop1233
-	i32.ne  	$push410=, $pop21, $pop409
-	br_if   	1, $pop410      # 1: down to label0
+	i32.load16_u	$push23=, 0($2)
+	i32.const	$push1244=, 3
+	i32.and 	$push410=, $pop23, $pop1244
+	i32.ne  	$push411=, $pop21, $pop410
+	br_if   	1, $pop411      # 1: down to label0
 # BB#12:                                # %lor.lhs.false97
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push20=, 18($10)
-	i32.const	$push1235=, 65535
-	i32.and 	$push412=, $pop20, $pop1235
-	i32.load16_u	$push22=, 0($4)
-	i32.const	$push1234=, 3
-	i32.and 	$push411=, $pop22, $pop1234
-	i32.ne  	$push413=, $pop412, $pop411
-	br_if   	1, $pop413      # 1: down to label0
+	i32.const	$push1246=, 65535
+	i32.and 	$push413=, $pop20, $pop1246
+	i32.load16_u	$push22=, 0($3)
+	i32.const	$push1245=, 3
+	i32.and 	$push412=, $pop22, $pop1245
+	i32.ne  	$push414=, $pop413, $pop412
+	br_if   	1, $pop414      # 1: down to label0
 # BB#13:                                # %if.end107
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1085=, 16
-	i32.add 	$push1086=, $10, $pop1085
-	copy_local	$9=, $pop1086
+	i32.const	$push1089=, 16
+	i32.add 	$push1090=, $10, $pop1089
+	copy_local	$9=, $pop1090
 	#APP
 	#NO_APP
 	i32.load16_u	$push24=, 24($10)
-	i32.load16_u	$push26=, 0($5)
-	i32.const	$push1236=, 3
-	i32.and 	$push414=, $pop26, $pop1236
-	i32.ne  	$push415=, $pop24, $pop414
-	br_if   	1, $pop415      # 1: down to label0
+	i32.load16_u	$push26=, 0($4)
+	i32.const	$push1247=, 3
+	i32.and 	$push415=, $pop26, $pop1247
+	i32.ne  	$push416=, $pop24, $pop415
+	br_if   	1, $pop416      # 1: down to label0
 # BB#14:                                # %lor.lhs.false116
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push25=, 30($10)
-	i32.const	$push1238=, 65535
-	i32.and 	$push417=, $pop25, $pop1238
-	i32.load16_u	$push27=, 0($6)
-	i32.const	$push1237=, 3
-	i32.and 	$push416=, $pop27, $pop1237
-	i32.ne  	$push418=, $pop417, $pop416
-	br_if   	1, $pop418      # 1: down to label0
+	i32.const	$push1249=, 65535
+	i32.and 	$push418=, $pop25, $pop1249
+	i32.load16_u	$push27=, 0($5)
+	i32.const	$push1248=, 3
+	i32.and 	$push417=, $pop27, $pop1248
+	i32.ne  	$push419=, $pop418, $pop417
+	br_if   	1, $pop419      # 1: down to label0
 # BB#15:                                # %if.end126
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1087=, 16
-	i32.add 	$push1088=, $10, $pop1087
-	copy_local	$9=, $pop1088
+	i32.const	$push1091=, 16
+	i32.add 	$push1092=, $10, $pop1091
+	copy_local	$9=, $pop1092
 	#APP
 	#NO_APP
 	i32.load16_u	$push29=, 28($10)
-	i32.load16_u	$push31=, 0($7)
-	i32.const	$push1239=, 3
-	i32.and 	$push419=, $pop31, $pop1239
-	i32.ne  	$push420=, $pop29, $pop419
-	br_if   	1, $pop420      # 1: down to label0
+	i32.load16_u	$push31=, 0($6)
+	i32.const	$push1250=, 3
+	i32.and 	$push420=, $pop31, $pop1250
+	i32.ne  	$push421=, $pop29, $pop420
+	br_if   	1, $pop421      # 1: down to label0
 # BB#16:                                # %lor.lhs.false135
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push28=, 26($10)
-	i32.const	$push1241=, 65535
-	i32.and 	$push422=, $pop28, $pop1241
-	i32.load16_u	$push30=, 0($8)
-	i32.const	$push1240=, 3
-	i32.and 	$push421=, $pop30, $pop1240
-	i32.ne  	$push423=, $pop422, $pop421
-	br_if   	1, $pop423      # 1: down to label0
+	i32.const	$push1252=, 65535
+	i32.and 	$push423=, $pop28, $pop1252
+	i32.load16_u	$push30=, 0($7)
+	i32.const	$push1251=, 3
+	i32.and 	$push422=, $pop30, $pop1251
+	i32.ne  	$push424=, $pop423, $pop422
+	br_if   	1, $pop424      # 1: down to label0
 # BB#17:                                # %if.end145
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1089=, 16
-	i32.add 	$push1090=, $10, $pop1089
-	copy_local	$9=, $pop1090
+	i32.const	$push1093=, 16
+	i32.add 	$push1094=, $10, $pop1093
+	copy_local	$9=, $pop1094
 	#APP
 	#NO_APP
-	i32.const	$push1091=, 16
-	i32.add 	$push1092=, $10, $pop1091
-	call    	uq1428166432128@FUNCTION, $pop1092, $0
+	i32.const	$push1095=, 16
+	i32.add 	$push1096=, $10, $pop1095
+	call    	uq1428166432128@FUNCTION, $pop1096, $1
 	i32.load16_u	$push32=, 16($10)
-	i32.load16_u	$push34=, 0($0)
-	i32.ne  	$push424=, $pop32, $pop34
-	br_if   	1, $pop424      # 1: down to label0
+	i32.load16_u	$push34=, 0($1)
+	i32.ne  	$push425=, $pop32, $pop34
+	br_if   	1, $pop425      # 1: down to label0
 # BB#18:                                # %lor.lhs.false155
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push33=, 22($10)
-	i32.const	$push1244=, 65535
-	i32.and 	$push425=, $pop33, $pop1244
-	i32.load16_u	$push35=, 0($2)
-	i32.const	$push1243=, 65528
-	i32.and 	$push426=, $pop35, $pop1243
-	i32.const	$push1242=, 3
-	i32.shr_u	$push427=, $pop426, $pop1242
-	i32.ne  	$push428=, $pop425, $pop427
-	br_if   	1, $pop428      # 1: down to label0
+	i32.const	$push1255=, 65535
+	i32.and 	$push426=, $pop33, $pop1255
+	i32.load16_u	$push35=, 0($8)
+	i32.const	$push1254=, 65528
+	i32.and 	$push427=, $pop35, $pop1254
+	i32.const	$push1253=, 3
+	i32.shr_u	$push428=, $pop427, $pop1253
+	i32.ne  	$push429=, $pop426, $pop428
+	br_if   	1, $pop429      # 1: down to label0
 # BB#19:                                # %if.end165
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1093=, 16
-	i32.add 	$push1094=, $10, $pop1093
-	copy_local	$9=, $pop1094
+	i32.const	$push1097=, 16
+	i32.add 	$push1098=, $10, $pop1097
+	copy_local	$9=, $pop1098
 	#APP
 	#NO_APP
 	i32.load16_u	$push37=, 20($10)
-	i32.load16_u	$push39=, 0($3)
-	i32.const	$push1245=, 1
-	i32.shr_u	$push429=, $pop39, $pop1245
-	i32.ne  	$push430=, $pop37, $pop429
-	br_if   	1, $pop430      # 1: down to label0
+	i32.load16_u	$push39=, 0($2)
+	i32.const	$push1256=, 1
+	i32.shr_u	$push430=, $pop39, $pop1256
+	i32.ne  	$push431=, $pop37, $pop430
+	br_if   	1, $pop431      # 1: down to label0
 # BB#20:                                # %lor.lhs.false174
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push36=, 18($10)
-	i32.const	$push1248=, 65535
-	i32.and 	$push431=, $pop36, $pop1248
-	i32.load16_u	$push38=, 0($4)
-	i32.const	$push1247=, 65532
-	i32.and 	$push432=, $pop38, $pop1247
-	i32.const	$push1246=, 2
-	i32.shr_u	$push433=, $pop432, $pop1246
-	i32.ne  	$push434=, $pop431, $pop433
-	br_if   	1, $pop434      # 1: down to label0
+	i32.const	$push1259=, 65535
+	i32.and 	$push432=, $pop36, $pop1259
+	i32.load16_u	$push38=, 0($3)
+	i32.const	$push1258=, 65532
+	i32.and 	$push433=, $pop38, $pop1258
+	i32.const	$push1257=, 2
+	i32.shr_u	$push434=, $pop433, $pop1257
+	i32.ne  	$push435=, $pop432, $pop434
+	br_if   	1, $pop435      # 1: down to label0
 # BB#21:                                # %if.end184
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1095=, 16
-	i32.add 	$push1096=, $10, $pop1095
-	copy_local	$9=, $pop1096
+	i32.const	$push1099=, 16
+	i32.add 	$push1100=, $10, $pop1099
+	copy_local	$9=, $pop1100
 	#APP
 	#NO_APP
 	i32.load16_u	$push40=, 24($10)
-	i32.load16_u	$push42=, 0($5)
-	i32.const	$push1249=, 4
-	i32.shr_u	$push435=, $pop42, $pop1249
-	i32.ne  	$push436=, $pop40, $pop435
-	br_if   	1, $pop436      # 1: down to label0
+	i32.load16_u	$push42=, 0($4)
+	i32.const	$push1260=, 4
+	i32.shr_u	$push436=, $pop42, $pop1260
+	i32.ne  	$push437=, $pop40, $pop436
+	br_if   	1, $pop437      # 1: down to label0
 # BB#22:                                # %lor.lhs.false193
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push41=, 30($10)
-	i32.const	$push1252=, 65535
-	i32.and 	$push437=, $pop41, $pop1252
-	i32.load16_u	$push43=, 0($6)
-	i32.const	$push1251=, 65408
-	i32.and 	$push438=, $pop43, $pop1251
-	i32.const	$push1250=, 7
-	i32.shr_u	$push439=, $pop438, $pop1250
-	i32.ne  	$push440=, $pop437, $pop439
-	br_if   	1, $pop440      # 1: down to label0
+	i32.const	$push1263=, 65535
+	i32.and 	$push438=, $pop41, $pop1263
+	i32.load16_u	$push43=, 0($5)
+	i32.const	$push1262=, 65408
+	i32.and 	$push439=, $pop43, $pop1262
+	i32.const	$push1261=, 7
+	i32.shr_u	$push440=, $pop439, $pop1261
+	i32.ne  	$push441=, $pop438, $pop440
+	br_if   	1, $pop441      # 1: down to label0
 # BB#23:                                # %if.end203
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1097=, 16
-	i32.add 	$push1098=, $10, $pop1097
-	copy_local	$9=, $pop1098
+	i32.const	$push1101=, 16
+	i32.add 	$push1102=, $10, $pop1101
+	copy_local	$9=, $pop1102
 	#APP
 	#NO_APP
 	i32.load16_u	$push45=, 28($10)
-	i32.load16_u	$push47=, 0($7)
-	i32.const	$push1253=, 5
-	i32.shr_u	$push441=, $pop47, $pop1253
-	i32.ne  	$push442=, $pop45, $pop441
-	br_if   	1, $pop442      # 1: down to label0
+	i32.load16_u	$push47=, 0($6)
+	i32.const	$push1264=, 5
+	i32.shr_u	$push442=, $pop47, $pop1264
+	i32.ne  	$push443=, $pop45, $pop442
+	br_if   	1, $pop443      # 1: down to label0
 # BB#24:                                # %lor.lhs.false212
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push44=, 26($10)
-	i32.const	$push1256=, 65535
-	i32.and 	$push443=, $pop44, $pop1256
-	i32.load16_u	$push46=, 0($8)
-	i32.const	$push1255=, 65472
-	i32.and 	$push444=, $pop46, $pop1255
-	i32.const	$push1254=, 6
-	i32.shr_u	$push445=, $pop444, $pop1254
-	i32.ne  	$push446=, $pop443, $pop445
-	br_if   	1, $pop446      # 1: down to label0
+	i32.const	$push1267=, 65535
+	i32.and 	$push444=, $pop44, $pop1267
+	i32.load16_u	$push46=, 0($7)
+	i32.const	$push1266=, 65472
+	i32.and 	$push445=, $pop46, $pop1266
+	i32.const	$push1265=, 6
+	i32.shr_u	$push446=, $pop445, $pop1265
+	i32.ne  	$push447=, $pop444, $pop446
+	br_if   	1, $pop447      # 1: down to label0
 # BB#25:                                # %if.end222
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1099=, 16
-	i32.add 	$push1100=, $10, $pop1099
-	copy_local	$9=, $pop1100
+	i32.const	$push1103=, 16
+	i32.add 	$push1104=, $10, $pop1103
+	copy_local	$9=, $pop1104
 	#APP
 	#NO_APP
-	i32.const	$push1101=, 16
-	i32.add 	$push1102=, $10, $pop1101
-	call    	ur1428166432128@FUNCTION, $pop1102, $0
+	i32.const	$push1105=, 16
+	i32.add 	$push1106=, $10, $pop1105
+	call    	ur1428166432128@FUNCTION, $pop1106, $1
 	i32.load16_u	$push48=, 16($10)
 	br_if   	1, $pop48       # 1: down to label0
 # BB#26:                                # %lor.lhs.false232
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push49=, 22($10)
-	i32.const	$push1258=, 65535
-	i32.and 	$push449=, $pop49, $pop1258
-	i32.load16_u	$push447=, 0($2)
-	i32.const	$push1257=, 7
-	i32.and 	$push448=, $pop447, $pop1257
-	i32.ne  	$push450=, $pop449, $pop448
-	br_if   	1, $pop450      # 1: down to label0
+	i32.const	$push1269=, 65535
+	i32.and 	$push450=, $pop49, $pop1269
+	i32.load16_u	$push448=, 0($8)
+	i32.const	$push1268=, 7
+	i32.and 	$push449=, $pop448, $pop1268
+	i32.ne  	$push451=, $pop450, $pop449
+	br_if   	1, $pop451      # 1: down to label0
 # BB#27:                                # %if.end242
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1103=, 16
-	i32.add 	$push1104=, $10, $pop1103
-	copy_local	$9=, $pop1104
+	i32.const	$push1107=, 16
+	i32.add 	$push1108=, $10, $pop1107
+	copy_local	$9=, $pop1108
 	#APP
 	#NO_APP
 	i32.load16_u	$push51=, 20($10)
-	i32.load16_u	$push53=, 0($3)
-	i32.const	$push1259=, 1
-	i32.and 	$push451=, $pop53, $pop1259
-	i32.ne  	$push452=, $pop51, $pop451
-	br_if   	1, $pop452      # 1: down to label0
+	i32.load16_u	$push53=, 0($2)
+	i32.const	$push1270=, 1
+	i32.and 	$push452=, $pop53, $pop1270
+	i32.ne  	$push453=, $pop51, $pop452
+	br_if   	1, $pop453      # 1: down to label0
 # BB#28:                                # %lor.lhs.false251
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push50=, 18($10)
-	i32.const	$push1261=, 65535
-	i32.and 	$push454=, $pop50, $pop1261
-	i32.load16_u	$push52=, 0($4)
-	i32.const	$push1260=, 3
-	i32.and 	$push453=, $pop52, $pop1260
-	i32.ne  	$push455=, $pop454, $pop453
-	br_if   	1, $pop455      # 1: down to label0
+	i32.const	$push1272=, 65535
+	i32.and 	$push455=, $pop50, $pop1272
+	i32.load16_u	$push52=, 0($3)
+	i32.const	$push1271=, 3
+	i32.and 	$push454=, $pop52, $pop1271
+	i32.ne  	$push456=, $pop455, $pop454
+	br_if   	1, $pop456      # 1: down to label0
 # BB#29:                                # %if.end261
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1105=, 16
-	i32.add 	$push1106=, $10, $pop1105
-	copy_local	$9=, $pop1106
+	i32.const	$push1109=, 16
+	i32.add 	$push1110=, $10, $pop1109
+	copy_local	$9=, $pop1110
 	#APP
 	#NO_APP
 	i32.load16_u	$push54=, 24($10)
-	i32.load16_u	$push56=, 0($5)
-	i32.const	$push1262=, 15
-	i32.and 	$push456=, $pop56, $pop1262
-	i32.ne  	$push457=, $pop54, $pop456
-	br_if   	1, $pop457      # 1: down to label0
+	i32.load16_u	$push56=, 0($4)
+	i32.const	$push1273=, 15
+	i32.and 	$push457=, $pop56, $pop1273
+	i32.ne  	$push458=, $pop54, $pop457
+	br_if   	1, $pop458      # 1: down to label0
 # BB#30:                                # %lor.lhs.false270
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push55=, 30($10)
-	i32.const	$push1264=, 65535
-	i32.and 	$push459=, $pop55, $pop1264
-	i32.load16_u	$push57=, 0($6)
-	i32.const	$push1263=, 127
-	i32.and 	$push458=, $pop57, $pop1263
-	i32.ne  	$push460=, $pop459, $pop458
-	br_if   	1, $pop460      # 1: down to label0
+	i32.const	$push1275=, 65535
+	i32.and 	$push460=, $pop55, $pop1275
+	i32.load16_u	$push57=, 0($5)
+	i32.const	$push1274=, 127
+	i32.and 	$push459=, $pop57, $pop1274
+	i32.ne  	$push461=, $pop460, $pop459
+	br_if   	1, $pop461      # 1: down to label0
 # BB#31:                                # %if.end280
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1107=, 16
-	i32.add 	$push1108=, $10, $pop1107
-	copy_local	$9=, $pop1108
+	i32.const	$push1111=, 16
+	i32.add 	$push1112=, $10, $pop1111
+	copy_local	$9=, $pop1112
 	#APP
 	#NO_APP
 	i32.load16_u	$push59=, 28($10)
-	i32.load16_u	$push61=, 0($7)
-	i32.const	$push1265=, 31
-	i32.and 	$push461=, $pop61, $pop1265
-	i32.ne  	$push462=, $pop59, $pop461
-	br_if   	1, $pop462      # 1: down to label0
+	i32.load16_u	$push61=, 0($6)
+	i32.const	$push1276=, 31
+	i32.and 	$push462=, $pop61, $pop1276
+	i32.ne  	$push463=, $pop59, $pop462
+	br_if   	1, $pop463      # 1: down to label0
 # BB#32:                                # %lor.lhs.false289
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push58=, 26($10)
-	i32.const	$push1267=, 65535
-	i32.and 	$push464=, $pop58, $pop1267
-	i32.load16_u	$push60=, 0($8)
-	i32.const	$push1266=, 63
-	i32.and 	$push463=, $pop60, $pop1266
-	i32.ne  	$push465=, $pop464, $pop463
-	br_if   	1, $pop465      # 1: down to label0
+	i32.const	$push1278=, 65535
+	i32.and 	$push465=, $pop58, $pop1278
+	i32.load16_u	$push60=, 0($7)
+	i32.const	$push1277=, 63
+	i32.and 	$push464=, $pop60, $pop1277
+	i32.ne  	$push466=, $pop465, $pop464
+	br_if   	1, $pop466      # 1: down to label0
 # BB#33:                                # %if.end299
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1109=, 16
-	i32.add 	$push1110=, $10, $pop1109
-	copy_local	$9=, $pop1110
+	i32.const	$push1113=, 16
+	i32.add 	$push1114=, $10, $pop1113
+	copy_local	$9=, $pop1114
 	#APP
 	#NO_APP
-	i32.const	$push1111=, 16
-	i32.add 	$push1112=, $10, $pop1111
-	call    	uq33333333@FUNCTION, $pop1112, $0
+	i32.const	$push1115=, 16
+	i32.add 	$push1116=, $10, $pop1115
+	call    	uq33333333@FUNCTION, $pop1116, $1
 	i32.load16_u	$push62=, 16($10)
-	i32.load16_u	$push64=, 0($0)
-	i32.const	$push1268=, 3
-	i32.div_u	$push466=, $pop64, $pop1268
-	i32.ne  	$push467=, $pop62, $pop466
-	br_if   	1, $pop467      # 1: down to label0
+	i32.load16_u	$push64=, 0($1)
+	i32.const	$push1279=, 3
+	i32.div_u	$push467=, $pop64, $pop1279
+	i32.ne  	$push468=, $pop62, $pop467
+	br_if   	1, $pop468      # 1: down to label0
 # BB#34:                                # %lor.lhs.false309
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push63=, 22($10)
-	i32.const	$push1271=, 65535
-	i32.and 	$push468=, $pop63, $pop1271
-	i32.load16_u	$push65=, 0($2)
-	i32.const	$push1270=, 65535
-	i32.and 	$push469=, $pop65, $pop1270
-	i32.const	$push1269=, 3
-	i32.div_u	$push470=, $pop469, $pop1269
-	i32.ne  	$push471=, $pop468, $pop470
-	br_if   	1, $pop471      # 1: down to label0
+	i32.const	$push1282=, 65535
+	i32.and 	$push469=, $pop63, $pop1282
+	i32.load16_u	$push65=, 0($8)
+	i32.const	$push1281=, 65535
+	i32.and 	$push470=, $pop65, $pop1281
+	i32.const	$push1280=, 3
+	i32.div_u	$push471=, $pop470, $pop1280
+	i32.ne  	$push472=, $pop469, $pop471
+	br_if   	1, $pop472      # 1: down to label0
 # BB#35:                                # %if.end319
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1113=, 16
-	i32.add 	$push1114=, $10, $pop1113
-	copy_local	$9=, $pop1114
+	i32.const	$push1117=, 16
+	i32.add 	$push1118=, $10, $pop1117
+	copy_local	$9=, $pop1118
 	#APP
 	#NO_APP
 	i32.load16_u	$push67=, 20($10)
-	i32.load16_u	$push69=, 0($3)
-	i32.const	$push1272=, 3
-	i32.div_u	$push472=, $pop69, $pop1272
-	i32.ne  	$push473=, $pop67, $pop472
-	br_if   	1, $pop473      # 1: down to label0
+	i32.load16_u	$push69=, 0($2)
+	i32.const	$push1283=, 3
+	i32.div_u	$push473=, $pop69, $pop1283
+	i32.ne  	$push474=, $pop67, $pop473
+	br_if   	1, $pop474      # 1: down to label0
 # BB#36:                                # %lor.lhs.false328
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push66=, 18($10)
-	i32.const	$push1275=, 65535
-	i32.and 	$push474=, $pop66, $pop1275
-	i32.load16_u	$push68=, 0($4)
-	i32.const	$push1274=, 65535
-	i32.and 	$push475=, $pop68, $pop1274
-	i32.const	$push1273=, 3
-	i32.div_u	$push476=, $pop475, $pop1273
-	i32.ne  	$push477=, $pop474, $pop476
-	br_if   	1, $pop477      # 1: down to label0
+	i32.const	$push1286=, 65535
+	i32.and 	$push475=, $pop66, $pop1286
+	i32.load16_u	$push68=, 0($3)
+	i32.const	$push1285=, 65535
+	i32.and 	$push476=, $pop68, $pop1285
+	i32.const	$push1284=, 3
+	i32.div_u	$push477=, $pop476, $pop1284
+	i32.ne  	$push478=, $pop475, $pop477
+	br_if   	1, $pop478      # 1: down to label0
 # BB#37:                                # %if.end338
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1115=, 16
-	i32.add 	$push1116=, $10, $pop1115
-	copy_local	$9=, $pop1116
+	i32.const	$push1119=, 16
+	i32.add 	$push1120=, $10, $pop1119
+	copy_local	$9=, $pop1120
 	#APP
 	#NO_APP
 	i32.load16_u	$push70=, 24($10)
-	i32.load16_u	$push72=, 0($5)
-	i32.const	$push1276=, 3
-	i32.div_u	$push478=, $pop72, $pop1276
-	i32.ne  	$push479=, $pop70, $pop478
-	br_if   	1, $pop479      # 1: down to label0
+	i32.load16_u	$push72=, 0($4)
+	i32.const	$push1287=, 3
+	i32.div_u	$push479=, $pop72, $pop1287
+	i32.ne  	$push480=, $pop70, $pop479
+	br_if   	1, $pop480      # 1: down to label0
 # BB#38:                                # %lor.lhs.false347
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push71=, 30($10)
-	i32.const	$push1279=, 65535
-	i32.and 	$push480=, $pop71, $pop1279
-	i32.load16_u	$push73=, 0($6)
-	i32.const	$push1278=, 65535
-	i32.and 	$push481=, $pop73, $pop1278
-	i32.const	$push1277=, 3
-	i32.div_u	$push482=, $pop481, $pop1277
-	i32.ne  	$push483=, $pop480, $pop482
-	br_if   	1, $pop483      # 1: down to label0
+	i32.const	$push1290=, 65535
+	i32.and 	$push481=, $pop71, $pop1290
+	i32.load16_u	$push73=, 0($5)
+	i32.const	$push1289=, 65535
+	i32.and 	$push482=, $pop73, $pop1289
+	i32.const	$push1288=, 3
+	i32.div_u	$push483=, $pop482, $pop1288
+	i32.ne  	$push484=, $pop481, $pop483
+	br_if   	1, $pop484      # 1: down to label0
 # BB#39:                                # %if.end357
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1117=, 16
-	i32.add 	$push1118=, $10, $pop1117
-	copy_local	$9=, $pop1118
+	i32.const	$push1121=, 16
+	i32.add 	$push1122=, $10, $pop1121
+	copy_local	$9=, $pop1122
 	#APP
 	#NO_APP
 	i32.load16_u	$push75=, 28($10)
-	i32.load16_u	$push77=, 0($7)
-	i32.const	$push1280=, 3
-	i32.div_u	$push484=, $pop77, $pop1280
-	i32.ne  	$push485=, $pop75, $pop484
-	br_if   	1, $pop485      # 1: down to label0
+	i32.load16_u	$push77=, 0($6)
+	i32.const	$push1291=, 3
+	i32.div_u	$push485=, $pop77, $pop1291
+	i32.ne  	$push486=, $pop75, $pop485
+	br_if   	1, $pop486      # 1: down to label0
 # BB#40:                                # %lor.lhs.false366
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push74=, 26($10)
-	i32.const	$push1283=, 65535
-	i32.and 	$push486=, $pop74, $pop1283
-	i32.load16_u	$push76=, 0($8)
-	i32.const	$push1282=, 65535
-	i32.and 	$push487=, $pop76, $pop1282
-	i32.const	$push1281=, 3
-	i32.div_u	$push488=, $pop487, $pop1281
-	i32.ne  	$push489=, $pop486, $pop488
-	br_if   	1, $pop489      # 1: down to label0
+	i32.const	$push1294=, 65535
+	i32.and 	$push487=, $pop74, $pop1294
+	i32.load16_u	$push76=, 0($7)
+	i32.const	$push1293=, 65535
+	i32.and 	$push488=, $pop76, $pop1293
+	i32.const	$push1292=, 3
+	i32.div_u	$push489=, $pop488, $pop1292
+	i32.ne  	$push490=, $pop487, $pop489
+	br_if   	1, $pop490      # 1: down to label0
 # BB#41:                                # %if.end376
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1119=, 16
-	i32.add 	$push1120=, $10, $pop1119
-	copy_local	$9=, $pop1120
+	i32.const	$push1123=, 16
+	i32.add 	$push1124=, $10, $pop1123
+	copy_local	$9=, $pop1124
 	#APP
 	#NO_APP
-	i32.const	$push1121=, 16
-	i32.add 	$push1122=, $10, $pop1121
-	call    	ur33333333@FUNCTION, $pop1122, $0
+	i32.const	$push1125=, 16
+	i32.add 	$push1126=, $10, $pop1125
+	call    	ur33333333@FUNCTION, $pop1126, $1
 	i32.load16_u	$push78=, 16($10)
-	i32.load16_u	$push80=, 0($0)
-	i32.const	$push1284=, 3
-	i32.rem_u	$push490=, $pop80, $pop1284
-	i32.ne  	$push491=, $pop78, $pop490
-	br_if   	1, $pop491      # 1: down to label0
+	i32.load16_u	$push80=, 0($1)
+	i32.const	$push1295=, 3
+	i32.rem_u	$push491=, $pop80, $pop1295
+	i32.ne  	$push492=, $pop78, $pop491
+	br_if   	1, $pop492      # 1: down to label0
 # BB#42:                                # %lor.lhs.false386
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push79=, 22($10)
-	i32.const	$push1287=, 65535
-	i32.and 	$push492=, $pop79, $pop1287
-	i32.load16_u	$push81=, 0($2)
-	i32.const	$push1286=, 65535
-	i32.and 	$push493=, $pop81, $pop1286
-	i32.const	$push1285=, 3
-	i32.rem_u	$push494=, $pop493, $pop1285
-	i32.ne  	$push495=, $pop492, $pop494
-	br_if   	1, $pop495      # 1: down to label0
+	i32.const	$push1298=, 65535
+	i32.and 	$push493=, $pop79, $pop1298
+	i32.load16_u	$push81=, 0($8)
+	i32.const	$push1297=, 65535
+	i32.and 	$push494=, $pop81, $pop1297
+	i32.const	$push1296=, 3
+	i32.rem_u	$push495=, $pop494, $pop1296
+	i32.ne  	$push496=, $pop493, $pop495
+	br_if   	1, $pop496      # 1: down to label0
 # BB#43:                                # %if.end396
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1123=, 16
-	i32.add 	$push1124=, $10, $pop1123
-	copy_local	$9=, $pop1124
+	i32.const	$push1127=, 16
+	i32.add 	$push1128=, $10, $pop1127
+	copy_local	$9=, $pop1128
 	#APP
 	#NO_APP
 	i32.load16_u	$push83=, 20($10)
-	i32.load16_u	$push85=, 0($3)
-	i32.const	$push1288=, 3
-	i32.rem_u	$push496=, $pop85, $pop1288
-	i32.ne  	$push497=, $pop83, $pop496
-	br_if   	1, $pop497      # 1: down to label0
+	i32.load16_u	$push85=, 0($2)
+	i32.const	$push1299=, 3
+	i32.rem_u	$push497=, $pop85, $pop1299
+	i32.ne  	$push498=, $pop83, $pop497
+	br_if   	1, $pop498      # 1: down to label0
 # BB#44:                                # %lor.lhs.false405
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push82=, 18($10)
-	i32.const	$push1291=, 65535
-	i32.and 	$push498=, $pop82, $pop1291
-	i32.load16_u	$push84=, 0($4)
-	i32.const	$push1290=, 65535
-	i32.and 	$push499=, $pop84, $pop1290
-	i32.const	$push1289=, 3
-	i32.rem_u	$push500=, $pop499, $pop1289
-	i32.ne  	$push501=, $pop498, $pop500
-	br_if   	1, $pop501      # 1: down to label0
+	i32.const	$push1302=, 65535
+	i32.and 	$push499=, $pop82, $pop1302
+	i32.load16_u	$push84=, 0($3)
+	i32.const	$push1301=, 65535
+	i32.and 	$push500=, $pop84, $pop1301
+	i32.const	$push1300=, 3
+	i32.rem_u	$push501=, $pop500, $pop1300
+	i32.ne  	$push502=, $pop499, $pop501
+	br_if   	1, $pop502      # 1: down to label0
 # BB#45:                                # %if.end415
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1125=, 16
-	i32.add 	$push1126=, $10, $pop1125
-	copy_local	$9=, $pop1126
+	i32.const	$push1129=, 16
+	i32.add 	$push1130=, $10, $pop1129
+	copy_local	$9=, $pop1130
 	#APP
 	#NO_APP
 	i32.load16_u	$push86=, 24($10)
-	i32.load16_u	$push88=, 0($5)
-	i32.const	$push1292=, 3
-	i32.rem_u	$push502=, $pop88, $pop1292
-	i32.ne  	$push503=, $pop86, $pop502
-	br_if   	1, $pop503      # 1: down to label0
+	i32.load16_u	$push88=, 0($4)
+	i32.const	$push1303=, 3
+	i32.rem_u	$push503=, $pop88, $pop1303
+	i32.ne  	$push504=, $pop86, $pop503
+	br_if   	1, $pop504      # 1: down to label0
 # BB#46:                                # %lor.lhs.false424
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push87=, 30($10)
-	i32.const	$push1295=, 65535
-	i32.and 	$push504=, $pop87, $pop1295
-	i32.load16_u	$push89=, 0($6)
-	i32.const	$push1294=, 65535
-	i32.and 	$push505=, $pop89, $pop1294
-	i32.const	$push1293=, 3
-	i32.rem_u	$push506=, $pop505, $pop1293
-	i32.ne  	$push507=, $pop504, $pop506
-	br_if   	1, $pop507      # 1: down to label0
+	i32.const	$push1306=, 65535
+	i32.and 	$push505=, $pop87, $pop1306
+	i32.load16_u	$push89=, 0($5)
+	i32.const	$push1305=, 65535
+	i32.and 	$push506=, $pop89, $pop1305
+	i32.const	$push1304=, 3
+	i32.rem_u	$push507=, $pop506, $pop1304
+	i32.ne  	$push508=, $pop505, $pop507
+	br_if   	1, $pop508      # 1: down to label0
 # BB#47:                                # %if.end434
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1127=, 16
-	i32.add 	$push1128=, $10, $pop1127
-	copy_local	$9=, $pop1128
+	i32.const	$push1131=, 16
+	i32.add 	$push1132=, $10, $pop1131
+	copy_local	$9=, $pop1132
 	#APP
 	#NO_APP
 	i32.load16_u	$push91=, 28($10)
-	i32.load16_u	$push93=, 0($7)
-	i32.const	$push1296=, 3
-	i32.rem_u	$push508=, $pop93, $pop1296
-	i32.ne  	$push509=, $pop91, $pop508
-	br_if   	1, $pop509      # 1: down to label0
+	i32.load16_u	$push93=, 0($6)
+	i32.const	$push1307=, 3
+	i32.rem_u	$push509=, $pop93, $pop1307
+	i32.ne  	$push510=, $pop91, $pop509
+	br_if   	1, $pop510      # 1: down to label0
 # BB#48:                                # %lor.lhs.false443
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push90=, 26($10)
-	i32.const	$push1299=, 65535
-	i32.and 	$push510=, $pop90, $pop1299
-	i32.load16_u	$push92=, 0($8)
-	i32.const	$push1298=, 65535
-	i32.and 	$push511=, $pop92, $pop1298
-	i32.const	$push1297=, 3
-	i32.rem_u	$push512=, $pop511, $pop1297
-	i32.ne  	$push513=, $pop510, $pop512
-	br_if   	1, $pop513      # 1: down to label0
+	i32.const	$push1310=, 65535
+	i32.and 	$push511=, $pop90, $pop1310
+	i32.load16_u	$push92=, 0($7)
+	i32.const	$push1309=, 65535
+	i32.and 	$push512=, $pop92, $pop1309
+	i32.const	$push1308=, 3
+	i32.rem_u	$push513=, $pop512, $pop1308
+	i32.ne  	$push514=, $pop511, $pop513
+	br_if   	1, $pop514      # 1: down to label0
 # BB#49:                                # %if.end453
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1129=, 16
-	i32.add 	$push1130=, $10, $pop1129
-	copy_local	$9=, $pop1130
+	i32.const	$push1133=, 16
+	i32.add 	$push1134=, $10, $pop1133
+	copy_local	$9=, $pop1134
 	#APP
 	#NO_APP
-	i32.const	$push1131=, 16
-	i32.add 	$push1132=, $10, $pop1131
-	call    	uq65656565@FUNCTION, $pop1132, $0
+	i32.const	$push1135=, 16
+	i32.add 	$push1136=, $10, $pop1135
+	call    	uq65656565@FUNCTION, $pop1136, $1
 	i32.load16_u	$push94=, 16($10)
-	i32.load16_u	$push96=, 0($0)
-	i32.const	$push1300=, 6
-	i32.div_u	$push514=, $pop96, $pop1300
-	i32.ne  	$push515=, $pop94, $pop514
-	br_if   	1, $pop515      # 1: down to label0
+	i32.load16_u	$push96=, 0($1)
+	i32.const	$push1311=, 6
+	i32.div_u	$push515=, $pop96, $pop1311
+	i32.ne  	$push516=, $pop94, $pop515
+	br_if   	1, $pop516      # 1: down to label0
 # BB#50:                                # %lor.lhs.false463
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push95=, 22($10)
-	i32.const	$push1303=, 65535
-	i32.and 	$push516=, $pop95, $pop1303
-	i32.load16_u	$push97=, 0($2)
-	i32.const	$push1302=, 65535
-	i32.and 	$push517=, $pop97, $pop1302
-	i32.const	$push1301=, 5
-	i32.div_u	$push518=, $pop517, $pop1301
-	i32.ne  	$push519=, $pop516, $pop518
-	br_if   	1, $pop519      # 1: down to label0
+	i32.const	$push1314=, 65535
+	i32.and 	$push517=, $pop95, $pop1314
+	i32.load16_u	$push97=, 0($8)
+	i32.const	$push1313=, 65535
+	i32.and 	$push518=, $pop97, $pop1313
+	i32.const	$push1312=, 5
+	i32.div_u	$push519=, $pop518, $pop1312
+	i32.ne  	$push520=, $pop517, $pop519
+	br_if   	1, $pop520      # 1: down to label0
 # BB#51:                                # %if.end473
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1133=, 16
-	i32.add 	$push1134=, $10, $pop1133
-	copy_local	$9=, $pop1134
+	i32.const	$push1137=, 16
+	i32.add 	$push1138=, $10, $pop1137
+	copy_local	$9=, $pop1138
 	#APP
 	#NO_APP
 	i32.load16_u	$push99=, 20($10)
-	i32.load16_u	$push101=, 0($3)
-	i32.const	$push1304=, 6
-	i32.div_u	$push520=, $pop101, $pop1304
-	i32.ne  	$push521=, $pop99, $pop520
-	br_if   	1, $pop521      # 1: down to label0
+	i32.load16_u	$push101=, 0($2)
+	i32.const	$push1315=, 6
+	i32.div_u	$push521=, $pop101, $pop1315
+	i32.ne  	$push522=, $pop99, $pop521
+	br_if   	1, $pop522      # 1: down to label0
 # BB#52:                                # %lor.lhs.false482
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push98=, 18($10)
-	i32.const	$push1307=, 65535
-	i32.and 	$push522=, $pop98, $pop1307
-	i32.load16_u	$push100=, 0($4)
-	i32.const	$push1306=, 65535
-	i32.and 	$push523=, $pop100, $pop1306
-	i32.const	$push1305=, 5
-	i32.div_u	$push524=, $pop523, $pop1305
-	i32.ne  	$push525=, $pop522, $pop524
-	br_if   	1, $pop525      # 1: down to label0
+	i32.const	$push1318=, 65535
+	i32.and 	$push523=, $pop98, $pop1318
+	i32.load16_u	$push100=, 0($3)
+	i32.const	$push1317=, 65535
+	i32.and 	$push524=, $pop100, $pop1317
+	i32.const	$push1316=, 5
+	i32.div_u	$push525=, $pop524, $pop1316
+	i32.ne  	$push526=, $pop523, $pop525
+	br_if   	1, $pop526      # 1: down to label0
 # BB#53:                                # %if.end492
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1135=, 16
-	i32.add 	$push1136=, $10, $pop1135
-	copy_local	$9=, $pop1136
+	i32.const	$push1139=, 16
+	i32.add 	$push1140=, $10, $pop1139
+	copy_local	$9=, $pop1140
 	#APP
 	#NO_APP
 	i32.load16_u	$push102=, 24($10)
-	i32.load16_u	$push104=, 0($5)
-	i32.const	$push1308=, 6
-	i32.div_u	$push526=, $pop104, $pop1308
-	i32.ne  	$push527=, $pop102, $pop526
-	br_if   	1, $pop527      # 1: down to label0
+	i32.load16_u	$push104=, 0($4)
+	i32.const	$push1319=, 6
+	i32.div_u	$push527=, $pop104, $pop1319
+	i32.ne  	$push528=, $pop102, $pop527
+	br_if   	1, $pop528      # 1: down to label0
 # BB#54:                                # %lor.lhs.false501
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push103=, 30($10)
-	i32.const	$push1311=, 65535
-	i32.and 	$push528=, $pop103, $pop1311
-	i32.load16_u	$push105=, 0($6)
-	i32.const	$push1310=, 65535
-	i32.and 	$push529=, $pop105, $pop1310
-	i32.const	$push1309=, 5
-	i32.div_u	$push530=, $pop529, $pop1309
-	i32.ne  	$push531=, $pop528, $pop530
-	br_if   	1, $pop531      # 1: down to label0
+	i32.const	$push1322=, 65535
+	i32.and 	$push529=, $pop103, $pop1322
+	i32.load16_u	$push105=, 0($5)
+	i32.const	$push1321=, 65535
+	i32.and 	$push530=, $pop105, $pop1321
+	i32.const	$push1320=, 5
+	i32.div_u	$push531=, $pop530, $pop1320
+	i32.ne  	$push532=, $pop529, $pop531
+	br_if   	1, $pop532      # 1: down to label0
 # BB#55:                                # %if.end511
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1137=, 16
-	i32.add 	$push1138=, $10, $pop1137
-	copy_local	$9=, $pop1138
+	i32.const	$push1141=, 16
+	i32.add 	$push1142=, $10, $pop1141
+	copy_local	$9=, $pop1142
 	#APP
 	#NO_APP
 	i32.load16_u	$push107=, 28($10)
-	i32.load16_u	$push109=, 0($7)
-	i32.const	$push1312=, 6
-	i32.div_u	$push532=, $pop109, $pop1312
-	i32.ne  	$push533=, $pop107, $pop532
-	br_if   	1, $pop533      # 1: down to label0
+	i32.load16_u	$push109=, 0($6)
+	i32.const	$push1323=, 6
+	i32.div_u	$push533=, $pop109, $pop1323
+	i32.ne  	$push534=, $pop107, $pop533
+	br_if   	1, $pop534      # 1: down to label0
 # BB#56:                                # %lor.lhs.false520
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push106=, 26($10)
-	i32.const	$push1315=, 65535
-	i32.and 	$push534=, $pop106, $pop1315
-	i32.load16_u	$push108=, 0($8)
-	i32.const	$push1314=, 65535
-	i32.and 	$push535=, $pop108, $pop1314
-	i32.const	$push1313=, 5
-	i32.div_u	$push536=, $pop535, $pop1313
-	i32.ne  	$push537=, $pop534, $pop536
-	br_if   	1, $pop537      # 1: down to label0
+	i32.const	$push1326=, 65535
+	i32.and 	$push535=, $pop106, $pop1326
+	i32.load16_u	$push108=, 0($7)
+	i32.const	$push1325=, 65535
+	i32.and 	$push536=, $pop108, $pop1325
+	i32.const	$push1324=, 5
+	i32.div_u	$push537=, $pop536, $pop1324
+	i32.ne  	$push538=, $pop535, $pop537
+	br_if   	1, $pop538      # 1: down to label0
 # BB#57:                                # %if.end530
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1139=, 16
-	i32.add 	$push1140=, $10, $pop1139
-	copy_local	$9=, $pop1140
+	i32.const	$push1143=, 16
+	i32.add 	$push1144=, $10, $pop1143
+	copy_local	$9=, $pop1144
 	#APP
 	#NO_APP
-	i32.const	$push1141=, 16
-	i32.add 	$push1142=, $10, $pop1141
-	call    	ur65656565@FUNCTION, $pop1142, $0
+	i32.const	$push1145=, 16
+	i32.add 	$push1146=, $10, $pop1145
+	call    	ur65656565@FUNCTION, $pop1146, $1
 	i32.load16_u	$push110=, 16($10)
-	i32.load16_u	$push112=, 0($0)
-	i32.const	$push1316=, 6
-	i32.rem_u	$push538=, $pop112, $pop1316
-	i32.ne  	$push539=, $pop110, $pop538
-	br_if   	1, $pop539      # 1: down to label0
+	i32.load16_u	$push112=, 0($1)
+	i32.const	$push1327=, 6
+	i32.rem_u	$push539=, $pop112, $pop1327
+	i32.ne  	$push540=, $pop110, $pop539
+	br_if   	1, $pop540      # 1: down to label0
 # BB#58:                                # %lor.lhs.false540
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push111=, 22($10)
-	i32.const	$push1319=, 65535
-	i32.and 	$push540=, $pop111, $pop1319
-	i32.load16_u	$push113=, 0($2)
-	i32.const	$push1318=, 65535
-	i32.and 	$push541=, $pop113, $pop1318
-	i32.const	$push1317=, 5
-	i32.rem_u	$push542=, $pop541, $pop1317
-	i32.ne  	$push543=, $pop540, $pop542
-	br_if   	1, $pop543      # 1: down to label0
+	i32.const	$push1330=, 65535
+	i32.and 	$push541=, $pop111, $pop1330
+	i32.load16_u	$push113=, 0($8)
+	i32.const	$push1329=, 65535
+	i32.and 	$push542=, $pop113, $pop1329
+	i32.const	$push1328=, 5
+	i32.rem_u	$push543=, $pop542, $pop1328
+	i32.ne  	$push544=, $pop541, $pop543
+	br_if   	1, $pop544      # 1: down to label0
 # BB#59:                                # %if.end550
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1143=, 16
-	i32.add 	$push1144=, $10, $pop1143
-	copy_local	$9=, $pop1144
+	i32.const	$push1147=, 16
+	i32.add 	$push1148=, $10, $pop1147
+	copy_local	$9=, $pop1148
 	#APP
 	#NO_APP
 	i32.load16_u	$push115=, 20($10)
-	i32.load16_u	$push117=, 0($3)
-	i32.const	$push1320=, 6
-	i32.rem_u	$push544=, $pop117, $pop1320
-	i32.ne  	$push545=, $pop115, $pop544
-	br_if   	1, $pop545      # 1: down to label0
+	i32.load16_u	$push117=, 0($2)
+	i32.const	$push1331=, 6
+	i32.rem_u	$push545=, $pop117, $pop1331
+	i32.ne  	$push546=, $pop115, $pop545
+	br_if   	1, $pop546      # 1: down to label0
 # BB#60:                                # %lor.lhs.false559
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push114=, 18($10)
-	i32.const	$push1323=, 65535
-	i32.and 	$push546=, $pop114, $pop1323
-	i32.load16_u	$push116=, 0($4)
-	i32.const	$push1322=, 65535
-	i32.and 	$push547=, $pop116, $pop1322
-	i32.const	$push1321=, 5
-	i32.rem_u	$push548=, $pop547, $pop1321
-	i32.ne  	$push549=, $pop546, $pop548
-	br_if   	1, $pop549      # 1: down to label0
+	i32.const	$push1334=, 65535
+	i32.and 	$push547=, $pop114, $pop1334
+	i32.load16_u	$push116=, 0($3)
+	i32.const	$push1333=, 65535
+	i32.and 	$push548=, $pop116, $pop1333
+	i32.const	$push1332=, 5
+	i32.rem_u	$push549=, $pop548, $pop1332
+	i32.ne  	$push550=, $pop547, $pop549
+	br_if   	1, $pop550      # 1: down to label0
 # BB#61:                                # %if.end569
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1145=, 16
-	i32.add 	$push1146=, $10, $pop1145
-	copy_local	$9=, $pop1146
+	i32.const	$push1149=, 16
+	i32.add 	$push1150=, $10, $pop1149
+	copy_local	$9=, $pop1150
 	#APP
 	#NO_APP
 	i32.load16_u	$push118=, 24($10)
-	i32.load16_u	$push120=, 0($5)
-	i32.const	$push1324=, 6
-	i32.rem_u	$push550=, $pop120, $pop1324
-	i32.ne  	$push551=, $pop118, $pop550
-	br_if   	1, $pop551      # 1: down to label0
+	i32.load16_u	$push120=, 0($4)
+	i32.const	$push1335=, 6
+	i32.rem_u	$push551=, $pop120, $pop1335
+	i32.ne  	$push552=, $pop118, $pop551
+	br_if   	1, $pop552      # 1: down to label0
 # BB#62:                                # %lor.lhs.false578
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push119=, 30($10)
-	i32.const	$push1327=, 65535
-	i32.and 	$push552=, $pop119, $pop1327
-	i32.load16_u	$push121=, 0($6)
-	i32.const	$push1326=, 65535
-	i32.and 	$push553=, $pop121, $pop1326
-	i32.const	$push1325=, 5
-	i32.rem_u	$push554=, $pop553, $pop1325
-	i32.ne  	$push555=, $pop552, $pop554
-	br_if   	1, $pop555      # 1: down to label0
+	i32.const	$push1338=, 65535
+	i32.and 	$push553=, $pop119, $pop1338
+	i32.load16_u	$push121=, 0($5)
+	i32.const	$push1337=, 65535
+	i32.and 	$push554=, $pop121, $pop1337
+	i32.const	$push1336=, 5
+	i32.rem_u	$push555=, $pop554, $pop1336
+	i32.ne  	$push556=, $pop553, $pop555
+	br_if   	1, $pop556      # 1: down to label0
 # BB#63:                                # %if.end588
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1147=, 16
-	i32.add 	$push1148=, $10, $pop1147
-	copy_local	$9=, $pop1148
+	i32.const	$push1151=, 16
+	i32.add 	$push1152=, $10, $pop1151
+	copy_local	$9=, $pop1152
 	#APP
 	#NO_APP
 	i32.load16_u	$push123=, 28($10)
-	i32.load16_u	$push125=, 0($7)
-	i32.const	$push1328=, 6
-	i32.rem_u	$push556=, $pop125, $pop1328
-	i32.ne  	$push557=, $pop123, $pop556
-	br_if   	1, $pop557      # 1: down to label0
+	i32.load16_u	$push125=, 0($6)
+	i32.const	$push1339=, 6
+	i32.rem_u	$push557=, $pop125, $pop1339
+	i32.ne  	$push558=, $pop123, $pop557
+	br_if   	1, $pop558      # 1: down to label0
 # BB#64:                                # %lor.lhs.false597
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push122=, 26($10)
-	i32.const	$push1331=, 65535
-	i32.and 	$push558=, $pop122, $pop1331
-	i32.load16_u	$push124=, 0($8)
-	i32.const	$push1330=, 65535
-	i32.and 	$push559=, $pop124, $pop1330
-	i32.const	$push1329=, 5
-	i32.rem_u	$push560=, $pop559, $pop1329
-	i32.ne  	$push561=, $pop558, $pop560
-	br_if   	1, $pop561      # 1: down to label0
+	i32.const	$push1342=, 65535
+	i32.and 	$push559=, $pop122, $pop1342
+	i32.load16_u	$push124=, 0($7)
+	i32.const	$push1341=, 65535
+	i32.and 	$push560=, $pop124, $pop1341
+	i32.const	$push1340=, 5
+	i32.rem_u	$push561=, $pop560, $pop1340
+	i32.ne  	$push562=, $pop559, $pop561
+	br_if   	1, $pop562      # 1: down to label0
 # BB#65:                                # %if.end607
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1149=, 16
-	i32.add 	$push1150=, $10, $pop1149
-	copy_local	$9=, $pop1150
+	i32.const	$push1153=, 16
+	i32.add 	$push1154=, $10, $pop1153
+	copy_local	$9=, $pop1154
 	#APP
 	#NO_APP
-	i32.const	$push1151=, 16
-	i32.add 	$push1152=, $10, $pop1151
-	call    	uq14141461461414@FUNCTION, $pop1152, $0
+	i32.const	$push1155=, 16
+	i32.add 	$push1156=, $10, $pop1155
+	call    	uq14141461461414@FUNCTION, $pop1156, $1
 	i32.load16_u	$push126=, 16($10)
-	i32.load16_u	$push128=, 0($0)
-	i32.const	$push1332=, 14
-	i32.div_u	$push562=, $pop128, $pop1332
-	i32.ne  	$push563=, $pop126, $pop562
-	br_if   	1, $pop563      # 1: down to label0
+	i32.load16_u	$push128=, 0($1)
+	i32.const	$push1343=, 14
+	i32.div_u	$push563=, $pop128, $pop1343
+	i32.ne  	$push564=, $pop126, $pop563
+	br_if   	1, $pop564      # 1: down to label0
 # BB#66:                                # %lor.lhs.false617
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push127=, 22($10)
-	i32.const	$push1335=, 65535
-	i32.and 	$push564=, $pop127, $pop1335
-	i32.load16_u	$push129=, 0($2)
-	i32.const	$push1334=, 65535
-	i32.and 	$push565=, $pop129, $pop1334
-	i32.const	$push1333=, 6
-	i32.div_u	$push566=, $pop565, $pop1333
-	i32.ne  	$push567=, $pop564, $pop566
-	br_if   	1, $pop567      # 1: down to label0
+	i32.const	$push1346=, 65535
+	i32.and 	$push565=, $pop127, $pop1346
+	i32.load16_u	$push129=, 0($8)
+	i32.const	$push1345=, 65535
+	i32.and 	$push566=, $pop129, $pop1345
+	i32.const	$push1344=, 6
+	i32.div_u	$push567=, $pop566, $pop1344
+	i32.ne  	$push568=, $pop565, $pop567
+	br_if   	1, $pop568      # 1: down to label0
 # BB#67:                                # %if.end627
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1153=, 16
-	i32.add 	$push1154=, $10, $pop1153
-	copy_local	$9=, $pop1154
+	i32.const	$push1157=, 16
+	i32.add 	$push1158=, $10, $pop1157
+	copy_local	$9=, $pop1158
 	#APP
 	#NO_APP
 	i32.load16_u	$push131=, 20($10)
-	i32.load16_u	$push133=, 0($3)
-	i32.const	$push1336=, 14
-	i32.div_u	$push568=, $pop133, $pop1336
-	i32.ne  	$push569=, $pop131, $pop568
-	br_if   	1, $pop569      # 1: down to label0
+	i32.load16_u	$push133=, 0($2)
+	i32.const	$push1347=, 14
+	i32.div_u	$push569=, $pop133, $pop1347
+	i32.ne  	$push570=, $pop131, $pop569
+	br_if   	1, $pop570      # 1: down to label0
 # BB#68:                                # %lor.lhs.false636
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push130=, 18($10)
-	i32.const	$push1339=, 65535
-	i32.and 	$push570=, $pop130, $pop1339
-	i32.load16_u	$push132=, 0($4)
-	i32.const	$push1338=, 65535
-	i32.and 	$push571=, $pop132, $pop1338
-	i32.const	$push1337=, 14
-	i32.div_u	$push572=, $pop571, $pop1337
-	i32.ne  	$push573=, $pop570, $pop572
-	br_if   	1, $pop573      # 1: down to label0
+	i32.const	$push1350=, 65535
+	i32.and 	$push571=, $pop130, $pop1350
+	i32.load16_u	$push132=, 0($3)
+	i32.const	$push1349=, 65535
+	i32.and 	$push572=, $pop132, $pop1349
+	i32.const	$push1348=, 14
+	i32.div_u	$push573=, $pop572, $pop1348
+	i32.ne  	$push574=, $pop571, $pop573
+	br_if   	1, $pop574      # 1: down to label0
 # BB#69:                                # %if.end646
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1155=, 16
-	i32.add 	$push1156=, $10, $pop1155
-	copy_local	$9=, $pop1156
+	i32.const	$push1159=, 16
+	i32.add 	$push1160=, $10, $pop1159
+	copy_local	$9=, $pop1160
 	#APP
 	#NO_APP
 	i32.load16_u	$push134=, 24($10)
-	i32.load16_u	$push136=, 0($5)
-	i32.const	$push1340=, 14
-	i32.div_u	$push574=, $pop136, $pop1340
-	i32.ne  	$push575=, $pop134, $pop574
-	br_if   	1, $pop575      # 1: down to label0
+	i32.load16_u	$push136=, 0($4)
+	i32.const	$push1351=, 14
+	i32.div_u	$push575=, $pop136, $pop1351
+	i32.ne  	$push576=, $pop134, $pop575
+	br_if   	1, $pop576      # 1: down to label0
 # BB#70:                                # %lor.lhs.false655
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push135=, 30($10)
-	i32.const	$push1343=, 65535
-	i32.and 	$push576=, $pop135, $pop1343
-	i32.load16_u	$push137=, 0($6)
-	i32.const	$push1342=, 65535
-	i32.and 	$push577=, $pop137, $pop1342
-	i32.const	$push1341=, 14
-	i32.div_u	$push578=, $pop577, $pop1341
-	i32.ne  	$push579=, $pop576, $pop578
-	br_if   	1, $pop579      # 1: down to label0
+	i32.const	$push1354=, 65535
+	i32.and 	$push577=, $pop135, $pop1354
+	i32.load16_u	$push137=, 0($5)
+	i32.const	$push1353=, 65535
+	i32.and 	$push578=, $pop137, $pop1353
+	i32.const	$push1352=, 14
+	i32.div_u	$push579=, $pop578, $pop1352
+	i32.ne  	$push580=, $pop577, $pop579
+	br_if   	1, $pop580      # 1: down to label0
 # BB#71:                                # %if.end665
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1157=, 16
-	i32.add 	$push1158=, $10, $pop1157
-	copy_local	$9=, $pop1158
+	i32.const	$push1161=, 16
+	i32.add 	$push1162=, $10, $pop1161
+	copy_local	$9=, $pop1162
 	#APP
 	#NO_APP
 	i32.load16_u	$push139=, 28($10)
-	i32.load16_u	$push141=, 0($7)
-	i32.const	$push1344=, 14
-	i32.div_u	$push580=, $pop141, $pop1344
-	i32.ne  	$push581=, $pop139, $pop580
-	br_if   	1, $pop581      # 1: down to label0
+	i32.load16_u	$push141=, 0($6)
+	i32.const	$push1355=, 14
+	i32.div_u	$push581=, $pop141, $pop1355
+	i32.ne  	$push582=, $pop139, $pop581
+	br_if   	1, $pop582      # 1: down to label0
 # BB#72:                                # %lor.lhs.false674
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push138=, 26($10)
-	i32.const	$push1347=, 65535
-	i32.and 	$push582=, $pop138, $pop1347
-	i32.load16_u	$push140=, 0($8)
-	i32.const	$push1346=, 65535
-	i32.and 	$push583=, $pop140, $pop1346
-	i32.const	$push1345=, 6
-	i32.div_u	$push584=, $pop583, $pop1345
-	i32.ne  	$push585=, $pop582, $pop584
-	br_if   	1, $pop585      # 1: down to label0
+	i32.const	$push1358=, 65535
+	i32.and 	$push583=, $pop138, $pop1358
+	i32.load16_u	$push140=, 0($7)
+	i32.const	$push1357=, 65535
+	i32.and 	$push584=, $pop140, $pop1357
+	i32.const	$push1356=, 6
+	i32.div_u	$push585=, $pop584, $pop1356
+	i32.ne  	$push586=, $pop583, $pop585
+	br_if   	1, $pop586      # 1: down to label0
 # BB#73:                                # %if.end684
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1159=, 16
-	i32.add 	$push1160=, $10, $pop1159
-	copy_local	$9=, $pop1160
+	i32.const	$push1163=, 16
+	i32.add 	$push1164=, $10, $pop1163
+	copy_local	$9=, $pop1164
 	#APP
 	#NO_APP
-	i32.const	$push1161=, 16
-	i32.add 	$push1162=, $10, $pop1161
-	call    	ur14141461461414@FUNCTION, $pop1162, $0
+	i32.const	$push1165=, 16
+	i32.add 	$push1166=, $10, $pop1165
+	call    	ur14141461461414@FUNCTION, $pop1166, $1
 	i32.load16_u	$push142=, 16($10)
-	i32.load16_u	$push144=, 0($0)
-	i32.const	$push1348=, 14
-	i32.rem_u	$push586=, $pop144, $pop1348
-	i32.ne  	$push587=, $pop142, $pop586
-	br_if   	1, $pop587      # 1: down to label0
+	i32.load16_u	$push144=, 0($1)
+	i32.const	$push1359=, 14
+	i32.rem_u	$push587=, $pop144, $pop1359
+	i32.ne  	$push588=, $pop142, $pop587
+	br_if   	1, $pop588      # 1: down to label0
 # BB#74:                                # %lor.lhs.false694
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push143=, 22($10)
-	i32.const	$push1351=, 65535
-	i32.and 	$push588=, $pop143, $pop1351
-	i32.load16_u	$push145=, 0($2)
-	i32.const	$push1350=, 65535
-	i32.and 	$push589=, $pop145, $pop1350
-	i32.const	$push1349=, 6
-	i32.rem_u	$push590=, $pop589, $pop1349
-	i32.ne  	$push591=, $pop588, $pop590
-	br_if   	1, $pop591      # 1: down to label0
+	i32.const	$push1362=, 65535
+	i32.and 	$push589=, $pop143, $pop1362
+	i32.load16_u	$push145=, 0($8)
+	i32.const	$push1361=, 65535
+	i32.and 	$push590=, $pop145, $pop1361
+	i32.const	$push1360=, 6
+	i32.rem_u	$push591=, $pop590, $pop1360
+	i32.ne  	$push592=, $pop589, $pop591
+	br_if   	1, $pop592      # 1: down to label0
 # BB#75:                                # %if.end704
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1163=, 16
-	i32.add 	$push1164=, $10, $pop1163
-	copy_local	$9=, $pop1164
+	i32.const	$push1167=, 16
+	i32.add 	$push1168=, $10, $pop1167
+	copy_local	$9=, $pop1168
 	#APP
 	#NO_APP
 	i32.load16_u	$push147=, 20($10)
-	i32.load16_u	$push149=, 0($3)
-	i32.const	$push1352=, 14
-	i32.rem_u	$push592=, $pop149, $pop1352
-	i32.ne  	$push593=, $pop147, $pop592
-	br_if   	1, $pop593      # 1: down to label0
+	i32.load16_u	$push149=, 0($2)
+	i32.const	$push1363=, 14
+	i32.rem_u	$push593=, $pop149, $pop1363
+	i32.ne  	$push594=, $pop147, $pop593
+	br_if   	1, $pop594      # 1: down to label0
 # BB#76:                                # %lor.lhs.false713
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push146=, 18($10)
-	i32.const	$push1355=, 65535
-	i32.and 	$push594=, $pop146, $pop1355
-	i32.load16_u	$push148=, 0($4)
-	i32.const	$push1354=, 65535
-	i32.and 	$push595=, $pop148, $pop1354
-	i32.const	$push1353=, 14
-	i32.rem_u	$push596=, $pop595, $pop1353
-	i32.ne  	$push597=, $pop594, $pop596
-	br_if   	1, $pop597      # 1: down to label0
+	i32.const	$push1366=, 65535
+	i32.and 	$push595=, $pop146, $pop1366
+	i32.load16_u	$push148=, 0($3)
+	i32.const	$push1365=, 65535
+	i32.and 	$push596=, $pop148, $pop1365
+	i32.const	$push1364=, 14
+	i32.rem_u	$push597=, $pop596, $pop1364
+	i32.ne  	$push598=, $pop595, $pop597
+	br_if   	1, $pop598      # 1: down to label0
 # BB#77:                                # %if.end723
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1165=, 16
-	i32.add 	$push1166=, $10, $pop1165
-	copy_local	$9=, $pop1166
+	i32.const	$push1169=, 16
+	i32.add 	$push1170=, $10, $pop1169
+	copy_local	$9=, $pop1170
 	#APP
 	#NO_APP
 	i32.load16_u	$push150=, 24($10)
-	i32.load16_u	$push152=, 0($5)
-	i32.const	$push1356=, 14
-	i32.rem_u	$push598=, $pop152, $pop1356
-	i32.ne  	$push599=, $pop150, $pop598
-	br_if   	1, $pop599      # 1: down to label0
+	i32.load16_u	$push152=, 0($4)
+	i32.const	$push1367=, 14
+	i32.rem_u	$push599=, $pop152, $pop1367
+	i32.ne  	$push600=, $pop150, $pop599
+	br_if   	1, $pop600      # 1: down to label0
 # BB#78:                                # %lor.lhs.false732
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push151=, 30($10)
-	i32.const	$push1359=, 65535
-	i32.and 	$push600=, $pop151, $pop1359
-	i32.load16_u	$push153=, 0($6)
-	i32.const	$push1358=, 65535
-	i32.and 	$push601=, $pop153, $pop1358
-	i32.const	$push1357=, 14
-	i32.rem_u	$push602=, $pop601, $pop1357
-	i32.ne  	$push603=, $pop600, $pop602
-	br_if   	1, $pop603      # 1: down to label0
+	i32.const	$push1370=, 65535
+	i32.and 	$push601=, $pop151, $pop1370
+	i32.load16_u	$push153=, 0($5)
+	i32.const	$push1369=, 65535
+	i32.and 	$push602=, $pop153, $pop1369
+	i32.const	$push1368=, 14
+	i32.rem_u	$push603=, $pop602, $pop1368
+	i32.ne  	$push604=, $pop601, $pop603
+	br_if   	1, $pop604      # 1: down to label0
 # BB#79:                                # %if.end742
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1167=, 16
-	i32.add 	$push1168=, $10, $pop1167
-	copy_local	$9=, $pop1168
+	i32.const	$push1171=, 16
+	i32.add 	$push1172=, $10, $pop1171
+	copy_local	$9=, $pop1172
 	#APP
 	#NO_APP
 	i32.load16_u	$push155=, 28($10)
-	i32.load16_u	$push157=, 0($7)
-	i32.const	$push1360=, 14
-	i32.rem_u	$push604=, $pop157, $pop1360
-	i32.ne  	$push605=, $pop155, $pop604
-	br_if   	1, $pop605      # 1: down to label0
+	i32.load16_u	$push157=, 0($6)
+	i32.const	$push1371=, 14
+	i32.rem_u	$push605=, $pop157, $pop1371
+	i32.ne  	$push606=, $pop155, $pop605
+	br_if   	1, $pop606      # 1: down to label0
 # BB#80:                                # %lor.lhs.false751
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push154=, 26($10)
-	i32.const	$push1363=, 65535
-	i32.and 	$push606=, $pop154, $pop1363
-	i32.load16_u	$push156=, 0($8)
-	i32.const	$push1362=, 65535
-	i32.and 	$push607=, $pop156, $pop1362
-	i32.const	$push1361=, 6
-	i32.rem_u	$push608=, $pop607, $pop1361
-	i32.ne  	$push609=, $pop606, $pop608
-	br_if   	1, $pop609      # 1: down to label0
+	i32.const	$push1374=, 65535
+	i32.and 	$push607=, $pop154, $pop1374
+	i32.load16_u	$push156=, 0($7)
+	i32.const	$push1373=, 65535
+	i32.and 	$push608=, $pop156, $pop1373
+	i32.const	$push1372=, 6
+	i32.rem_u	$push609=, $pop608, $pop1372
+	i32.ne  	$push610=, $pop607, $pop609
+	br_if   	1, $pop610      # 1: down to label0
 # BB#81:                                # %if.end761
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1169=, 16
-	i32.add 	$push1170=, $10, $pop1169
-	copy_local	$9=, $pop1170
+	i32.const	$push1173=, 16
+	i32.add 	$push1174=, $10, $pop1173
+	copy_local	$9=, $pop1174
 	#APP
 	#NO_APP
-	i32.const	$push1171=, 16
-	i32.add 	$push1172=, $10, $pop1171
-	call    	uq77777777@FUNCTION, $pop1172, $0
+	i32.const	$push1175=, 16
+	i32.add 	$push1176=, $10, $pop1175
+	call    	uq77777777@FUNCTION, $pop1176, $1
 	i32.load16_u	$push158=, 16($10)
-	i32.load16_u	$push160=, 0($0)
-	i32.const	$push1364=, 7
-	i32.div_u	$push610=, $pop160, $pop1364
-	i32.ne  	$push611=, $pop158, $pop610
-	br_if   	1, $pop611      # 1: down to label0
+	i32.load16_u	$push160=, 0($1)
+	i32.const	$push1375=, 7
+	i32.div_u	$push611=, $pop160, $pop1375
+	i32.ne  	$push612=, $pop158, $pop611
+	br_if   	1, $pop612      # 1: down to label0
 # BB#82:                                # %lor.lhs.false771
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push159=, 22($10)
-	i32.const	$push1367=, 65535
-	i32.and 	$push612=, $pop159, $pop1367
-	i32.load16_u	$push161=, 0($2)
-	i32.const	$push1366=, 65535
-	i32.and 	$push613=, $pop161, $pop1366
-	i32.const	$push1365=, 7
-	i32.div_u	$push614=, $pop613, $pop1365
-	i32.ne  	$push615=, $pop612, $pop614
-	br_if   	1, $pop615      # 1: down to label0
+	i32.const	$push1378=, 65535
+	i32.and 	$push613=, $pop159, $pop1378
+	i32.load16_u	$push161=, 0($8)
+	i32.const	$push1377=, 65535
+	i32.and 	$push614=, $pop161, $pop1377
+	i32.const	$push1376=, 7
+	i32.div_u	$push615=, $pop614, $pop1376
+	i32.ne  	$push616=, $pop613, $pop615
+	br_if   	1, $pop616      # 1: down to label0
 # BB#83:                                # %if.end781
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1173=, 16
-	i32.add 	$push1174=, $10, $pop1173
-	copy_local	$9=, $pop1174
+	i32.const	$push1177=, 16
+	i32.add 	$push1178=, $10, $pop1177
+	copy_local	$9=, $pop1178
 	#APP
 	#NO_APP
 	i32.load16_u	$push163=, 20($10)
-	i32.load16_u	$push165=, 0($3)
-	i32.const	$push1368=, 7
-	i32.div_u	$push616=, $pop165, $pop1368
-	i32.ne  	$push617=, $pop163, $pop616
-	br_if   	1, $pop617      # 1: down to label0
+	i32.load16_u	$push165=, 0($2)
+	i32.const	$push1379=, 7
+	i32.div_u	$push617=, $pop165, $pop1379
+	i32.ne  	$push618=, $pop163, $pop617
+	br_if   	1, $pop618      # 1: down to label0
 # BB#84:                                # %lor.lhs.false790
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push162=, 18($10)
-	i32.const	$push1371=, 65535
-	i32.and 	$push618=, $pop162, $pop1371
-	i32.load16_u	$push164=, 0($4)
-	i32.const	$push1370=, 65535
-	i32.and 	$push619=, $pop164, $pop1370
-	i32.const	$push1369=, 7
-	i32.div_u	$push620=, $pop619, $pop1369
-	i32.ne  	$push621=, $pop618, $pop620
-	br_if   	1, $pop621      # 1: down to label0
+	i32.const	$push1382=, 65535
+	i32.and 	$push619=, $pop162, $pop1382
+	i32.load16_u	$push164=, 0($3)
+	i32.const	$push1381=, 65535
+	i32.and 	$push620=, $pop164, $pop1381
+	i32.const	$push1380=, 7
+	i32.div_u	$push621=, $pop620, $pop1380
+	i32.ne  	$push622=, $pop619, $pop621
+	br_if   	1, $pop622      # 1: down to label0
 # BB#85:                                # %if.end800
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1175=, 16
-	i32.add 	$push1176=, $10, $pop1175
-	copy_local	$9=, $pop1176
+	i32.const	$push1179=, 16
+	i32.add 	$push1180=, $10, $pop1179
+	copy_local	$9=, $pop1180
 	#APP
 	#NO_APP
 	i32.load16_u	$push166=, 24($10)
-	i32.load16_u	$push168=, 0($5)
-	i32.const	$push1372=, 7
-	i32.div_u	$push622=, $pop168, $pop1372
-	i32.ne  	$push623=, $pop166, $pop622
-	br_if   	1, $pop623      # 1: down to label0
+	i32.load16_u	$push168=, 0($4)
+	i32.const	$push1383=, 7
+	i32.div_u	$push623=, $pop168, $pop1383
+	i32.ne  	$push624=, $pop166, $pop623
+	br_if   	1, $pop624      # 1: down to label0
 # BB#86:                                # %lor.lhs.false809
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push167=, 30($10)
-	i32.const	$push1375=, 65535
-	i32.and 	$push624=, $pop167, $pop1375
-	i32.load16_u	$push169=, 0($6)
-	i32.const	$push1374=, 65535
-	i32.and 	$push625=, $pop169, $pop1374
-	i32.const	$push1373=, 7
-	i32.div_u	$push626=, $pop625, $pop1373
-	i32.ne  	$push627=, $pop624, $pop626
-	br_if   	1, $pop627      # 1: down to label0
+	i32.const	$push1386=, 65535
+	i32.and 	$push625=, $pop167, $pop1386
+	i32.load16_u	$push169=, 0($5)
+	i32.const	$push1385=, 65535
+	i32.and 	$push626=, $pop169, $pop1385
+	i32.const	$push1384=, 7
+	i32.div_u	$push627=, $pop626, $pop1384
+	i32.ne  	$push628=, $pop625, $pop627
+	br_if   	1, $pop628      # 1: down to label0
 # BB#87:                                # %if.end819
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1177=, 16
-	i32.add 	$push1178=, $10, $pop1177
-	copy_local	$9=, $pop1178
+	i32.const	$push1181=, 16
+	i32.add 	$push1182=, $10, $pop1181
+	copy_local	$9=, $pop1182
 	#APP
 	#NO_APP
 	i32.load16_u	$push171=, 28($10)
-	i32.load16_u	$push173=, 0($7)
-	i32.const	$push1376=, 7
-	i32.div_u	$push628=, $pop173, $pop1376
-	i32.ne  	$push629=, $pop171, $pop628
-	br_if   	1, $pop629      # 1: down to label0
+	i32.load16_u	$push173=, 0($6)
+	i32.const	$push1387=, 7
+	i32.div_u	$push629=, $pop173, $pop1387
+	i32.ne  	$push630=, $pop171, $pop629
+	br_if   	1, $pop630      # 1: down to label0
 # BB#88:                                # %lor.lhs.false828
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push170=, 26($10)
-	i32.const	$push1379=, 65535
-	i32.and 	$push630=, $pop170, $pop1379
-	i32.load16_u	$push172=, 0($8)
-	i32.const	$push1378=, 65535
-	i32.and 	$push631=, $pop172, $pop1378
-	i32.const	$push1377=, 7
-	i32.div_u	$push632=, $pop631, $pop1377
-	i32.ne  	$push633=, $pop630, $pop632
-	br_if   	1, $pop633      # 1: down to label0
+	i32.const	$push1390=, 65535
+	i32.and 	$push631=, $pop170, $pop1390
+	i32.load16_u	$push172=, 0($7)
+	i32.const	$push1389=, 65535
+	i32.and 	$push632=, $pop172, $pop1389
+	i32.const	$push1388=, 7
+	i32.div_u	$push633=, $pop632, $pop1388
+	i32.ne  	$push634=, $pop631, $pop633
+	br_if   	1, $pop634      # 1: down to label0
 # BB#89:                                # %if.end838
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1179=, 16
-	i32.add 	$push1180=, $10, $pop1179
-	copy_local	$9=, $pop1180
+	i32.const	$push1183=, 16
+	i32.add 	$push1184=, $10, $pop1183
+	copy_local	$9=, $pop1184
 	#APP
 	#NO_APP
-	i32.const	$push1181=, 16
-	i32.add 	$push1182=, $10, $pop1181
-	call    	ur77777777@FUNCTION, $pop1182, $0
+	i32.const	$push1185=, 16
+	i32.add 	$push1186=, $10, $pop1185
+	call    	ur77777777@FUNCTION, $pop1186, $1
 	i32.load16_u	$push174=, 16($10)
-	i32.load16_u	$push176=, 0($0)
-	i32.const	$push1380=, 7
-	i32.rem_u	$push634=, $pop176, $pop1380
-	i32.ne  	$push635=, $pop174, $pop634
-	br_if   	1, $pop635      # 1: down to label0
+	i32.load16_u	$push176=, 0($1)
+	i32.const	$push1391=, 7
+	i32.rem_u	$push635=, $pop176, $pop1391
+	i32.ne  	$push636=, $pop174, $pop635
+	br_if   	1, $pop636      # 1: down to label0
 # BB#90:                                # %lor.lhs.false848
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push175=, 22($10)
-	i32.const	$push1383=, 65535
-	i32.and 	$push636=, $pop175, $pop1383
-	i32.load16_u	$push177=, 0($2)
-	i32.const	$push1382=, 65535
-	i32.and 	$push637=, $pop177, $pop1382
-	i32.const	$push1381=, 7
-	i32.rem_u	$push638=, $pop637, $pop1381
-	i32.ne  	$push639=, $pop636, $pop638
-	br_if   	1, $pop639      # 1: down to label0
+	i32.const	$push1394=, 65535
+	i32.and 	$push637=, $pop175, $pop1394
+	i32.load16_u	$push177=, 0($8)
+	i32.const	$push1393=, 65535
+	i32.and 	$push638=, $pop177, $pop1393
+	i32.const	$push1392=, 7
+	i32.rem_u	$push639=, $pop638, $pop1392
+	i32.ne  	$push640=, $pop637, $pop639
+	br_if   	1, $pop640      # 1: down to label0
 # BB#91:                                # %if.end858
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1183=, 16
-	i32.add 	$push1184=, $10, $pop1183
-	copy_local	$2=, $pop1184
+	i32.const	$push1187=, 16
+	i32.add 	$push1188=, $10, $pop1187
+	copy_local	$1=, $pop1188
 	#APP
 	#NO_APP
 	i32.load16_u	$push179=, 20($10)
-	i32.load16_u	$push181=, 0($3)
-	i32.const	$push1384=, 7
-	i32.rem_u	$push640=, $pop181, $pop1384
-	i32.ne  	$push641=, $pop179, $pop640
-	br_if   	1, $pop641      # 1: down to label0
+	i32.load16_u	$push181=, 0($2)
+	i32.const	$push1395=, 7
+	i32.rem_u	$push641=, $pop181, $pop1395
+	i32.ne  	$push642=, $pop179, $pop641
+	br_if   	1, $pop642      # 1: down to label0
 # BB#92:                                # %lor.lhs.false867
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push178=, 18($10)
-	i32.const	$push1387=, 65535
-	i32.and 	$push642=, $pop178, $pop1387
-	i32.load16_u	$push180=, 0($4)
-	i32.const	$push1386=, 65535
-	i32.and 	$push643=, $pop180, $pop1386
-	i32.const	$push1385=, 7
-	i32.rem_u	$push644=, $pop643, $pop1385
-	i32.ne  	$push645=, $pop642, $pop644
-	br_if   	1, $pop645      # 1: down to label0
+	i32.const	$push1398=, 65535
+	i32.and 	$push643=, $pop178, $pop1398
+	i32.load16_u	$push180=, 0($3)
+	i32.const	$push1397=, 65535
+	i32.and 	$push644=, $pop180, $pop1397
+	i32.const	$push1396=, 7
+	i32.rem_u	$push645=, $pop644, $pop1396
+	i32.ne  	$push646=, $pop643, $pop645
+	br_if   	1, $pop646      # 1: down to label0
 # BB#93:                                # %if.end877
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1185=, 16
-	i32.add 	$push1186=, $10, $pop1185
-	copy_local	$2=, $pop1186
+	i32.const	$push1189=, 16
+	i32.add 	$push1190=, $10, $pop1189
+	copy_local	$1=, $pop1190
 	#APP
 	#NO_APP
 	i32.load16_u	$push182=, 24($10)
-	i32.load16_u	$push184=, 0($5)
-	i32.const	$push1388=, 7
-	i32.rem_u	$push646=, $pop184, $pop1388
-	i32.ne  	$push647=, $pop182, $pop646
-	br_if   	1, $pop647      # 1: down to label0
+	i32.load16_u	$push184=, 0($4)
+	i32.const	$push1399=, 7
+	i32.rem_u	$push647=, $pop184, $pop1399
+	i32.ne  	$push648=, $pop182, $pop647
+	br_if   	1, $pop648      # 1: down to label0
 # BB#94:                                # %lor.lhs.false886
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push183=, 30($10)
-	i32.const	$push1391=, 65535
-	i32.and 	$push648=, $pop183, $pop1391
-	i32.load16_u	$push185=, 0($6)
-	i32.const	$push1390=, 65535
-	i32.and 	$push649=, $pop185, $pop1390
-	i32.const	$push1389=, 7
-	i32.rem_u	$push650=, $pop649, $pop1389
-	i32.ne  	$push651=, $pop648, $pop650
-	br_if   	1, $pop651      # 1: down to label0
+	i32.const	$push1402=, 65535
+	i32.and 	$push649=, $pop183, $pop1402
+	i32.load16_u	$push185=, 0($5)
+	i32.const	$push1401=, 65535
+	i32.and 	$push650=, $pop185, $pop1401
+	i32.const	$push1400=, 7
+	i32.rem_u	$push651=, $pop650, $pop1400
+	i32.ne  	$push652=, $pop649, $pop651
+	br_if   	1, $pop652      # 1: down to label0
 # BB#95:                                # %if.end896
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1187=, 16
-	i32.add 	$push1188=, $10, $pop1187
-	copy_local	$2=, $pop1188
+	i32.const	$push1191=, 16
+	i32.add 	$push1192=, $10, $pop1191
+	copy_local	$1=, $pop1192
 	#APP
 	#NO_APP
 	i32.load16_u	$push187=, 28($10)
-	i32.load16_u	$push189=, 0($7)
-	i32.const	$push1392=, 7
-	i32.rem_u	$push652=, $pop189, $pop1392
-	i32.ne  	$push653=, $pop187, $pop652
-	br_if   	1, $pop653      # 1: down to label0
+	i32.load16_u	$push189=, 0($6)
+	i32.const	$push1403=, 7
+	i32.rem_u	$push653=, $pop189, $pop1403
+	i32.ne  	$push654=, $pop187, $pop653
+	br_if   	1, $pop654      # 1: down to label0
 # BB#96:                                # %lor.lhs.false905
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load16_u	$push186=, 26($10)
-	i32.const	$push1395=, 65535
-	i32.and 	$push654=, $pop186, $pop1395
-	i32.load16_u	$push188=, 0($8)
-	i32.const	$push1394=, 65535
-	i32.and 	$push655=, $pop188, $pop1394
-	i32.const	$push1393=, 7
-	i32.rem_u	$push656=, $pop655, $pop1393
-	i32.ne  	$push657=, $pop654, $pop656
-	br_if   	1, $pop657      # 1: down to label0
+	i32.const	$push1406=, 65535
+	i32.and 	$push655=, $pop186, $pop1406
+	i32.load16_u	$push188=, 0($7)
+	i32.const	$push1405=, 65535
+	i32.and 	$push656=, $pop188, $pop1405
+	i32.const	$push1404=, 7
+	i32.rem_u	$push657=, $pop656, $pop1404
+	i32.ne  	$push658=, $pop655, $pop657
+	br_if   	1, $pop658      # 1: down to label0
 # BB#97:                                # %if.end915
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push1189=, 16
-	i32.add 	$push1190=, $10, $pop1189
-	copy_local	$2=, $pop1190
+	i32.const	$push1193=, 16
+	i32.add 	$push1194=, $10, $pop1193
+	copy_local	$1=, $pop1194
 	#APP
 	#NO_APP
-	i32.const	$push1400=, 16
-	i32.add 	$0=, $0, $pop1400
-	i32.const	$push1399=, 1
-	i32.add 	$push1398=, $1, $pop1399
-	tee_local	$push1397=, $1=, $pop1398
-	i32.const	$push1396=, 2
-	i32.lt_u	$push658=, $pop1397, $pop1396
-	br_if   	0, $pop658      # 0: up to label1
+	i32.const	$push659=, 1
+	i32.add 	$1=, $0, $pop659
+	i32.const	$0=, 1
+	i32.const	$push1407=, 2
+	i32.lt_u	$push660=, $1, $pop1407
+	br_if   	0, $pop660      # 0: up to label1
 # BB#98:                                # %for.body919.preheader
 	end_loop
-	i32.const	$1=, 0
-	i32.const	$0=, s
+	i32.const	$0=, 0
 .LBB24_99:                              # %for.body919
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	call    	sq44444444@FUNCTION, $10, $0
+	i32.const	$push1415=, 4
+	i32.shl 	$push1414=, $0, $pop1415
+	tee_local	$push1413=, $2=, $pop1414
+	i32.const	$push1412=, s
+	i32.add 	$push1411=, $pop1413, $pop1412
+	tee_local	$push1410=, $1=, $pop1411
+	call    	sq44444444@FUNCTION, $10, $pop1410
 	i32.load16_u	$push190=, 0($10)
-	i32.load16_s	$push192=, 0($0)
-	i32.const	$push1402=, 4
-	i32.div_s	$push659=, $pop192, $pop1402
-	i32.const	$push1401=, 65535
-	i32.and 	$push660=, $pop659, $pop1401
-	i32.ne  	$push661=, $pop190, $pop660
-	br_if   	1, $pop661      # 1: down to label0
+	i32.load16_s	$push192=, 0($1)
+	i32.const	$push1409=, 4
+	i32.div_s	$push661=, $pop192, $pop1409
+	i32.const	$push1408=, 65535
+	i32.and 	$push662=, $pop661, $pop1408
+	i32.ne  	$push663=, $pop190, $pop662
+	br_if   	1, $pop663      # 1: down to label0
 # BB#100:                               # %lor.lhs.false929
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push191=, 6($10)
-	i32.const	$push1410=, 65535
-	i32.and 	$push662=, $pop191, $pop1410
-	i32.const	$push1409=, 6
-	i32.add 	$push1408=, $0, $pop1409
-	tee_local	$push1407=, $2=, $pop1408
-	i32.load16_u	$push193=, 0($pop1407)
-	i32.const	$push1406=, 16
-	i32.shl 	$push663=, $pop193, $pop1406
-	i32.const	$push1405=, 16
-	i32.shr_s	$push664=, $pop663, $pop1405
-	i32.const	$push1404=, 4
-	i32.div_s	$push665=, $pop664, $pop1404
-	i32.const	$push1403=, 65535
-	i32.and 	$push666=, $pop665, $pop1403
-	i32.ne  	$push667=, $pop662, $pop666
-	br_if   	1, $pop667      # 1: down to label0
+	i32.const	$push1421=, 65535
+	i32.and 	$push665=, $pop191, $pop1421
+	i32.const	$push1420=, s+6
+	i32.add 	$push664=, $2, $pop1420
+	i32.load16_u	$push193=, 0($pop664)
+	i32.const	$push1419=, 16
+	i32.shl 	$push666=, $pop193, $pop1419
+	i32.const	$push1418=, 16
+	i32.shr_s	$push667=, $pop666, $pop1418
+	i32.const	$push1417=, 4
+	i32.div_s	$push668=, $pop667, $pop1417
+	i32.const	$push1416=, 65535
+	i32.and 	$push669=, $pop668, $pop1416
+	i32.ne  	$push670=, $pop665, $pop669
+	br_if   	1, $pop670      # 1: down to label0
 # BB#101:                               # %if.end939
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$3=, $10
+	copy_local	$2=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push195=, 4($10)
-	i32.const	$push1415=, 4
-	i32.add 	$push1414=, $0, $pop1415
-	tee_local	$push1413=, $3=, $pop1414
-	i32.load16_s	$push197=, 0($pop1413)
-	i32.const	$push1412=, 4
-	i32.div_s	$push668=, $pop197, $pop1412
-	i32.const	$push1411=, 65535
-	i32.and 	$push669=, $pop668, $pop1411
-	i32.ne  	$push670=, $pop195, $pop669
-	br_if   	1, $pop670      # 1: down to label0
+	i32.const	$push1426=, 4
+	i32.add 	$push1425=, $1, $pop1426
+	tee_local	$push1424=, $2=, $pop1425
+	i32.load16_s	$push197=, 0($pop1424)
+	i32.const	$push1423=, 4
+	i32.div_s	$push671=, $pop197, $pop1423
+	i32.const	$push1422=, 65535
+	i32.and 	$push672=, $pop671, $pop1422
+	i32.ne  	$push673=, $pop195, $pop672
+	br_if   	1, $pop673      # 1: down to label0
 # BB#102:                               # %lor.lhs.false948
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push194=, 2($10)
-	i32.const	$push1423=, 65535
-	i32.and 	$push671=, $pop194, $pop1423
-	i32.const	$push1422=, 2
-	i32.add 	$push1421=, $0, $pop1422
-	tee_local	$push1420=, $4=, $pop1421
-	i32.load16_u	$push196=, 0($pop1420)
-	i32.const	$push1419=, 16
-	i32.shl 	$push672=, $pop196, $pop1419
-	i32.const	$push1418=, 16
-	i32.shr_s	$push673=, $pop672, $pop1418
-	i32.const	$push1417=, 4
-	i32.div_s	$push674=, $pop673, $pop1417
-	i32.const	$push1416=, 65535
-	i32.and 	$push675=, $pop674, $pop1416
-	i32.ne  	$push676=, $pop671, $pop675
-	br_if   	1, $pop676      # 1: down to label0
+	i32.const	$push1434=, 65535
+	i32.and 	$push674=, $pop194, $pop1434
+	i32.const	$push1433=, 2
+	i32.add 	$push1432=, $1, $pop1433
+	tee_local	$push1431=, $3=, $pop1432
+	i32.load16_u	$push196=, 0($pop1431)
+	i32.const	$push1430=, 16
+	i32.shl 	$push675=, $pop196, $pop1430
+	i32.const	$push1429=, 16
+	i32.shr_s	$push676=, $pop675, $pop1429
+	i32.const	$push1428=, 4
+	i32.div_s	$push677=, $pop676, $pop1428
+	i32.const	$push1427=, 65535
+	i32.and 	$push678=, $pop677, $pop1427
+	i32.ne  	$push679=, $pop674, $pop678
+	br_if   	1, $pop679      # 1: down to label0
 # BB#103:                               # %if.end958
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$5=, $10
+	copy_local	$4=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push198=, 8($10)
-	i32.const	$push1428=, 8
-	i32.add 	$push1427=, $0, $pop1428
-	tee_local	$push1426=, $5=, $pop1427
-	i32.load16_s	$push200=, 0($pop1426)
-	i32.const	$push1425=, 4
-	i32.div_s	$push677=, $pop200, $pop1425
-	i32.const	$push1424=, 65535
-	i32.and 	$push678=, $pop677, $pop1424
-	i32.ne  	$push679=, $pop198, $pop678
-	br_if   	1, $pop679      # 1: down to label0
+	i32.const	$push1439=, 8
+	i32.add 	$push1438=, $1, $pop1439
+	tee_local	$push1437=, $4=, $pop1438
+	i32.load16_s	$push200=, 0($pop1437)
+	i32.const	$push1436=, 4
+	i32.div_s	$push680=, $pop200, $pop1436
+	i32.const	$push1435=, 65535
+	i32.and 	$push681=, $pop680, $pop1435
+	i32.ne  	$push682=, $pop198, $pop681
+	br_if   	1, $pop682      # 1: down to label0
 # BB#104:                               # %lor.lhs.false967
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push199=, 14($10)
-	i32.const	$push1436=, 65535
-	i32.and 	$push680=, $pop199, $pop1436
-	i32.const	$push1435=, 14
-	i32.add 	$push1434=, $0, $pop1435
-	tee_local	$push1433=, $6=, $pop1434
-	i32.load16_u	$push201=, 0($pop1433)
-	i32.const	$push1432=, 16
-	i32.shl 	$push681=, $pop201, $pop1432
-	i32.const	$push1431=, 16
-	i32.shr_s	$push682=, $pop681, $pop1431
-	i32.const	$push1430=, 4
-	i32.div_s	$push683=, $pop682, $pop1430
-	i32.const	$push1429=, 65535
-	i32.and 	$push684=, $pop683, $pop1429
-	i32.ne  	$push685=, $pop680, $pop684
-	br_if   	1, $pop685      # 1: down to label0
+	i32.const	$push1447=, 65535
+	i32.and 	$push683=, $pop199, $pop1447
+	i32.const	$push1446=, 14
+	i32.add 	$push1445=, $1, $pop1446
+	tee_local	$push1444=, $5=, $pop1445
+	i32.load16_u	$push201=, 0($pop1444)
+	i32.const	$push1443=, 16
+	i32.shl 	$push684=, $pop201, $pop1443
+	i32.const	$push1442=, 16
+	i32.shr_s	$push685=, $pop684, $pop1442
+	i32.const	$push1441=, 4
+	i32.div_s	$push686=, $pop685, $pop1441
+	i32.const	$push1440=, 65535
+	i32.and 	$push687=, $pop686, $pop1440
+	i32.ne  	$push688=, $pop683, $pop687
+	br_if   	1, $pop688      # 1: down to label0
 # BB#105:                               # %if.end977
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$7=, $10
+	copy_local	$6=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push203=, 12($10)
-	i32.const	$push1441=, 12
-	i32.add 	$push1440=, $0, $pop1441
-	tee_local	$push1439=, $7=, $pop1440
-	i32.load16_s	$push205=, 0($pop1439)
-	i32.const	$push1438=, 4
-	i32.div_s	$push686=, $pop205, $pop1438
-	i32.const	$push1437=, 65535
-	i32.and 	$push687=, $pop686, $pop1437
-	i32.ne  	$push688=, $pop203, $pop687
-	br_if   	1, $pop688      # 1: down to label0
+	i32.const	$push1452=, 12
+	i32.add 	$push1451=, $1, $pop1452
+	tee_local	$push1450=, $6=, $pop1451
+	i32.load16_s	$push205=, 0($pop1450)
+	i32.const	$push1449=, 4
+	i32.div_s	$push689=, $pop205, $pop1449
+	i32.const	$push1448=, 65535
+	i32.and 	$push690=, $pop689, $pop1448
+	i32.ne  	$push691=, $pop203, $pop690
+	br_if   	1, $pop691      # 1: down to label0
 # BB#106:                               # %lor.lhs.false986
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push202=, 10($10)
-	i32.const	$push1449=, 65535
-	i32.and 	$push689=, $pop202, $pop1449
-	i32.const	$push1448=, 10
-	i32.add 	$push1447=, $0, $pop1448
-	tee_local	$push1446=, $8=, $pop1447
-	i32.load16_u	$push204=, 0($pop1446)
-	i32.const	$push1445=, 16
-	i32.shl 	$push690=, $pop204, $pop1445
-	i32.const	$push1444=, 16
-	i32.shr_s	$push691=, $pop690, $pop1444
-	i32.const	$push1443=, 4
-	i32.div_s	$push692=, $pop691, $pop1443
-	i32.const	$push1442=, 65535
-	i32.and 	$push693=, $pop692, $pop1442
-	i32.ne  	$push694=, $pop689, $pop693
-	br_if   	1, $pop694      # 1: down to label0
+	i32.const	$push1460=, 65535
+	i32.and 	$push692=, $pop202, $pop1460
+	i32.const	$push1459=, 10
+	i32.add 	$push1458=, $1, $pop1459
+	tee_local	$push1457=, $7=, $pop1458
+	i32.load16_u	$push204=, 0($pop1457)
+	i32.const	$push1456=, 16
+	i32.shl 	$push693=, $pop204, $pop1456
+	i32.const	$push1455=, 16
+	i32.shr_s	$push694=, $pop693, $pop1455
+	i32.const	$push1454=, 4
+	i32.div_s	$push695=, $pop694, $pop1454
+	i32.const	$push1453=, 65535
+	i32.and 	$push696=, $pop695, $pop1453
+	i32.ne  	$push697=, $pop692, $pop696
+	br_if   	1, $pop697      # 1: down to label0
 # BB#107:                               # %if.end996
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$8=, $10
 	#APP
 	#NO_APP
-	call    	sr44444444@FUNCTION, $10, $0
+	call    	sr44444444@FUNCTION, $10, $1
+	i32.load16_s	$push208=, 0($1)
+	i32.const	$push1461=, 4
+	i32.rem_s	$push698=, $pop208, $pop1461
 	i32.load16_s	$push206=, 0($10)
-	i32.load16_s	$push208=, 0($0)
-	i32.const	$push1450=, 4
-	i32.rem_s	$push695=, $pop208, $pop1450
-	i32.ne  	$push696=, $pop206, $pop695
-	br_if   	1, $pop696      # 1: down to label0
+	i32.ne  	$push699=, $pop698, $pop206
+	br_if   	1, $pop699      # 1: down to label0
 # BB#108:                               # %lor.lhs.false1006
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.const	$push1469=, 6
+	i32.add 	$push1468=, $1, $pop1469
+	tee_local	$push1467=, $8=, $pop1468
+	i32.load16_u	$push209=, 0($pop1467)
+	i32.const	$push1466=, 16
+	i32.shl 	$push702=, $pop209, $pop1466
+	i32.const	$push1465=, 16
+	i32.shr_s	$push703=, $pop702, $pop1465
+	i32.const	$push1464=, 4
+	i32.rem_s	$push704=, $pop703, $pop1464
 	i32.load16_u	$push207=, 6($10)
-	i32.const	$push1455=, 16
-	i32.shl 	$push697=, $pop207, $pop1455
-	i32.const	$push1454=, 16
-	i32.shr_s	$push698=, $pop697, $pop1454
-	i32.load16_u	$push209=, 0($2)
-	i32.const	$push1453=, 16
-	i32.shl 	$push699=, $pop209, $pop1453
-	i32.const	$push1452=, 16
-	i32.shr_s	$push700=, $pop699, $pop1452
-	i32.const	$push1451=, 4
-	i32.rem_s	$push701=, $pop700, $pop1451
-	i32.ne  	$push702=, $pop698, $pop701
-	br_if   	1, $pop702      # 1: down to label0
+	i32.const	$push1463=, 16
+	i32.shl 	$push700=, $pop207, $pop1463
+	i32.const	$push1462=, 16
+	i32.shr_s	$push701=, $pop700, $pop1462
+	i32.ne  	$push705=, $pop704, $pop701
+	br_if   	1, $pop705      # 1: down to label0
 # BB#109:                               # %if.end1016
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push213=, 0($2)
+	i32.const	$push1470=, 4
+	i32.rem_s	$push706=, $pop213, $pop1470
 	i32.load16_s	$push211=, 4($10)
-	i32.load16_s	$push213=, 0($3)
-	i32.const	$push1456=, 4
-	i32.rem_s	$push703=, $pop213, $pop1456
-	i32.ne  	$push704=, $pop211, $pop703
-	br_if   	1, $pop704      # 1: down to label0
+	i32.ne  	$push707=, $pop706, $pop211
+	br_if   	1, $pop707      # 1: down to label0
 # BB#110:                               # %lor.lhs.false1025
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push212=, 0($3)
+	i32.const	$push1475=, 16
+	i32.shl 	$push710=, $pop212, $pop1475
+	i32.const	$push1474=, 16
+	i32.shr_s	$push711=, $pop710, $pop1474
+	i32.const	$push1473=, 4
+	i32.rem_s	$push712=, $pop711, $pop1473
 	i32.load16_u	$push210=, 2($10)
-	i32.const	$push1461=, 16
-	i32.shl 	$push705=, $pop210, $pop1461
-	i32.const	$push1460=, 16
-	i32.shr_s	$push706=, $pop705, $pop1460
-	i32.load16_u	$push212=, 0($4)
-	i32.const	$push1459=, 16
-	i32.shl 	$push707=, $pop212, $pop1459
-	i32.const	$push1458=, 16
-	i32.shr_s	$push708=, $pop707, $pop1458
-	i32.const	$push1457=, 4
-	i32.rem_s	$push709=, $pop708, $pop1457
-	i32.ne  	$push710=, $pop706, $pop709
-	br_if   	1, $pop710      # 1: down to label0
+	i32.const	$push1472=, 16
+	i32.shl 	$push708=, $pop210, $pop1472
+	i32.const	$push1471=, 16
+	i32.shr_s	$push709=, $pop708, $pop1471
+	i32.ne  	$push713=, $pop712, $pop709
+	br_if   	1, $pop713      # 1: down to label0
 # BB#111:                               # %if.end1035
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push216=, 0($4)
+	i32.const	$push1476=, 4
+	i32.rem_s	$push714=, $pop216, $pop1476
 	i32.load16_s	$push214=, 8($10)
-	i32.load16_s	$push216=, 0($5)
-	i32.const	$push1462=, 4
-	i32.rem_s	$push711=, $pop216, $pop1462
-	i32.ne  	$push712=, $pop214, $pop711
-	br_if   	1, $pop712      # 1: down to label0
+	i32.ne  	$push715=, $pop714, $pop214
+	br_if   	1, $pop715      # 1: down to label0
 # BB#112:                               # %lor.lhs.false1044
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push217=, 0($5)
+	i32.const	$push1481=, 16
+	i32.shl 	$push718=, $pop217, $pop1481
+	i32.const	$push1480=, 16
+	i32.shr_s	$push719=, $pop718, $pop1480
+	i32.const	$push1479=, 4
+	i32.rem_s	$push720=, $pop719, $pop1479
 	i32.load16_u	$push215=, 14($10)
-	i32.const	$push1467=, 16
-	i32.shl 	$push713=, $pop215, $pop1467
-	i32.const	$push1466=, 16
-	i32.shr_s	$push714=, $pop713, $pop1466
-	i32.load16_u	$push217=, 0($6)
-	i32.const	$push1465=, 16
-	i32.shl 	$push715=, $pop217, $pop1465
-	i32.const	$push1464=, 16
-	i32.shr_s	$push716=, $pop715, $pop1464
-	i32.const	$push1463=, 4
-	i32.rem_s	$push717=, $pop716, $pop1463
-	i32.ne  	$push718=, $pop714, $pop717
-	br_if   	1, $pop718      # 1: down to label0
+	i32.const	$push1478=, 16
+	i32.shl 	$push716=, $pop215, $pop1478
+	i32.const	$push1477=, 16
+	i32.shr_s	$push717=, $pop716, $pop1477
+	i32.ne  	$push721=, $pop720, $pop717
+	br_if   	1, $pop721      # 1: down to label0
 # BB#113:                               # %if.end1054
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push221=, 0($6)
+	i32.const	$push1482=, 4
+	i32.rem_s	$push722=, $pop221, $pop1482
 	i32.load16_s	$push219=, 12($10)
-	i32.load16_s	$push221=, 0($7)
-	i32.const	$push1468=, 4
-	i32.rem_s	$push719=, $pop221, $pop1468
-	i32.ne  	$push720=, $pop219, $pop719
-	br_if   	1, $pop720      # 1: down to label0
+	i32.ne  	$push723=, $pop722, $pop219
+	br_if   	1, $pop723      # 1: down to label0
 # BB#114:                               # %lor.lhs.false1063
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push220=, 0($7)
+	i32.const	$push1487=, 16
+	i32.shl 	$push726=, $pop220, $pop1487
+	i32.const	$push1486=, 16
+	i32.shr_s	$push727=, $pop726, $pop1486
+	i32.const	$push1485=, 4
+	i32.rem_s	$push728=, $pop727, $pop1485
 	i32.load16_u	$push218=, 10($10)
-	i32.const	$push1473=, 16
-	i32.shl 	$push721=, $pop218, $pop1473
-	i32.const	$push1472=, 16
-	i32.shr_s	$push722=, $pop721, $pop1472
-	i32.load16_u	$push220=, 0($8)
-	i32.const	$push1471=, 16
-	i32.shl 	$push723=, $pop220, $pop1471
-	i32.const	$push1470=, 16
-	i32.shr_s	$push724=, $pop723, $pop1470
-	i32.const	$push1469=, 4
-	i32.rem_s	$push725=, $pop724, $pop1469
-	i32.ne  	$push726=, $pop722, $pop725
-	br_if   	1, $pop726      # 1: down to label0
+	i32.const	$push1484=, 16
+	i32.shl 	$push724=, $pop218, $pop1484
+	i32.const	$push1483=, 16
+	i32.shr_s	$push725=, $pop724, $pop1483
+	i32.ne  	$push729=, $pop728, $pop725
+	br_if   	1, $pop729      # 1: down to label0
 # BB#115:                               # %if.end1073
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sq1428166432128@FUNCTION, $10, $0
+	call    	sq1428166432128@FUNCTION, $10, $1
 	i32.load16_u	$push222=, 0($10)
-	i32.load16_u	$push224=, 0($0)
-	i32.ne  	$push727=, $pop222, $pop224
-	br_if   	1, $pop727      # 1: down to label0
+	i32.load16_u	$push224=, 0($1)
+	i32.ne  	$push730=, $pop222, $pop224
+	br_if   	1, $pop730      # 1: down to label0
 # BB#116:                               # %lor.lhs.false1083
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push223=, 6($10)
-	i32.const	$push1478=, 65535
-	i32.and 	$push728=, $pop223, $pop1478
-	i32.load16_u	$push225=, 0($2)
-	i32.const	$push1477=, 16
-	i32.shl 	$push729=, $pop225, $pop1477
-	i32.const	$push1476=, 16
-	i32.shr_s	$push730=, $pop729, $pop1476
-	i32.const	$push1475=, 8
-	i32.div_s	$push731=, $pop730, $pop1475
-	i32.const	$push1474=, 65535
-	i32.and 	$push732=, $pop731, $pop1474
-	i32.ne  	$push733=, $pop728, $pop732
-	br_if   	1, $pop733      # 1: down to label0
+	i32.const	$push1492=, 65535
+	i32.and 	$push731=, $pop223, $pop1492
+	i32.load16_u	$push225=, 0($8)
+	i32.const	$push1491=, 16
+	i32.shl 	$push732=, $pop225, $pop1491
+	i32.const	$push1490=, 16
+	i32.shr_s	$push733=, $pop732, $pop1490
+	i32.const	$push1489=, 8
+	i32.div_s	$push734=, $pop733, $pop1489
+	i32.const	$push1488=, 65535
+	i32.and 	$push735=, $pop734, $pop1488
+	i32.ne  	$push736=, $pop731, $pop735
+	br_if   	1, $pop736      # 1: down to label0
 # BB#117:                               # %if.end1093
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push227=, 4($10)
-	i32.load16_s	$push229=, 0($3)
-	i32.const	$push1480=, 2
-	i32.div_s	$push734=, $pop229, $pop1480
-	i32.const	$push1479=, 65535
-	i32.and 	$push735=, $pop734, $pop1479
-	i32.ne  	$push736=, $pop227, $pop735
-	br_if   	1, $pop736      # 1: down to label0
+	i32.load16_s	$push229=, 0($2)
+	i32.const	$push1494=, 2
+	i32.div_s	$push737=, $pop229, $pop1494
+	i32.const	$push1493=, 65535
+	i32.and 	$push738=, $pop737, $pop1493
+	i32.ne  	$push739=, $pop227, $pop738
+	br_if   	1, $pop739      # 1: down to label0
 # BB#118:                               # %lor.lhs.false1102
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push226=, 2($10)
-	i32.const	$push1485=, 65535
-	i32.and 	$push737=, $pop226, $pop1485
-	i32.load16_u	$push228=, 0($4)
-	i32.const	$push1484=, 16
-	i32.shl 	$push738=, $pop228, $pop1484
-	i32.const	$push1483=, 16
-	i32.shr_s	$push739=, $pop738, $pop1483
-	i32.const	$push1482=, 4
-	i32.div_s	$push740=, $pop739, $pop1482
-	i32.const	$push1481=, 65535
-	i32.and 	$push741=, $pop740, $pop1481
-	i32.ne  	$push742=, $pop737, $pop741
-	br_if   	1, $pop742      # 1: down to label0
+	i32.const	$push1499=, 65535
+	i32.and 	$push740=, $pop226, $pop1499
+	i32.load16_u	$push228=, 0($3)
+	i32.const	$push1498=, 16
+	i32.shl 	$push741=, $pop228, $pop1498
+	i32.const	$push1497=, 16
+	i32.shr_s	$push742=, $pop741, $pop1497
+	i32.const	$push1496=, 4
+	i32.div_s	$push743=, $pop742, $pop1496
+	i32.const	$push1495=, 65535
+	i32.and 	$push744=, $pop743, $pop1495
+	i32.ne  	$push745=, $pop740, $pop744
+	br_if   	1, $pop745      # 1: down to label0
 # BB#119:                               # %if.end1112
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push230=, 8($10)
-	i32.load16_s	$push232=, 0($5)
-	i32.const	$push1487=, 16
-	i32.div_s	$push743=, $pop232, $pop1487
-	i32.const	$push1486=, 65535
-	i32.and 	$push744=, $pop743, $pop1486
-	i32.ne  	$push745=, $pop230, $pop744
-	br_if   	1, $pop745      # 1: down to label0
+	i32.load16_s	$push232=, 0($4)
+	i32.const	$push1501=, 16
+	i32.div_s	$push746=, $pop232, $pop1501
+	i32.const	$push1500=, 65535
+	i32.and 	$push747=, $pop746, $pop1500
+	i32.ne  	$push748=, $pop230, $pop747
+	br_if   	1, $pop748      # 1: down to label0
 # BB#120:                               # %lor.lhs.false1121
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push231=, 14($10)
-	i32.const	$push1492=, 65535
-	i32.and 	$push746=, $pop231, $pop1492
-	i32.load16_u	$push233=, 0($6)
-	i32.const	$push1491=, 16
-	i32.shl 	$push747=, $pop233, $pop1491
-	i32.const	$push1490=, 16
-	i32.shr_s	$push748=, $pop747, $pop1490
-	i32.const	$push1489=, 128
-	i32.div_s	$push749=, $pop748, $pop1489
-	i32.const	$push1488=, 65535
-	i32.and 	$push750=, $pop749, $pop1488
-	i32.ne  	$push751=, $pop746, $pop750
-	br_if   	1, $pop751      # 1: down to label0
+	i32.const	$push1506=, 65535
+	i32.and 	$push749=, $pop231, $pop1506
+	i32.load16_u	$push233=, 0($5)
+	i32.const	$push1505=, 16
+	i32.shl 	$push750=, $pop233, $pop1505
+	i32.const	$push1504=, 16
+	i32.shr_s	$push751=, $pop750, $pop1504
+	i32.const	$push1503=, 128
+	i32.div_s	$push752=, $pop751, $pop1503
+	i32.const	$push1502=, 65535
+	i32.and 	$push753=, $pop752, $pop1502
+	i32.ne  	$push754=, $pop749, $pop753
+	br_if   	1, $pop754      # 1: down to label0
 # BB#121:                               # %if.end1131
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push235=, 12($10)
-	i32.load16_s	$push237=, 0($7)
-	i32.const	$push1494=, 32
-	i32.div_s	$push752=, $pop237, $pop1494
-	i32.const	$push1493=, 65535
-	i32.and 	$push753=, $pop752, $pop1493
-	i32.ne  	$push754=, $pop235, $pop753
-	br_if   	1, $pop754      # 1: down to label0
+	i32.load16_s	$push237=, 0($6)
+	i32.const	$push1508=, 32
+	i32.div_s	$push755=, $pop237, $pop1508
+	i32.const	$push1507=, 65535
+	i32.and 	$push756=, $pop755, $pop1507
+	i32.ne  	$push757=, $pop235, $pop756
+	br_if   	1, $pop757      # 1: down to label0
 # BB#122:                               # %lor.lhs.false1140
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push234=, 10($10)
-	i32.const	$push1499=, 65535
-	i32.and 	$push755=, $pop234, $pop1499
-	i32.load16_u	$push236=, 0($8)
-	i32.const	$push1498=, 16
-	i32.shl 	$push756=, $pop236, $pop1498
-	i32.const	$push1497=, 16
-	i32.shr_s	$push757=, $pop756, $pop1497
-	i32.const	$push1496=, 64
-	i32.div_s	$push758=, $pop757, $pop1496
-	i32.const	$push1495=, 65535
-	i32.and 	$push759=, $pop758, $pop1495
-	i32.ne  	$push760=, $pop755, $pop759
-	br_if   	1, $pop760      # 1: down to label0
+	i32.const	$push1513=, 65535
+	i32.and 	$push758=, $pop234, $pop1513
+	i32.load16_u	$push236=, 0($7)
+	i32.const	$push1512=, 16
+	i32.shl 	$push759=, $pop236, $pop1512
+	i32.const	$push1511=, 16
+	i32.shr_s	$push760=, $pop759, $pop1511
+	i32.const	$push1510=, 64
+	i32.div_s	$push761=, $pop760, $pop1510
+	i32.const	$push1509=, 65535
+	i32.and 	$push762=, $pop761, $pop1509
+	i32.ne  	$push763=, $pop758, $pop762
+	br_if   	1, $pop763      # 1: down to label0
 # BB#123:                               # %if.end1150
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sr1428166432128@FUNCTION, $10, $0
+	call    	sr1428166432128@FUNCTION, $10, $1
 	i32.load16_u	$push238=, 0($10)
 	br_if   	1, $pop238      # 1: down to label0
 # BB#124:                               # %lor.lhs.false1160
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_s	$push764=, 0($8)
+	i32.const	$push1516=, 8
+	i32.rem_s	$push765=, $pop764, $pop1516
 	i32.load16_u	$push239=, 6($10)
-	i32.const	$push1502=, 16
-	i32.shl 	$push763=, $pop239, $pop1502
-	i32.const	$push1501=, 16
-	i32.shr_s	$push764=, $pop763, $pop1501
-	i32.load16_s	$push761=, 0($2)
-	i32.const	$push1500=, 8
-	i32.rem_s	$push762=, $pop761, $pop1500
-	i32.ne  	$push765=, $pop764, $pop762
-	br_if   	1, $pop765      # 1: down to label0
+	i32.const	$push1515=, 16
+	i32.shl 	$push766=, $pop239, $pop1515
+	i32.const	$push1514=, 16
+	i32.shr_s	$push767=, $pop766, $pop1514
+	i32.ne  	$push768=, $pop765, $pop767
+	br_if   	1, $pop768      # 1: down to label0
 # BB#125:                               # %if.end1170
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push243=, 0($2)
+	i32.const	$push1517=, 2
+	i32.rem_s	$push769=, $pop243, $pop1517
 	i32.load16_s	$push241=, 4($10)
-	i32.load16_s	$push243=, 0($3)
-	i32.const	$push1503=, 2
-	i32.rem_s	$push766=, $pop243, $pop1503
-	i32.ne  	$push767=, $pop241, $pop766
-	br_if   	1, $pop767      # 1: down to label0
+	i32.ne  	$push770=, $pop769, $pop241
+	br_if   	1, $pop770      # 1: down to label0
 # BB#126:                               # %lor.lhs.false1179
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push242=, 0($3)
+	i32.const	$push1522=, 16
+	i32.shl 	$push773=, $pop242, $pop1522
+	i32.const	$push1521=, 16
+	i32.shr_s	$push774=, $pop773, $pop1521
+	i32.const	$push1520=, 4
+	i32.rem_s	$push775=, $pop774, $pop1520
 	i32.load16_u	$push240=, 2($10)
-	i32.const	$push1508=, 16
-	i32.shl 	$push768=, $pop240, $pop1508
-	i32.const	$push1507=, 16
-	i32.shr_s	$push769=, $pop768, $pop1507
-	i32.load16_u	$push242=, 0($4)
-	i32.const	$push1506=, 16
-	i32.shl 	$push770=, $pop242, $pop1506
-	i32.const	$push1505=, 16
-	i32.shr_s	$push771=, $pop770, $pop1505
-	i32.const	$push1504=, 4
-	i32.rem_s	$push772=, $pop771, $pop1504
-	i32.ne  	$push773=, $pop769, $pop772
-	br_if   	1, $pop773      # 1: down to label0
+	i32.const	$push1519=, 16
+	i32.shl 	$push771=, $pop240, $pop1519
+	i32.const	$push1518=, 16
+	i32.shr_s	$push772=, $pop771, $pop1518
+	i32.ne  	$push776=, $pop775, $pop772
+	br_if   	1, $pop776      # 1: down to label0
 # BB#127:                               # %if.end1189
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push246=, 0($4)
+	i32.const	$push1523=, 16
+	i32.rem_s	$push777=, $pop246, $pop1523
 	i32.load16_s	$push244=, 8($10)
-	i32.load16_s	$push246=, 0($5)
-	i32.const	$push1509=, 16
-	i32.rem_s	$push774=, $pop246, $pop1509
-	i32.ne  	$push775=, $pop244, $pop774
-	br_if   	1, $pop775      # 1: down to label0
+	i32.ne  	$push778=, $pop777, $pop244
+	br_if   	1, $pop778      # 1: down to label0
 # BB#128:                               # %lor.lhs.false1198
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push247=, 0($5)
+	i32.const	$push1528=, 16
+	i32.shl 	$push781=, $pop247, $pop1528
+	i32.const	$push1527=, 16
+	i32.shr_s	$push782=, $pop781, $pop1527
+	i32.const	$push1526=, 128
+	i32.rem_s	$push783=, $pop782, $pop1526
 	i32.load16_u	$push245=, 14($10)
-	i32.const	$push1514=, 16
-	i32.shl 	$push776=, $pop245, $pop1514
-	i32.const	$push1513=, 16
-	i32.shr_s	$push777=, $pop776, $pop1513
-	i32.load16_u	$push247=, 0($6)
-	i32.const	$push1512=, 16
-	i32.shl 	$push778=, $pop247, $pop1512
-	i32.const	$push1511=, 16
-	i32.shr_s	$push779=, $pop778, $pop1511
-	i32.const	$push1510=, 128
-	i32.rem_s	$push780=, $pop779, $pop1510
-	i32.ne  	$push781=, $pop777, $pop780
-	br_if   	1, $pop781      # 1: down to label0
+	i32.const	$push1525=, 16
+	i32.shl 	$push779=, $pop245, $pop1525
+	i32.const	$push1524=, 16
+	i32.shr_s	$push780=, $pop779, $pop1524
+	i32.ne  	$push784=, $pop783, $pop780
+	br_if   	1, $pop784      # 1: down to label0
 # BB#129:                               # %if.end1208
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push251=, 0($6)
+	i32.const	$push1529=, 32
+	i32.rem_s	$push785=, $pop251, $pop1529
 	i32.load16_s	$push249=, 12($10)
-	i32.load16_s	$push251=, 0($7)
-	i32.const	$push1515=, 32
-	i32.rem_s	$push782=, $pop251, $pop1515
-	i32.ne  	$push783=, $pop249, $pop782
-	br_if   	1, $pop783      # 1: down to label0
+	i32.ne  	$push786=, $pop785, $pop249
+	br_if   	1, $pop786      # 1: down to label0
 # BB#130:                               # %lor.lhs.false1217
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push250=, 0($7)
+	i32.const	$push1534=, 16
+	i32.shl 	$push789=, $pop250, $pop1534
+	i32.const	$push1533=, 16
+	i32.shr_s	$push790=, $pop789, $pop1533
+	i32.const	$push1532=, 64
+	i32.rem_s	$push791=, $pop790, $pop1532
 	i32.load16_u	$push248=, 10($10)
-	i32.const	$push1520=, 16
-	i32.shl 	$push784=, $pop248, $pop1520
-	i32.const	$push1519=, 16
-	i32.shr_s	$push785=, $pop784, $pop1519
-	i32.load16_u	$push250=, 0($8)
-	i32.const	$push1518=, 16
-	i32.shl 	$push786=, $pop250, $pop1518
-	i32.const	$push1517=, 16
-	i32.shr_s	$push787=, $pop786, $pop1517
-	i32.const	$push1516=, 64
-	i32.rem_s	$push788=, $pop787, $pop1516
-	i32.ne  	$push789=, $pop785, $pop788
-	br_if   	1, $pop789      # 1: down to label0
+	i32.const	$push1531=, 16
+	i32.shl 	$push787=, $pop248, $pop1531
+	i32.const	$push1530=, 16
+	i32.shr_s	$push788=, $pop787, $pop1530
+	i32.ne  	$push792=, $pop791, $pop788
+	br_if   	1, $pop792      # 1: down to label0
 # BB#131:                               # %if.end1227
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sq33333333@FUNCTION, $10, $0
+	call    	sq33333333@FUNCTION, $10, $1
 	i32.load16_u	$push252=, 0($10)
-	i32.load16_s	$push254=, 0($0)
-	i32.const	$push1522=, 3
-	i32.div_s	$push790=, $pop254, $pop1522
-	i32.const	$push1521=, 65535
-	i32.and 	$push791=, $pop790, $pop1521
-	i32.ne  	$push792=, $pop252, $pop791
-	br_if   	1, $pop792      # 1: down to label0
+	i32.load16_s	$push254=, 0($1)
+	i32.const	$push1536=, 3
+	i32.div_s	$push793=, $pop254, $pop1536
+	i32.const	$push1535=, 65535
+	i32.and 	$push794=, $pop793, $pop1535
+	i32.ne  	$push795=, $pop252, $pop794
+	br_if   	1, $pop795      # 1: down to label0
 # BB#132:                               # %lor.lhs.false1237
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push253=, 6($10)
-	i32.const	$push1527=, 65535
-	i32.and 	$push793=, $pop253, $pop1527
-	i32.load16_u	$push255=, 0($2)
-	i32.const	$push1526=, 16
-	i32.shl 	$push794=, $pop255, $pop1526
-	i32.const	$push1525=, 16
-	i32.shr_s	$push795=, $pop794, $pop1525
-	i32.const	$push1524=, 3
-	i32.div_s	$push796=, $pop795, $pop1524
-	i32.const	$push1523=, 65535
-	i32.and 	$push797=, $pop796, $pop1523
-	i32.ne  	$push798=, $pop793, $pop797
-	br_if   	1, $pop798      # 1: down to label0
+	i32.const	$push1541=, 65535
+	i32.and 	$push796=, $pop253, $pop1541
+	i32.load16_u	$push255=, 0($8)
+	i32.const	$push1540=, 16
+	i32.shl 	$push797=, $pop255, $pop1540
+	i32.const	$push1539=, 16
+	i32.shr_s	$push798=, $pop797, $pop1539
+	i32.const	$push1538=, 3
+	i32.div_s	$push799=, $pop798, $pop1538
+	i32.const	$push1537=, 65535
+	i32.and 	$push800=, $pop799, $pop1537
+	i32.ne  	$push801=, $pop796, $pop800
+	br_if   	1, $pop801      # 1: down to label0
 # BB#133:                               # %if.end1247
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push257=, 4($10)
-	i32.load16_s	$push259=, 0($3)
-	i32.const	$push1529=, 3
-	i32.div_s	$push799=, $pop259, $pop1529
-	i32.const	$push1528=, 65535
-	i32.and 	$push800=, $pop799, $pop1528
-	i32.ne  	$push801=, $pop257, $pop800
-	br_if   	1, $pop801      # 1: down to label0
+	i32.load16_s	$push259=, 0($2)
+	i32.const	$push1543=, 3
+	i32.div_s	$push802=, $pop259, $pop1543
+	i32.const	$push1542=, 65535
+	i32.and 	$push803=, $pop802, $pop1542
+	i32.ne  	$push804=, $pop257, $pop803
+	br_if   	1, $pop804      # 1: down to label0
 # BB#134:                               # %lor.lhs.false1256
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push256=, 2($10)
-	i32.const	$push1534=, 65535
-	i32.and 	$push802=, $pop256, $pop1534
-	i32.load16_u	$push258=, 0($4)
-	i32.const	$push1533=, 16
-	i32.shl 	$push803=, $pop258, $pop1533
-	i32.const	$push1532=, 16
-	i32.shr_s	$push804=, $pop803, $pop1532
-	i32.const	$push1531=, 3
-	i32.div_s	$push805=, $pop804, $pop1531
-	i32.const	$push1530=, 65535
-	i32.and 	$push806=, $pop805, $pop1530
-	i32.ne  	$push807=, $pop802, $pop806
-	br_if   	1, $pop807      # 1: down to label0
+	i32.const	$push1548=, 65535
+	i32.and 	$push805=, $pop256, $pop1548
+	i32.load16_u	$push258=, 0($3)
+	i32.const	$push1547=, 16
+	i32.shl 	$push806=, $pop258, $pop1547
+	i32.const	$push1546=, 16
+	i32.shr_s	$push807=, $pop806, $pop1546
+	i32.const	$push1545=, 3
+	i32.div_s	$push808=, $pop807, $pop1545
+	i32.const	$push1544=, 65535
+	i32.and 	$push809=, $pop808, $pop1544
+	i32.ne  	$push810=, $pop805, $pop809
+	br_if   	1, $pop810      # 1: down to label0
 # BB#135:                               # %if.end1266
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push260=, 8($10)
-	i32.load16_s	$push262=, 0($5)
-	i32.const	$push1536=, 3
-	i32.div_s	$push808=, $pop262, $pop1536
-	i32.const	$push1535=, 65535
-	i32.and 	$push809=, $pop808, $pop1535
-	i32.ne  	$push810=, $pop260, $pop809
-	br_if   	1, $pop810      # 1: down to label0
+	i32.load16_s	$push262=, 0($4)
+	i32.const	$push1550=, 3
+	i32.div_s	$push811=, $pop262, $pop1550
+	i32.const	$push1549=, 65535
+	i32.and 	$push812=, $pop811, $pop1549
+	i32.ne  	$push813=, $pop260, $pop812
+	br_if   	1, $pop813      # 1: down to label0
 # BB#136:                               # %lor.lhs.false1275
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push261=, 14($10)
-	i32.const	$push1541=, 65535
-	i32.and 	$push811=, $pop261, $pop1541
-	i32.load16_u	$push263=, 0($6)
-	i32.const	$push1540=, 16
-	i32.shl 	$push812=, $pop263, $pop1540
-	i32.const	$push1539=, 16
-	i32.shr_s	$push813=, $pop812, $pop1539
-	i32.const	$push1538=, 3
-	i32.div_s	$push814=, $pop813, $pop1538
-	i32.const	$push1537=, 65535
-	i32.and 	$push815=, $pop814, $pop1537
-	i32.ne  	$push816=, $pop811, $pop815
-	br_if   	1, $pop816      # 1: down to label0
+	i32.const	$push1555=, 65535
+	i32.and 	$push814=, $pop261, $pop1555
+	i32.load16_u	$push263=, 0($5)
+	i32.const	$push1554=, 16
+	i32.shl 	$push815=, $pop263, $pop1554
+	i32.const	$push1553=, 16
+	i32.shr_s	$push816=, $pop815, $pop1553
+	i32.const	$push1552=, 3
+	i32.div_s	$push817=, $pop816, $pop1552
+	i32.const	$push1551=, 65535
+	i32.and 	$push818=, $pop817, $pop1551
+	i32.ne  	$push819=, $pop814, $pop818
+	br_if   	1, $pop819      # 1: down to label0
 # BB#137:                               # %if.end1285
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push265=, 12($10)
-	i32.load16_s	$push267=, 0($7)
-	i32.const	$push1543=, 3
-	i32.div_s	$push817=, $pop267, $pop1543
-	i32.const	$push1542=, 65535
-	i32.and 	$push818=, $pop817, $pop1542
-	i32.ne  	$push819=, $pop265, $pop818
-	br_if   	1, $pop819      # 1: down to label0
+	i32.load16_s	$push267=, 0($6)
+	i32.const	$push1557=, 3
+	i32.div_s	$push820=, $pop267, $pop1557
+	i32.const	$push1556=, 65535
+	i32.and 	$push821=, $pop820, $pop1556
+	i32.ne  	$push822=, $pop265, $pop821
+	br_if   	1, $pop822      # 1: down to label0
 # BB#138:                               # %lor.lhs.false1294
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push264=, 10($10)
-	i32.const	$push1548=, 65535
-	i32.and 	$push820=, $pop264, $pop1548
-	i32.load16_u	$push266=, 0($8)
-	i32.const	$push1547=, 16
-	i32.shl 	$push821=, $pop266, $pop1547
-	i32.const	$push1546=, 16
-	i32.shr_s	$push822=, $pop821, $pop1546
-	i32.const	$push1545=, 3
-	i32.div_s	$push823=, $pop822, $pop1545
-	i32.const	$push1544=, 65535
-	i32.and 	$push824=, $pop823, $pop1544
-	i32.ne  	$push825=, $pop820, $pop824
-	br_if   	1, $pop825      # 1: down to label0
+	i32.const	$push1562=, 65535
+	i32.and 	$push823=, $pop264, $pop1562
+	i32.load16_u	$push266=, 0($7)
+	i32.const	$push1561=, 16
+	i32.shl 	$push824=, $pop266, $pop1561
+	i32.const	$push1560=, 16
+	i32.shr_s	$push825=, $pop824, $pop1560
+	i32.const	$push1559=, 3
+	i32.div_s	$push826=, $pop825, $pop1559
+	i32.const	$push1558=, 65535
+	i32.and 	$push827=, $pop826, $pop1558
+	i32.ne  	$push828=, $pop823, $pop827
+	br_if   	1, $pop828      # 1: down to label0
 # BB#139:                               # %if.end1304
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sr33333333@FUNCTION, $10, $0
+	call    	sr33333333@FUNCTION, $10, $1
+	i32.load16_s	$push270=, 0($1)
+	i32.const	$push1563=, 3
+	i32.rem_s	$push829=, $pop270, $pop1563
 	i32.load16_s	$push268=, 0($10)
-	i32.load16_s	$push270=, 0($0)
-	i32.const	$push1549=, 3
-	i32.rem_s	$push826=, $pop270, $pop1549
-	i32.ne  	$push827=, $pop268, $pop826
-	br_if   	1, $pop827      # 1: down to label0
+	i32.ne  	$push830=, $pop829, $pop268
+	br_if   	1, $pop830      # 1: down to label0
 # BB#140:                               # %lor.lhs.false1314
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push271=, 0($8)
+	i32.const	$push1568=, 16
+	i32.shl 	$push833=, $pop271, $pop1568
+	i32.const	$push1567=, 16
+	i32.shr_s	$push834=, $pop833, $pop1567
+	i32.const	$push1566=, 3
+	i32.rem_s	$push835=, $pop834, $pop1566
 	i32.load16_u	$push269=, 6($10)
-	i32.const	$push1554=, 16
-	i32.shl 	$push828=, $pop269, $pop1554
-	i32.const	$push1553=, 16
-	i32.shr_s	$push829=, $pop828, $pop1553
-	i32.load16_u	$push271=, 0($2)
-	i32.const	$push1552=, 16
-	i32.shl 	$push830=, $pop271, $pop1552
-	i32.const	$push1551=, 16
-	i32.shr_s	$push831=, $pop830, $pop1551
-	i32.const	$push1550=, 3
-	i32.rem_s	$push832=, $pop831, $pop1550
-	i32.ne  	$push833=, $pop829, $pop832
-	br_if   	1, $pop833      # 1: down to label0
+	i32.const	$push1565=, 16
+	i32.shl 	$push831=, $pop269, $pop1565
+	i32.const	$push1564=, 16
+	i32.shr_s	$push832=, $pop831, $pop1564
+	i32.ne  	$push836=, $pop835, $pop832
+	br_if   	1, $pop836      # 1: down to label0
 # BB#141:                               # %if.end1324
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push275=, 0($2)
+	i32.const	$push1569=, 3
+	i32.rem_s	$push837=, $pop275, $pop1569
 	i32.load16_s	$push273=, 4($10)
-	i32.load16_s	$push275=, 0($3)
-	i32.const	$push1555=, 3
-	i32.rem_s	$push834=, $pop275, $pop1555
-	i32.ne  	$push835=, $pop273, $pop834
-	br_if   	1, $pop835      # 1: down to label0
+	i32.ne  	$push838=, $pop837, $pop273
+	br_if   	1, $pop838      # 1: down to label0
 # BB#142:                               # %lor.lhs.false1333
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push274=, 0($3)
+	i32.const	$push1574=, 16
+	i32.shl 	$push841=, $pop274, $pop1574
+	i32.const	$push1573=, 16
+	i32.shr_s	$push842=, $pop841, $pop1573
+	i32.const	$push1572=, 3
+	i32.rem_s	$push843=, $pop842, $pop1572
 	i32.load16_u	$push272=, 2($10)
-	i32.const	$push1560=, 16
-	i32.shl 	$push836=, $pop272, $pop1560
-	i32.const	$push1559=, 16
-	i32.shr_s	$push837=, $pop836, $pop1559
-	i32.load16_u	$push274=, 0($4)
-	i32.const	$push1558=, 16
-	i32.shl 	$push838=, $pop274, $pop1558
-	i32.const	$push1557=, 16
-	i32.shr_s	$push839=, $pop838, $pop1557
-	i32.const	$push1556=, 3
-	i32.rem_s	$push840=, $pop839, $pop1556
-	i32.ne  	$push841=, $pop837, $pop840
-	br_if   	1, $pop841      # 1: down to label0
+	i32.const	$push1571=, 16
+	i32.shl 	$push839=, $pop272, $pop1571
+	i32.const	$push1570=, 16
+	i32.shr_s	$push840=, $pop839, $pop1570
+	i32.ne  	$push844=, $pop843, $pop840
+	br_if   	1, $pop844      # 1: down to label0
 # BB#143:                               # %if.end1343
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push278=, 0($4)
+	i32.const	$push1575=, 3
+	i32.rem_s	$push845=, $pop278, $pop1575
 	i32.load16_s	$push276=, 8($10)
-	i32.load16_s	$push278=, 0($5)
-	i32.const	$push1561=, 3
-	i32.rem_s	$push842=, $pop278, $pop1561
-	i32.ne  	$push843=, $pop276, $pop842
-	br_if   	1, $pop843      # 1: down to label0
+	i32.ne  	$push846=, $pop845, $pop276
+	br_if   	1, $pop846      # 1: down to label0
 # BB#144:                               # %lor.lhs.false1352
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push279=, 0($5)
+	i32.const	$push1580=, 16
+	i32.shl 	$push849=, $pop279, $pop1580
+	i32.const	$push1579=, 16
+	i32.shr_s	$push850=, $pop849, $pop1579
+	i32.const	$push1578=, 3
+	i32.rem_s	$push851=, $pop850, $pop1578
 	i32.load16_u	$push277=, 14($10)
-	i32.const	$push1566=, 16
-	i32.shl 	$push844=, $pop277, $pop1566
-	i32.const	$push1565=, 16
-	i32.shr_s	$push845=, $pop844, $pop1565
-	i32.load16_u	$push279=, 0($6)
-	i32.const	$push1564=, 16
-	i32.shl 	$push846=, $pop279, $pop1564
-	i32.const	$push1563=, 16
-	i32.shr_s	$push847=, $pop846, $pop1563
-	i32.const	$push1562=, 3
-	i32.rem_s	$push848=, $pop847, $pop1562
-	i32.ne  	$push849=, $pop845, $pop848
-	br_if   	1, $pop849      # 1: down to label0
+	i32.const	$push1577=, 16
+	i32.shl 	$push847=, $pop277, $pop1577
+	i32.const	$push1576=, 16
+	i32.shr_s	$push848=, $pop847, $pop1576
+	i32.ne  	$push852=, $pop851, $pop848
+	br_if   	1, $pop852      # 1: down to label0
 # BB#145:                               # %if.end1362
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push283=, 0($6)
+	i32.const	$push1581=, 3
+	i32.rem_s	$push853=, $pop283, $pop1581
 	i32.load16_s	$push281=, 12($10)
-	i32.load16_s	$push283=, 0($7)
-	i32.const	$push1567=, 3
-	i32.rem_s	$push850=, $pop283, $pop1567
-	i32.ne  	$push851=, $pop281, $pop850
-	br_if   	1, $pop851      # 1: down to label0
+	i32.ne  	$push854=, $pop853, $pop281
+	br_if   	1, $pop854      # 1: down to label0
 # BB#146:                               # %lor.lhs.false1371
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push282=, 0($7)
+	i32.const	$push1586=, 16
+	i32.shl 	$push857=, $pop282, $pop1586
+	i32.const	$push1585=, 16
+	i32.shr_s	$push858=, $pop857, $pop1585
+	i32.const	$push1584=, 3
+	i32.rem_s	$push859=, $pop858, $pop1584
 	i32.load16_u	$push280=, 10($10)
-	i32.const	$push1572=, 16
-	i32.shl 	$push852=, $pop280, $pop1572
-	i32.const	$push1571=, 16
-	i32.shr_s	$push853=, $pop852, $pop1571
-	i32.load16_u	$push282=, 0($8)
-	i32.const	$push1570=, 16
-	i32.shl 	$push854=, $pop282, $pop1570
-	i32.const	$push1569=, 16
-	i32.shr_s	$push855=, $pop854, $pop1569
-	i32.const	$push1568=, 3
-	i32.rem_s	$push856=, $pop855, $pop1568
-	i32.ne  	$push857=, $pop853, $pop856
-	br_if   	1, $pop857      # 1: down to label0
+	i32.const	$push1583=, 16
+	i32.shl 	$push855=, $pop280, $pop1583
+	i32.const	$push1582=, 16
+	i32.shr_s	$push856=, $pop855, $pop1582
+	i32.ne  	$push860=, $pop859, $pop856
+	br_if   	1, $pop860      # 1: down to label0
 # BB#147:                               # %if.end1381
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sq65656565@FUNCTION, $10, $0
+	call    	sq65656565@FUNCTION, $10, $1
 	i32.load16_u	$push284=, 0($10)
-	i32.load16_s	$push286=, 0($0)
-	i32.const	$push1574=, 6
-	i32.div_s	$push858=, $pop286, $pop1574
-	i32.const	$push1573=, 65535
-	i32.and 	$push859=, $pop858, $pop1573
-	i32.ne  	$push860=, $pop284, $pop859
-	br_if   	1, $pop860      # 1: down to label0
+	i32.load16_s	$push286=, 0($1)
+	i32.const	$push1588=, 6
+	i32.div_s	$push861=, $pop286, $pop1588
+	i32.const	$push1587=, 65535
+	i32.and 	$push862=, $pop861, $pop1587
+	i32.ne  	$push863=, $pop284, $pop862
+	br_if   	1, $pop863      # 1: down to label0
 # BB#148:                               # %lor.lhs.false1391
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push285=, 6($10)
-	i32.const	$push1579=, 65535
-	i32.and 	$push861=, $pop285, $pop1579
-	i32.load16_u	$push287=, 0($2)
-	i32.const	$push1578=, 16
-	i32.shl 	$push862=, $pop287, $pop1578
-	i32.const	$push1577=, 16
-	i32.shr_s	$push863=, $pop862, $pop1577
-	i32.const	$push1576=, 5
-	i32.div_s	$push864=, $pop863, $pop1576
-	i32.const	$push1575=, 65535
-	i32.and 	$push865=, $pop864, $pop1575
-	i32.ne  	$push866=, $pop861, $pop865
-	br_if   	1, $pop866      # 1: down to label0
+	i32.const	$push1593=, 65535
+	i32.and 	$push864=, $pop285, $pop1593
+	i32.load16_u	$push287=, 0($8)
+	i32.const	$push1592=, 16
+	i32.shl 	$push865=, $pop287, $pop1592
+	i32.const	$push1591=, 16
+	i32.shr_s	$push866=, $pop865, $pop1591
+	i32.const	$push1590=, 5
+	i32.div_s	$push867=, $pop866, $pop1590
+	i32.const	$push1589=, 65535
+	i32.and 	$push868=, $pop867, $pop1589
+	i32.ne  	$push869=, $pop864, $pop868
+	br_if   	1, $pop869      # 1: down to label0
 # BB#149:                               # %if.end1401
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push289=, 4($10)
-	i32.load16_s	$push291=, 0($3)
-	i32.const	$push1581=, 6
-	i32.div_s	$push867=, $pop291, $pop1581
-	i32.const	$push1580=, 65535
-	i32.and 	$push868=, $pop867, $pop1580
-	i32.ne  	$push869=, $pop289, $pop868
-	br_if   	1, $pop869      # 1: down to label0
+	i32.load16_s	$push291=, 0($2)
+	i32.const	$push1595=, 6
+	i32.div_s	$push870=, $pop291, $pop1595
+	i32.const	$push1594=, 65535
+	i32.and 	$push871=, $pop870, $pop1594
+	i32.ne  	$push872=, $pop289, $pop871
+	br_if   	1, $pop872      # 1: down to label0
 # BB#150:                               # %lor.lhs.false1410
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push288=, 2($10)
-	i32.const	$push1586=, 65535
-	i32.and 	$push870=, $pop288, $pop1586
-	i32.load16_u	$push290=, 0($4)
-	i32.const	$push1585=, 16
-	i32.shl 	$push871=, $pop290, $pop1585
-	i32.const	$push1584=, 16
-	i32.shr_s	$push872=, $pop871, $pop1584
-	i32.const	$push1583=, 5
-	i32.div_s	$push873=, $pop872, $pop1583
-	i32.const	$push1582=, 65535
-	i32.and 	$push874=, $pop873, $pop1582
-	i32.ne  	$push875=, $pop870, $pop874
-	br_if   	1, $pop875      # 1: down to label0
+	i32.const	$push1600=, 65535
+	i32.and 	$push873=, $pop288, $pop1600
+	i32.load16_u	$push290=, 0($3)
+	i32.const	$push1599=, 16
+	i32.shl 	$push874=, $pop290, $pop1599
+	i32.const	$push1598=, 16
+	i32.shr_s	$push875=, $pop874, $pop1598
+	i32.const	$push1597=, 5
+	i32.div_s	$push876=, $pop875, $pop1597
+	i32.const	$push1596=, 65535
+	i32.and 	$push877=, $pop876, $pop1596
+	i32.ne  	$push878=, $pop873, $pop877
+	br_if   	1, $pop878      # 1: down to label0
 # BB#151:                               # %if.end1420
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push292=, 8($10)
-	i32.load16_s	$push294=, 0($5)
-	i32.const	$push1588=, 6
-	i32.div_s	$push876=, $pop294, $pop1588
-	i32.const	$push1587=, 65535
-	i32.and 	$push877=, $pop876, $pop1587
-	i32.ne  	$push878=, $pop292, $pop877
-	br_if   	1, $pop878      # 1: down to label0
+	i32.load16_s	$push294=, 0($4)
+	i32.const	$push1602=, 6
+	i32.div_s	$push879=, $pop294, $pop1602
+	i32.const	$push1601=, 65535
+	i32.and 	$push880=, $pop879, $pop1601
+	i32.ne  	$push881=, $pop292, $pop880
+	br_if   	1, $pop881      # 1: down to label0
 # BB#152:                               # %lor.lhs.false1429
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push293=, 14($10)
-	i32.const	$push1593=, 65535
-	i32.and 	$push879=, $pop293, $pop1593
-	i32.load16_u	$push295=, 0($6)
-	i32.const	$push1592=, 16
-	i32.shl 	$push880=, $pop295, $pop1592
-	i32.const	$push1591=, 16
-	i32.shr_s	$push881=, $pop880, $pop1591
-	i32.const	$push1590=, 5
-	i32.div_s	$push882=, $pop881, $pop1590
-	i32.const	$push1589=, 65535
-	i32.and 	$push883=, $pop882, $pop1589
-	i32.ne  	$push884=, $pop879, $pop883
-	br_if   	1, $pop884      # 1: down to label0
+	i32.const	$push1607=, 65535
+	i32.and 	$push882=, $pop293, $pop1607
+	i32.load16_u	$push295=, 0($5)
+	i32.const	$push1606=, 16
+	i32.shl 	$push883=, $pop295, $pop1606
+	i32.const	$push1605=, 16
+	i32.shr_s	$push884=, $pop883, $pop1605
+	i32.const	$push1604=, 5
+	i32.div_s	$push885=, $pop884, $pop1604
+	i32.const	$push1603=, 65535
+	i32.and 	$push886=, $pop885, $pop1603
+	i32.ne  	$push887=, $pop882, $pop886
+	br_if   	1, $pop887      # 1: down to label0
 # BB#153:                               # %if.end1439
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push297=, 12($10)
-	i32.load16_s	$push299=, 0($7)
-	i32.const	$push1595=, 6
-	i32.div_s	$push885=, $pop299, $pop1595
-	i32.const	$push1594=, 65535
-	i32.and 	$push886=, $pop885, $pop1594
-	i32.ne  	$push887=, $pop297, $pop886
-	br_if   	1, $pop887      # 1: down to label0
+	i32.load16_s	$push299=, 0($6)
+	i32.const	$push1609=, 6
+	i32.div_s	$push888=, $pop299, $pop1609
+	i32.const	$push1608=, 65535
+	i32.and 	$push889=, $pop888, $pop1608
+	i32.ne  	$push890=, $pop297, $pop889
+	br_if   	1, $pop890      # 1: down to label0
 # BB#154:                               # %lor.lhs.false1448
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push296=, 10($10)
-	i32.const	$push1600=, 65535
-	i32.and 	$push888=, $pop296, $pop1600
-	i32.load16_u	$push298=, 0($8)
-	i32.const	$push1599=, 16
-	i32.shl 	$push889=, $pop298, $pop1599
-	i32.const	$push1598=, 16
-	i32.shr_s	$push890=, $pop889, $pop1598
-	i32.const	$push1597=, 5
-	i32.div_s	$push891=, $pop890, $pop1597
-	i32.const	$push1596=, 65535
-	i32.and 	$push892=, $pop891, $pop1596
-	i32.ne  	$push893=, $pop888, $pop892
-	br_if   	1, $pop893      # 1: down to label0
+	i32.const	$push1614=, 65535
+	i32.and 	$push891=, $pop296, $pop1614
+	i32.load16_u	$push298=, 0($7)
+	i32.const	$push1613=, 16
+	i32.shl 	$push892=, $pop298, $pop1613
+	i32.const	$push1612=, 16
+	i32.shr_s	$push893=, $pop892, $pop1612
+	i32.const	$push1611=, 5
+	i32.div_s	$push894=, $pop893, $pop1611
+	i32.const	$push1610=, 65535
+	i32.and 	$push895=, $pop894, $pop1610
+	i32.ne  	$push896=, $pop891, $pop895
+	br_if   	1, $pop896      # 1: down to label0
 # BB#155:                               # %if.end1458
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sr65656565@FUNCTION, $10, $0
+	call    	sr65656565@FUNCTION, $10, $1
+	i32.load16_s	$push302=, 0($1)
+	i32.const	$push1615=, 6
+	i32.rem_s	$push897=, $pop302, $pop1615
 	i32.load16_s	$push300=, 0($10)
-	i32.load16_s	$push302=, 0($0)
-	i32.const	$push1601=, 6
-	i32.rem_s	$push894=, $pop302, $pop1601
-	i32.ne  	$push895=, $pop300, $pop894
-	br_if   	1, $pop895      # 1: down to label0
+	i32.ne  	$push898=, $pop897, $pop300
+	br_if   	1, $pop898      # 1: down to label0
 # BB#156:                               # %lor.lhs.false1468
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push303=, 0($8)
+	i32.const	$push1620=, 16
+	i32.shl 	$push901=, $pop303, $pop1620
+	i32.const	$push1619=, 16
+	i32.shr_s	$push902=, $pop901, $pop1619
+	i32.const	$push1618=, 5
+	i32.rem_s	$push903=, $pop902, $pop1618
 	i32.load16_u	$push301=, 6($10)
-	i32.const	$push1606=, 16
-	i32.shl 	$push896=, $pop301, $pop1606
-	i32.const	$push1605=, 16
-	i32.shr_s	$push897=, $pop896, $pop1605
-	i32.load16_u	$push303=, 0($2)
-	i32.const	$push1604=, 16
-	i32.shl 	$push898=, $pop303, $pop1604
-	i32.const	$push1603=, 16
-	i32.shr_s	$push899=, $pop898, $pop1603
-	i32.const	$push1602=, 5
-	i32.rem_s	$push900=, $pop899, $pop1602
-	i32.ne  	$push901=, $pop897, $pop900
-	br_if   	1, $pop901      # 1: down to label0
+	i32.const	$push1617=, 16
+	i32.shl 	$push899=, $pop301, $pop1617
+	i32.const	$push1616=, 16
+	i32.shr_s	$push900=, $pop899, $pop1616
+	i32.ne  	$push904=, $pop903, $pop900
+	br_if   	1, $pop904      # 1: down to label0
 # BB#157:                               # %if.end1478
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push307=, 0($2)
+	i32.const	$push1621=, 6
+	i32.rem_s	$push905=, $pop307, $pop1621
 	i32.load16_s	$push305=, 4($10)
-	i32.load16_s	$push307=, 0($3)
-	i32.const	$push1607=, 6
-	i32.rem_s	$push902=, $pop307, $pop1607
-	i32.ne  	$push903=, $pop305, $pop902
-	br_if   	1, $pop903      # 1: down to label0
+	i32.ne  	$push906=, $pop905, $pop305
+	br_if   	1, $pop906      # 1: down to label0
 # BB#158:                               # %lor.lhs.false1487
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push306=, 0($3)
+	i32.const	$push1626=, 16
+	i32.shl 	$push909=, $pop306, $pop1626
+	i32.const	$push1625=, 16
+	i32.shr_s	$push910=, $pop909, $pop1625
+	i32.const	$push1624=, 5
+	i32.rem_s	$push911=, $pop910, $pop1624
 	i32.load16_u	$push304=, 2($10)
-	i32.const	$push1612=, 16
-	i32.shl 	$push904=, $pop304, $pop1612
-	i32.const	$push1611=, 16
-	i32.shr_s	$push905=, $pop904, $pop1611
-	i32.load16_u	$push306=, 0($4)
-	i32.const	$push1610=, 16
-	i32.shl 	$push906=, $pop306, $pop1610
-	i32.const	$push1609=, 16
-	i32.shr_s	$push907=, $pop906, $pop1609
-	i32.const	$push1608=, 5
-	i32.rem_s	$push908=, $pop907, $pop1608
-	i32.ne  	$push909=, $pop905, $pop908
-	br_if   	1, $pop909      # 1: down to label0
+	i32.const	$push1623=, 16
+	i32.shl 	$push907=, $pop304, $pop1623
+	i32.const	$push1622=, 16
+	i32.shr_s	$push908=, $pop907, $pop1622
+	i32.ne  	$push912=, $pop911, $pop908
+	br_if   	1, $pop912      # 1: down to label0
 # BB#159:                               # %if.end1497
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push310=, 0($4)
+	i32.const	$push1627=, 6
+	i32.rem_s	$push913=, $pop310, $pop1627
 	i32.load16_s	$push308=, 8($10)
-	i32.load16_s	$push310=, 0($5)
-	i32.const	$push1613=, 6
-	i32.rem_s	$push910=, $pop310, $pop1613
-	i32.ne  	$push911=, $pop308, $pop910
-	br_if   	1, $pop911      # 1: down to label0
+	i32.ne  	$push914=, $pop913, $pop308
+	br_if   	1, $pop914      # 1: down to label0
 # BB#160:                               # %lor.lhs.false1506
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push311=, 0($5)
+	i32.const	$push1632=, 16
+	i32.shl 	$push917=, $pop311, $pop1632
+	i32.const	$push1631=, 16
+	i32.shr_s	$push918=, $pop917, $pop1631
+	i32.const	$push1630=, 5
+	i32.rem_s	$push919=, $pop918, $pop1630
 	i32.load16_u	$push309=, 14($10)
-	i32.const	$push1618=, 16
-	i32.shl 	$push912=, $pop309, $pop1618
-	i32.const	$push1617=, 16
-	i32.shr_s	$push913=, $pop912, $pop1617
-	i32.load16_u	$push311=, 0($6)
-	i32.const	$push1616=, 16
-	i32.shl 	$push914=, $pop311, $pop1616
-	i32.const	$push1615=, 16
-	i32.shr_s	$push915=, $pop914, $pop1615
-	i32.const	$push1614=, 5
-	i32.rem_s	$push916=, $pop915, $pop1614
-	i32.ne  	$push917=, $pop913, $pop916
-	br_if   	1, $pop917      # 1: down to label0
+	i32.const	$push1629=, 16
+	i32.shl 	$push915=, $pop309, $pop1629
+	i32.const	$push1628=, 16
+	i32.shr_s	$push916=, $pop915, $pop1628
+	i32.ne  	$push920=, $pop919, $pop916
+	br_if   	1, $pop920      # 1: down to label0
 # BB#161:                               # %if.end1516
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push315=, 0($6)
+	i32.const	$push1633=, 6
+	i32.rem_s	$push921=, $pop315, $pop1633
 	i32.load16_s	$push313=, 12($10)
-	i32.load16_s	$push315=, 0($7)
-	i32.const	$push1619=, 6
-	i32.rem_s	$push918=, $pop315, $pop1619
-	i32.ne  	$push919=, $pop313, $pop918
-	br_if   	1, $pop919      # 1: down to label0
+	i32.ne  	$push922=, $pop921, $pop313
+	br_if   	1, $pop922      # 1: down to label0
 # BB#162:                               # %lor.lhs.false1525
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push314=, 0($7)
+	i32.const	$push1638=, 16
+	i32.shl 	$push925=, $pop314, $pop1638
+	i32.const	$push1637=, 16
+	i32.shr_s	$push926=, $pop925, $pop1637
+	i32.const	$push1636=, 5
+	i32.rem_s	$push927=, $pop926, $pop1636
 	i32.load16_u	$push312=, 10($10)
-	i32.const	$push1624=, 16
-	i32.shl 	$push920=, $pop312, $pop1624
-	i32.const	$push1623=, 16
-	i32.shr_s	$push921=, $pop920, $pop1623
-	i32.load16_u	$push314=, 0($8)
-	i32.const	$push1622=, 16
-	i32.shl 	$push922=, $pop314, $pop1622
-	i32.const	$push1621=, 16
-	i32.shr_s	$push923=, $pop922, $pop1621
-	i32.const	$push1620=, 5
-	i32.rem_s	$push924=, $pop923, $pop1620
-	i32.ne  	$push925=, $pop921, $pop924
-	br_if   	1, $pop925      # 1: down to label0
+	i32.const	$push1635=, 16
+	i32.shl 	$push923=, $pop312, $pop1635
+	i32.const	$push1634=, 16
+	i32.shr_s	$push924=, $pop923, $pop1634
+	i32.ne  	$push928=, $pop927, $pop924
+	br_if   	1, $pop928      # 1: down to label0
 # BB#163:                               # %if.end1535
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sq14141461461414@FUNCTION, $10, $0
+	call    	sq14141461461414@FUNCTION, $10, $1
 	i32.load16_u	$push316=, 0($10)
-	i32.load16_s	$push318=, 0($0)
-	i32.const	$push1626=, 14
-	i32.div_s	$push926=, $pop318, $pop1626
-	i32.const	$push1625=, 65535
-	i32.and 	$push927=, $pop926, $pop1625
-	i32.ne  	$push928=, $pop316, $pop927
-	br_if   	1, $pop928      # 1: down to label0
+	i32.load16_s	$push318=, 0($1)
+	i32.const	$push1640=, 14
+	i32.div_s	$push929=, $pop318, $pop1640
+	i32.const	$push1639=, 65535
+	i32.and 	$push930=, $pop929, $pop1639
+	i32.ne  	$push931=, $pop316, $pop930
+	br_if   	1, $pop931      # 1: down to label0
 # BB#164:                               # %lor.lhs.false1545
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push317=, 6($10)
-	i32.const	$push1631=, 65535
-	i32.and 	$push929=, $pop317, $pop1631
-	i32.load16_u	$push319=, 0($2)
-	i32.const	$push1630=, 16
-	i32.shl 	$push930=, $pop319, $pop1630
-	i32.const	$push1629=, 16
-	i32.shr_s	$push931=, $pop930, $pop1629
-	i32.const	$push1628=, 6
-	i32.div_s	$push932=, $pop931, $pop1628
-	i32.const	$push1627=, 65535
-	i32.and 	$push933=, $pop932, $pop1627
-	i32.ne  	$push934=, $pop929, $pop933
-	br_if   	1, $pop934      # 1: down to label0
+	i32.const	$push1645=, 65535
+	i32.and 	$push932=, $pop317, $pop1645
+	i32.load16_u	$push319=, 0($8)
+	i32.const	$push1644=, 16
+	i32.shl 	$push933=, $pop319, $pop1644
+	i32.const	$push1643=, 16
+	i32.shr_s	$push934=, $pop933, $pop1643
+	i32.const	$push1642=, 6
+	i32.div_s	$push935=, $pop934, $pop1642
+	i32.const	$push1641=, 65535
+	i32.and 	$push936=, $pop935, $pop1641
+	i32.ne  	$push937=, $pop932, $pop936
+	br_if   	1, $pop937      # 1: down to label0
 # BB#165:                               # %if.end1555
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push321=, 4($10)
-	i32.load16_s	$push323=, 0($3)
-	i32.const	$push1633=, 14
-	i32.div_s	$push935=, $pop323, $pop1633
-	i32.const	$push1632=, 65535
-	i32.and 	$push936=, $pop935, $pop1632
-	i32.ne  	$push937=, $pop321, $pop936
-	br_if   	1, $pop937      # 1: down to label0
+	i32.load16_s	$push323=, 0($2)
+	i32.const	$push1647=, 14
+	i32.div_s	$push938=, $pop323, $pop1647
+	i32.const	$push1646=, 65535
+	i32.and 	$push939=, $pop938, $pop1646
+	i32.ne  	$push940=, $pop321, $pop939
+	br_if   	1, $pop940      # 1: down to label0
 # BB#166:                               # %lor.lhs.false1564
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push320=, 2($10)
-	i32.const	$push1638=, 65535
-	i32.and 	$push938=, $pop320, $pop1638
-	i32.load16_u	$push322=, 0($4)
-	i32.const	$push1637=, 16
-	i32.shl 	$push939=, $pop322, $pop1637
-	i32.const	$push1636=, 16
-	i32.shr_s	$push940=, $pop939, $pop1636
-	i32.const	$push1635=, 14
-	i32.div_s	$push941=, $pop940, $pop1635
-	i32.const	$push1634=, 65535
-	i32.and 	$push942=, $pop941, $pop1634
-	i32.ne  	$push943=, $pop938, $pop942
-	br_if   	1, $pop943      # 1: down to label0
+	i32.const	$push1652=, 65535
+	i32.and 	$push941=, $pop320, $pop1652
+	i32.load16_u	$push322=, 0($3)
+	i32.const	$push1651=, 16
+	i32.shl 	$push942=, $pop322, $pop1651
+	i32.const	$push1650=, 16
+	i32.shr_s	$push943=, $pop942, $pop1650
+	i32.const	$push1649=, 14
+	i32.div_s	$push944=, $pop943, $pop1649
+	i32.const	$push1648=, 65535
+	i32.and 	$push945=, $pop944, $pop1648
+	i32.ne  	$push946=, $pop941, $pop945
+	br_if   	1, $pop946      # 1: down to label0
 # BB#167:                               # %if.end1574
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push324=, 8($10)
-	i32.load16_s	$push326=, 0($5)
-	i32.const	$push1640=, 14
-	i32.div_s	$push944=, $pop326, $pop1640
-	i32.const	$push1639=, 65535
-	i32.and 	$push945=, $pop944, $pop1639
-	i32.ne  	$push946=, $pop324, $pop945
-	br_if   	1, $pop946      # 1: down to label0
+	i32.load16_s	$push326=, 0($4)
+	i32.const	$push1654=, 14
+	i32.div_s	$push947=, $pop326, $pop1654
+	i32.const	$push1653=, 65535
+	i32.and 	$push948=, $pop947, $pop1653
+	i32.ne  	$push949=, $pop324, $pop948
+	br_if   	1, $pop949      # 1: down to label0
 # BB#168:                               # %lor.lhs.false1583
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push325=, 14($10)
-	i32.const	$push1645=, 65535
-	i32.and 	$push947=, $pop325, $pop1645
-	i32.load16_u	$push327=, 0($6)
-	i32.const	$push1644=, 16
-	i32.shl 	$push948=, $pop327, $pop1644
-	i32.const	$push1643=, 16
-	i32.shr_s	$push949=, $pop948, $pop1643
-	i32.const	$push1642=, 14
-	i32.div_s	$push950=, $pop949, $pop1642
-	i32.const	$push1641=, 65535
-	i32.and 	$push951=, $pop950, $pop1641
-	i32.ne  	$push952=, $pop947, $pop951
-	br_if   	1, $pop952      # 1: down to label0
+	i32.const	$push1659=, 65535
+	i32.and 	$push950=, $pop325, $pop1659
+	i32.load16_u	$push327=, 0($5)
+	i32.const	$push1658=, 16
+	i32.shl 	$push951=, $pop327, $pop1658
+	i32.const	$push1657=, 16
+	i32.shr_s	$push952=, $pop951, $pop1657
+	i32.const	$push1656=, 14
+	i32.div_s	$push953=, $pop952, $pop1656
+	i32.const	$push1655=, 65535
+	i32.and 	$push954=, $pop953, $pop1655
+	i32.ne  	$push955=, $pop950, $pop954
+	br_if   	1, $pop955      # 1: down to label0
 # BB#169:                               # %if.end1593
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push329=, 12($10)
-	i32.load16_s	$push331=, 0($7)
-	i32.const	$push1647=, 14
-	i32.div_s	$push953=, $pop331, $pop1647
-	i32.const	$push1646=, 65535
-	i32.and 	$push954=, $pop953, $pop1646
-	i32.ne  	$push955=, $pop329, $pop954
-	br_if   	1, $pop955      # 1: down to label0
+	i32.load16_s	$push331=, 0($6)
+	i32.const	$push1661=, 14
+	i32.div_s	$push956=, $pop331, $pop1661
+	i32.const	$push1660=, 65535
+	i32.and 	$push957=, $pop956, $pop1660
+	i32.ne  	$push958=, $pop329, $pop957
+	br_if   	1, $pop958      # 1: down to label0
 # BB#170:                               # %lor.lhs.false1602
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push328=, 10($10)
-	i32.const	$push1652=, 65535
-	i32.and 	$push956=, $pop328, $pop1652
-	i32.load16_u	$push330=, 0($8)
-	i32.const	$push1651=, 16
-	i32.shl 	$push957=, $pop330, $pop1651
-	i32.const	$push1650=, 16
-	i32.shr_s	$push958=, $pop957, $pop1650
-	i32.const	$push1649=, 6
-	i32.div_s	$push959=, $pop958, $pop1649
-	i32.const	$push1648=, 65535
-	i32.and 	$push960=, $pop959, $pop1648
-	i32.ne  	$push961=, $pop956, $pop960
-	br_if   	1, $pop961      # 1: down to label0
+	i32.const	$push1666=, 65535
+	i32.and 	$push959=, $pop328, $pop1666
+	i32.load16_u	$push330=, 0($7)
+	i32.const	$push1665=, 16
+	i32.shl 	$push960=, $pop330, $pop1665
+	i32.const	$push1664=, 16
+	i32.shr_s	$push961=, $pop960, $pop1664
+	i32.const	$push1663=, 6
+	i32.div_s	$push962=, $pop961, $pop1663
+	i32.const	$push1662=, 65535
+	i32.and 	$push963=, $pop962, $pop1662
+	i32.ne  	$push964=, $pop959, $pop963
+	br_if   	1, $pop964      # 1: down to label0
 # BB#171:                               # %if.end1612
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sr14141461461414@FUNCTION, $10, $0
+	call    	sr14141461461414@FUNCTION, $10, $1
+	i32.load16_s	$push334=, 0($1)
+	i32.const	$push1667=, 14
+	i32.rem_s	$push965=, $pop334, $pop1667
 	i32.load16_s	$push332=, 0($10)
-	i32.load16_s	$push334=, 0($0)
-	i32.const	$push1653=, 14
-	i32.rem_s	$push962=, $pop334, $pop1653
-	i32.ne  	$push963=, $pop332, $pop962
-	br_if   	1, $pop963      # 1: down to label0
+	i32.ne  	$push966=, $pop965, $pop332
+	br_if   	1, $pop966      # 1: down to label0
 # BB#172:                               # %lor.lhs.false1622
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push335=, 0($8)
+	i32.const	$push1672=, 16
+	i32.shl 	$push969=, $pop335, $pop1672
+	i32.const	$push1671=, 16
+	i32.shr_s	$push970=, $pop969, $pop1671
+	i32.const	$push1670=, 6
+	i32.rem_s	$push971=, $pop970, $pop1670
 	i32.load16_u	$push333=, 6($10)
-	i32.const	$push1658=, 16
-	i32.shl 	$push964=, $pop333, $pop1658
-	i32.const	$push1657=, 16
-	i32.shr_s	$push965=, $pop964, $pop1657
-	i32.load16_u	$push335=, 0($2)
-	i32.const	$push1656=, 16
-	i32.shl 	$push966=, $pop335, $pop1656
-	i32.const	$push1655=, 16
-	i32.shr_s	$push967=, $pop966, $pop1655
-	i32.const	$push1654=, 6
-	i32.rem_s	$push968=, $pop967, $pop1654
-	i32.ne  	$push969=, $pop965, $pop968
-	br_if   	1, $pop969      # 1: down to label0
+	i32.const	$push1669=, 16
+	i32.shl 	$push967=, $pop333, $pop1669
+	i32.const	$push1668=, 16
+	i32.shr_s	$push968=, $pop967, $pop1668
+	i32.ne  	$push972=, $pop971, $pop968
+	br_if   	1, $pop972      # 1: down to label0
 # BB#173:                               # %if.end1632
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push339=, 0($2)
+	i32.const	$push1673=, 14
+	i32.rem_s	$push973=, $pop339, $pop1673
 	i32.load16_s	$push337=, 4($10)
-	i32.load16_s	$push339=, 0($3)
-	i32.const	$push1659=, 14
-	i32.rem_s	$push970=, $pop339, $pop1659
-	i32.ne  	$push971=, $pop337, $pop970
-	br_if   	1, $pop971      # 1: down to label0
+	i32.ne  	$push974=, $pop973, $pop337
+	br_if   	1, $pop974      # 1: down to label0
 # BB#174:                               # %lor.lhs.false1641
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push338=, 0($3)
+	i32.const	$push1678=, 16
+	i32.shl 	$push977=, $pop338, $pop1678
+	i32.const	$push1677=, 16
+	i32.shr_s	$push978=, $pop977, $pop1677
+	i32.const	$push1676=, 14
+	i32.rem_s	$push979=, $pop978, $pop1676
 	i32.load16_u	$push336=, 2($10)
-	i32.const	$push1664=, 16
-	i32.shl 	$push972=, $pop336, $pop1664
-	i32.const	$push1663=, 16
-	i32.shr_s	$push973=, $pop972, $pop1663
-	i32.load16_u	$push338=, 0($4)
-	i32.const	$push1662=, 16
-	i32.shl 	$push974=, $pop338, $pop1662
-	i32.const	$push1661=, 16
-	i32.shr_s	$push975=, $pop974, $pop1661
-	i32.const	$push1660=, 14
-	i32.rem_s	$push976=, $pop975, $pop1660
-	i32.ne  	$push977=, $pop973, $pop976
-	br_if   	1, $pop977      # 1: down to label0
+	i32.const	$push1675=, 16
+	i32.shl 	$push975=, $pop336, $pop1675
+	i32.const	$push1674=, 16
+	i32.shr_s	$push976=, $pop975, $pop1674
+	i32.ne  	$push980=, $pop979, $pop976
+	br_if   	1, $pop980      # 1: down to label0
 # BB#175:                               # %if.end1651
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push342=, 0($4)
+	i32.const	$push1679=, 14
+	i32.rem_s	$push981=, $pop342, $pop1679
 	i32.load16_s	$push340=, 8($10)
-	i32.load16_s	$push342=, 0($5)
-	i32.const	$push1665=, 14
-	i32.rem_s	$push978=, $pop342, $pop1665
-	i32.ne  	$push979=, $pop340, $pop978
-	br_if   	1, $pop979      # 1: down to label0
+	i32.ne  	$push982=, $pop981, $pop340
+	br_if   	1, $pop982      # 1: down to label0
 # BB#176:                               # %lor.lhs.false1660
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push343=, 0($5)
+	i32.const	$push1684=, 16
+	i32.shl 	$push985=, $pop343, $pop1684
+	i32.const	$push1683=, 16
+	i32.shr_s	$push986=, $pop985, $pop1683
+	i32.const	$push1682=, 14
+	i32.rem_s	$push987=, $pop986, $pop1682
 	i32.load16_u	$push341=, 14($10)
-	i32.const	$push1670=, 16
-	i32.shl 	$push980=, $pop341, $pop1670
-	i32.const	$push1669=, 16
-	i32.shr_s	$push981=, $pop980, $pop1669
-	i32.load16_u	$push343=, 0($6)
-	i32.const	$push1668=, 16
-	i32.shl 	$push982=, $pop343, $pop1668
-	i32.const	$push1667=, 16
-	i32.shr_s	$push983=, $pop982, $pop1667
-	i32.const	$push1666=, 14
-	i32.rem_s	$push984=, $pop983, $pop1666
-	i32.ne  	$push985=, $pop981, $pop984
-	br_if   	1, $pop985      # 1: down to label0
+	i32.const	$push1681=, 16
+	i32.shl 	$push983=, $pop341, $pop1681
+	i32.const	$push1680=, 16
+	i32.shr_s	$push984=, $pop983, $pop1680
+	i32.ne  	$push988=, $pop987, $pop984
+	br_if   	1, $pop988      # 1: down to label0
 # BB#177:                               # %if.end1670
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push347=, 0($6)
+	i32.const	$push1685=, 14
+	i32.rem_s	$push989=, $pop347, $pop1685
 	i32.load16_s	$push345=, 12($10)
-	i32.load16_s	$push347=, 0($7)
-	i32.const	$push1671=, 14
-	i32.rem_s	$push986=, $pop347, $pop1671
-	i32.ne  	$push987=, $pop345, $pop986
-	br_if   	1, $pop987      # 1: down to label0
+	i32.ne  	$push990=, $pop989, $pop345
+	br_if   	1, $pop990      # 1: down to label0
 # BB#178:                               # %lor.lhs.false1679
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push346=, 0($7)
+	i32.const	$push1690=, 16
+	i32.shl 	$push993=, $pop346, $pop1690
+	i32.const	$push1689=, 16
+	i32.shr_s	$push994=, $pop993, $pop1689
+	i32.const	$push1688=, 6
+	i32.rem_s	$push995=, $pop994, $pop1688
 	i32.load16_u	$push344=, 10($10)
-	i32.const	$push1676=, 16
-	i32.shl 	$push988=, $pop344, $pop1676
-	i32.const	$push1675=, 16
-	i32.shr_s	$push989=, $pop988, $pop1675
-	i32.load16_u	$push346=, 0($8)
-	i32.const	$push1674=, 16
-	i32.shl 	$push990=, $pop346, $pop1674
-	i32.const	$push1673=, 16
-	i32.shr_s	$push991=, $pop990, $pop1673
-	i32.const	$push1672=, 6
-	i32.rem_s	$push992=, $pop991, $pop1672
-	i32.ne  	$push993=, $pop989, $pop992
-	br_if   	1, $pop993      # 1: down to label0
+	i32.const	$push1687=, 16
+	i32.shl 	$push991=, $pop344, $pop1687
+	i32.const	$push1686=, 16
+	i32.shr_s	$push992=, $pop991, $pop1686
+	i32.ne  	$push996=, $pop995, $pop992
+	br_if   	1, $pop996      # 1: down to label0
 # BB#179:                               # %if.end1689
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sq77777777@FUNCTION, $10, $0
+	call    	sq77777777@FUNCTION, $10, $1
 	i32.load16_u	$push348=, 0($10)
-	i32.load16_s	$push350=, 0($0)
-	i32.const	$push1678=, 7
-	i32.div_s	$push994=, $pop350, $pop1678
-	i32.const	$push1677=, 65535
-	i32.and 	$push995=, $pop994, $pop1677
-	i32.ne  	$push996=, $pop348, $pop995
-	br_if   	1, $pop996      # 1: down to label0
+	i32.load16_s	$push350=, 0($1)
+	i32.const	$push1692=, 7
+	i32.div_s	$push997=, $pop350, $pop1692
+	i32.const	$push1691=, 65535
+	i32.and 	$push998=, $pop997, $pop1691
+	i32.ne  	$push999=, $pop348, $pop998
+	br_if   	1, $pop999      # 1: down to label0
 # BB#180:                               # %lor.lhs.false1699
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push349=, 6($10)
-	i32.const	$push1683=, 65535
-	i32.and 	$push997=, $pop349, $pop1683
-	i32.load16_u	$push351=, 0($2)
-	i32.const	$push1682=, 16
-	i32.shl 	$push998=, $pop351, $pop1682
-	i32.const	$push1681=, 16
-	i32.shr_s	$push999=, $pop998, $pop1681
-	i32.const	$push1680=, 7
-	i32.div_s	$push1000=, $pop999, $pop1680
-	i32.const	$push1679=, 65535
-	i32.and 	$push1001=, $pop1000, $pop1679
-	i32.ne  	$push1002=, $pop997, $pop1001
-	br_if   	1, $pop1002     # 1: down to label0
+	i32.const	$push1697=, 65535
+	i32.and 	$push1000=, $pop349, $pop1697
+	i32.load16_u	$push351=, 0($8)
+	i32.const	$push1696=, 16
+	i32.shl 	$push1001=, $pop351, $pop1696
+	i32.const	$push1695=, 16
+	i32.shr_s	$push1002=, $pop1001, $pop1695
+	i32.const	$push1694=, 7
+	i32.div_s	$push1003=, $pop1002, $pop1694
+	i32.const	$push1693=, 65535
+	i32.and 	$push1004=, $pop1003, $pop1693
+	i32.ne  	$push1005=, $pop1000, $pop1004
+	br_if   	1, $pop1005     # 1: down to label0
 # BB#181:                               # %if.end1709
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push353=, 4($10)
-	i32.load16_s	$push355=, 0($3)
-	i32.const	$push1685=, 7
-	i32.div_s	$push1003=, $pop355, $pop1685
-	i32.const	$push1684=, 65535
-	i32.and 	$push1004=, $pop1003, $pop1684
-	i32.ne  	$push1005=, $pop353, $pop1004
-	br_if   	1, $pop1005     # 1: down to label0
+	i32.load16_s	$push355=, 0($2)
+	i32.const	$push1699=, 7
+	i32.div_s	$push1006=, $pop355, $pop1699
+	i32.const	$push1698=, 65535
+	i32.and 	$push1007=, $pop1006, $pop1698
+	i32.ne  	$push1008=, $pop353, $pop1007
+	br_if   	1, $pop1008     # 1: down to label0
 # BB#182:                               # %lor.lhs.false1718
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push352=, 2($10)
-	i32.const	$push1690=, 65535
-	i32.and 	$push1006=, $pop352, $pop1690
-	i32.load16_u	$push354=, 0($4)
-	i32.const	$push1689=, 16
-	i32.shl 	$push1007=, $pop354, $pop1689
-	i32.const	$push1688=, 16
-	i32.shr_s	$push1008=, $pop1007, $pop1688
-	i32.const	$push1687=, 7
-	i32.div_s	$push1009=, $pop1008, $pop1687
-	i32.const	$push1686=, 65535
-	i32.and 	$push1010=, $pop1009, $pop1686
-	i32.ne  	$push1011=, $pop1006, $pop1010
-	br_if   	1, $pop1011     # 1: down to label0
+	i32.const	$push1704=, 65535
+	i32.and 	$push1009=, $pop352, $pop1704
+	i32.load16_u	$push354=, 0($3)
+	i32.const	$push1703=, 16
+	i32.shl 	$push1010=, $pop354, $pop1703
+	i32.const	$push1702=, 16
+	i32.shr_s	$push1011=, $pop1010, $pop1702
+	i32.const	$push1701=, 7
+	i32.div_s	$push1012=, $pop1011, $pop1701
+	i32.const	$push1700=, 65535
+	i32.and 	$push1013=, $pop1012, $pop1700
+	i32.ne  	$push1014=, $pop1009, $pop1013
+	br_if   	1, $pop1014     # 1: down to label0
 # BB#183:                               # %if.end1728
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push356=, 8($10)
-	i32.load16_s	$push358=, 0($5)
-	i32.const	$push1692=, 7
-	i32.div_s	$push1012=, $pop358, $pop1692
-	i32.const	$push1691=, 65535
-	i32.and 	$push1013=, $pop1012, $pop1691
-	i32.ne  	$push1014=, $pop356, $pop1013
-	br_if   	1, $pop1014     # 1: down to label0
+	i32.load16_s	$push358=, 0($4)
+	i32.const	$push1706=, 7
+	i32.div_s	$push1015=, $pop358, $pop1706
+	i32.const	$push1705=, 65535
+	i32.and 	$push1016=, $pop1015, $pop1705
+	i32.ne  	$push1017=, $pop356, $pop1016
+	br_if   	1, $pop1017     # 1: down to label0
 # BB#184:                               # %lor.lhs.false1737
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push357=, 14($10)
-	i32.const	$push1697=, 65535
-	i32.and 	$push1015=, $pop357, $pop1697
-	i32.load16_u	$push359=, 0($6)
-	i32.const	$push1696=, 16
-	i32.shl 	$push1016=, $pop359, $pop1696
-	i32.const	$push1695=, 16
-	i32.shr_s	$push1017=, $pop1016, $pop1695
-	i32.const	$push1694=, 7
-	i32.div_s	$push1018=, $pop1017, $pop1694
-	i32.const	$push1693=, 65535
-	i32.and 	$push1019=, $pop1018, $pop1693
-	i32.ne  	$push1020=, $pop1015, $pop1019
-	br_if   	1, $pop1020     # 1: down to label0
+	i32.const	$push1711=, 65535
+	i32.and 	$push1018=, $pop357, $pop1711
+	i32.load16_u	$push359=, 0($5)
+	i32.const	$push1710=, 16
+	i32.shl 	$push1019=, $pop359, $pop1710
+	i32.const	$push1709=, 16
+	i32.shr_s	$push1020=, $pop1019, $pop1709
+	i32.const	$push1708=, 7
+	i32.div_s	$push1021=, $pop1020, $pop1708
+	i32.const	$push1707=, 65535
+	i32.and 	$push1022=, $pop1021, $pop1707
+	i32.ne  	$push1023=, $pop1018, $pop1022
+	br_if   	1, $pop1023     # 1: down to label0
 # BB#185:                               # %if.end1747
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
 	i32.load16_u	$push361=, 12($10)
-	i32.load16_s	$push363=, 0($7)
-	i32.const	$push1699=, 7
-	i32.div_s	$push1021=, $pop363, $pop1699
-	i32.const	$push1698=, 65535
-	i32.and 	$push1022=, $pop1021, $pop1698
-	i32.ne  	$push1023=, $pop361, $pop1022
-	br_if   	1, $pop1023     # 1: down to label0
+	i32.load16_s	$push363=, 0($6)
+	i32.const	$push1713=, 7
+	i32.div_s	$push1024=, $pop363, $pop1713
+	i32.const	$push1712=, 65535
+	i32.and 	$push1025=, $pop1024, $pop1712
+	i32.ne  	$push1026=, $pop361, $pop1025
+	br_if   	1, $pop1026     # 1: down to label0
 # BB#186:                               # %lor.lhs.false1756
                                         #   in Loop: Header=BB24_99 Depth=1
 	i32.load16_u	$push360=, 10($10)
-	i32.const	$push1704=, 65535
-	i32.and 	$push1024=, $pop360, $pop1704
-	i32.load16_u	$push362=, 0($8)
-	i32.const	$push1703=, 16
-	i32.shl 	$push1025=, $pop362, $pop1703
-	i32.const	$push1702=, 16
-	i32.shr_s	$push1026=, $pop1025, $pop1702
-	i32.const	$push1701=, 7
-	i32.div_s	$push1027=, $pop1026, $pop1701
-	i32.const	$push1700=, 65535
-	i32.and 	$push1028=, $pop1027, $pop1700
-	i32.ne  	$push1029=, $pop1024, $pop1028
-	br_if   	1, $pop1029     # 1: down to label0
+	i32.const	$push1718=, 65535
+	i32.and 	$push1027=, $pop360, $pop1718
+	i32.load16_u	$push362=, 0($7)
+	i32.const	$push1717=, 16
+	i32.shl 	$push1028=, $pop362, $pop1717
+	i32.const	$push1716=, 16
+	i32.shr_s	$push1029=, $pop1028, $pop1716
+	i32.const	$push1715=, 7
+	i32.div_s	$push1030=, $pop1029, $pop1715
+	i32.const	$push1714=, 65535
+	i32.and 	$push1031=, $pop1030, $pop1714
+	i32.ne  	$push1032=, $pop1027, $pop1031
+	br_if   	1, $pop1032     # 1: down to label0
 # BB#187:                               # %if.end1766
                                         #   in Loop: Header=BB24_99 Depth=1
 	copy_local	$9=, $10
 	#APP
 	#NO_APP
-	call    	sr77777777@FUNCTION, $10, $0
+	call    	sr77777777@FUNCTION, $10, $1
+	i32.load16_s	$push366=, 0($1)
+	i32.const	$push1719=, 7
+	i32.rem_s	$push1033=, $pop366, $pop1719
 	i32.load16_s	$push364=, 0($10)
-	i32.load16_s	$push366=, 0($0)
-	i32.const	$push1705=, 7
-	i32.rem_s	$push1030=, $pop366, $pop1705
-	i32.ne  	$push1031=, $pop364, $pop1030
-	br_if   	1, $pop1031     # 1: down to label0
+	i32.ne  	$push1034=, $pop1033, $pop364
+	br_if   	1, $pop1034     # 1: down to label0
 # BB#188:                               # %lor.lhs.false1776
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push367=, 0($8)
+	i32.const	$push1724=, 16
+	i32.shl 	$push1037=, $pop367, $pop1724
+	i32.const	$push1723=, 16
+	i32.shr_s	$push1038=, $pop1037, $pop1723
+	i32.const	$push1722=, 7
+	i32.rem_s	$push1039=, $pop1038, $pop1722
 	i32.load16_u	$push365=, 6($10)
-	i32.const	$push1710=, 16
-	i32.shl 	$push1032=, $pop365, $pop1710
-	i32.const	$push1709=, 16
-	i32.shr_s	$push1033=, $pop1032, $pop1709
-	i32.load16_u	$push367=, 0($2)
-	i32.const	$push1708=, 16
-	i32.shl 	$push1034=, $pop367, $pop1708
-	i32.const	$push1707=, 16
-	i32.shr_s	$push1035=, $pop1034, $pop1707
-	i32.const	$push1706=, 7
-	i32.rem_s	$push1036=, $pop1035, $pop1706
-	i32.ne  	$push1037=, $pop1033, $pop1036
-	br_if   	1, $pop1037     # 1: down to label0
+	i32.const	$push1721=, 16
+	i32.shl 	$push1035=, $pop365, $pop1721
+	i32.const	$push1720=, 16
+	i32.shr_s	$push1036=, $pop1035, $pop1720
+	i32.ne  	$push1040=, $pop1039, $pop1036
+	br_if   	1, $pop1040     # 1: down to label0
 # BB#189:                               # %if.end1786
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$2=, $10
+	copy_local	$1=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push371=, 0($2)
+	i32.const	$push1725=, 7
+	i32.rem_s	$push1041=, $pop371, $pop1725
 	i32.load16_s	$push369=, 4($10)
-	i32.load16_s	$push371=, 0($3)
-	i32.const	$push1711=, 7
-	i32.rem_s	$push1038=, $pop371, $pop1711
-	i32.ne  	$push1039=, $pop369, $pop1038
-	br_if   	1, $pop1039     # 1: down to label0
+	i32.ne  	$push1042=, $pop1041, $pop369
+	br_if   	1, $pop1042     # 1: down to label0
 # BB#190:                               # %lor.lhs.false1795
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push370=, 0($3)
+	i32.const	$push1730=, 16
+	i32.shl 	$push1045=, $pop370, $pop1730
+	i32.const	$push1729=, 16
+	i32.shr_s	$push1046=, $pop1045, $pop1729
+	i32.const	$push1728=, 7
+	i32.rem_s	$push1047=, $pop1046, $pop1728
 	i32.load16_u	$push368=, 2($10)
-	i32.const	$push1716=, 16
-	i32.shl 	$push1040=, $pop368, $pop1716
-	i32.const	$push1715=, 16
-	i32.shr_s	$push1041=, $pop1040, $pop1715
-	i32.load16_u	$push370=, 0($4)
-	i32.const	$push1714=, 16
-	i32.shl 	$push1042=, $pop370, $pop1714
-	i32.const	$push1713=, 16
-	i32.shr_s	$push1043=, $pop1042, $pop1713
-	i32.const	$push1712=, 7
-	i32.rem_s	$push1044=, $pop1043, $pop1712
-	i32.ne  	$push1045=, $pop1041, $pop1044
-	br_if   	1, $pop1045     # 1: down to label0
+	i32.const	$push1727=, 16
+	i32.shl 	$push1043=, $pop368, $pop1727
+	i32.const	$push1726=, 16
+	i32.shr_s	$push1044=, $pop1043, $pop1726
+	i32.ne  	$push1048=, $pop1047, $pop1044
+	br_if   	1, $pop1048     # 1: down to label0
 # BB#191:                               # %if.end1805
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$2=, $10
+	copy_local	$1=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push374=, 0($4)
+	i32.const	$push1731=, 7
+	i32.rem_s	$push1049=, $pop374, $pop1731
 	i32.load16_s	$push372=, 8($10)
-	i32.load16_s	$push374=, 0($5)
-	i32.const	$push1717=, 7
-	i32.rem_s	$push1046=, $pop374, $pop1717
-	i32.ne  	$push1047=, $pop372, $pop1046
-	br_if   	1, $pop1047     # 1: down to label0
+	i32.ne  	$push1050=, $pop1049, $pop372
+	br_if   	1, $pop1050     # 1: down to label0
 # BB#192:                               # %lor.lhs.false1814
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push375=, 0($5)
+	i32.const	$push1736=, 16
+	i32.shl 	$push1053=, $pop375, $pop1736
+	i32.const	$push1735=, 16
+	i32.shr_s	$push1054=, $pop1053, $pop1735
+	i32.const	$push1734=, 7
+	i32.rem_s	$push1055=, $pop1054, $pop1734
 	i32.load16_u	$push373=, 14($10)
-	i32.const	$push1722=, 16
-	i32.shl 	$push1048=, $pop373, $pop1722
-	i32.const	$push1721=, 16
-	i32.shr_s	$push1049=, $pop1048, $pop1721
-	i32.load16_u	$push375=, 0($6)
-	i32.const	$push1720=, 16
-	i32.shl 	$push1050=, $pop375, $pop1720
-	i32.const	$push1719=, 16
-	i32.shr_s	$push1051=, $pop1050, $pop1719
-	i32.const	$push1718=, 7
-	i32.rem_s	$push1052=, $pop1051, $pop1718
-	i32.ne  	$push1053=, $pop1049, $pop1052
-	br_if   	1, $pop1053     # 1: down to label0
+	i32.const	$push1733=, 16
+	i32.shl 	$push1051=, $pop373, $pop1733
+	i32.const	$push1732=, 16
+	i32.shr_s	$push1052=, $pop1051, $pop1732
+	i32.ne  	$push1056=, $pop1055, $pop1052
+	br_if   	1, $pop1056     # 1: down to label0
 # BB#193:                               # %if.end1824
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$2=, $10
+	copy_local	$1=, $10
 	#APP
 	#NO_APP
+	i32.load16_s	$push379=, 0($6)
+	i32.const	$push1737=, 7
+	i32.rem_s	$push1057=, $pop379, $pop1737
 	i32.load16_s	$push377=, 12($10)
-	i32.load16_s	$push379=, 0($7)
-	i32.const	$push1723=, 7
-	i32.rem_s	$push1054=, $pop379, $pop1723
-	i32.ne  	$push1055=, $pop377, $pop1054
-	br_if   	1, $pop1055     # 1: down to label0
+	i32.ne  	$push1058=, $pop1057, $pop377
+	br_if   	1, $pop1058     # 1: down to label0
 # BB#194:                               # %lor.lhs.false1833
                                         #   in Loop: Header=BB24_99 Depth=1
+	i32.load16_u	$push378=, 0($7)
+	i32.const	$push1742=, 16
+	i32.shl 	$push1061=, $pop378, $pop1742
+	i32.const	$push1741=, 16
+	i32.shr_s	$push1062=, $pop1061, $pop1741
+	i32.const	$push1740=, 7
+	i32.rem_s	$push1063=, $pop1062, $pop1740
 	i32.load16_u	$push376=, 10($10)
-	i32.const	$push1728=, 16
-	i32.shl 	$push1056=, $pop376, $pop1728
-	i32.const	$push1727=, 16
-	i32.shr_s	$push1057=, $pop1056, $pop1727
-	i32.load16_u	$push378=, 0($8)
-	i32.const	$push1726=, 16
-	i32.shl 	$push1058=, $pop378, $pop1726
-	i32.const	$push1725=, 16
-	i32.shr_s	$push1059=, $pop1058, $pop1725
-	i32.const	$push1724=, 7
-	i32.rem_s	$push1060=, $pop1059, $pop1724
-	i32.ne  	$push1061=, $pop1057, $pop1060
-	br_if   	1, $pop1061     # 1: down to label0
+	i32.const	$push1739=, 16
+	i32.shl 	$push1059=, $pop376, $pop1739
+	i32.const	$push1738=, 16
+	i32.shr_s	$push1060=, $pop1059, $pop1738
+	i32.ne  	$push1064=, $pop1063, $pop1060
+	br_if   	1, $pop1064     # 1: down to label0
 # BB#195:                               # %if.end1843
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$2=, $10
+	copy_local	$1=, $10
 	#APP
 	#NO_APP
-	i32.const	$push1733=, 16
-	i32.add 	$0=, $0, $pop1733
-	i32.const	$push1732=, 1
-	i32.add 	$push1731=, $1, $pop1732
-	tee_local	$push1730=, $1=, $pop1731
-	i32.const	$push1729=, 2
-	i32.lt_u	$push1062=, $pop1730, $pop1729
-	br_if   	0, $pop1062     # 0: up to label2
+	i32.const	$push1065=, 1
+	i32.add 	$1=, $0, $pop1065
+	i32.const	$0=, 1
+	i32.const	$push1743=, 2
+	i32.lt_u	$push1066=, $1, $pop1743
+	br_if   	0, $pop1066     # 0: up to label2
 # BB#196:                               # %for.end1846
 	end_loop
-	i32.const	$push1070=, 0
-	i32.const	$push1068=, 32
-	i32.add 	$push1069=, $10, $pop1068
-	i32.store	__stack_pointer($pop1070), $pop1069
-	i32.const	$push1063=, 0
-	return  	$pop1063
-.LBB24_197:                             # %if.then1842
+	i32.const	$push1074=, 0
+	i32.const	$push1072=, 32
+	i32.add 	$push1073=, $10, $pop1072
+	i32.store	__stack_pointer($pop1074), $pop1073
+	i32.const	$push1067=, 0
+	return  	$pop1067
+.LBB24_197:                             # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end24:
 	.size	main, .Lfunc_end24-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.data.u,"aw",@progbits
@@ -4453,5 +4439,5 @@ s:
 	.size	s, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53645.c.s b/test/torture-s/pr53645.c.s
index 87b8a82a1..88e89fa2b 100644
--- a/test/torture-s/pr53645.c.s
+++ b/test/torture-s/pr53645.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53645.c"
+	.file	"pr53645.c"
 	.section	.text.uq4444,"ax",@progbits
-	.hidden	uq4444
+	.hidden	uq4444                  # -- Begin function uq4444
 	.globl	uq4444
 	.type	uq4444,@function
 uq4444:                                 # @uq4444
@@ -39,9 +39,9 @@ uq4444:                                 # @uq4444
 	.endfunc
 .Lfunc_end0:
 	.size	uq4444, .Lfunc_end0-uq4444
-
+                                        # -- End function
 	.section	.text.ur4444,"ax",@progbits
-	.hidden	ur4444
+	.hidden	ur4444                  # -- Begin function ur4444
 	.globl	ur4444
 	.type	ur4444,@function
 ur4444:                                 # @ur4444
@@ -79,9 +79,9 @@ ur4444:                                 # @ur4444
 	.endfunc
 .Lfunc_end1:
 	.size	ur4444, .Lfunc_end1-ur4444
-
+                                        # -- End function
 	.section	.text.sq4444,"ax",@progbits
-	.hidden	sq4444
+	.hidden	sq4444                  # -- Begin function sq4444
 	.globl	sq4444
 	.type	sq4444,@function
 sq4444:                                 # @sq4444
@@ -119,9 +119,9 @@ sq4444:                                 # @sq4444
 	.endfunc
 .Lfunc_end2:
 	.size	sq4444, .Lfunc_end2-sq4444
-
+                                        # -- End function
 	.section	.text.sr4444,"ax",@progbits
-	.hidden	sr4444
+	.hidden	sr4444                  # -- Begin function sr4444
 	.globl	sr4444
 	.type	sr4444,@function
 sr4444:                                 # @sr4444
@@ -159,9 +159,9 @@ sr4444:                                 # @sr4444
 	.endfunc
 .Lfunc_end3:
 	.size	sr4444, .Lfunc_end3-sr4444
-
+                                        # -- End function
 	.section	.text.uq1428,"ax",@progbits
-	.hidden	uq1428
+	.hidden	uq1428                  # -- Begin function uq1428
 	.globl	uq1428
 	.type	uq1428,@function
 uq1428:                                 # @uq1428
@@ -197,9 +197,9 @@ uq1428:                                 # @uq1428
 	.endfunc
 .Lfunc_end4:
 	.size	uq1428, .Lfunc_end4-uq1428
-
+                                        # -- End function
 	.section	.text.ur1428,"ax",@progbits
-	.hidden	ur1428
+	.hidden	ur1428                  # -- Begin function ur1428
 	.globl	ur1428
 	.type	ur1428,@function
 ur1428:                                 # @ur1428
@@ -235,9 +235,9 @@ ur1428:                                 # @ur1428
 	.endfunc
 .Lfunc_end5:
 	.size	ur1428, .Lfunc_end5-ur1428
-
+                                        # -- End function
 	.section	.text.sq1428,"ax",@progbits
-	.hidden	sq1428
+	.hidden	sq1428                  # -- Begin function sq1428
 	.globl	sq1428
 	.type	sq1428,@function
 sq1428:                                 # @sq1428
@@ -273,9 +273,9 @@ sq1428:                                 # @sq1428
 	.endfunc
 .Lfunc_end6:
 	.size	sq1428, .Lfunc_end6-sq1428
-
+                                        # -- End function
 	.section	.text.sr1428,"ax",@progbits
-	.hidden	sr1428
+	.hidden	sr1428                  # -- Begin function sr1428
 	.globl	sr1428
 	.type	sr1428,@function
 sr1428:                                 # @sr1428
@@ -313,9 +313,9 @@ sr1428:                                 # @sr1428
 	.endfunc
 .Lfunc_end7:
 	.size	sr1428, .Lfunc_end7-sr1428
-
+                                        # -- End function
 	.section	.text.uq3333,"ax",@progbits
-	.hidden	uq3333
+	.hidden	uq3333                  # -- Begin function uq3333
 	.globl	uq3333
 	.type	uq3333,@function
 uq3333:                                 # @uq3333
@@ -353,9 +353,9 @@ uq3333:                                 # @uq3333
 	.endfunc
 .Lfunc_end8:
 	.size	uq3333, .Lfunc_end8-uq3333
-
+                                        # -- End function
 	.section	.text.ur3333,"ax",@progbits
-	.hidden	ur3333
+	.hidden	ur3333                  # -- Begin function ur3333
 	.globl	ur3333
 	.type	ur3333,@function
 ur3333:                                 # @ur3333
@@ -393,9 +393,9 @@ ur3333:                                 # @ur3333
 	.endfunc
 .Lfunc_end9:
 	.size	ur3333, .Lfunc_end9-ur3333
-
+                                        # -- End function
 	.section	.text.sq3333,"ax",@progbits
-	.hidden	sq3333
+	.hidden	sq3333                  # -- Begin function sq3333
 	.globl	sq3333
 	.type	sq3333,@function
 sq3333:                                 # @sq3333
@@ -433,9 +433,9 @@ sq3333:                                 # @sq3333
 	.endfunc
 .Lfunc_end10:
 	.size	sq3333, .Lfunc_end10-sq3333
-
+                                        # -- End function
 	.section	.text.sr3333,"ax",@progbits
-	.hidden	sr3333
+	.hidden	sr3333                  # -- Begin function sr3333
 	.globl	sr3333
 	.type	sr3333,@function
 sr3333:                                 # @sr3333
@@ -473,9 +473,9 @@ sr3333:                                 # @sr3333
 	.endfunc
 .Lfunc_end11:
 	.size	sr3333, .Lfunc_end11-sr3333
-
+                                        # -- End function
 	.section	.text.uq6565,"ax",@progbits
-	.hidden	uq6565
+	.hidden	uq6565                  # -- Begin function uq6565
 	.globl	uq6565
 	.type	uq6565,@function
 uq6565:                                 # @uq6565
@@ -513,9 +513,9 @@ uq6565:                                 # @uq6565
 	.endfunc
 .Lfunc_end12:
 	.size	uq6565, .Lfunc_end12-uq6565
-
+                                        # -- End function
 	.section	.text.ur6565,"ax",@progbits
-	.hidden	ur6565
+	.hidden	ur6565                  # -- Begin function ur6565
 	.globl	ur6565
 	.type	ur6565,@function
 ur6565:                                 # @ur6565
@@ -553,9 +553,9 @@ ur6565:                                 # @ur6565
 	.endfunc
 .Lfunc_end13:
 	.size	ur6565, .Lfunc_end13-ur6565
-
+                                        # -- End function
 	.section	.text.sq6565,"ax",@progbits
-	.hidden	sq6565
+	.hidden	sq6565                  # -- Begin function sq6565
 	.globl	sq6565
 	.type	sq6565,@function
 sq6565:                                 # @sq6565
@@ -593,9 +593,9 @@ sq6565:                                 # @sq6565
 	.endfunc
 .Lfunc_end14:
 	.size	sq6565, .Lfunc_end14-sq6565
-
+                                        # -- End function
 	.section	.text.sr6565,"ax",@progbits
-	.hidden	sr6565
+	.hidden	sr6565                  # -- Begin function sr6565
 	.globl	sr6565
 	.type	sr6565,@function
 sr6565:                                 # @sr6565
@@ -633,9 +633,9 @@ sr6565:                                 # @sr6565
 	.endfunc
 .Lfunc_end15:
 	.size	sr6565, .Lfunc_end15-sr6565
-
+                                        # -- End function
 	.section	.text.uq1414146,"ax",@progbits
-	.hidden	uq1414146
+	.hidden	uq1414146               # -- Begin function uq1414146
 	.globl	uq1414146
 	.type	uq1414146,@function
 uq1414146:                              # @uq1414146
@@ -673,9 +673,9 @@ uq1414146:                              # @uq1414146
 	.endfunc
 .Lfunc_end16:
 	.size	uq1414146, .Lfunc_end16-uq1414146
-
+                                        # -- End function
 	.section	.text.ur1414146,"ax",@progbits
-	.hidden	ur1414146
+	.hidden	ur1414146               # -- Begin function ur1414146
 	.globl	ur1414146
 	.type	ur1414146,@function
 ur1414146:                              # @ur1414146
@@ -713,9 +713,9 @@ ur1414146:                              # @ur1414146
 	.endfunc
 .Lfunc_end17:
 	.size	ur1414146, .Lfunc_end17-ur1414146
-
+                                        # -- End function
 	.section	.text.sq1414146,"ax",@progbits
-	.hidden	sq1414146
+	.hidden	sq1414146               # -- Begin function sq1414146
 	.globl	sq1414146
 	.type	sq1414146,@function
 sq1414146:                              # @sq1414146
@@ -753,9 +753,9 @@ sq1414146:                              # @sq1414146
 	.endfunc
 .Lfunc_end18:
 	.size	sq1414146, .Lfunc_end18-sq1414146
-
+                                        # -- End function
 	.section	.text.sr1414146,"ax",@progbits
-	.hidden	sr1414146
+	.hidden	sr1414146               # -- Begin function sr1414146
 	.globl	sr1414146
 	.type	sr1414146,@function
 sr1414146:                              # @sr1414146
@@ -793,9 +793,9 @@ sr1414146:                              # @sr1414146
 	.endfunc
 .Lfunc_end19:
 	.size	sr1414146, .Lfunc_end19-sr1414146
-
+                                        # -- End function
 	.section	.text.uq7777,"ax",@progbits
-	.hidden	uq7777
+	.hidden	uq7777                  # -- Begin function uq7777
 	.globl	uq7777
 	.type	uq7777,@function
 uq7777:                                 # @uq7777
@@ -833,9 +833,9 @@ uq7777:                                 # @uq7777
 	.endfunc
 .Lfunc_end20:
 	.size	uq7777, .Lfunc_end20-uq7777
-
+                                        # -- End function
 	.section	.text.ur7777,"ax",@progbits
-	.hidden	ur7777
+	.hidden	ur7777                  # -- Begin function ur7777
 	.globl	ur7777
 	.type	ur7777,@function
 ur7777:                                 # @ur7777
@@ -873,9 +873,9 @@ ur7777:                                 # @ur7777
 	.endfunc
 .Lfunc_end21:
 	.size	ur7777, .Lfunc_end21-ur7777
-
+                                        # -- End function
 	.section	.text.sq7777,"ax",@progbits
-	.hidden	sq7777
+	.hidden	sq7777                  # -- Begin function sq7777
 	.globl	sq7777
 	.type	sq7777,@function
 sq7777:                                 # @sq7777
@@ -913,9 +913,9 @@ sq7777:                                 # @sq7777
 	.endfunc
 .Lfunc_end22:
 	.size	sq7777, .Lfunc_end22-sq7777
-
+                                        # -- End function
 	.section	.text.sr7777,"ax",@progbits
-	.hidden	sr7777
+	.hidden	sr7777                  # -- Begin function sr7777
 	.globl	sr7777
 	.type	sr7777,@function
 sr7777:                                 # @sr7777
@@ -953,1081 +953,1091 @@ sr7777:                                 # @sr7777
 	.endfunc
 .Lfunc_end23:
 	.size	sr7777, .Lfunc_end23-sr7777
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push382=, 0
-	i32.const	$push379=, 0
-	i32.load	$push380=, __stack_pointer($pop379)
-	i32.const	$push381=, 32
-	i32.sub 	$push459=, $pop380, $pop381
-	tee_local	$push458=, $6=, $pop459
-	i32.store	__stack_pointer($pop382), $pop458
-	i32.const	$1=, 0
-	i32.const	$0=, u
+	i32.const	$push386=, 0
+	i32.const	$push384=, 0
+	i32.load	$push383=, __stack_pointer($pop384)
+	i32.const	$push385=, 32
+	i32.sub 	$push463=, $pop383, $pop385
+	tee_local	$push462=, $6=, $pop463
+	i32.store	__stack_pointer($pop386), $pop462
+	i32.const	$0=, 0
 .LBB24_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push386=, 16
-	i32.add 	$push387=, $6, $pop386
-	call    	uq4444@FUNCTION, $pop387, $0
+	i32.const	$push390=, 16
+	i32.add 	$push391=, $6, $pop390
+	i32.const	$push470=, 4
+	i32.shl 	$push469=, $0, $pop470
+	tee_local	$push468=, $2=, $pop469
+	i32.const	$push467=, u
+	i32.add 	$push466=, $pop468, $pop467
+	tee_local	$push465=, $1=, $pop466
+	call    	uq4444@FUNCTION, $pop391, $pop465
 	i32.load	$push0=, 16($6)
-	i32.load	$push2=, 0($0)
-	i32.const	$push460=, 2
-	i32.shr_u	$push188=, $pop2, $pop460
+	i32.load	$push2=, 0($1)
+	i32.const	$push464=, 2
+	i32.shr_u	$push188=, $pop2, $pop464
 	i32.ne  	$push189=, $pop0, $pop188
 	br_if   	1, $pop189      # 1: down to label0
 # BB#2:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push1=, 28($6)
-	i32.const	$push464=, 12
-	i32.add 	$push463=, $0, $pop464
-	tee_local	$push462=, $2=, $pop463
-	i32.load	$push3=, 0($pop462)
-	i32.const	$push461=, 2
-	i32.shr_u	$push190=, $pop3, $pop461
-	i32.ne  	$push191=, $pop1, $pop190
-	br_if   	1, $pop191      # 1: down to label0
+	i32.const	$push472=, u+12
+	i32.add 	$push190=, $2, $pop472
+	i32.load	$push3=, 0($pop190)
+	i32.const	$push471=, 2
+	i32.shr_u	$push191=, $pop3, $pop471
+	i32.ne  	$push192=, $pop1, $pop191
+	br_if   	1, $pop192      # 1: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push388=, 16
-	i32.add 	$push389=, $6, $pop388
-	copy_local	$3=, $pop389
+	i32.const	$push392=, 16
+	i32.add 	$push393=, $6, $pop392
+	copy_local	$2=, $pop393
 	#APP
 	#NO_APP
 	i32.load	$push5=, 24($6)
-	i32.const	$push468=, 8
-	i32.add 	$push467=, $0, $pop468
-	tee_local	$push466=, $3=, $pop467
-	i32.load	$push7=, 0($pop466)
-	i32.const	$push465=, 2
-	i32.shr_u	$push192=, $pop7, $pop465
-	i32.ne  	$push193=, $pop5, $pop192
-	br_if   	1, $pop193      # 1: down to label0
+	i32.const	$push476=, 8
+	i32.add 	$push475=, $1, $pop476
+	tee_local	$push474=, $2=, $pop475
+	i32.load	$push7=, 0($pop474)
+	i32.const	$push473=, 2
+	i32.shr_u	$push193=, $pop7, $pop473
+	i32.ne  	$push194=, $pop5, $pop193
+	br_if   	1, $pop194      # 1: down to label0
 # BB#4:                                 # %lor.lhs.false13
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push4=, 20($6)
-	i32.const	$push472=, 4
-	i32.add 	$push471=, $0, $pop472
-	tee_local	$push470=, $4=, $pop471
-	i32.load	$push6=, 0($pop470)
-	i32.const	$push469=, 2
-	i32.shr_u	$push194=, $pop6, $pop469
-	i32.ne  	$push195=, $pop4, $pop194
-	br_if   	1, $pop195      # 1: down to label0
+	i32.const	$push480=, 4
+	i32.add 	$push479=, $1, $pop480
+	tee_local	$push478=, $3=, $pop479
+	i32.load	$push6=, 0($pop478)
+	i32.const	$push477=, 2
+	i32.shr_u	$push195=, $pop6, $pop477
+	i32.ne  	$push196=, $pop4, $pop195
+	br_if   	1, $pop196      # 1: down to label0
 # BB#5:                                 # %if.end20
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push390=, 16
-	i32.add 	$push391=, $6, $pop390
-	copy_local	$5=, $pop391
+	i32.const	$push394=, 16
+	i32.add 	$push395=, $6, $pop394
+	copy_local	$4=, $pop395
 	#APP
 	#NO_APP
-	i32.const	$push392=, 16
-	i32.add 	$push393=, $6, $pop392
-	call    	ur4444@FUNCTION, $pop393, $0
+	i32.const	$push396=, 16
+	i32.add 	$push397=, $6, $pop396
+	call    	ur4444@FUNCTION, $pop397, $1
 	i32.load	$push8=, 16($6)
-	i32.load	$push10=, 0($0)
-	i32.const	$push473=, 3
-	i32.and 	$push196=, $pop10, $pop473
-	i32.ne  	$push197=, $pop8, $pop196
-	br_if   	1, $pop197      # 1: down to label0
+	i32.load	$push10=, 0($1)
+	i32.const	$push481=, 3
+	i32.and 	$push197=, $pop10, $pop481
+	i32.ne  	$push198=, $pop8, $pop197
+	br_if   	1, $pop198      # 1: down to label0
 # BB#6:                                 # %lor.lhs.false26
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push9=, 28($6)
-	i32.load	$push11=, 0($2)
-	i32.const	$push474=, 3
-	i32.and 	$push198=, $pop11, $pop474
-	i32.ne  	$push199=, $pop9, $pop198
-	br_if   	1, $pop199      # 1: down to label0
+	i32.const	$push485=, 12
+	i32.add 	$push484=, $1, $pop485
+	tee_local	$push483=, $4=, $pop484
+	i32.load	$push11=, 0($pop483)
+	i32.const	$push482=, 3
+	i32.and 	$push199=, $pop11, $pop482
+	i32.ne  	$push200=, $pop9, $pop199
+	br_if   	1, $pop200      # 1: down to label0
 # BB#7:                                 # %if.end33
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push394=, 16
-	i32.add 	$push395=, $6, $pop394
-	copy_local	$5=, $pop395
+	i32.const	$push398=, 16
+	i32.add 	$push399=, $6, $pop398
+	copy_local	$5=, $pop399
 	#APP
 	#NO_APP
 	i32.load	$push13=, 24($6)
-	i32.load	$push15=, 0($3)
-	i32.const	$push475=, 3
-	i32.and 	$push200=, $pop15, $pop475
-	i32.ne  	$push201=, $pop13, $pop200
-	br_if   	1, $pop201      # 1: down to label0
+	i32.load	$push15=, 0($2)
+	i32.const	$push486=, 3
+	i32.and 	$push201=, $pop15, $pop486
+	i32.ne  	$push202=, $pop13, $pop201
+	br_if   	1, $pop202      # 1: down to label0
 # BB#8:                                 # %lor.lhs.false39
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push12=, 20($6)
-	i32.load	$push14=, 0($4)
-	i32.const	$push476=, 3
-	i32.and 	$push202=, $pop14, $pop476
-	i32.ne  	$push203=, $pop12, $pop202
-	br_if   	1, $pop203      # 1: down to label0
+	i32.load	$push14=, 0($3)
+	i32.const	$push487=, 3
+	i32.and 	$push203=, $pop14, $pop487
+	i32.ne  	$push204=, $pop12, $pop203
+	br_if   	1, $pop204      # 1: down to label0
 # BB#9:                                 # %if.end46
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push396=, 16
-	i32.add 	$push397=, $6, $pop396
-	copy_local	$5=, $pop397
+	i32.const	$push400=, 16
+	i32.add 	$push401=, $6, $pop400
+	copy_local	$5=, $pop401
 	#APP
 	#NO_APP
-	i32.const	$push398=, 16
-	i32.add 	$push399=, $6, $pop398
-	call    	uq1428@FUNCTION, $pop399, $0
+	i32.const	$push402=, 16
+	i32.add 	$push403=, $6, $pop402
+	call    	uq1428@FUNCTION, $pop403, $1
 	i32.load	$push16=, 16($6)
-	i32.load	$push18=, 0($0)
-	i32.ne  	$push204=, $pop16, $pop18
-	br_if   	1, $pop204      # 1: down to label0
+	i32.load	$push18=, 0($1)
+	i32.ne  	$push205=, $pop16, $pop18
+	br_if   	1, $pop205      # 1: down to label0
 # BB#10:                                # %lor.lhs.false53
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push17=, 28($6)
-	i32.load	$push19=, 0($2)
-	i32.const	$push477=, 3
-	i32.shr_u	$push205=, $pop19, $pop477
-	i32.ne  	$push206=, $pop17, $pop205
-	br_if   	1, $pop206      # 1: down to label0
+	i32.load	$push19=, 0($4)
+	i32.const	$push488=, 3
+	i32.shr_u	$push206=, $pop19, $pop488
+	i32.ne  	$push207=, $pop17, $pop206
+	br_if   	1, $pop207      # 1: down to label0
 # BB#11:                                # %if.end60
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push400=, 16
-	i32.add 	$push401=, $6, $pop400
-	copy_local	$5=, $pop401
+	i32.const	$push404=, 16
+	i32.add 	$push405=, $6, $pop404
+	copy_local	$5=, $pop405
 	#APP
 	#NO_APP
 	i32.load	$push21=, 24($6)
-	i32.load	$push23=, 0($3)
-	i32.const	$push478=, 1
-	i32.shr_u	$push207=, $pop23, $pop478
-	i32.ne  	$push208=, $pop21, $pop207
-	br_if   	1, $pop208      # 1: down to label0
+	i32.load	$push23=, 0($2)
+	i32.const	$push489=, 1
+	i32.shr_u	$push208=, $pop23, $pop489
+	i32.ne  	$push209=, $pop21, $pop208
+	br_if   	1, $pop209      # 1: down to label0
 # BB#12:                                # %lor.lhs.false66
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push20=, 20($6)
-	i32.load	$push22=, 0($4)
-	i32.const	$push479=, 2
-	i32.shr_u	$push209=, $pop22, $pop479
-	i32.ne  	$push210=, $pop20, $pop209
-	br_if   	1, $pop210      # 1: down to label0
+	i32.load	$push22=, 0($3)
+	i32.const	$push490=, 2
+	i32.shr_u	$push210=, $pop22, $pop490
+	i32.ne  	$push211=, $pop20, $pop210
+	br_if   	1, $pop211      # 1: down to label0
 # BB#13:                                # %if.end73
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push402=, 16
-	i32.add 	$push403=, $6, $pop402
-	copy_local	$5=, $pop403
+	i32.const	$push406=, 16
+	i32.add 	$push407=, $6, $pop406
+	copy_local	$5=, $pop407
 	#APP
 	#NO_APP
-	i32.const	$push404=, 16
-	i32.add 	$push405=, $6, $pop404
-	call    	ur1428@FUNCTION, $pop405, $0
+	i32.const	$push408=, 16
+	i32.add 	$push409=, $6, $pop408
+	call    	ur1428@FUNCTION, $pop409, $1
 	i32.load	$push24=, 16($6)
 	br_if   	1, $pop24       # 1: down to label0
 # BB#14:                                # %lor.lhs.false80
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push25=, 28($6)
-	i32.load	$push211=, 0($2)
-	i32.const	$push480=, 7
-	i32.and 	$push212=, $pop211, $pop480
-	i32.ne  	$push213=, $pop25, $pop212
-	br_if   	1, $pop213      # 1: down to label0
+	i32.load	$push212=, 0($4)
+	i32.const	$push491=, 7
+	i32.and 	$push213=, $pop212, $pop491
+	i32.ne  	$push214=, $pop25, $pop213
+	br_if   	1, $pop214      # 1: down to label0
 # BB#15:                                # %if.end87
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push406=, 16
-	i32.add 	$push407=, $6, $pop406
-	copy_local	$5=, $pop407
+	i32.const	$push410=, 16
+	i32.add 	$push411=, $6, $pop410
+	copy_local	$5=, $pop411
 	#APP
 	#NO_APP
 	i32.load	$push27=, 24($6)
-	i32.load	$push29=, 0($3)
-	i32.const	$push481=, 1
-	i32.and 	$push214=, $pop29, $pop481
-	i32.ne  	$push215=, $pop27, $pop214
-	br_if   	1, $pop215      # 1: down to label0
+	i32.load	$push29=, 0($2)
+	i32.const	$push492=, 1
+	i32.and 	$push215=, $pop29, $pop492
+	i32.ne  	$push216=, $pop27, $pop215
+	br_if   	1, $pop216      # 1: down to label0
 # BB#16:                                # %lor.lhs.false93
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push26=, 20($6)
-	i32.load	$push28=, 0($4)
-	i32.const	$push482=, 3
-	i32.and 	$push216=, $pop28, $pop482
-	i32.ne  	$push217=, $pop26, $pop216
-	br_if   	1, $pop217      # 1: down to label0
+	i32.load	$push28=, 0($3)
+	i32.const	$push493=, 3
+	i32.and 	$push217=, $pop28, $pop493
+	i32.ne  	$push218=, $pop26, $pop217
+	br_if   	1, $pop218      # 1: down to label0
 # BB#17:                                # %if.end100
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push408=, 16
-	i32.add 	$push409=, $6, $pop408
-	copy_local	$5=, $pop409
+	i32.const	$push412=, 16
+	i32.add 	$push413=, $6, $pop412
+	copy_local	$5=, $pop413
 	#APP
 	#NO_APP
-	i32.const	$push410=, 16
-	i32.add 	$push411=, $6, $pop410
-	call    	uq3333@FUNCTION, $pop411, $0
+	i32.const	$push414=, 16
+	i32.add 	$push415=, $6, $pop414
+	call    	uq3333@FUNCTION, $pop415, $1
 	i32.load	$push30=, 16($6)
-	i32.load	$push32=, 0($0)
-	i32.const	$push483=, 3
-	i32.div_u	$push218=, $pop32, $pop483
-	i32.ne  	$push219=, $pop30, $pop218
-	br_if   	1, $pop219      # 1: down to label0
+	i32.load	$push32=, 0($1)
+	i32.const	$push494=, 3
+	i32.div_u	$push219=, $pop32, $pop494
+	i32.ne  	$push220=, $pop30, $pop219
+	br_if   	1, $pop220      # 1: down to label0
 # BB#18:                                # %lor.lhs.false107
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push31=, 28($6)
-	i32.load	$push33=, 0($2)
-	i32.const	$push484=, 3
-	i32.div_u	$push220=, $pop33, $pop484
-	i32.ne  	$push221=, $pop31, $pop220
-	br_if   	1, $pop221      # 1: down to label0
+	i32.load	$push33=, 0($4)
+	i32.const	$push495=, 3
+	i32.div_u	$push221=, $pop33, $pop495
+	i32.ne  	$push222=, $pop31, $pop221
+	br_if   	1, $pop222      # 1: down to label0
 # BB#19:                                # %if.end114
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push412=, 16
-	i32.add 	$push413=, $6, $pop412
-	copy_local	$5=, $pop413
+	i32.const	$push416=, 16
+	i32.add 	$push417=, $6, $pop416
+	copy_local	$5=, $pop417
 	#APP
 	#NO_APP
 	i32.load	$push35=, 24($6)
-	i32.load	$push37=, 0($3)
-	i32.const	$push485=, 3
-	i32.div_u	$push222=, $pop37, $pop485
-	i32.ne  	$push223=, $pop35, $pop222
-	br_if   	1, $pop223      # 1: down to label0
+	i32.load	$push37=, 0($2)
+	i32.const	$push496=, 3
+	i32.div_u	$push223=, $pop37, $pop496
+	i32.ne  	$push224=, $pop35, $pop223
+	br_if   	1, $pop224      # 1: down to label0
 # BB#20:                                # %lor.lhs.false120
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push34=, 20($6)
-	i32.load	$push36=, 0($4)
-	i32.const	$push486=, 3
-	i32.div_u	$push224=, $pop36, $pop486
-	i32.ne  	$push225=, $pop34, $pop224
-	br_if   	1, $pop225      # 1: down to label0
+	i32.load	$push36=, 0($3)
+	i32.const	$push497=, 3
+	i32.div_u	$push225=, $pop36, $pop497
+	i32.ne  	$push226=, $pop34, $pop225
+	br_if   	1, $pop226      # 1: down to label0
 # BB#21:                                # %if.end127
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push414=, 16
-	i32.add 	$push415=, $6, $pop414
-	copy_local	$5=, $pop415
+	i32.const	$push418=, 16
+	i32.add 	$push419=, $6, $pop418
+	copy_local	$5=, $pop419
 	#APP
 	#NO_APP
-	i32.const	$push416=, 16
-	i32.add 	$push417=, $6, $pop416
-	call    	ur3333@FUNCTION, $pop417, $0
+	i32.const	$push420=, 16
+	i32.add 	$push421=, $6, $pop420
+	call    	ur3333@FUNCTION, $pop421, $1
 	i32.load	$push38=, 16($6)
-	i32.load	$push40=, 0($0)
-	i32.const	$push487=, 3
-	i32.rem_u	$push226=, $pop40, $pop487
-	i32.ne  	$push227=, $pop38, $pop226
-	br_if   	1, $pop227      # 1: down to label0
+	i32.load	$push40=, 0($1)
+	i32.const	$push498=, 3
+	i32.rem_u	$push227=, $pop40, $pop498
+	i32.ne  	$push228=, $pop38, $pop227
+	br_if   	1, $pop228      # 1: down to label0
 # BB#22:                                # %lor.lhs.false134
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push39=, 28($6)
-	i32.load	$push41=, 0($2)
-	i32.const	$push488=, 3
-	i32.rem_u	$push228=, $pop41, $pop488
-	i32.ne  	$push229=, $pop39, $pop228
-	br_if   	1, $pop229      # 1: down to label0
+	i32.load	$push41=, 0($4)
+	i32.const	$push499=, 3
+	i32.rem_u	$push229=, $pop41, $pop499
+	i32.ne  	$push230=, $pop39, $pop229
+	br_if   	1, $pop230      # 1: down to label0
 # BB#23:                                # %if.end141
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push418=, 16
-	i32.add 	$push419=, $6, $pop418
-	copy_local	$5=, $pop419
+	i32.const	$push422=, 16
+	i32.add 	$push423=, $6, $pop422
+	copy_local	$5=, $pop423
 	#APP
 	#NO_APP
 	i32.load	$push43=, 24($6)
-	i32.load	$push45=, 0($3)
-	i32.const	$push489=, 3
-	i32.rem_u	$push230=, $pop45, $pop489
-	i32.ne  	$push231=, $pop43, $pop230
-	br_if   	1, $pop231      # 1: down to label0
+	i32.load	$push45=, 0($2)
+	i32.const	$push500=, 3
+	i32.rem_u	$push231=, $pop45, $pop500
+	i32.ne  	$push232=, $pop43, $pop231
+	br_if   	1, $pop232      # 1: down to label0
 # BB#24:                                # %lor.lhs.false147
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push42=, 20($6)
-	i32.load	$push44=, 0($4)
-	i32.const	$push490=, 3
-	i32.rem_u	$push232=, $pop44, $pop490
-	i32.ne  	$push233=, $pop42, $pop232
-	br_if   	1, $pop233      # 1: down to label0
+	i32.load	$push44=, 0($3)
+	i32.const	$push501=, 3
+	i32.rem_u	$push233=, $pop44, $pop501
+	i32.ne  	$push234=, $pop42, $pop233
+	br_if   	1, $pop234      # 1: down to label0
 # BB#25:                                # %if.end154
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push420=, 16
-	i32.add 	$push421=, $6, $pop420
-	copy_local	$5=, $pop421
+	i32.const	$push424=, 16
+	i32.add 	$push425=, $6, $pop424
+	copy_local	$5=, $pop425
 	#APP
 	#NO_APP
-	i32.const	$push422=, 16
-	i32.add 	$push423=, $6, $pop422
-	call    	uq6565@FUNCTION, $pop423, $0
+	i32.const	$push426=, 16
+	i32.add 	$push427=, $6, $pop426
+	call    	uq6565@FUNCTION, $pop427, $1
 	i32.load	$push46=, 16($6)
-	i32.load	$push48=, 0($0)
-	i32.const	$push491=, 6
-	i32.div_u	$push234=, $pop48, $pop491
-	i32.ne  	$push235=, $pop46, $pop234
-	br_if   	1, $pop235      # 1: down to label0
+	i32.load	$push48=, 0($1)
+	i32.const	$push502=, 6
+	i32.div_u	$push235=, $pop48, $pop502
+	i32.ne  	$push236=, $pop46, $pop235
+	br_if   	1, $pop236      # 1: down to label0
 # BB#26:                                # %lor.lhs.false161
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push47=, 28($6)
-	i32.load	$push49=, 0($2)
-	i32.const	$push492=, 5
-	i32.div_u	$push236=, $pop49, $pop492
-	i32.ne  	$push237=, $pop47, $pop236
-	br_if   	1, $pop237      # 1: down to label0
+	i32.load	$push49=, 0($4)
+	i32.const	$push503=, 5
+	i32.div_u	$push237=, $pop49, $pop503
+	i32.ne  	$push238=, $pop47, $pop237
+	br_if   	1, $pop238      # 1: down to label0
 # BB#27:                                # %if.end168
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push424=, 16
-	i32.add 	$push425=, $6, $pop424
-	copy_local	$5=, $pop425
+	i32.const	$push428=, 16
+	i32.add 	$push429=, $6, $pop428
+	copy_local	$5=, $pop429
 	#APP
 	#NO_APP
 	i32.load	$push51=, 24($6)
-	i32.load	$push53=, 0($3)
-	i32.const	$push493=, 6
-	i32.div_u	$push238=, $pop53, $pop493
-	i32.ne  	$push239=, $pop51, $pop238
-	br_if   	1, $pop239      # 1: down to label0
+	i32.load	$push53=, 0($2)
+	i32.const	$push504=, 6
+	i32.div_u	$push239=, $pop53, $pop504
+	i32.ne  	$push240=, $pop51, $pop239
+	br_if   	1, $pop240      # 1: down to label0
 # BB#28:                                # %lor.lhs.false174
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push50=, 20($6)
-	i32.load	$push52=, 0($4)
-	i32.const	$push494=, 5
-	i32.div_u	$push240=, $pop52, $pop494
-	i32.ne  	$push241=, $pop50, $pop240
-	br_if   	1, $pop241      # 1: down to label0
+	i32.load	$push52=, 0($3)
+	i32.const	$push505=, 5
+	i32.div_u	$push241=, $pop52, $pop505
+	i32.ne  	$push242=, $pop50, $pop241
+	br_if   	1, $pop242      # 1: down to label0
 # BB#29:                                # %if.end181
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push426=, 16
-	i32.add 	$push427=, $6, $pop426
-	copy_local	$5=, $pop427
+	i32.const	$push430=, 16
+	i32.add 	$push431=, $6, $pop430
+	copy_local	$5=, $pop431
 	#APP
 	#NO_APP
-	i32.const	$push428=, 16
-	i32.add 	$push429=, $6, $pop428
-	call    	ur6565@FUNCTION, $pop429, $0
+	i32.const	$push432=, 16
+	i32.add 	$push433=, $6, $pop432
+	call    	ur6565@FUNCTION, $pop433, $1
 	i32.load	$push54=, 16($6)
-	i32.load	$push56=, 0($0)
-	i32.const	$push495=, 6
-	i32.rem_u	$push242=, $pop56, $pop495
-	i32.ne  	$push243=, $pop54, $pop242
-	br_if   	1, $pop243      # 1: down to label0
+	i32.load	$push56=, 0($1)
+	i32.const	$push506=, 6
+	i32.rem_u	$push243=, $pop56, $pop506
+	i32.ne  	$push244=, $pop54, $pop243
+	br_if   	1, $pop244      # 1: down to label0
 # BB#30:                                # %lor.lhs.false188
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push55=, 28($6)
-	i32.load	$push57=, 0($2)
-	i32.const	$push496=, 5
-	i32.rem_u	$push244=, $pop57, $pop496
-	i32.ne  	$push245=, $pop55, $pop244
-	br_if   	1, $pop245      # 1: down to label0
+	i32.load	$push57=, 0($4)
+	i32.const	$push507=, 5
+	i32.rem_u	$push245=, $pop57, $pop507
+	i32.ne  	$push246=, $pop55, $pop245
+	br_if   	1, $pop246      # 1: down to label0
 # BB#31:                                # %if.end195
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push430=, 16
-	i32.add 	$push431=, $6, $pop430
-	copy_local	$5=, $pop431
+	i32.const	$push434=, 16
+	i32.add 	$push435=, $6, $pop434
+	copy_local	$5=, $pop435
 	#APP
 	#NO_APP
 	i32.load	$push59=, 24($6)
-	i32.load	$push61=, 0($3)
-	i32.const	$push497=, 6
-	i32.rem_u	$push246=, $pop61, $pop497
-	i32.ne  	$push247=, $pop59, $pop246
-	br_if   	1, $pop247      # 1: down to label0
+	i32.load	$push61=, 0($2)
+	i32.const	$push508=, 6
+	i32.rem_u	$push247=, $pop61, $pop508
+	i32.ne  	$push248=, $pop59, $pop247
+	br_if   	1, $pop248      # 1: down to label0
 # BB#32:                                # %lor.lhs.false201
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push58=, 20($6)
-	i32.load	$push60=, 0($4)
-	i32.const	$push498=, 5
-	i32.rem_u	$push248=, $pop60, $pop498
-	i32.ne  	$push249=, $pop58, $pop248
-	br_if   	1, $pop249      # 1: down to label0
+	i32.load	$push60=, 0($3)
+	i32.const	$push509=, 5
+	i32.rem_u	$push249=, $pop60, $pop509
+	i32.ne  	$push250=, $pop58, $pop249
+	br_if   	1, $pop250      # 1: down to label0
 # BB#33:                                # %if.end208
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push432=, 16
-	i32.add 	$push433=, $6, $pop432
-	copy_local	$5=, $pop433
+	i32.const	$push436=, 16
+	i32.add 	$push437=, $6, $pop436
+	copy_local	$5=, $pop437
 	#APP
 	#NO_APP
-	i32.const	$push434=, 16
-	i32.add 	$push435=, $6, $pop434
-	call    	uq1414146@FUNCTION, $pop435, $0
+	i32.const	$push438=, 16
+	i32.add 	$push439=, $6, $pop438
+	call    	uq1414146@FUNCTION, $pop439, $1
 	i32.load	$push62=, 16($6)
-	i32.load	$push64=, 0($0)
-	i32.const	$push499=, 14
-	i32.div_u	$push250=, $pop64, $pop499
-	i32.ne  	$push251=, $pop62, $pop250
-	br_if   	1, $pop251      # 1: down to label0
+	i32.load	$push64=, 0($1)
+	i32.const	$push510=, 14
+	i32.div_u	$push251=, $pop64, $pop510
+	i32.ne  	$push252=, $pop62, $pop251
+	br_if   	1, $pop252      # 1: down to label0
 # BB#34:                                # %lor.lhs.false215
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push63=, 28($6)
-	i32.load	$push65=, 0($2)
-	i32.const	$push500=, 6
-	i32.div_u	$push252=, $pop65, $pop500
-	i32.ne  	$push253=, $pop63, $pop252
-	br_if   	1, $pop253      # 1: down to label0
+	i32.load	$push65=, 0($4)
+	i32.const	$push511=, 6
+	i32.div_u	$push253=, $pop65, $pop511
+	i32.ne  	$push254=, $pop63, $pop253
+	br_if   	1, $pop254      # 1: down to label0
 # BB#35:                                # %if.end222
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push436=, 16
-	i32.add 	$push437=, $6, $pop436
-	copy_local	$5=, $pop437
+	i32.const	$push440=, 16
+	i32.add 	$push441=, $6, $pop440
+	copy_local	$5=, $pop441
 	#APP
 	#NO_APP
 	i32.load	$push67=, 24($6)
-	i32.load	$push69=, 0($3)
-	i32.const	$push501=, 14
-	i32.div_u	$push254=, $pop69, $pop501
-	i32.ne  	$push255=, $pop67, $pop254
-	br_if   	1, $pop255      # 1: down to label0
+	i32.load	$push69=, 0($2)
+	i32.const	$push512=, 14
+	i32.div_u	$push255=, $pop69, $pop512
+	i32.ne  	$push256=, $pop67, $pop255
+	br_if   	1, $pop256      # 1: down to label0
 # BB#36:                                # %lor.lhs.false228
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push66=, 20($6)
-	i32.load	$push68=, 0($4)
-	i32.const	$push502=, 14
-	i32.div_u	$push256=, $pop68, $pop502
-	i32.ne  	$push257=, $pop66, $pop256
-	br_if   	1, $pop257      # 1: down to label0
+	i32.load	$push68=, 0($3)
+	i32.const	$push513=, 14
+	i32.div_u	$push257=, $pop68, $pop513
+	i32.ne  	$push258=, $pop66, $pop257
+	br_if   	1, $pop258      # 1: down to label0
 # BB#37:                                # %if.end235
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push438=, 16
-	i32.add 	$push439=, $6, $pop438
-	copy_local	$5=, $pop439
+	i32.const	$push442=, 16
+	i32.add 	$push443=, $6, $pop442
+	copy_local	$5=, $pop443
 	#APP
 	#NO_APP
-	i32.const	$push440=, 16
-	i32.add 	$push441=, $6, $pop440
-	call    	ur1414146@FUNCTION, $pop441, $0
+	i32.const	$push444=, 16
+	i32.add 	$push445=, $6, $pop444
+	call    	ur1414146@FUNCTION, $pop445, $1
 	i32.load	$push70=, 16($6)
-	i32.load	$push72=, 0($0)
-	i32.const	$push503=, 14
-	i32.rem_u	$push258=, $pop72, $pop503
-	i32.ne  	$push259=, $pop70, $pop258
-	br_if   	1, $pop259      # 1: down to label0
+	i32.load	$push72=, 0($1)
+	i32.const	$push514=, 14
+	i32.rem_u	$push259=, $pop72, $pop514
+	i32.ne  	$push260=, $pop70, $pop259
+	br_if   	1, $pop260      # 1: down to label0
 # BB#38:                                # %lor.lhs.false242
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push71=, 28($6)
-	i32.load	$push73=, 0($2)
-	i32.const	$push504=, 6
-	i32.rem_u	$push260=, $pop73, $pop504
-	i32.ne  	$push261=, $pop71, $pop260
-	br_if   	1, $pop261      # 1: down to label0
+	i32.load	$push73=, 0($4)
+	i32.const	$push515=, 6
+	i32.rem_u	$push261=, $pop73, $pop515
+	i32.ne  	$push262=, $pop71, $pop261
+	br_if   	1, $pop262      # 1: down to label0
 # BB#39:                                # %if.end249
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push442=, 16
-	i32.add 	$push443=, $6, $pop442
-	copy_local	$5=, $pop443
+	i32.const	$push446=, 16
+	i32.add 	$push447=, $6, $pop446
+	copy_local	$5=, $pop447
 	#APP
 	#NO_APP
 	i32.load	$push75=, 24($6)
-	i32.load	$push77=, 0($3)
-	i32.const	$push505=, 14
-	i32.rem_u	$push262=, $pop77, $pop505
-	i32.ne  	$push263=, $pop75, $pop262
-	br_if   	1, $pop263      # 1: down to label0
+	i32.load	$push77=, 0($2)
+	i32.const	$push516=, 14
+	i32.rem_u	$push263=, $pop77, $pop516
+	i32.ne  	$push264=, $pop75, $pop263
+	br_if   	1, $pop264      # 1: down to label0
 # BB#40:                                # %lor.lhs.false255
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push74=, 20($6)
-	i32.load	$push76=, 0($4)
-	i32.const	$push506=, 14
-	i32.rem_u	$push264=, $pop76, $pop506
-	i32.ne  	$push265=, $pop74, $pop264
-	br_if   	1, $pop265      # 1: down to label0
+	i32.load	$push76=, 0($3)
+	i32.const	$push517=, 14
+	i32.rem_u	$push265=, $pop76, $pop517
+	i32.ne  	$push266=, $pop74, $pop265
+	br_if   	1, $pop266      # 1: down to label0
 # BB#41:                                # %if.end262
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push444=, 16
-	i32.add 	$push445=, $6, $pop444
-	copy_local	$5=, $pop445
+	i32.const	$push448=, 16
+	i32.add 	$push449=, $6, $pop448
+	copy_local	$5=, $pop449
 	#APP
 	#NO_APP
-	i32.const	$push446=, 16
-	i32.add 	$push447=, $6, $pop446
-	call    	uq7777@FUNCTION, $pop447, $0
+	i32.const	$push450=, 16
+	i32.add 	$push451=, $6, $pop450
+	call    	uq7777@FUNCTION, $pop451, $1
 	i32.load	$push78=, 16($6)
-	i32.load	$push80=, 0($0)
-	i32.const	$push507=, 7
-	i32.div_u	$push266=, $pop80, $pop507
-	i32.ne  	$push267=, $pop78, $pop266
-	br_if   	1, $pop267      # 1: down to label0
+	i32.load	$push80=, 0($1)
+	i32.const	$push518=, 7
+	i32.div_u	$push267=, $pop80, $pop518
+	i32.ne  	$push268=, $pop78, $pop267
+	br_if   	1, $pop268      # 1: down to label0
 # BB#42:                                # %lor.lhs.false269
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push79=, 28($6)
-	i32.load	$push81=, 0($2)
-	i32.const	$push508=, 7
-	i32.div_u	$push268=, $pop81, $pop508
-	i32.ne  	$push269=, $pop79, $pop268
-	br_if   	1, $pop269      # 1: down to label0
+	i32.load	$push81=, 0($4)
+	i32.const	$push519=, 7
+	i32.div_u	$push269=, $pop81, $pop519
+	i32.ne  	$push270=, $pop79, $pop269
+	br_if   	1, $pop270      # 1: down to label0
 # BB#43:                                # %if.end276
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push448=, 16
-	i32.add 	$push449=, $6, $pop448
-	copy_local	$5=, $pop449
+	i32.const	$push452=, 16
+	i32.add 	$push453=, $6, $pop452
+	copy_local	$5=, $pop453
 	#APP
 	#NO_APP
 	i32.load	$push83=, 24($6)
-	i32.load	$push85=, 0($3)
-	i32.const	$push509=, 7
-	i32.div_u	$push270=, $pop85, $pop509
-	i32.ne  	$push271=, $pop83, $pop270
-	br_if   	1, $pop271      # 1: down to label0
+	i32.load	$push85=, 0($2)
+	i32.const	$push520=, 7
+	i32.div_u	$push271=, $pop85, $pop520
+	i32.ne  	$push272=, $pop83, $pop271
+	br_if   	1, $pop272      # 1: down to label0
 # BB#44:                                # %lor.lhs.false282
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push82=, 20($6)
-	i32.load	$push84=, 0($4)
-	i32.const	$push510=, 7
-	i32.div_u	$push272=, $pop84, $pop510
-	i32.ne  	$push273=, $pop82, $pop272
-	br_if   	1, $pop273      # 1: down to label0
+	i32.load	$push84=, 0($3)
+	i32.const	$push521=, 7
+	i32.div_u	$push273=, $pop84, $pop521
+	i32.ne  	$push274=, $pop82, $pop273
+	br_if   	1, $pop274      # 1: down to label0
 # BB#45:                                # %if.end289
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push450=, 16
-	i32.add 	$push451=, $6, $pop450
-	copy_local	$5=, $pop451
+	i32.const	$push454=, 16
+	i32.add 	$push455=, $6, $pop454
+	copy_local	$5=, $pop455
 	#APP
 	#NO_APP
-	i32.const	$push452=, 16
-	i32.add 	$push453=, $6, $pop452
-	call    	ur7777@FUNCTION, $pop453, $0
+	i32.const	$push456=, 16
+	i32.add 	$push457=, $6, $pop456
+	call    	ur7777@FUNCTION, $pop457, $1
 	i32.load	$push86=, 16($6)
-	i32.load	$push88=, 0($0)
-	i32.const	$push511=, 7
-	i32.rem_u	$push274=, $pop88, $pop511
-	i32.ne  	$push275=, $pop86, $pop274
-	br_if   	1, $pop275      # 1: down to label0
+	i32.load	$push88=, 0($1)
+	i32.const	$push522=, 7
+	i32.rem_u	$push275=, $pop88, $pop522
+	i32.ne  	$push276=, $pop86, $pop275
+	br_if   	1, $pop276      # 1: down to label0
 # BB#46:                                # %lor.lhs.false296
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push87=, 28($6)
-	i32.load	$push89=, 0($2)
-	i32.const	$push512=, 7
-	i32.rem_u	$push276=, $pop89, $pop512
-	i32.ne  	$push277=, $pop87, $pop276
-	br_if   	1, $pop277      # 1: down to label0
+	i32.load	$push89=, 0($4)
+	i32.const	$push523=, 7
+	i32.rem_u	$push277=, $pop89, $pop523
+	i32.ne  	$push278=, $pop87, $pop277
+	br_if   	1, $pop278      # 1: down to label0
 # BB#47:                                # %if.end303
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push454=, 16
-	i32.add 	$push455=, $6, $pop454
-	copy_local	$2=, $pop455
+	i32.const	$push458=, 16
+	i32.add 	$push459=, $6, $pop458
+	copy_local	$1=, $pop459
 	#APP
 	#NO_APP
 	i32.load	$push91=, 24($6)
-	i32.load	$push93=, 0($3)
-	i32.const	$push513=, 7
-	i32.rem_u	$push278=, $pop93, $pop513
-	i32.ne  	$push279=, $pop91, $pop278
-	br_if   	1, $pop279      # 1: down to label0
+	i32.load	$push93=, 0($2)
+	i32.const	$push524=, 7
+	i32.rem_u	$push279=, $pop93, $pop524
+	i32.ne  	$push280=, $pop91, $pop279
+	br_if   	1, $pop280      # 1: down to label0
 # BB#48:                                # %lor.lhs.false309
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.load	$push90=, 20($6)
-	i32.load	$push92=, 0($4)
-	i32.const	$push514=, 7
-	i32.rem_u	$push280=, $pop92, $pop514
-	i32.ne  	$push281=, $pop90, $pop280
-	br_if   	1, $pop281      # 1: down to label0
+	i32.load	$push92=, 0($3)
+	i32.const	$push525=, 7
+	i32.rem_u	$push281=, $pop92, $pop525
+	i32.ne  	$push282=, $pop90, $pop281
+	br_if   	1, $pop282      # 1: down to label0
 # BB#49:                                # %if.end316
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.const	$push456=, 16
-	i32.add 	$push457=, $6, $pop456
-	copy_local	$2=, $pop457
+	i32.const	$push460=, 16
+	i32.add 	$push461=, $6, $pop460
+	copy_local	$1=, $pop461
 	#APP
 	#NO_APP
-	i32.const	$push519=, 16
-	i32.add 	$0=, $0, $pop519
-	i32.const	$push518=, 1
-	i32.add 	$push517=, $1, $pop518
-	tee_local	$push516=, $1=, $pop517
-	i32.const	$push515=, 2
-	i32.lt_u	$push282=, $pop516, $pop515
-	br_if   	0, $pop282      # 0: up to label1
+	i32.const	$push283=, 1
+	i32.add 	$1=, $0, $pop283
+	i32.const	$0=, 1
+	i32.const	$push526=, 2
+	i32.lt_u	$push284=, $1, $pop526
+	br_if   	0, $pop284      # 0: up to label1
 # BB#50:                                # %for.body319.preheader
 	end_loop
-	i32.const	$1=, 0
-	i32.const	$0=, s
+	i32.const	$0=, 0
 .LBB24_51:                              # %for.body319
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	call    	sq4444@FUNCTION, $6, $0
+	i32.const	$push533=, 4
+	i32.shl 	$push532=, $0, $pop533
+	tee_local	$push531=, $2=, $pop532
+	i32.const	$push530=, s
+	i32.add 	$push529=, $pop531, $pop530
+	tee_local	$push528=, $1=, $pop529
+	call    	sq4444@FUNCTION, $6, $pop528
 	i32.load	$push94=, 0($6)
-	i32.load	$push96=, 0($0)
-	i32.const	$push520=, 4
-	i32.div_s	$push283=, $pop96, $pop520
-	i32.ne  	$push284=, $pop94, $pop283
-	br_if   	1, $pop284      # 1: down to label0
+	i32.load	$push96=, 0($1)
+	i32.const	$push527=, 4
+	i32.div_s	$push285=, $pop96, $pop527
+	i32.ne  	$push286=, $pop94, $pop285
+	br_if   	1, $pop286      # 1: down to label0
 # BB#52:                                # %lor.lhs.false326
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push95=, 12($6)
-	i32.const	$push524=, 12
-	i32.add 	$push523=, $0, $pop524
-	tee_local	$push522=, $2=, $pop523
-	i32.load	$push97=, 0($pop522)
-	i32.const	$push521=, 4
-	i32.div_s	$push285=, $pop97, $pop521
-	i32.ne  	$push286=, $pop95, $pop285
-	br_if   	1, $pop286      # 1: down to label0
+	i32.const	$push535=, s+12
+	i32.add 	$push287=, $2, $pop535
+	i32.load	$push97=, 0($pop287)
+	i32.const	$push534=, 4
+	i32.div_s	$push288=, $pop97, $pop534
+	i32.ne  	$push289=, $pop95, $pop288
+	br_if   	1, $pop289      # 1: down to label0
 # BB#53:                                # %if.end333
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$3=, $6
+	copy_local	$2=, $6
 	#APP
 	#NO_APP
 	i32.load	$push99=, 8($6)
-	i32.const	$push528=, 8
-	i32.add 	$push527=, $0, $pop528
-	tee_local	$push526=, $3=, $pop527
-	i32.load	$push101=, 0($pop526)
-	i32.const	$push525=, 4
-	i32.div_s	$push287=, $pop101, $pop525
-	i32.ne  	$push288=, $pop99, $pop287
-	br_if   	1, $pop288      # 1: down to label0
+	i32.const	$push539=, 8
+	i32.add 	$push538=, $1, $pop539
+	tee_local	$push537=, $2=, $pop538
+	i32.load	$push101=, 0($pop537)
+	i32.const	$push536=, 4
+	i32.div_s	$push290=, $pop101, $pop536
+	i32.ne  	$push291=, $pop99, $pop290
+	br_if   	1, $pop291      # 1: down to label0
 # BB#54:                                # %lor.lhs.false339
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push98=, 4($6)
-	i32.const	$push532=, 4
-	i32.add 	$push531=, $0, $pop532
-	tee_local	$push530=, $4=, $pop531
-	i32.load	$push100=, 0($pop530)
-	i32.const	$push529=, 4
-	i32.div_s	$push289=, $pop100, $pop529
-	i32.ne  	$push290=, $pop98, $pop289
-	br_if   	1, $pop290      # 1: down to label0
+	i32.const	$push543=, 4
+	i32.add 	$push542=, $1, $pop543
+	tee_local	$push541=, $3=, $pop542
+	i32.load	$push100=, 0($pop541)
+	i32.const	$push540=, 4
+	i32.div_s	$push292=, $pop100, $pop540
+	i32.ne  	$push293=, $pop98, $pop292
+	br_if   	1, $pop293      # 1: down to label0
 # BB#55:                                # %if.end346
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$4=, $6
 	#APP
 	#NO_APP
-	call    	sr4444@FUNCTION, $6, $0
+	call    	sr4444@FUNCTION, $6, $1
 	i32.load	$push102=, 0($6)
-	i32.load	$push104=, 0($0)
-	i32.const	$push533=, 4
-	i32.rem_s	$push291=, $pop104, $pop533
-	i32.ne  	$push292=, $pop102, $pop291
-	br_if   	1, $pop292      # 1: down to label0
+	i32.load	$push104=, 0($1)
+	i32.const	$push544=, 4
+	i32.rem_s	$push294=, $pop104, $pop544
+	i32.ne  	$push295=, $pop102, $pop294
+	br_if   	1, $pop295      # 1: down to label0
 # BB#56:                                # %lor.lhs.false353
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push103=, 12($6)
-	i32.load	$push105=, 0($2)
-	i32.const	$push534=, 4
-	i32.rem_s	$push293=, $pop105, $pop534
-	i32.ne  	$push294=, $pop103, $pop293
-	br_if   	1, $pop294      # 1: down to label0
+	i32.const	$push548=, 12
+	i32.add 	$push547=, $1, $pop548
+	tee_local	$push546=, $4=, $pop547
+	i32.load	$push105=, 0($pop546)
+	i32.const	$push545=, 4
+	i32.rem_s	$push296=, $pop105, $pop545
+	i32.ne  	$push297=, $pop103, $pop296
+	br_if   	1, $pop297      # 1: down to label0
 # BB#57:                                # %if.end360
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push107=, 8($6)
-	i32.load	$push109=, 0($3)
-	i32.const	$push535=, 4
-	i32.rem_s	$push295=, $pop109, $pop535
-	i32.ne  	$push296=, $pop107, $pop295
-	br_if   	1, $pop296      # 1: down to label0
+	i32.load	$push109=, 0($2)
+	i32.const	$push549=, 4
+	i32.rem_s	$push298=, $pop109, $pop549
+	i32.ne  	$push299=, $pop107, $pop298
+	br_if   	1, $pop299      # 1: down to label0
 # BB#58:                                # %lor.lhs.false366
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push106=, 4($6)
-	i32.load	$push108=, 0($4)
-	i32.const	$push536=, 4
-	i32.rem_s	$push297=, $pop108, $pop536
-	i32.ne  	$push298=, $pop106, $pop297
-	br_if   	1, $pop298      # 1: down to label0
+	i32.load	$push108=, 0($3)
+	i32.const	$push550=, 4
+	i32.rem_s	$push300=, $pop108, $pop550
+	i32.ne  	$push301=, $pop106, $pop300
+	br_if   	1, $pop301      # 1: down to label0
 # BB#59:                                # %if.end373
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sq1428@FUNCTION, $6, $0
+	call    	sq1428@FUNCTION, $6, $1
 	i32.load	$push110=, 0($6)
-	i32.load	$push112=, 0($0)
-	i32.ne  	$push299=, $pop110, $pop112
-	br_if   	1, $pop299      # 1: down to label0
+	i32.load	$push112=, 0($1)
+	i32.ne  	$push302=, $pop110, $pop112
+	br_if   	1, $pop302      # 1: down to label0
 # BB#60:                                # %lor.lhs.false380
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push111=, 12($6)
-	i32.load	$push113=, 0($2)
-	i32.const	$push537=, 8
-	i32.div_s	$push300=, $pop113, $pop537
-	i32.ne  	$push301=, $pop111, $pop300
-	br_if   	1, $pop301      # 1: down to label0
+	i32.load	$push113=, 0($4)
+	i32.const	$push551=, 8
+	i32.div_s	$push303=, $pop113, $pop551
+	i32.ne  	$push304=, $pop111, $pop303
+	br_if   	1, $pop304      # 1: down to label0
 # BB#61:                                # %if.end387
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push115=, 8($6)
-	i32.load	$push117=, 0($3)
-	i32.const	$push538=, 2
-	i32.div_s	$push302=, $pop117, $pop538
-	i32.ne  	$push303=, $pop115, $pop302
-	br_if   	1, $pop303      # 1: down to label0
+	i32.load	$push117=, 0($2)
+	i32.const	$push552=, 2
+	i32.div_s	$push305=, $pop117, $pop552
+	i32.ne  	$push306=, $pop115, $pop305
+	br_if   	1, $pop306      # 1: down to label0
 # BB#62:                                # %lor.lhs.false393
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push114=, 4($6)
-	i32.load	$push116=, 0($4)
-	i32.const	$push539=, 4
-	i32.div_s	$push304=, $pop116, $pop539
-	i32.ne  	$push305=, $pop114, $pop304
-	br_if   	1, $pop305      # 1: down to label0
+	i32.load	$push116=, 0($3)
+	i32.const	$push553=, 4
+	i32.div_s	$push307=, $pop116, $pop553
+	i32.ne  	$push308=, $pop114, $pop307
+	br_if   	1, $pop308      # 1: down to label0
 # BB#63:                                # %if.end400
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sr1428@FUNCTION, $6, $0
+	call    	sr1428@FUNCTION, $6, $1
 	i32.load	$push118=, 0($6)
 	br_if   	1, $pop118      # 1: down to label0
 # BB#64:                                # %lor.lhs.false407
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push119=, 12($6)
-	i32.load	$push306=, 0($2)
-	i32.const	$push540=, 8
-	i32.rem_s	$push307=, $pop306, $pop540
-	i32.ne  	$push308=, $pop119, $pop307
-	br_if   	1, $pop308      # 1: down to label0
+	i32.load	$push309=, 0($4)
+	i32.const	$push554=, 8
+	i32.rem_s	$push310=, $pop309, $pop554
+	i32.ne  	$push311=, $pop119, $pop310
+	br_if   	1, $pop311      # 1: down to label0
 # BB#65:                                # %if.end414
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push121=, 8($6)
-	i32.load	$push123=, 0($3)
-	i32.const	$push541=, 2
-	i32.rem_s	$push309=, $pop123, $pop541
-	i32.ne  	$push310=, $pop121, $pop309
-	br_if   	1, $pop310      # 1: down to label0
+	i32.load	$push123=, 0($2)
+	i32.const	$push555=, 2
+	i32.rem_s	$push312=, $pop123, $pop555
+	i32.ne  	$push313=, $pop121, $pop312
+	br_if   	1, $pop313      # 1: down to label0
 # BB#66:                                # %lor.lhs.false420
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push120=, 4($6)
-	i32.load	$push122=, 0($4)
-	i32.const	$push542=, 4
-	i32.rem_s	$push311=, $pop122, $pop542
-	i32.ne  	$push312=, $pop120, $pop311
-	br_if   	1, $pop312      # 1: down to label0
+	i32.load	$push122=, 0($3)
+	i32.const	$push556=, 4
+	i32.rem_s	$push314=, $pop122, $pop556
+	i32.ne  	$push315=, $pop120, $pop314
+	br_if   	1, $pop315      # 1: down to label0
 # BB#67:                                # %if.end427
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sq3333@FUNCTION, $6, $0
+	call    	sq3333@FUNCTION, $6, $1
 	i32.load	$push124=, 0($6)
-	i32.load	$push126=, 0($0)
-	i32.const	$push543=, 3
-	i32.div_s	$push313=, $pop126, $pop543
-	i32.ne  	$push314=, $pop124, $pop313
-	br_if   	1, $pop314      # 1: down to label0
+	i32.load	$push126=, 0($1)
+	i32.const	$push557=, 3
+	i32.div_s	$push316=, $pop126, $pop557
+	i32.ne  	$push317=, $pop124, $pop316
+	br_if   	1, $pop317      # 1: down to label0
 # BB#68:                                # %lor.lhs.false434
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push125=, 12($6)
-	i32.load	$push127=, 0($2)
-	i32.const	$push544=, 3
-	i32.div_s	$push315=, $pop127, $pop544
-	i32.ne  	$push316=, $pop125, $pop315
-	br_if   	1, $pop316      # 1: down to label0
+	i32.load	$push127=, 0($4)
+	i32.const	$push558=, 3
+	i32.div_s	$push318=, $pop127, $pop558
+	i32.ne  	$push319=, $pop125, $pop318
+	br_if   	1, $pop319      # 1: down to label0
 # BB#69:                                # %if.end441
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push129=, 8($6)
-	i32.load	$push131=, 0($3)
-	i32.const	$push545=, 3
-	i32.div_s	$push317=, $pop131, $pop545
-	i32.ne  	$push318=, $pop129, $pop317
-	br_if   	1, $pop318      # 1: down to label0
+	i32.load	$push131=, 0($2)
+	i32.const	$push559=, 3
+	i32.div_s	$push320=, $pop131, $pop559
+	i32.ne  	$push321=, $pop129, $pop320
+	br_if   	1, $pop321      # 1: down to label0
 # BB#70:                                # %lor.lhs.false447
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push128=, 4($6)
-	i32.load	$push130=, 0($4)
-	i32.const	$push546=, 3
-	i32.div_s	$push319=, $pop130, $pop546
-	i32.ne  	$push320=, $pop128, $pop319
-	br_if   	1, $pop320      # 1: down to label0
+	i32.load	$push130=, 0($3)
+	i32.const	$push560=, 3
+	i32.div_s	$push322=, $pop130, $pop560
+	i32.ne  	$push323=, $pop128, $pop322
+	br_if   	1, $pop323      # 1: down to label0
 # BB#71:                                # %if.end454
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sr3333@FUNCTION, $6, $0
+	call    	sr3333@FUNCTION, $6, $1
 	i32.load	$push132=, 0($6)
-	i32.load	$push134=, 0($0)
-	i32.const	$push547=, 3
-	i32.rem_s	$push321=, $pop134, $pop547
-	i32.ne  	$push322=, $pop132, $pop321
-	br_if   	1, $pop322      # 1: down to label0
+	i32.load	$push134=, 0($1)
+	i32.const	$push561=, 3
+	i32.rem_s	$push324=, $pop134, $pop561
+	i32.ne  	$push325=, $pop132, $pop324
+	br_if   	1, $pop325      # 1: down to label0
 # BB#72:                                # %lor.lhs.false461
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push133=, 12($6)
-	i32.load	$push135=, 0($2)
-	i32.const	$push548=, 3
-	i32.rem_s	$push323=, $pop135, $pop548
-	i32.ne  	$push324=, $pop133, $pop323
-	br_if   	1, $pop324      # 1: down to label0
+	i32.load	$push135=, 0($4)
+	i32.const	$push562=, 3
+	i32.rem_s	$push326=, $pop135, $pop562
+	i32.ne  	$push327=, $pop133, $pop326
+	br_if   	1, $pop327      # 1: down to label0
 # BB#73:                                # %if.end468
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push137=, 8($6)
-	i32.load	$push139=, 0($3)
-	i32.const	$push549=, 3
-	i32.rem_s	$push325=, $pop139, $pop549
-	i32.ne  	$push326=, $pop137, $pop325
-	br_if   	1, $pop326      # 1: down to label0
+	i32.load	$push139=, 0($2)
+	i32.const	$push563=, 3
+	i32.rem_s	$push328=, $pop139, $pop563
+	i32.ne  	$push329=, $pop137, $pop328
+	br_if   	1, $pop329      # 1: down to label0
 # BB#74:                                # %lor.lhs.false474
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push136=, 4($6)
-	i32.load	$push138=, 0($4)
-	i32.const	$push550=, 3
-	i32.rem_s	$push327=, $pop138, $pop550
-	i32.ne  	$push328=, $pop136, $pop327
-	br_if   	1, $pop328      # 1: down to label0
+	i32.load	$push138=, 0($3)
+	i32.const	$push564=, 3
+	i32.rem_s	$push330=, $pop138, $pop564
+	i32.ne  	$push331=, $pop136, $pop330
+	br_if   	1, $pop331      # 1: down to label0
 # BB#75:                                # %if.end481
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sq6565@FUNCTION, $6, $0
+	call    	sq6565@FUNCTION, $6, $1
 	i32.load	$push140=, 0($6)
-	i32.load	$push142=, 0($0)
-	i32.const	$push551=, 6
-	i32.div_s	$push329=, $pop142, $pop551
-	i32.ne  	$push330=, $pop140, $pop329
-	br_if   	1, $pop330      # 1: down to label0
+	i32.load	$push142=, 0($1)
+	i32.const	$push565=, 6
+	i32.div_s	$push332=, $pop142, $pop565
+	i32.ne  	$push333=, $pop140, $pop332
+	br_if   	1, $pop333      # 1: down to label0
 # BB#76:                                # %lor.lhs.false488
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push141=, 12($6)
-	i32.load	$push143=, 0($2)
-	i32.const	$push552=, 5
-	i32.div_s	$push331=, $pop143, $pop552
-	i32.ne  	$push332=, $pop141, $pop331
-	br_if   	1, $pop332      # 1: down to label0
+	i32.load	$push143=, 0($4)
+	i32.const	$push566=, 5
+	i32.div_s	$push334=, $pop143, $pop566
+	i32.ne  	$push335=, $pop141, $pop334
+	br_if   	1, $pop335      # 1: down to label0
 # BB#77:                                # %if.end495
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push145=, 8($6)
-	i32.load	$push147=, 0($3)
-	i32.const	$push553=, 6
-	i32.div_s	$push333=, $pop147, $pop553
-	i32.ne  	$push334=, $pop145, $pop333
-	br_if   	1, $pop334      # 1: down to label0
+	i32.load	$push147=, 0($2)
+	i32.const	$push567=, 6
+	i32.div_s	$push336=, $pop147, $pop567
+	i32.ne  	$push337=, $pop145, $pop336
+	br_if   	1, $pop337      # 1: down to label0
 # BB#78:                                # %lor.lhs.false501
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push144=, 4($6)
-	i32.load	$push146=, 0($4)
-	i32.const	$push554=, 5
-	i32.div_s	$push335=, $pop146, $pop554
-	i32.ne  	$push336=, $pop144, $pop335
-	br_if   	1, $pop336      # 1: down to label0
+	i32.load	$push146=, 0($3)
+	i32.const	$push568=, 5
+	i32.div_s	$push338=, $pop146, $pop568
+	i32.ne  	$push339=, $pop144, $pop338
+	br_if   	1, $pop339      # 1: down to label0
 # BB#79:                                # %if.end508
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sr6565@FUNCTION, $6, $0
+	call    	sr6565@FUNCTION, $6, $1
 	i32.load	$push148=, 0($6)
-	i32.load	$push150=, 0($0)
-	i32.const	$push555=, 6
-	i32.rem_s	$push337=, $pop150, $pop555
-	i32.ne  	$push338=, $pop148, $pop337
-	br_if   	1, $pop338      # 1: down to label0
+	i32.load	$push150=, 0($1)
+	i32.const	$push569=, 6
+	i32.rem_s	$push340=, $pop150, $pop569
+	i32.ne  	$push341=, $pop148, $pop340
+	br_if   	1, $pop341      # 1: down to label0
 # BB#80:                                # %lor.lhs.false515
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push149=, 12($6)
-	i32.load	$push151=, 0($2)
-	i32.const	$push556=, 5
-	i32.rem_s	$push339=, $pop151, $pop556
-	i32.ne  	$push340=, $pop149, $pop339
-	br_if   	1, $pop340      # 1: down to label0
+	i32.load	$push151=, 0($4)
+	i32.const	$push570=, 5
+	i32.rem_s	$push342=, $pop151, $pop570
+	i32.ne  	$push343=, $pop149, $pop342
+	br_if   	1, $pop343      # 1: down to label0
 # BB#81:                                # %if.end522
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push153=, 8($6)
-	i32.load	$push155=, 0($3)
-	i32.const	$push557=, 6
-	i32.rem_s	$push341=, $pop155, $pop557
-	i32.ne  	$push342=, $pop153, $pop341
-	br_if   	1, $pop342      # 1: down to label0
+	i32.load	$push155=, 0($2)
+	i32.const	$push571=, 6
+	i32.rem_s	$push344=, $pop155, $pop571
+	i32.ne  	$push345=, $pop153, $pop344
+	br_if   	1, $pop345      # 1: down to label0
 # BB#82:                                # %lor.lhs.false528
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push152=, 4($6)
-	i32.load	$push154=, 0($4)
-	i32.const	$push558=, 5
-	i32.rem_s	$push343=, $pop154, $pop558
-	i32.ne  	$push344=, $pop152, $pop343
-	br_if   	1, $pop344      # 1: down to label0
+	i32.load	$push154=, 0($3)
+	i32.const	$push572=, 5
+	i32.rem_s	$push346=, $pop154, $pop572
+	i32.ne  	$push347=, $pop152, $pop346
+	br_if   	1, $pop347      # 1: down to label0
 # BB#83:                                # %if.end535
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sq1414146@FUNCTION, $6, $0
+	call    	sq1414146@FUNCTION, $6, $1
 	i32.load	$push156=, 0($6)
-	i32.load	$push158=, 0($0)
-	i32.const	$push559=, 14
-	i32.div_s	$push345=, $pop158, $pop559
-	i32.ne  	$push346=, $pop156, $pop345
-	br_if   	1, $pop346      # 1: down to label0
+	i32.load	$push158=, 0($1)
+	i32.const	$push573=, 14
+	i32.div_s	$push348=, $pop158, $pop573
+	i32.ne  	$push349=, $pop156, $pop348
+	br_if   	1, $pop349      # 1: down to label0
 # BB#84:                                # %lor.lhs.false542
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push157=, 12($6)
-	i32.load	$push159=, 0($2)
-	i32.const	$push560=, 6
-	i32.div_s	$push347=, $pop159, $pop560
-	i32.ne  	$push348=, $pop157, $pop347
-	br_if   	1, $pop348      # 1: down to label0
+	i32.load	$push159=, 0($4)
+	i32.const	$push574=, 6
+	i32.div_s	$push350=, $pop159, $pop574
+	i32.ne  	$push351=, $pop157, $pop350
+	br_if   	1, $pop351      # 1: down to label0
 # BB#85:                                # %if.end549
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push161=, 8($6)
-	i32.load	$push163=, 0($3)
-	i32.const	$push561=, 14
-	i32.div_s	$push349=, $pop163, $pop561
-	i32.ne  	$push350=, $pop161, $pop349
-	br_if   	1, $pop350      # 1: down to label0
+	i32.load	$push163=, 0($2)
+	i32.const	$push575=, 14
+	i32.div_s	$push352=, $pop163, $pop575
+	i32.ne  	$push353=, $pop161, $pop352
+	br_if   	1, $pop353      # 1: down to label0
 # BB#86:                                # %lor.lhs.false555
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push160=, 4($6)
-	i32.load	$push162=, 0($4)
-	i32.const	$push562=, 14
-	i32.div_s	$push351=, $pop162, $pop562
-	i32.ne  	$push352=, $pop160, $pop351
-	br_if   	1, $pop352      # 1: down to label0
+	i32.load	$push162=, 0($3)
+	i32.const	$push576=, 14
+	i32.div_s	$push354=, $pop162, $pop576
+	i32.ne  	$push355=, $pop160, $pop354
+	br_if   	1, $pop355      # 1: down to label0
 # BB#87:                                # %if.end562
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sr1414146@FUNCTION, $6, $0
+	call    	sr1414146@FUNCTION, $6, $1
 	i32.load	$push164=, 0($6)
-	i32.load	$push166=, 0($0)
-	i32.const	$push563=, 14
-	i32.rem_s	$push353=, $pop166, $pop563
-	i32.ne  	$push354=, $pop164, $pop353
-	br_if   	1, $pop354      # 1: down to label0
+	i32.load	$push166=, 0($1)
+	i32.const	$push577=, 14
+	i32.rem_s	$push356=, $pop166, $pop577
+	i32.ne  	$push357=, $pop164, $pop356
+	br_if   	1, $pop357      # 1: down to label0
 # BB#88:                                # %lor.lhs.false569
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push165=, 12($6)
-	i32.load	$push167=, 0($2)
-	i32.const	$push564=, 6
-	i32.rem_s	$push355=, $pop167, $pop564
-	i32.ne  	$push356=, $pop165, $pop355
-	br_if   	1, $pop356      # 1: down to label0
+	i32.load	$push167=, 0($4)
+	i32.const	$push578=, 6
+	i32.rem_s	$push358=, $pop167, $pop578
+	i32.ne  	$push359=, $pop165, $pop358
+	br_if   	1, $pop359      # 1: down to label0
 # BB#89:                                # %if.end576
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push169=, 8($6)
-	i32.load	$push171=, 0($3)
-	i32.const	$push565=, 14
-	i32.rem_s	$push357=, $pop171, $pop565
-	i32.ne  	$push358=, $pop169, $pop357
-	br_if   	1, $pop358      # 1: down to label0
+	i32.load	$push171=, 0($2)
+	i32.const	$push579=, 14
+	i32.rem_s	$push360=, $pop171, $pop579
+	i32.ne  	$push361=, $pop169, $pop360
+	br_if   	1, $pop361      # 1: down to label0
 # BB#90:                                # %lor.lhs.false582
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push168=, 4($6)
-	i32.load	$push170=, 0($4)
-	i32.const	$push566=, 14
-	i32.rem_s	$push359=, $pop170, $pop566
-	i32.ne  	$push360=, $pop168, $pop359
-	br_if   	1, $pop360      # 1: down to label0
+	i32.load	$push170=, 0($3)
+	i32.const	$push580=, 14
+	i32.rem_s	$push362=, $pop170, $pop580
+	i32.ne  	$push363=, $pop168, $pop362
+	br_if   	1, $pop363      # 1: down to label0
 # BB#91:                                # %if.end589
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sq7777@FUNCTION, $6, $0
+	call    	sq7777@FUNCTION, $6, $1
 	i32.load	$push172=, 0($6)
-	i32.load	$push174=, 0($0)
-	i32.const	$push567=, 7
-	i32.div_s	$push361=, $pop174, $pop567
-	i32.ne  	$push362=, $pop172, $pop361
-	br_if   	1, $pop362      # 1: down to label0
+	i32.load	$push174=, 0($1)
+	i32.const	$push581=, 7
+	i32.div_s	$push364=, $pop174, $pop581
+	i32.ne  	$push365=, $pop172, $pop364
+	br_if   	1, $pop365      # 1: down to label0
 # BB#92:                                # %lor.lhs.false596
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push173=, 12($6)
-	i32.load	$push175=, 0($2)
-	i32.const	$push568=, 7
-	i32.div_s	$push363=, $pop175, $pop568
-	i32.ne  	$push364=, $pop173, $pop363
-	br_if   	1, $pop364      # 1: down to label0
+	i32.load	$push175=, 0($4)
+	i32.const	$push582=, 7
+	i32.div_s	$push366=, $pop175, $pop582
+	i32.ne  	$push367=, $pop173, $pop366
+	br_if   	1, $pop367      # 1: down to label0
 # BB#93:                                # %if.end603
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
 	i32.load	$push177=, 8($6)
-	i32.load	$push179=, 0($3)
-	i32.const	$push569=, 7
-	i32.div_s	$push365=, $pop179, $pop569
-	i32.ne  	$push366=, $pop177, $pop365
-	br_if   	1, $pop366      # 1: down to label0
+	i32.load	$push179=, 0($2)
+	i32.const	$push583=, 7
+	i32.div_s	$push368=, $pop179, $pop583
+	i32.ne  	$push369=, $pop177, $pop368
+	br_if   	1, $pop369      # 1: down to label0
 # BB#94:                                # %lor.lhs.false609
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push176=, 4($6)
-	i32.load	$push178=, 0($4)
-	i32.const	$push570=, 7
-	i32.div_s	$push367=, $pop178, $pop570
-	i32.ne  	$push368=, $pop176, $pop367
-	br_if   	1, $pop368      # 1: down to label0
+	i32.load	$push178=, 0($3)
+	i32.const	$push584=, 7
+	i32.div_s	$push370=, $pop178, $pop584
+	i32.ne  	$push371=, $pop176, $pop370
+	br_if   	1, $pop371      # 1: down to label0
 # BB#95:                                # %if.end616
                                         #   in Loop: Header=BB24_51 Depth=1
 	copy_local	$5=, $6
 	#APP
 	#NO_APP
-	call    	sr7777@FUNCTION, $6, $0
+	call    	sr7777@FUNCTION, $6, $1
 	i32.load	$push180=, 0($6)
-	i32.load	$push182=, 0($0)
-	i32.const	$push571=, 7
-	i32.rem_s	$push369=, $pop182, $pop571
-	i32.ne  	$push370=, $pop180, $pop369
-	br_if   	1, $pop370      # 1: down to label0
+	i32.load	$push182=, 0($1)
+	i32.const	$push585=, 7
+	i32.rem_s	$push372=, $pop182, $pop585
+	i32.ne  	$push373=, $pop180, $pop372
+	br_if   	1, $pop373      # 1: down to label0
 # BB#96:                                # %lor.lhs.false623
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push181=, 12($6)
-	i32.load	$push183=, 0($2)
-	i32.const	$push572=, 7
-	i32.rem_s	$push371=, $pop183, $pop572
-	i32.ne  	$push372=, $pop181, $pop371
-	br_if   	1, $pop372      # 1: down to label0
+	i32.load	$push183=, 0($4)
+	i32.const	$push586=, 7
+	i32.rem_s	$push374=, $pop183, $pop586
+	i32.ne  	$push375=, $pop181, $pop374
+	br_if   	1, $pop375      # 1: down to label0
 # BB#97:                                # %if.end630
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$2=, $6
+	copy_local	$1=, $6
 	#APP
 	#NO_APP
 	i32.load	$push185=, 8($6)
-	i32.load	$push187=, 0($3)
-	i32.const	$push573=, 7
-	i32.rem_s	$push373=, $pop187, $pop573
-	i32.ne  	$push374=, $pop185, $pop373
-	br_if   	1, $pop374      # 1: down to label0
+	i32.load	$push187=, 0($2)
+	i32.const	$push587=, 7
+	i32.rem_s	$push376=, $pop187, $pop587
+	i32.ne  	$push377=, $pop185, $pop376
+	br_if   	1, $pop377      # 1: down to label0
 # BB#98:                                # %lor.lhs.false636
                                         #   in Loop: Header=BB24_51 Depth=1
 	i32.load	$push184=, 4($6)
-	i32.load	$push186=, 0($4)
-	i32.const	$push574=, 7
-	i32.rem_s	$push375=, $pop186, $pop574
-	i32.ne  	$push376=, $pop184, $pop375
-	br_if   	1, $pop376      # 1: down to label0
+	i32.load	$push186=, 0($3)
+	i32.const	$push588=, 7
+	i32.rem_s	$push378=, $pop186, $pop588
+	i32.ne  	$push379=, $pop184, $pop378
+	br_if   	1, $pop379      # 1: down to label0
 # BB#99:                                # %if.end643
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$2=, $6
+	copy_local	$1=, $6
 	#APP
 	#NO_APP
-	i32.const	$push579=, 16
-	i32.add 	$0=, $0, $pop579
-	i32.const	$push578=, 1
-	i32.add 	$push577=, $1, $pop578
-	tee_local	$push576=, $1=, $pop577
-	i32.const	$push575=, 2
-	i32.lt_u	$push377=, $pop576, $pop575
-	br_if   	0, $pop377      # 0: up to label2
+	i32.const	$push380=, 1
+	i32.add 	$1=, $0, $pop380
+	i32.const	$0=, 1
+	i32.const	$push589=, 2
+	i32.lt_u	$push381=, $1, $pop589
+	br_if   	0, $pop381      # 0: up to label2
 # BB#100:                               # %for.end646
 	end_loop
-	i32.const	$push385=, 0
-	i32.const	$push383=, 32
-	i32.add 	$push384=, $6, $pop383
-	i32.store	__stack_pointer($pop385), $pop384
-	i32.const	$push378=, 0
-	return  	$pop378
-.LBB24_101:                             # %if.then642
+	i32.const	$push389=, 0
+	i32.const	$push387=, 32
+	i32.add 	$push388=, $6, $pop387
+	i32.store	__stack_pointer($pop389), $pop388
+	i32.const	$push382=, 0
+	return  	$pop382
+.LBB24_101:                             # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end24:
 	.size	main, .Lfunc_end24-main
-
+                                        # -- End function
 	.hidden	u                       # @u
 	.type	u,@object
 	.section	.data.u,"aw",@progbits
@@ -2061,5 +2071,5 @@ s:
 	.size	s, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53688.c.s b/test/torture-s/pr53688.c.s
index 554e9e22c..e93d2e4b0 100644
--- a/test/torture-s/pr53688.c.s
+++ b/test/torture-s/pr53688.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr53688.c"
+	.file	"pr53688.c"
 	.section	.text.init,"ax",@progbits
-	.hidden	init
+	.hidden	init                    # -- Begin function init
 	.globl	init
 	.type	init,@function
 init:                                   # @init
@@ -21,9 +21,9 @@ init:                                   # @init
 	.endfunc
 .Lfunc_end0:
 	.size	init, .Lfunc_end0-init
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -68,7 +68,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -93,5 +93,5 @@ headline:
 	.size	headline, 256
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr54471.c.s b/test/torture-s/pr54471.c.s
index f075537a0..402e4ee8d 100644
--- a/test/torture-s/pr54471.c.s
+++ b/test/torture-s/pr54471.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr54471.c"
+	.file	"pr54471.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,10 +9,10 @@ foo:                                    # @foo
 	.local  	i64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 32
-	i32.sub 	$push20=, $pop9, $pop10
+	i32.sub 	$push20=, $pop8, $pop10
 	tee_local	$push19=, $6=, $pop20
 	i32.store	__stack_pointer($pop11), $pop19
 	block   	
@@ -69,9 +69,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -79,10 +79,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push12=, $pop5, $pop6
+	i32.sub 	$push12=, $pop4, $pop6
 	tee_local	$push11=, $0=, $pop12
 	i32.store	__stack_pointer($pop7), $pop11
 	i64.const	$push2=, 3
@@ -98,7 +98,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr54937.c.s b/test/torture-s/pr54937.c.s
index a63ae0a0a..62535241f 100644
--- a/test/torture-s/pr54937.c.s
+++ b/test/torture-s/pr54937.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr54937.c"
+	.file	"pr54937.c"
 	.section	.text.t,"ax",@progbits
-	.hidden	t
+	.hidden	t                       # -- Begin function t
 	.globl	t
 	.type	t,@function
 t:                                      # @t
@@ -48,9 +48,9 @@ t:                                      # @t
 	.endfunc
 .Lfunc_end0:
 	.size	t, .Lfunc_end0-t
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,7 +66,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	terminate_me            # @terminate_me
 	.type	terminate_me,@object
 	.section	.bss.terminate_me,"aw",@nobits
@@ -86,6 +86,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr54985.c.s b/test/torture-s/pr54985.c.s
index 9c3a6b087..2bbb6e587 100644
--- a/test/torture-s/pr54985.c.s
+++ b/test/torture-s/pr54985.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr54985.c"
+	.file	"pr54985.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,7 +13,7 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push8=, $1
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push1=, 4
 	i32.add 	$4=, $0, $pop1
 	i32.load	$0=, 0($0)
@@ -45,9 +45,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -55,10 +55,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop5, $pop6
+	i32.sub 	$push14=, $pop4, $pop6
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop7), $pop13
 	i64.const	$push0=, 4294967298
@@ -83,7 +83,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr55137.c.s b/test/torture-s/pr55137.c.s
index 4a5d09a99..b73cdc20a 100644
--- a/test/torture-s/pr55137.c.s
+++ b/test/torture-s/pr55137.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr55137.c"
+	.file	"pr55137.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -14,9 +14,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -29,9 +29,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -44,9 +44,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -57,6 +57,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr55750.c.s b/test/torture-s/pr55750.c.s
index f992c9b35..8031bd7d1 100644
--- a/test/torture-s/pr55750.c.s
+++ b/test/torture-s/pr55750.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr55750.c"
+	.file	"pr55750.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -20,9 +20,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	arr                     # @arr
 	.type	arr,@object
 	.section	.bss.arr,"aw",@nobits
@@ -71,5 +71,5 @@ arr:
 	.size	arr, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr55875.c.s b/test/torture-s/pr55875.c.s
index f69ce235f..c04fefebf 100644
--- a/test/torture-s/pr55875.c.s
+++ b/test/torture-s/pr55875.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr55875.c"
+	.file	"pr55875.c"
 	.section	.text.t,"ax",@progbits
-	.hidden	t
+	.hidden	t                       # -- Begin function t
 	.globl	t
 	.type	t,@function
 t:                                      # @t
@@ -30,9 +30,9 @@ t:                                      # @t
 	.endfunc
 .Lfunc_end0:
 	.size	t, .Lfunc_end0-t
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,7 +54,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -65,6 +65,6 @@ a:
 	.size	a, 1004
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr56051.c.s b/test/torture-s/pr56051.c.s
index 8fa534047..36f349c63 100644
--- a/test/torture-s/pr56051.c.s
+++ b/test/torture-s/pr56051.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56051.c"
+	.file	"pr56051.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr56205.c.s b/test/torture-s/pr56205.c.s
index b2943ca31..95dd1209b 100644
--- a/test/torture-s/pr56205.c.s
+++ b/test/torture-s/pr56205.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56205.c"
+	.file	"pr56205.c"
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -9,10 +9,10 @@ f4:                                     # @f4
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 32
-	i32.sub 	$push23=, $pop14, $pop15
+	i32.sub 	$push23=, $pop13, $pop15
 	tee_local	$push22=, $5=, $pop23
 	i32.store	__stack_pointer($pop16), $pop22
 	i32.store	28($5), $2
@@ -82,9 +82,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end0:
 	.size	f4, .Lfunc_end0-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -92,10 +92,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push22=, $pop12, $pop13
+	i32.sub 	$push22=, $pop11, $pop13
 	tee_local	$push21=, $0=, $pop22
 	i32.store	__stack_pointer($pop14), $pop21
 	#APP
@@ -137,23 +137,22 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.type	f1,@function
+	.type	f1,@function            # -- Begin function f1
 f1:                                     # @f1
 	.param  	i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push23=, $pop14, $pop15
+	i32.sub 	$push23=, $pop13, $pop15
 	tee_local	$push22=, $4=, $pop23
 	i32.store	__stack_pointer($pop16), $pop22
 	#APP
 	#NO_APP
-	i32.store	12($4), $1
 	i32.const	$push0=, 4
 	i32.add 	$push21=, $1, $pop0
 	tee_local	$push20=, $2=, $pop21
@@ -193,9 +192,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end2:
 	.size	f1, .Lfunc_end2-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.type	f2,@function
+	.type	f2,@function            # -- Begin function f2
 f2:                                     # @f2
 	.param  	i32, i32
 # BB#0:                                 # %entry
@@ -234,7 +233,7 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -285,6 +284,6 @@ a:
 	.size	.L.str.4, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/pr56250.c.s b/test/torture-s/pr56250.c.s
index 35e2e7836..1e6d53305 100644
--- a/test/torture-s/pr56250.c.s
+++ b/test/torture-s/pr56250.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56250.c"
+	.file	"pr56250.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr56799.c.s b/test/torture-s/pr56799.c.s
index 9b64274d8..66723d73d 100644
--- a/test/torture-s/pr56799.c.s
+++ b/test/torture-s/pr56799.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56799.c"
+	.file	"pr56799.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 16
-	i32.sub 	$push16=, $pop10, $pop11
+	i32.sub 	$push16=, $pop9, $pop11
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop12), $pop15
 	i64.const	$push2=, 4295032832
@@ -45,9 +45,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -55,43 +55,49 @@ foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.load	$2=, 4($0)
 	block   	
 	block   	
-	i32.load	$push10=, 0($0)
-	tee_local	$push9=, $1=, $pop10
-	i32.const	$push0=, 65535
-	i32.and 	$push1=, $pop9, $pop0
-	i32.eqz 	$push11=, $pop1
-	br_if   	0, $pop11       # 0: down to label2
+	block   	
+	i32.load	$push12=, 0($0)
+	tee_local	$push11=, $1=, $pop12
+	i32.const	$push10=, 65535
+	i32.and 	$push0=, $pop11, $pop10
+	i32.eqz 	$push18=, $pop0
+	br_if   	0, $pop18       # 0: down to label3
 # BB#1:                                 # %if.then
-	i32.const	$push3=, 0
-	i32.const	$push2=, 1
-	i32.store	lo($pop3), $pop2
-	copy_local	$0=, $2
-	br      	1               # 1: down to label1
+	i32.const	$push2=, 0
+	i32.const	$push1=, 1
+	i32.store	lo($pop2), $pop1
+	i32.load	$2=, 4($0)
+	i32.const	$push13=, 65535
+	i32.le_u	$push4=, $1, $pop13
+	br_if   	1, $pop4        # 1: down to label2
+	br      	2               # 2: down to label1
 .LBB1_2:
+	end_block                       # label3:
+	i32.const	$2=, 0
+	i32.const	$push17=, 65535
+	i32.gt_u	$push3=, $1, $pop17
+	br_if   	1, $pop3        # 1: down to label1
+.LBB1_3:                                # %if.end.if.end10_crit_edge
 	end_block                       # label2:
-	i32.const	$0=, 0
-.LBB1_3:                                # %if.end
+	i32.load	$push9=, 4($0)
+	i32.add 	$push7=, $pop9, $2
+	return  	$pop7
+.LBB1_4:                                # %if.then7
 	end_block                       # label1:
-	block   	
-	i32.const	$push4=, 65536
-	i32.lt_u	$push5=, $1, $pop4
-	br_if   	0, $pop5        # 0: down to label3
-# BB#4:                                 # %if.then7
-	i32.const	$push7=, 0
-	i32.const	$push6=, 1
-	i32.store	hi($pop7), $pop6
-	i32.add 	$0=, $0, $2
-.LBB1_5:                                # %if.end10
-	end_block                       # label3:
-	i32.add 	$push8=, $0, $2
+	i32.const	$push6=, 0
+	i32.const	$push5=, 1
+	i32.store	hi($pop6), $pop5
+	i32.load	$push16=, 4($0)
+	tee_local	$push15=, $0=, $pop16
+	i32.add 	$push14=, $0, $2
+	i32.add 	$push8=, $pop15, $pop14
                                         # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.hidden	hi                      # @hi
 	.type	hi,@object
 	.section	.bss.hi,"aw",@nobits
@@ -111,6 +117,6 @@ lo:
 	.size	lo, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr56837.c.s b/test/torture-s/pr56837.c.s
index 3eccb00e8..8326466f8 100644
--- a/test/torture-s/pr56837.c.s
+++ b/test/torture-s/pr56837.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56837.c"
+	.file	"pr56837.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,8 +35,8 @@ main:                                   # @main
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	call    	foo@FUNCTION
-	i32.const	$1=, 0
 	i32.const	$0=, a
+	i32.const	$1=, -1
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -58,8 +58,8 @@ main:                                   # @main
 	i32.const	$push11=, 1
 	i32.add 	$push10=, $1, $pop11
 	tee_local	$push9=, $1=, $pop10
-	i32.const	$push8=, 1023
-	i32.le_s	$push4=, $pop9, $pop8
+	i32.const	$push8=, 1022
+	i32.le_u	$push4=, $pop9, $pop8
 	br_if   	0, $pop4        # 0: up to label2
 # BB#4:                                 # %for.end
 	end_loop
@@ -72,7 +72,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -83,5 +83,5 @@ a:
 	.size	a, 8192
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56866.c.s b/test/torture-s/pr56866.c.s
index ad06e92d4..5f7d697ea 100644
--- a/test/torture-s/pr56866.c.s
+++ b/test/torture-s/pr56866.c.s
@@ -1,89 +1,87 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56866.c"
+	.file	"pr56866.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push50=, 0
-	i32.const	$push47=, 0
-	i32.load	$push48=, __stack_pointer($pop47)
+	i32.const	$push48=, 0
+	i32.load	$push47=, __stack_pointer($pop48)
 	i32.const	$push49=, 7712
-	i32.sub 	$push107=, $pop48, $pop49
-	tee_local	$push106=, $5=, $pop107
-	i32.store	__stack_pointer($pop50), $pop106
+	i32.sub 	$push105=, $pop47, $pop49
+	tee_local	$push104=, $4=, $pop105
+	i32.store	__stack_pointer($pop50), $pop104
 	i32.const	$1=, 0
 	i32.const	$push54=, 5664
-	i32.add 	$push55=, $5, $pop54
-	i32.const	$push105=, 0
-	i32.const	$push104=, 2048
-	i32.call	$drop=, memset@FUNCTION, $pop55, $pop105, $pop104
-	i32.const	$push56=, 2592
-	i32.add 	$push57=, $5, $pop56
+	i32.add 	$push55=, $4, $pop54
 	i32.const	$push103=, 0
+	i32.const	$push102=, 2048
+	i32.call	$drop=, memset@FUNCTION, $pop55, $pop103, $pop102
+	i32.const	$push56=, 2592
+	i32.add 	$push57=, $4, $pop56
+	i32.const	$push101=, 0
 	i32.const	$push0=, 1024
-	i32.call	$drop=, memset@FUNCTION, $pop57, $pop103, $pop0
+	i32.call	$drop=, memset@FUNCTION, $pop57, $pop101, $pop0
 	i32.const	$push58=, 1056
-	i32.add 	$push59=, $5, $pop58
-	i32.const	$push102=, 0
+	i32.add 	$push59=, $4, $pop58
+	i32.const	$push100=, 0
 	i32.const	$push1=, 512
-	i32.call	$drop=, memset@FUNCTION, $pop59, $pop102, $pop1
+	i32.call	$drop=, memset@FUNCTION, $pop59, $pop100, $pop1
 	i32.const	$push60=, 288
-	i32.add 	$push61=, $5, $pop60
-	i32.const	$push101=, 0
+	i32.add 	$push61=, $4, $pop60
+	i32.const	$push99=, 0
 	i32.const	$push2=, 256
-	i32.call	$drop=, memset@FUNCTION, $pop61, $pop101, $pop2
-	i64.const	$push3=, 81985529216486895
-	i64.store	5664($5), $pop3
-	i32.const	$push4=, 19088743
-	i32.store	2592($5), $pop4
+	i32.call	$drop=, memset@FUNCTION, $pop61, $pop99, $pop2
+	i32.const	$push3=, 19088743
+	i32.store	2592($4), $pop3
+	i64.const	$push4=, 81985529216486895
+	i64.store	5664($4), $pop4
 	i32.const	$push5=, 17767
-	i32.store16	1056($5), $pop5
+	i32.store16	1056($4), $pop5
 	i32.const	$push6=, 115
-	i32.store8	288($5), $pop6
+	i32.store8	288($4), $pop6
 	i32.const	$push62=, 5664
-	i32.add 	$push63=, $5, $pop62
-	i32.store	28($5), $pop63
+	i32.add 	$push63=, $4, $pop62
+	i32.store	28($4), $pop63
 	i32.const	$push64=, 2592
-	i32.add 	$push65=, $5, $pop64
-	i32.store	24($5), $pop65
+	i32.add 	$push65=, $4, $pop64
+	i32.store	24($4), $pop65
 	i32.const	$push66=, 1056
-	i32.add 	$push67=, $5, $pop66
-	i32.store	20($5), $pop67
+	i32.add 	$push67=, $4, $pop66
+	i32.store	20($4), $pop67
 	i32.const	$push68=, 288
-	i32.add 	$push69=, $5, $pop68
-	i32.store	16($5), $pop69
-	i32.const	$push70=, 28
-	i32.add 	$0=, $5, $pop70
-	i32.const	$push71=, 24
-	i32.add 	$2=, $5, $pop71
-	i32.const	$push72=, 20
-	i32.add 	$3=, $5, $pop72
-	i32.const	$push73=, 16
-	i32.add 	$4=, $5, $pop73
+	i32.add 	$push69=, $4, $pop68
+	i32.store	16($4), $pop69
+	i32.const	$push70=, 24
+	i32.add 	$0=, $4, $pop70
+	i32.const	$push71=, 20
+	i32.add 	$2=, $4, $pop71
+	i32.const	$push72=, 16
+	i32.add 	$3=, $4, $pop72
 	#APP
 	#NO_APP
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push76=, 3616
-	i32.add 	$push77=, $5, $pop76
-	i32.add 	$push10=, $pop77, $1
-	i32.const	$push74=, 5664
-	i32.add 	$push75=, $5, $pop74
-	i32.add 	$push7=, $pop75, $1
+	i32.const	$push75=, 3616
+	i32.add 	$push76=, $4, $pop75
+	i32.add 	$push10=, $pop76, $1
+	i32.const	$push73=, 5664
+	i32.add 	$push74=, $4, $pop73
+	i32.add 	$push7=, $pop74, $1
 	i64.load	$push8=, 0($pop7)
-	i64.const	$push112=, 56
-	i64.rotl	$push9=, $pop8, $pop112
+	i64.const	$push110=, 56
+	i64.rotl	$push9=, $pop8, $pop110
 	i64.store	0($pop10), $pop9
-	i32.const	$push111=, 8
-	i32.add 	$push110=, $1, $pop111
-	tee_local	$push109=, $1=, $pop110
-	i32.const	$push108=, 2048
-	i32.ne  	$push11=, $pop109, $pop108
+	i32.const	$push109=, 8
+	i32.add 	$push108=, $1, $pop109
+	tee_local	$push107=, $1=, $pop108
+	i32.const	$push106=, 2048
+	i32.ne  	$push11=, $pop107, $pop106
 	br_if   	0, $pop11       # 0: up to label0
 # BB#2:                                 # %for.body16.preheader
 	end_loop
@@ -91,21 +89,21 @@ main:                                   # @main
 .LBB0_3:                                # %for.body16
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push80=, 1568
-	i32.add 	$push81=, $5, $pop80
-	i32.add 	$push15=, $pop81, $1
-	i32.const	$push78=, 2592
-	i32.add 	$push79=, $5, $pop78
-	i32.add 	$push12=, $pop79, $1
+	i32.const	$push79=, 1568
+	i32.add 	$push80=, $4, $pop79
+	i32.add 	$push15=, $pop80, $1
+	i32.const	$push77=, 2592
+	i32.add 	$push78=, $4, $pop77
+	i32.add 	$push12=, $pop78, $1
 	i32.load	$push13=, 0($pop12)
-	i32.const	$push117=, 24
-	i32.rotl	$push14=, $pop13, $pop117
+	i32.const	$push115=, 24
+	i32.rotl	$push14=, $pop13, $pop115
 	i32.store	0($pop15), $pop14
-	i32.const	$push116=, 4
-	i32.add 	$push115=, $1, $pop116
-	tee_local	$push114=, $1=, $pop115
-	i32.const	$push113=, 1024
-	i32.ne  	$push16=, $pop114, $pop113
+	i32.const	$push114=, 4
+	i32.add 	$push113=, $1, $pop114
+	tee_local	$push112=, $1=, $pop113
+	i32.const	$push111=, 1024
+	i32.ne  	$push16=, $pop112, $pop111
 	br_if   	0, $pop16       # 0: up to label1
 # BB#4:                                 # %for.body28.preheader
 	end_loop
@@ -113,25 +111,25 @@ main:                                   # @main
 .LBB0_5:                                # %for.body28
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push84=, 544
-	i32.add 	$push85=, $5, $pop84
-	i32.add 	$push21=, $pop85, $1
-	i32.const	$push82=, 1056
-	i32.add 	$push83=, $5, $pop82
-	i32.add 	$push17=, $pop83, $1
-	i32.load16_u	$push125=, 0($pop17)
-	tee_local	$push124=, $0=, $pop125
-	i32.const	$push123=, 9
-	i32.shr_u	$push19=, $pop124, $pop123
-	i32.const	$push122=, 7
-	i32.shl 	$push18=, $0, $pop122
+	i32.const	$push83=, 544
+	i32.add 	$push84=, $4, $pop83
+	i32.add 	$push21=, $pop84, $1
+	i32.const	$push81=, 1056
+	i32.add 	$push82=, $4, $pop81
+	i32.add 	$push17=, $pop82, $1
+	i32.load16_u	$push123=, 0($pop17)
+	tee_local	$push122=, $0=, $pop123
+	i32.const	$push121=, 9
+	i32.shr_u	$push19=, $pop122, $pop121
+	i32.const	$push120=, 7
+	i32.shl 	$push18=, $0, $pop120
 	i32.or  	$push20=, $pop19, $pop18
 	i32.store16	0($pop21), $pop20
-	i32.const	$push121=, 2
-	i32.add 	$push120=, $1, $pop121
-	tee_local	$push119=, $1=, $pop120
-	i32.const	$push118=, 512
-	i32.ne  	$push22=, $pop119, $pop118
+	i32.const	$push119=, 2
+	i32.add 	$push118=, $1, $pop119
+	tee_local	$push117=, $1=, $pop118
+	i32.const	$push116=, 512
+	i32.ne  	$push22=, $pop117, $pop116
 	br_if   	0, $pop22       # 0: up to label2
 # BB#6:                                 # %for.body43.preheader
 	end_loop
@@ -139,97 +137,95 @@ main:                                   # @main
 .LBB0_7:                                # %for.body43
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push88=, 32
-	i32.add 	$push89=, $5, $pop88
-	i32.add 	$push27=, $pop89, $1
-	i32.const	$push86=, 288
-	i32.add 	$push87=, $5, $pop86
-	i32.add 	$push23=, $pop87, $1
-	i32.load8_u	$push133=, 0($pop23)
-	tee_local	$push132=, $0=, $pop133
-	i32.const	$push131=, 5
-	i32.shr_u	$push25=, $pop132, $pop131
-	i32.const	$push130=, 3
-	i32.shl 	$push24=, $0, $pop130
+	i32.const	$push87=, 32
+	i32.add 	$push88=, $4, $pop87
+	i32.add 	$push27=, $pop88, $1
+	i32.const	$push85=, 288
+	i32.add 	$push86=, $4, $pop85
+	i32.add 	$push23=, $pop86, $1
+	i32.load8_u	$push131=, 0($pop23)
+	tee_local	$push130=, $0=, $pop131
+	i32.const	$push129=, 5
+	i32.shr_u	$push25=, $pop130, $pop129
+	i32.const	$push128=, 3
+	i32.shl 	$push24=, $0, $pop128
 	i32.or  	$push26=, $pop25, $pop24
 	i32.store8	0($pop27), $pop26
-	i32.const	$push129=, 1
-	i32.add 	$push128=, $1, $pop129
-	tee_local	$push127=, $1=, $pop128
-	i32.const	$push126=, 256
-	i32.ne  	$push28=, $pop127, $pop126
+	i32.const	$push127=, 1
+	i32.add 	$push126=, $1, $pop127
+	tee_local	$push125=, $1=, $pop126
+	i32.const	$push124=, 256
+	i32.ne  	$push28=, $pop125, $pop124
 	br_if   	0, $pop28       # 0: up to label3
 # BB#8:                                 # %for.end55
 	end_loop
-	i32.const	$push90=, 3616
-	i32.add 	$push91=, $5, $pop90
-	i32.store	12($5), $pop91
-	i32.const	$push92=, 1568
-	i32.add 	$push93=, $5, $pop92
-	i32.store	8($5), $pop93
-	i32.const	$push94=, 544
-	i32.add 	$push95=, $5, $pop94
-	i32.store	4($5), $pop95
-	i32.const	$push96=, 32
-	i32.add 	$push97=, $5, $pop96
-	i32.store	0($5), $pop97
-	i32.const	$push98=, 12
-	i32.add 	$1=, $5, $pop98
-	i32.const	$push99=, 8
-	i32.add 	$0=, $5, $pop99
-	i32.const	$push100=, 4
-	i32.add 	$2=, $5, $pop100
+	i32.const	$push89=, 1568
+	i32.add 	$push90=, $4, $pop89
+	i32.store	8($4), $pop90
+	i32.const	$push91=, 3616
+	i32.add 	$push92=, $4, $pop91
+	i32.store	12($4), $pop92
+	i32.const	$push93=, 544
+	i32.add 	$push94=, $4, $pop93
+	i32.store	4($4), $pop94
+	i32.const	$push95=, 32
+	i32.add 	$push96=, $4, $pop95
+	i32.store	0($4), $pop96
+	i32.const	$push97=, 8
+	i32.add 	$1=, $4, $pop97
+	i32.const	$push98=, 4
+	i32.add 	$0=, $4, $pop98
 	#APP
 	#NO_APP
 	block   	
-	i64.load	$push30=, 3616($5)
+	i64.load	$push30=, 3616($4)
 	i64.const	$push29=, -1224658842671273011
 	i64.ne  	$push31=, $pop30, $pop29
 	br_if   	0, $pop31       # 0: down to label4
 # BB#9:                                 # %lor.lhs.false
-	i64.load	$push32=, 3624($5)
+	i64.load	$push32=, 3624($4)
 	i64.eqz 	$push33=, $pop32
-	i32.eqz 	$push134=, $pop33
-	br_if   	0, $pop134      # 0: down to label4
+	i32.eqz 	$push132=, $pop33
+	br_if   	0, $pop132      # 0: down to label4
 # BB#10:                                # %if.end
-	i32.load	$push35=, 1568($5)
+	i32.load	$push35=, 1568($4)
 	i32.const	$push34=, 1728127813
 	i32.ne  	$push36=, $pop35, $pop34
 	br_if   	0, $pop36       # 0: down to label4
 # BB#11:                                # %lor.lhs.false67
-	i32.load	$push37=, 1572($5)
+	i32.load	$push37=, 1572($4)
 	br_if   	0, $pop37       # 0: down to label4
 # BB#12:                                # %if.end71
-	i32.load16_u	$push39=, 544($5)
+	i32.load16_u	$push39=, 544($4)
 	i32.const	$push38=, 45986
 	i32.ne  	$push40=, $pop39, $pop38
 	br_if   	0, $pop40       # 0: down to label4
 # BB#13:                                # %lor.lhs.false76
-	i32.load16_u	$push41=, 546($5)
+	i32.load16_u	$push41=, 546($4)
 	br_if   	0, $pop41       # 0: down to label4
 # BB#14:                                # %if.end81
-	i32.load8_u	$push43=, 32($5)
+	i32.load8_u	$push43=, 32($4)
 	i32.const	$push42=, 155
 	i32.ne  	$push44=, $pop43, $pop42
 	br_if   	0, $pop44       # 0: down to label4
 # BB#15:                                # %lor.lhs.false86
-	i32.load8_u	$push45=, 33($5)
+	i32.load8_u	$push45=, 33($4)
 	br_if   	0, $pop45       # 0: down to label4
 # BB#16:                                # %if.end91
 	i32.const	$push53=, 0
 	i32.const	$push51=, 7712
-	i32.add 	$push52=, $5, $pop51
+	i32.add 	$push52=, $4, $pop51
 	i32.store	__stack_pointer($pop53), $pop52
 	i32.const	$push46=, 0
 	return  	$pop46
-.LBB0_17:                               # %if.then90
+.LBB0_17:                               # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56899.c.s b/test/torture-s/pr56899.c.s
index e3b0d2047..d86613652 100644
--- a/test/torture-s/pr56899.c.s
+++ b/test/torture-s/pr56899.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56899.c"
+	.file	"pr56899.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -22,9 +22,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -45,9 +45,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -68,9 +68,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -91,9 +91,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end3:
 	.size	f4, .Lfunc_end3-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -112,7 +112,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end4:
 	.size	main, .Lfunc_end4-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56962.c.s b/test/torture-s/pr56962.c.s
index d727b7485..ad3e4d4bb 100644
--- a/test/torture-s/pr56962.c.s
+++ b/test/torture-s/pr56962.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56962.c"
+	.file	"pr56962.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -20,9 +20,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -75,9 +75,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -92,7 +92,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.bss.v,"aw",@nobits
@@ -103,5 +103,5 @@ v:
 	.size	v, 1152
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56982.c.s b/test/torture-s/pr56982.c.s
index 3982b8045..058a38bf0 100644
--- a/test/torture-s/pr56982.c.s
+++ b/test/torture-s/pr56982.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr56982.c"
+	.file	"pr56982.c"
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -12,9 +12,9 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end0:
 	.size	baz, .Lfunc_end0-baz
-
+                                        # -- End function
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -50,9 +50,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,10 +61,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop3, $pop4
+	i32.sub 	$push12=, $pop2, $pop4
 	tee_local	$push11=, $2=, $pop12
 	i32.store	__stack_pointer($pop5), $pop11
 	i32.const	$push0=, 0
@@ -81,7 +81,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	env,@object             # @env
 	.section	.bss.env,"aw",@nobits
 	.p2align	4
@@ -90,7 +90,7 @@ env:
 	.size	env, 156
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	setjmp, i32, i32
 	.functype	exit, void, i32
 	.functype	longjmp, void, i32, i32
diff --git a/test/torture-s/pr57124.c.s b/test/torture-s/pr57124.c.s
index 02b60c613..1653c8c7b 100644
--- a/test/torture-s/pr57124.c.s
+++ b/test/torture-s/pr57124.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57124.c"
+	.file	"pr57124.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,37 +24,35 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
+	i32.const	$push4=, 0
 	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
-	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop3, $pop4
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop5), $pop10
+	i32.load	$push1=, __stack_pointer($pop2)
+	i32.const	$push3=, 16
+	i32.sub 	$push10=, $pop1, $pop3
+	tee_local	$push9=, $0=, $pop10
+	i32.store	__stack_pointer($pop4), $pop9
 	i32.const	$push0=, 65531
 	i32.store16	14($0), $pop0
-	i32.const	$push1=, 65526
-	i32.store16	12($0), $pop1
-	i32.const	$push6=, 14
-	i32.add 	$push7=, $0, $pop6
-	i32.const	$push8=, 12
-	i32.add 	$push9=, $0, $pop8
-	i32.call	$drop=, foo@FUNCTION, $pop7, $pop9
+	i32.const	$push5=, 14
+	i32.add 	$push6=, $0, $pop5
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.call	$drop=, foo@FUNCTION, $pop6, $pop8
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr57130.c.s b/test/torture-s/pr57130.c.s
index 3884f5b02..1712d3b69 100644
--- a/test/torture-s/pr57130.c.s
+++ b/test/torture-s/pr57130.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57130.c"
+	.file	"pr57130.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -32,9 +32,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,10 +42,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 48
-	i32.sub 	$push25=, $pop9, $pop10
+	i32.sub 	$push25=, $pop8, $pop10
 	tee_local	$push24=, $0=, $pop25
 	i32.store	__stack_pointer($pop11), $pop24
 	i32.const	$push15=, 16
@@ -54,23 +54,23 @@ main:                                   # @main
 	i32.add 	$push3=, $pop16, $pop2
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.r+8($pop0):p2align=2
-	i64.store	0($pop3):p2align=2, $pop1
+	i64.store	0($pop3), $pop1
 	i32.const	$push23=, 0
 	i64.load	$push4=, .Lmain.r($pop23):p2align=2
-	i64.store	16($0):p2align=2, $pop4
+	i64.store	16($0), $pop4
 	i32.const	$push17=, 16
 	i32.add 	$push18=, $0, $pop17
 	call    	foo@FUNCTION, $pop18
-	i64.const	$push5=, 12884901887
-	i64.store	40($0), $pop5
 	i32.const	$push22=, 8
-	i32.add 	$push6=, $0, $pop22
+	i32.add 	$push5=, $0, $pop22
+	i64.const	$push6=, 12884901887
+	i64.store	0($pop5), $pop6
 	i64.const	$push21=, 12884901887
-	i64.store	0($pop6):p2align=2, $pop21
+	i64.store	40($0), $pop21
 	i64.const	$push7=, 8589934592
-	i64.store	32($0), $pop7
+	i64.store	0($0), $pop7
 	i64.const	$push20=, 8589934592
-	i64.store	0($0):p2align=2, $pop20
+	i64.store	32($0), $pop20
 	call    	foo@FUNCTION, $0
 	i32.const	$push14=, 0
 	i32.const	$push12=, 48
@@ -81,7 +81,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -116,6 +116,6 @@ foo.cnt:
 	.size	.Lmain.r, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr57131.c.s b/test/torture-s/pr57131.c.s
index 91883538b..fc8a86f5b 100644
--- a/test/torture-s/pr57131.c.s
+++ b/test/torture-s/pr57131.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57131.c"
+	.file	"pr57131.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i64, i64, i64, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 48
-	i32.sub 	$push23=, $pop12, $pop13
+	i32.sub 	$push23=, $pop11, $pop13
 	tee_local	$push22=, $5=, $pop23
 	i32.store	__stack_pointer($pop14), $pop22
 	i32.const	$push21=, 0
@@ -57,7 +57,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57144.c.s b/test/torture-s/pr57144.c.s
index 826cfa6e8..bab6d85b6 100644
--- a/test/torture-s/pr57144.c.s
+++ b/test/torture-s/pr57144.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57144.c"
+	.file	"pr57144.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,7 +27,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr57281.c.s b/test/torture-s/pr57281.c.s
index 65292476d..9f928444a 100644
--- a/test/torture-s/pr57281.c.s
+++ b/test/torture-s/pr57281.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57281.c"
+	.file	"pr57281.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +77,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -142,4 +142,4 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr57321.c.s b/test/torture-s/pr57321.c.s
index 5812ea70f..126afd974 100644
--- a/test/torture-s/pr57321.c.s
+++ b/test/torture-s/pr57321.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57321.c"
+	.file	"pr57321.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,20 +10,23 @@ main:                                   # @main
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, a($pop3)
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then.i
+	i32.eqz 	$push7=, $pop0
+	br_if   	0, $pop7        # 0: down to label0
+# BB#1:                                 # %foo.exit
 	i32.const	$push4=, 0
-	i32.load	$push1=, b($pop4)
+	return  	$pop4
+.LBB0_2:                                # %if.then.i
+	end_block                       # label0:
+	i32.const	$push6=, 0
+	i32.load	$push1=, b($pop6)
 	i32.const	$push2=, 1
 	i32.store	0($pop1), $pop2
-.LBB0_2:                                # %foo.exit
-	end_block                       # label0:
 	i32.const	$push5=, 0
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -52,4 +55,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr57344-1.c.s b/test/torture-s/pr57344-1.c.s
index d700ef0a3..b8cff4b2a 100644
--- a/test/torture-s/pr57344-1.c.s
+++ b/test/torture-s/pr57344-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57344-1.c"
+	.file	"pr57344-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	i32.const	$push17=, 0
 	i32.gt_s	$push2=, $pop1, $pop17
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push3=, -3161
 	call    	foo@FUNCTION, $pop3
 	i32.const	$push24=, 0
@@ -90,7 +90,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -110,5 +110,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-2.c.s b/test/torture-s/pr57344-2.c.s
index 194e41448..2e49ea3a2 100644
--- a/test/torture-s/pr57344-2.c.s
+++ b/test/torture-s/pr57344-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57344-2.c"
+	.file	"pr57344-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	i32.const	$push19=, 0
 	i32.gt_s	$push2=, $pop1, $pop19
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i32.const	$push3=, -3161
 	call    	foo@FUNCTION, $pop3
 	i32.const	$push26=, 0
@@ -93,7 +93,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.bss.s,"aw",@nobits
@@ -113,5 +113,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-3.c.s b/test/torture-s/pr57344-3.c.s
index 49b73a009..6896a188e 100644
--- a/test/torture-s/pr57344-3.c.s
+++ b/test/torture-s/pr57344-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57344-3.c"
+	.file	"pr57344-3.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	i32.const	$push20=, 0
 	i32.gt_s	$push3=, $pop2, $pop20
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i64.const	$push4=, -3161
 	call    	foo@FUNCTION, $pop4
 	i32.const	$push30=, 0
@@ -102,7 +102,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.t,@object        # @main.t
 	.section	.rodata.cst16,"aM",@progbits,16
 .Lmain.t:
@@ -138,5 +138,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-4.c.s b/test/torture-s/pr57344-4.c.s
index 0e01023b1..078055a82 100644
--- a/test/torture-s/pr57344-4.c.s
+++ b/test/torture-s/pr57344-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57344-4.c"
+	.file	"pr57344-4.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -45,7 +45,7 @@ main:                                   # @main
 	i32.const	$push23=, 0
 	i32.gt_s	$push3=, $pop2, $pop23
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# BB#1:                                 # %for.body.lr.ph
 	i64.const	$push4=, -1220975898975746
 	call    	foo@FUNCTION, $pop4
 	i32.const	$push33=, 0
@@ -104,7 +104,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.Lmain.t,@object        # @main.t
 	.section	.rodata.cst16,"aM",@progbits,16
 .Lmain.t:
@@ -145,5 +145,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57568.c.s b/test/torture-s/pr57568.c.s
index 67c5c5c9c..ca1eca3fd 100644
--- a/test/torture-s/pr57568.c.s
+++ b/test/torture-s/pr57568.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57568.c"
+	.file	"pr57568.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -64,5 +64,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57829.c.s b/test/torture-s/pr57829.c.s
index 5ed503275..db0e250cd 100644
--- a/test/torture-s/pr57829.c.s
+++ b/test/torture-s/pr57829.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57829.c"
+	.file	"pr57829.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -18,9 +18,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -37,9 +37,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -58,9 +58,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -100,7 +100,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57860.c.s b/test/torture-s/pr57860.c.s
index ada39de5d..28d20dc5f 100644
--- a/test/torture-s/pr57860.c.s
+++ b/test/torture-s/pr57860.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57860.c"
+	.file	"pr57860.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -54,7 +54,7 @@ foo:                                    # @foo
 # BB#5:                                 #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$5=, 0
 	br      	5               # 5: up to label2
-.LBB0_6:                                # %for.inc.preheader
+.LBB0_6:                                # %for.inc.lr.ph
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label7:
 	i32.const	$push19=, 0
@@ -66,13 +66,13 @@ foo:                                    # @foo
 .LBB0_8:                                # %for.end
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label6:
-	i64.load32_s	$push4=, 0($2)
 	i32.const	$push28=, 0
 	i64.load32_s	$push2=, a($pop28)
 	i64.const	$push27=, 8589934591
 	i64.xor 	$push3=, $pop2, $pop27
-	i64.and 	$push5=, $pop4, $pop3
-	i64.gt_s	$push26=, $1, $pop5
+	i64.load32_s	$push4=, 0($2)
+	i64.and 	$push5=, $pop3, $pop4
+	i64.lt_s	$push26=, $pop5, $1
 	tee_local	$push25=, $0=, $pop26
 	i32.store	0($3), $pop25
 	i32.store	0($4), $0
@@ -106,9 +106,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -164,7 +164,7 @@ main:                                   # @main
 # BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$4=, 0
 	br      	8               # 8: up to label11
-.LBB1_6:                                # %for.inc.preheader.i
+.LBB1_6:                                # %for.inc.lr.ph.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label19:
 	i32.const	$push21=, 0
@@ -176,12 +176,12 @@ main:                                   # @main
 .LBB1_8:                                # %for.end.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label18:
-	i64.load32_s	$push4=, 0($0)
 	i32.const	$push31=, 0
 	i64.load32_s	$push2=, a($pop31)
 	i64.const	$push30=, 8589934591
 	i64.xor 	$push3=, $pop2, $pop30
-	i64.and 	$push5=, $pop4, $pop3
+	i64.load32_s	$push4=, 0($0)
+	i64.and 	$push5=, $pop3, $pop4
 	i64.const	$push29=, 1
 	i64.lt_s	$push28=, $pop5, $pop29
 	tee_local	$push27=, $3=, $pop28
@@ -236,7 +236,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -319,5 +319,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57861.c.s b/test/torture-s/pr57861.c.s
index efe06557d..059e14758 100644
--- a/test/torture-s/pr57861.c.s
+++ b/test/torture-s/pr57861.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57861.c"
+	.file	"pr57861.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -17,30 +17,30 @@ main:                                   # @main
 	copy_local	$1=, $pop19
 	block   	
 	i32.const	$push18=, 0
-	i32.load	$push7=, e($pop18)
-	i32.const	$push4=, 24
-	i32.shl 	$push5=, $0, $pop4
+	i32.load	$push3=, e($pop18)
+	i32.const	$push0=, 24
+	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push17=, 24
-	i32.shr_s	$push6=, $pop5, $pop17
-	i32.ge_u	$push8=, $pop7, $pop6
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.then.i.1
+	i32.shr_s	$push2=, $pop1, $pop17
+	i32.ge_u	$push4=, $pop3, $pop2
+	br_if   	0, $pop4        # 0: down to label0
+# BB#1:                                 # %if.then.1.i
 	i32.const	$push32=, 0
 	i32.const	$push31=, 0
-	i32.load	$push2=, d($pop31)
+	i32.load	$push7=, d($pop31)
 	i32.const	$push30=, 0
-	i32.ne  	$push3=, $pop2, $pop30
+	i32.ne  	$push8=, $pop7, $pop30
 	i32.const	$push29=, 0
-	i32.load	$push0=, h($pop29)
+	i32.load	$push5=, h($pop29)
 	i32.const	$push28=, 0
-	i32.ne  	$push1=, $pop0, $pop28
-	i32.and 	$push27=, $pop3, $pop1
+	i32.ne  	$push6=, $pop5, $pop28
+	i32.and 	$push27=, $pop8, $pop6
 	tee_local	$push26=, $1=, $pop27
 	i32.store16	a($pop32), $pop26
 	i32.const	$push25=, 0
 	i32.const	$push24=, 0
 	i32.store16	f($pop25), $pop24
-.LBB0_2:                                # %for.inc.i.1
+.LBB0_2:                                # %foo.exit
 	end_block                       # label0:
 	i32.const	$push39=, 0
 	i32.const	$push9=, 2
@@ -72,7 +72,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -164,5 +164,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57875.c.s b/test/torture-s/pr57875.c.s
index bfbe0d889..20b889af2 100644
--- a/test/torture-s/pr57875.c.s
+++ b/test/torture-s/pr57875.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57875.c"
+	.file	"pr57875.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	i32.const	$push22=, 0
 	i32.const	$push21=, 0
 	i32.load8_u	$push1=, e($pop21)
-	i32.and 	$push2=, $pop1, $3
+	i32.and 	$push2=, $3, $pop1
 	i32.store8	e($pop22), $pop2
 .LBB0_7:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
@@ -91,7 +91,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -155,5 +155,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57876.c.s b/test/torture-s/pr57876.c.s
index ef444662a..94f3be514 100644
--- a/test/torture-s/pr57876.c.s
+++ b/test/torture-s/pr57876.c.s
@@ -1,336 +1,243 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57876.c"
+	.file	"pr57876.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i32, i32, i32
-# BB#0:                                 # %for.body4.1
-	i32.const	$push75=, 0
-	i32.const	$push72=, 0
-	i32.load	$push73=, __stack_pointer($pop72)
-	i32.const	$push74=, 16
-	i32.sub 	$push245=, $pop73, $pop74
-	tee_local	$push244=, $4=, $pop245
-	i32.store	__stack_pointer($pop75), $pop244
-	i32.const	$push243=, 0
-	i64.load32_s	$0=, b($pop243)
-	i32.const	$push242=, 0
-	i32.load	$1=, d($pop242)
-	i32.const	$push241=, 0
-	i32.const	$push240=, 0
-	i32.store	f($pop241), $pop240
-	i32.const	$push239=, 0
-	i32.load	$push238=, 0($1)
-	tee_local	$push237=, $2=, $pop238
-	i32.store	j($pop239), $pop237
-	i32.const	$push236=, 0
-	i32.const	$push0=, 1
-	i32.store	f($pop236), $pop0
-	i32.const	$push235=, 0
-	i32.const	$push234=, 0
-	i32.load	$push233=, a($pop234)
-	tee_local	$push232=, $3=, $pop233
-	i32.mul 	$push1=, $2, $pop232
-	i32.const	$push2=, -1
-	i32.add 	$push231=, $pop1, $pop2
-	tee_local	$push230=, $2=, $pop231
-	i32.store	h($pop235), $pop230
-	i32.const	$push229=, 0
-	i32.eqz 	$push3=, $2
-	i64.extend_u/i32	$push4=, $pop3
-	i64.lt_s	$push5=, $pop4, $0
-	i32.store	e($pop229), $pop5
-	i32.const	$push228=, 0
-	i32.load	$push227=, 0($1)
-	tee_local	$push226=, $2=, $pop227
-	i32.store	j($pop228), $pop226
-	i32.const	$push225=, 0
-	i32.const	$push6=, 2
-	i32.store	f($pop225), $pop6
-	i32.const	$push224=, 0
-	i32.mul 	$push7=, $3, $2
-	i32.const	$push223=, -1
-	i32.add 	$push222=, $pop7, $pop223
-	tee_local	$push221=, $2=, $pop222
-	i32.store	h($pop224), $pop221
-	i32.const	$push220=, 0
-	i32.eqz 	$push8=, $2
-	i64.extend_u/i32	$push9=, $pop8
-	i64.lt_s	$push10=, $pop9, $0
-	i32.store	e($pop220), $pop10
-	i32.const	$push219=, 0
-	i32.load	$push218=, 0($1)
-	tee_local	$push217=, $2=, $pop218
-	i32.store	j($pop219), $pop217
-	i32.const	$push216=, 0
-	i32.const	$push11=, 3
-	i32.store	f($pop216), $pop11
-	i32.const	$push215=, 0
-	i32.mul 	$push12=, $3, $2
-	i32.const	$push214=, -1
-	i32.add 	$push213=, $pop12, $pop214
-	tee_local	$push212=, $2=, $pop213
-	i32.store	h($pop215), $pop212
-	i32.const	$push211=, 0
-	i32.eqz 	$push13=, $2
-	i64.extend_u/i32	$push14=, $pop13
-	i64.lt_s	$push15=, $pop14, $0
-	i32.store	e($pop211), $pop15
-	i32.const	$push210=, 0
-	i32.load	$push209=, 0($1)
-	tee_local	$push208=, $2=, $pop209
-	i32.store	j($pop210), $pop208
-	i32.const	$push207=, 0
-	i32.const	$push16=, 4
-	i32.store	f($pop207), $pop16
-	i32.const	$push206=, 0
-	i32.mul 	$push17=, $3, $2
-	i32.const	$push205=, -1
-	i32.add 	$push204=, $pop17, $pop205
-	tee_local	$push203=, $2=, $pop204
-	i32.store	h($pop206), $pop203
-	i32.const	$push202=, 0
-	i32.eqz 	$push18=, $2
-	i64.extend_u/i32	$push19=, $pop18
-	i64.lt_s	$push20=, $pop19, $0
-	i32.store	e($pop202), $pop20
-	i32.const	$push201=, 0
-	i32.load	$push200=, 0($1)
-	tee_local	$push199=, $2=, $pop200
-	i32.store	j($pop201), $pop199
-	i32.const	$push198=, 0
-	i32.const	$push21=, 5
-	i32.store	f($pop198), $pop21
-	i32.const	$push197=, 0
-	i32.mul 	$push22=, $3, $2
-	i32.const	$push196=, -1
-	i32.add 	$push195=, $pop22, $pop196
-	tee_local	$push194=, $2=, $pop195
-	i32.store	h($pop197), $pop194
-	i32.const	$push193=, 0
-	i32.eqz 	$push23=, $2
-	i64.extend_u/i32	$push24=, $pop23
-	i64.lt_s	$push25=, $pop24, $0
-	i32.store	e($pop193), $pop25
-	i32.const	$push192=, 0
-	i32.load	$push191=, 0($1)
-	tee_local	$push190=, $2=, $pop191
-	i32.store	j($pop192), $pop190
-	i32.const	$push189=, 0
-	i32.const	$push26=, 6
-	i32.store	f($pop189), $pop26
-	i32.const	$push188=, 0
-	i32.mul 	$push27=, $3, $2
-	i32.const	$push187=, -1
-	i32.add 	$push186=, $pop27, $pop187
-	tee_local	$push185=, $2=, $pop186
-	i32.store	h($pop188), $pop185
-	i32.const	$push184=, 0
-	i32.eqz 	$push28=, $2
-	i64.extend_u/i32	$push29=, $pop28
-	i64.lt_s	$push30=, $pop29, $0
-	i32.store	e($pop184), $pop30
-	i32.const	$push183=, 0
-	i32.load	$push182=, 0($1)
-	tee_local	$push181=, $2=, $pop182
-	i32.store	j($pop183), $pop181
-	i32.const	$push180=, 0
-	i32.const	$push31=, 7
-	i32.store	f($pop180), $pop31
-	i32.const	$push179=, 0
-	i32.mul 	$push32=, $3, $2
-	i32.const	$push178=, -1
-	i32.add 	$push177=, $pop32, $pop178
-	tee_local	$push176=, $2=, $pop177
-	i32.store	h($pop179), $pop176
-	i32.const	$push175=, 0
-	i32.eqz 	$push33=, $2
-	i64.extend_u/i32	$push34=, $pop33
-	i64.lt_s	$push35=, $pop34, $0
-	i32.store	e($pop175), $pop35
-	i32.const	$push174=, 0
-	i32.load	$push173=, 0($1)
-	tee_local	$push172=, $2=, $pop173
-	i32.store	j($pop174), $pop172
-	i32.const	$push171=, 0
-	i32.const	$push36=, 8
-	i32.store	f($pop171), $pop36
-	i32.const	$push170=, 0
-	i32.mul 	$push37=, $3, $2
-	i32.const	$push169=, -1
-	i32.add 	$push168=, $pop37, $pop169
-	tee_local	$push167=, $2=, $pop168
-	i32.store	h($pop170), $pop167
+	.local  	i32, i32, i32, i64, i32
+# BB#0:                                 # %entry
+	i32.const	$push45=, 0
+	i32.const	$push43=, 0
+	i32.load	$push42=, __stack_pointer($pop43)
+	i32.const	$push44=, 16
+	i32.sub 	$push168=, $pop42, $pop44
+	tee_local	$push167=, $4=, $pop168
+	i32.store	__stack_pointer($pop45), $pop167
 	i32.const	$push166=, 0
-	i32.eqz 	$push38=, $2
-	i64.extend_u/i32	$push39=, $pop38
-	i64.lt_s	$push40=, $pop39, $0
-	i32.store	e($pop166), $pop40
+	i32.load	$0=, d($pop166)
 	i32.const	$push165=, 0
 	i32.const	$push164=, 0
 	i32.store	f($pop165), $pop164
 	i32.const	$push163=, 0
-	i32.load	$push162=, 0($1)
-	tee_local	$push161=, $2=, $pop162
+	i32.load	$push162=, 0($0)
+	tee_local	$push161=, $1=, $pop162
 	i32.store	j($pop163), $pop161
 	i32.const	$push160=, 0
-	i32.const	$push159=, 1
-	i32.store	f($pop160), $pop159
+	i32.const	$push0=, 1
+	i32.store	f($pop160), $pop0
+	i32.const	$push159=, 0
 	i32.const	$push158=, 0
-	i32.mul 	$push41=, $3, $2
-	i32.const	$push157=, -1
-	i32.add 	$push156=, $pop41, $pop157
-	tee_local	$push155=, $2=, $pop156
-	i32.store	h($pop158), $pop155
-	i32.const	$push154=, 0
-	i32.eqz 	$push42=, $2
-	i64.extend_u/i32	$push43=, $pop42
-	i64.lt_s	$push44=, $pop43, $0
-	i32.store	e($pop154), $pop44
-	i32.const	$push153=, 0
-	i32.load	$push152=, 0($1)
-	tee_local	$push151=, $2=, $pop152
-	i32.store	j($pop153), $pop151
-	i32.const	$push150=, 0
-	i32.const	$push149=, 2
-	i32.store	f($pop150), $pop149
-	i32.const	$push148=, 0
-	i32.mul 	$push45=, $3, $2
-	i32.const	$push147=, -1
-	i32.add 	$push146=, $pop45, $pop147
-	tee_local	$push145=, $2=, $pop146
-	i32.store	h($pop148), $pop145
-	i32.const	$push144=, 0
-	i32.eqz 	$push46=, $2
-	i64.extend_u/i32	$push47=, $pop46
-	i64.lt_s	$push48=, $pop47, $0
-	i32.store	e($pop144), $pop48
+	i32.load	$push157=, a($pop158)
+	tee_local	$push156=, $2=, $pop157
+	i32.mul 	$push1=, $1, $pop156
+	i32.const	$push2=, -1
+	i32.add 	$push3=, $pop1, $pop2
+	i32.store	h($pop159), $pop3
+	i32.const	$push155=, 0
+	i32.load	$push154=, 0($0)
+	tee_local	$push153=, $1=, $pop154
+	i32.store	j($pop155), $pop153
+	i32.const	$push152=, 0
+	i32.const	$push4=, 2
+	i32.store	f($pop152), $pop4
+	i32.const	$push151=, 0
+	i32.mul 	$push5=, $2, $1
+	i32.const	$push150=, -1
+	i32.add 	$push6=, $pop5, $pop150
+	i32.store	h($pop151), $pop6
+	i32.const	$push149=, 0
+	i32.load	$push148=, 0($0)
+	tee_local	$push147=, $1=, $pop148
+	i32.store	j($pop149), $pop147
+	i32.const	$push146=, 0
+	i32.const	$push7=, 3
+	i32.store	f($pop146), $pop7
+	i32.const	$push145=, 0
+	i32.mul 	$push8=, $2, $1
+	i32.const	$push144=, -1
+	i32.add 	$push9=, $pop8, $pop144
+	i32.store	h($pop145), $pop9
 	i32.const	$push143=, 0
-	i32.load	$push142=, 0($1)
-	tee_local	$push141=, $2=, $pop142
+	i32.load	$push142=, 0($0)
+	tee_local	$push141=, $1=, $pop142
 	i32.store	j($pop143), $pop141
 	i32.const	$push140=, 0
-	i32.const	$push139=, 3
-	i32.store	f($pop140), $pop139
-	i32.const	$push138=, 0
-	i32.mul 	$push49=, $3, $2
-	i32.const	$push137=, -1
-	i32.add 	$push136=, $pop49, $pop137
-	tee_local	$push135=, $2=, $pop136
-	i32.store	h($pop138), $pop135
+	i32.const	$push10=, 4
+	i32.store	f($pop140), $pop10
+	i32.const	$push139=, 0
+	i32.mul 	$push11=, $2, $1
+	i32.const	$push138=, -1
+	i32.add 	$push12=, $pop11, $pop138
+	i32.store	h($pop139), $pop12
+	i32.const	$push137=, 0
+	i32.load	$push136=, 0($0)
+	tee_local	$push135=, $1=, $pop136
+	i32.store	j($pop137), $pop135
 	i32.const	$push134=, 0
-	i32.eqz 	$push50=, $2
-	i64.extend_u/i32	$push51=, $pop50
-	i64.lt_s	$push52=, $pop51, $0
-	i32.store	e($pop134), $pop52
+	i32.const	$push13=, 5
+	i32.store	f($pop134), $pop13
 	i32.const	$push133=, 0
-	i32.load	$push132=, 0($1)
-	tee_local	$push131=, $2=, $pop132
-	i32.store	j($pop133), $pop131
-	i32.const	$push130=, 0
-	i32.const	$push129=, 4
-	i32.store	f($pop130), $pop129
+	i32.mul 	$push14=, $2, $1
+	i32.const	$push132=, -1
+	i32.add 	$push15=, $pop14, $pop132
+	i32.store	h($pop133), $pop15
+	i32.const	$push131=, 0
+	i32.load	$push130=, 0($0)
+	tee_local	$push129=, $1=, $pop130
+	i32.store	j($pop131), $pop129
 	i32.const	$push128=, 0
-	i32.mul 	$push53=, $3, $2
-	i32.const	$push127=, -1
-	i32.add 	$push126=, $pop53, $pop127
-	tee_local	$push125=, $2=, $pop126
-	i32.store	h($pop128), $pop125
-	i32.const	$push124=, 0
-	i32.eqz 	$push54=, $2
-	i64.extend_u/i32	$push55=, $pop54
-	i64.lt_s	$push56=, $pop55, $0
-	i32.store	e($pop124), $pop56
-	i32.const	$push123=, 0
-	i32.load	$push122=, 0($1)
-	tee_local	$push121=, $2=, $pop122
-	i32.store	j($pop123), $pop121
-	i32.const	$push120=, 0
-	i32.const	$push119=, 5
-	i32.store	f($pop120), $pop119
-	i32.const	$push118=, 0
-	i32.mul 	$push57=, $3, $2
-	i32.const	$push117=, -1
-	i32.add 	$push116=, $pop57, $pop117
-	tee_local	$push115=, $2=, $pop116
-	i32.store	h($pop118), $pop115
+	i32.const	$push16=, 6
+	i32.store	f($pop128), $pop16
+	i32.const	$push127=, 0
+	i32.mul 	$push17=, $2, $1
+	i32.const	$push126=, -1
+	i32.add 	$push18=, $pop17, $pop126
+	i32.store	h($pop127), $pop18
+	i32.const	$push125=, 0
+	i32.load	$push124=, 0($0)
+	tee_local	$push123=, $1=, $pop124
+	i32.store	j($pop125), $pop123
+	i32.const	$push122=, 0
+	i32.const	$push19=, 7
+	i32.store	f($pop122), $pop19
+	i32.const	$push121=, 0
+	i32.mul 	$push20=, $2, $1
+	i32.const	$push120=, -1
+	i32.add 	$push21=, $pop20, $pop120
+	i32.store	h($pop121), $pop21
+	i32.const	$push119=, 0
+	i32.load	$push118=, 0($0)
+	tee_local	$push117=, $1=, $pop118
+	i32.store	j($pop119), $pop117
+	i32.const	$push116=, 0
+	i32.mul 	$push22=, $2, $1
+	i32.const	$push115=, -1
+	i32.add 	$push23=, $pop22, $pop115
+	i32.store	h($pop116), $pop23
 	i32.const	$push114=, 0
-	i32.eqz 	$push58=, $2
-	i64.extend_u/i32	$push59=, $pop58
-	i64.lt_s	$push60=, $pop59, $0
-	i32.store	e($pop114), $pop60
+	i64.load32_s	$3=, b($pop114)
 	i32.const	$push113=, 0
-	i32.load	$push112=, 0($1)
-	tee_local	$push111=, $2=, $pop112
-	i32.store	j($pop113), $pop111
-	i32.const	$push110=, 0
-	i32.const	$push109=, 6
-	i32.store	f($pop110), $pop109
+	i32.const	$push112=, 0
+	i32.store	f($pop113), $pop112
+	i32.const	$push111=, 0
+	i32.load	$push110=, 0($0)
+	tee_local	$push109=, $1=, $pop110
+	i32.store	j($pop111), $pop109
 	i32.const	$push108=, 0
-	i32.mul 	$push61=, $3, $2
-	i32.const	$push107=, -1
-	i32.add 	$push106=, $pop61, $pop107
-	tee_local	$push105=, $2=, $pop106
-	i32.store	h($pop108), $pop105
+	i32.const	$push107=, 1
+	i32.store	f($pop108), $pop107
+	i32.const	$push106=, 0
+	i32.mul 	$push24=, $2, $1
+	i32.const	$push105=, -1
+	i32.add 	$push25=, $pop24, $pop105
+	i32.store	h($pop106), $pop25
 	i32.const	$push104=, 0
-	i32.eqz 	$push62=, $2
-	i64.extend_u/i32	$push63=, $pop62
-	i64.lt_s	$push64=, $pop63, $0
-	i32.store	e($pop104), $pop64
-	i32.const	$push103=, 0
-	i32.load	$push102=, 0($1)
-	tee_local	$push101=, $2=, $pop102
-	i32.store	j($pop103), $pop101
-	i32.const	$push100=, 0
-	i32.const	$push99=, 7
-	i32.store	f($pop100), $pop99
-	i32.const	$push98=, 0
-	i32.mul 	$push65=, $3, $2
-	i32.const	$push97=, -1
-	i32.add 	$push96=, $pop65, $pop97
-	tee_local	$push95=, $2=, $pop96
-	i32.store	h($pop98), $pop95
+	i32.load	$push103=, 0($0)
+	tee_local	$push102=, $1=, $pop103
+	i32.store	j($pop104), $pop102
+	i32.const	$push101=, 0
+	i32.const	$push100=, 2
+	i32.store	f($pop101), $pop100
+	i32.const	$push99=, 0
+	i32.mul 	$push26=, $2, $1
+	i32.const	$push98=, -1
+	i32.add 	$push27=, $pop26, $pop98
+	i32.store	h($pop99), $pop27
+	i32.const	$push97=, 0
+	i32.load	$push96=, 0($0)
+	tee_local	$push95=, $1=, $pop96
+	i32.store	j($pop97), $pop95
 	i32.const	$push94=, 0
-	i32.eqz 	$push66=, $2
-	i64.extend_u/i32	$push67=, $pop66
-	i64.lt_s	$push68=, $pop67, $0
-	i32.store	e($pop94), $pop68
-	i32.const	$push93=, 0
-	i32.load	$push92=, 0($1)
-	tee_local	$push91=, $1=, $pop92
-	i32.store	j($pop93), $pop91
+	i32.const	$push93=, 3
+	i32.store	f($pop94), $pop93
+	i32.const	$push92=, 0
+	i32.mul 	$push28=, $2, $1
+	i32.const	$push91=, -1
+	i32.add 	$push29=, $pop28, $pop91
+	i32.store	h($pop92), $pop29
 	i32.const	$push90=, 0
-	i32.const	$push89=, 8
-	i32.store	f($pop90), $pop89
-	i32.const	$push88=, 0
-	i32.mul 	$push69=, $3, $1
-	i32.const	$push87=, -1
-	i32.add 	$push86=, $pop69, $pop87
-	tee_local	$push85=, $1=, $pop86
-	i32.store	h($pop88), $pop85
-	i32.const	$push84=, 0
-	i32.eqz 	$push70=, $1
-	i64.extend_u/i32	$push71=, $pop70
-	i64.lt_s	$push83=, $pop71, $0
-	tee_local	$push82=, $1=, $pop83
-	i32.store	e($pop84), $pop82
-	i32.const	$push81=, 0
-	i32.const	$push79=, 12
-	i32.add 	$push80=, $4, $pop79
-	i32.store	g($pop81), $pop80
+	i32.load	$push89=, 0($0)
+	tee_local	$push88=, $1=, $pop89
+	i32.store	j($pop90), $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 4
+	i32.store	f($pop87), $pop86
+	i32.const	$push85=, 0
+	i32.mul 	$push30=, $2, $1
+	i32.const	$push84=, -1
+	i32.add 	$push31=, $pop30, $pop84
+	i32.store	h($pop85), $pop31
+	i32.const	$push83=, 0
+	i32.load	$push82=, 0($0)
+	tee_local	$push81=, $1=, $pop82
+	i32.store	j($pop83), $pop81
+	i32.const	$push80=, 0
+	i32.const	$push79=, 5
+	i32.store	f($pop80), $pop79
+	i32.const	$push78=, 0
+	i32.mul 	$push32=, $2, $1
+	i32.const	$push77=, -1
+	i32.add 	$push33=, $pop32, $pop77
+	i32.store	h($pop78), $pop33
+	i32.const	$push76=, 0
+	i32.load	$push75=, 0($0)
+	tee_local	$push74=, $1=, $pop75
+	i32.store	j($pop76), $pop74
+	i32.const	$push73=, 0
+	i32.const	$push72=, 6
+	i32.store	f($pop73), $pop72
+	i32.const	$push71=, 0
+	i32.mul 	$push34=, $2, $1
+	i32.const	$push70=, -1
+	i32.add 	$push35=, $pop34, $pop70
+	i32.store	h($pop71), $pop35
+	i32.const	$push69=, 0
+	i32.load	$push68=, 0($0)
+	tee_local	$push67=, $1=, $pop68
+	i32.store	j($pop69), $pop67
+	i32.const	$push66=, 0
+	i32.const	$push65=, 7
+	i32.store	f($pop66), $pop65
+	i32.const	$push64=, 0
+	i32.mul 	$push36=, $2, $1
+	i32.const	$push63=, -1
+	i32.add 	$push37=, $pop36, $pop63
+	i32.store	h($pop64), $pop37
+	i32.const	$push62=, 0
+	i32.load	$push61=, 0($0)
+	tee_local	$push60=, $0=, $pop61
+	i32.store	j($pop62), $pop60
+	i32.const	$push59=, 0
+	i32.const	$push38=, 8
+	i32.store	f($pop59), $pop38
+	i32.const	$push58=, 0
+	i32.mul 	$push39=, $2, $0
+	i32.const	$push57=, -1
+	i32.add 	$push56=, $pop39, $pop57
+	tee_local	$push55=, $0=, $pop56
+	i32.store	h($pop58), $pop55
+	i32.const	$push54=, 0
+	i32.eqz 	$push40=, $0
+	i64.extend_u/i32	$push41=, $pop40
+	i64.lt_s	$push53=, $pop41, $3
+	tee_local	$push52=, $0=, $pop53
+	i32.store	e($pop54), $pop52
+	i32.const	$push51=, 0
+	i32.const	$push49=, 12
+	i32.add 	$push50=, $4, $pop49
+	i32.store	g($pop51), $pop50
 	block   	
-	i32.eqz 	$push247=, $1
-	br_if   	0, $pop247      # 0: down to label0
+	i32.eqz 	$push170=, $0
+	br_if   	0, $pop170      # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push78=, 0
-	i32.const	$push76=, 16
-	i32.add 	$push77=, $4, $pop76
-	i32.store	__stack_pointer($pop78), $pop77
-	i32.const	$push246=, 0
-	return  	$pop246
+	i32.const	$push48=, 0
+	i32.const	$push46=, 16
+	i32.add 	$push47=, $4, $pop46
+	i32.store	__stack_pointer($pop48), $pop47
+	i32.const	$push169=, 0
+	return  	$pop169
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -338,7 +245,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -419,5 +326,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57877.c.s b/test/torture-s/pr57877.c.s
index 9f8fcbcd5..c68ab29ca 100644
--- a/test/torture-s/pr57877.c.s
+++ b/test/torture-s/pr57877.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr57877.c"
+	.file	"pr57877.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -77,7 +77,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -151,5 +151,5 @@ d:
 	.size	d, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58209.c.s b/test/torture-s/pr58209.c.s
index 6799943ea..317e3311a 100644
--- a/test/torture-s/pr58209.c.s
+++ b/test/torture-s/pr58209.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58209.c"
+	.file	"pr58209.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -51,9 +51,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -71,23 +71,23 @@ main:                                   # @main
 	tee_local	$push11=, $1=, $pop12
 	i32.call	$push10=, foo@FUNCTION, $2
 	tee_local	$push9=, $0=, $pop10
-	i32.ne  	$push0=, $pop11, $pop9
-	br_if   	1, $pop0        # 1: down to label2
+	i32.ne  	$push1=, $pop11, $pop9
+	br_if   	1, $pop1        # 1: down to label2
 # BB#2:                                 # %lor.lhs.false
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
 	block   	
-	i32.eqz 	$push20=, $2
-	br_if   	0, $pop20       # 0: down to label5
+	i32.eqz 	$push18=, $2
+	br_if   	0, $pop18       # 0: down to label5
 # BB#3:                                 # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.const	$push15=, -1
-	i32.add 	$push1=, $2, $pop15
-	i32.call	$push2=, foo@FUNCTION, $pop1
+	i32.add 	$push2=, $2, $pop15
+	i32.call	$push3=, foo@FUNCTION, $pop2
 	i32.const	$push14=, 4
-	i32.add 	$push7=, $pop2, $pop14
-	i32.eq  	$push3=, $pop7, $0
-	br_if   	1, $pop3        # 1: down to label4
+	i32.add 	$push7=, $pop3, $pop14
+	i32.eq  	$push5=, $pop7, $0
+	br_if   	1, $pop5        # 1: down to label4
 	br      	3               # 3: down to label2
 .LBB2_4:                                #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label5:
@@ -97,12 +97,13 @@ main:                                   # @main
 .LBB2_5:                                # %for.cond
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label4:
-	i32.const	$push19=, 1
-	i32.add 	$push18=, $2, $pop19
-	tee_local	$push17=, $2=, $pop18
-	i32.const	$push16=, 26
-	i32.le_s	$push5=, $pop17, $pop16
-	br_if   	0, $pop5        # 0: up to label3
+	i32.const	$push17=, 25
+	i32.gt_u	$0=, $2, $pop17
+	i32.const	$push16=, 1
+	i32.add 	$push0=, $2, $pop16
+	copy_local	$2=, $pop0
+	i32.eqz 	$push19=, $0
+	br_if   	0, $pop19       # 0: up to label3
 # BB#6:                                 # %for.end
 	end_loop
 	i32.const	$push6=, 0
@@ -114,7 +115,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	buf                     # @buf
 	.type	buf,@object
 	.section	.bss.buf,"aw",@nobits
@@ -125,5 +126,5 @@ buf:
 	.size	buf, 4096
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58277-1.c.s b/test/torture-s/pr58277-1.c.s
index fbf6b545a..ce8d3a685 100644
--- a/test/torture-s/pr58277-1.c.s
+++ b/test/torture-s/pr58277-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58277-1.c"
+	.file	"pr58277-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -15,9 +15,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -28,395 +28,742 @@ baz:                                    # @baz
 	.endfunc
 .Lfunc_end1:
 	.size	baz, .Lfunc_end1-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push117=, 0
-	i32.const	$push114=, 0
-	i32.load	$push115=, __stack_pointer($pop114)
-	i32.const	$push116=, 32
-	i32.sub 	$push128=, $pop115, $pop116
-	tee_local	$push127=, $3=, $pop128
-	i32.store	__stack_pointer($pop117), $pop127
-	i32.const	$push126=, 0
-	i32.const	$push125=, 1
-	i32.store	n($pop126), $pop125
-	i32.const	$push124=, 0
-	i32.const	$push123=, 1
-	i32.store	a($pop124), $pop123
-	i32.const	$push122=, 0
-	i32.const	$push121=, 0
-	i32.store8	u($pop122), $pop121
+	i32.const	$push334=, 0
+	i32.const	$push332=, 0
+	i32.load	$push331=, __stack_pointer($pop332)
+	i32.const	$push333=, 32
+	i32.sub 	$push345=, $pop331, $pop333
+	tee_local	$push344=, $2=, $pop345
+	i32.store	__stack_pointer($pop334), $pop344
+	i32.const	$push343=, 0
+	i32.const	$push342=, 1
+	i32.store	n($pop343), $pop342
+	i32.const	$push341=, 0
+	i32.const	$push340=, 1
+	i32.store	a($pop341), $pop340
+	i32.const	$push339=, 0
+	i32.const	$push338=, 0
+	i32.store8	u($pop339), $pop338
 	i32.const	$0=, 1
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_4 Depth 2
                                         #       Child Loop BB2_6 Depth 3
 	loop    	                # label0:
-	i32.const	$push131=, 0
-	i32.const	$push130=, 0
-	i32.store	g($pop131), $pop130
+	i32.const	$push348=, 0
+	i32.const	$push347=, 0
+	i32.store	g($pop348), $pop347
 	block   	
 	block   	
-	i32.const	$push129=, 0
-	i32.load	$push0=, l($pop129)
-	i32.eqz 	$push254=, $pop0
-	br_if   	0, $pop254      # 0: down to label2
+	i32.const	$push346=, 0
+	i32.load	$push0=, l($pop346)
+	i32.eqz 	$push612=, $pop0
+	br_if   	0, $pop612      # 0: down to label2
 # BB#2:                                 # %for.end
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push144=, 0
-	i32.load	$push1=, j($pop144)
-	i32.const	$push143=, 0
-	i32.store	0($pop1), $pop143
-	i32.const	$push142=, 0
-	i32.load	$push2=, i($pop142)
-	i32.const	$push141=, 0
-	i32.load	$push3=, j($pop141)
+	i32.const	$push361=, 0
+	i32.load	$push1=, j($pop361)
+	i32.const	$push360=, 0
+	i32.store	0($pop1), $pop360
+	i32.const	$push359=, 0
+	i32.load	$push2=, i($pop359)
+	i32.const	$push358=, 0
+	i32.load	$push3=, j($pop358)
 	i32.load	$push4=, 0($pop3)
 	i32.store	0($pop2), $pop4
-	i32.const	$push140=, 0
-	i32.const	$push139=, 0
-	i32.store	d($pop140), $pop139
-	i32.const	$push138=, 0
-	i32.const	$push137=, 1
-	i32.store8	u($pop138), $pop137
-	i32.const	$push136=, 0
-	i32.load	$push5=, i($pop136)
-	i32.const	$push135=, 0
-	i32.store	0($pop5), $pop135
-	i32.const	$push134=, 0
-	i32.load	$push6=, i($pop134)
-	i32.const	$push133=, 0
-	i32.store	0($pop6), $pop133
-	i32.const	$push132=, 0
-	i32.load	$push7=, i($pop132)
-	i32.store	0($pop7), $3
+	i32.const	$push357=, 0
+	i32.load	$push5=, i($pop357)
+	i32.const	$push356=, 0
+	i32.store	0($pop5), $pop356
+	i32.const	$push355=, 0
+	i32.const	$push354=, 1
+	i32.store8	u($pop355), $pop354
+	i32.const	$push353=, 0
+	i32.load	$push6=, i($pop353)
+	i32.const	$push352=, 0
+	i32.store	0($pop6), $pop352
+	i32.const	$push351=, 0
+	i32.const	$push350=, 0
+	i32.store	d($pop351), $pop350
+	i32.const	$push349=, 0
+	i32.load	$push7=, i($pop349)
+	i32.store	0($pop7), $2
 	br      	1               # 1: down to label1
-.LBB2_3:                                # %for.cond.preheader.i
+.LBB2_3:                                # %if.else.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push151=, 0
-	i32.load	$push8=, i($pop151)
-	i32.const	$push150=, 0
-	i32.store	0($pop8), $pop150
-	i32.const	$push149=, 0
-	i32.load	$push9=, e($pop149)
-	i32.const	$push148=, 0
-	i32.store	0($pop9), $pop148
-	i32.const	$push147=, 0
-	i32.const	$push146=, 0
-	i32.store	o($pop147), $pop146
+	i32.const	$push368=, 0
+	i32.load	$push8=, i($pop368)
+	i32.const	$push367=, 0
+	i32.store	0($pop8), $pop367
+	i32.const	$push366=, 0
+	i32.load	$push9=, e($pop366)
+	i32.const	$push365=, 0
+	i32.store	0($pop9), $pop365
+	i32.const	$push364=, 0
+	i32.const	$push363=, 0
+	i32.store	o($pop364), $pop363
 	block   	
-	i32.const	$push145=, 0
-	i32.load	$push10=, p($pop145)
+	i32.const	$push362=, 0
+	i32.load	$push10=, p($pop362)
 	br_if   	0, $pop10       # 0: down to label3
-.LBB2_4:                                # %for.cond3.preheader.i
+.LBB2_4:                                # %if.end.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB2_6 Depth 3
 	loop    	                # label4:
-	i32.const	$push156=, 0
-	i32.load	$push155=, i($pop156)
-	tee_local	$push154=, $2=, $pop155
-	i32.load	$push11=, 0($pop154)
-	i32.const	$push153=, 0
-	i32.store	0($pop11), $pop153
+	i32.const	$push373=, 0
+	i32.load	$push372=, i($pop373)
+	tee_local	$push371=, $1=, $pop372
+	i32.load	$push11=, 0($pop371)
+	i32.const	$push370=, 0
+	i32.store	0($pop11), $pop370
 	block   	
-	i32.const	$push152=, 0
-	i32.load	$push12=, j($pop152)
+	i32.const	$push369=, 0
+	i32.load	$push12=, j($pop369)
 	i32.load	$push13=, 0($pop12)
 	i32.load	$push14=, 0($pop13)
 	br_if   	0, $pop14       # 0: down to label5
 # BB#5:                                 # %if.end110.lr.ph.i
                                         #   in Loop: Header=BB2_4 Depth=2
-	i32.const	$push159=, 0
-	i32.load	$push158=, i($pop159)
-	tee_local	$push157=, $2=, $pop158
-	i32.load	$0=, 0($pop157)
+	i32.const	$push376=, 0
+	i32.load	$push375=, i($pop376)
+	tee_local	$push374=, $1=, $pop375
+	i32.load	$0=, 0($pop374)
 .LBB2_6:                                # %if.end110.i
                                         #   Parent Loop BB2_1 Depth=1
                                         #     Parent Loop BB2_4 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label6:
-	i32.const	$push166=, 0
-	i32.const	$push165=, 0
-	i32.load	$push15=, k($pop165)
-	i32.const	$push164=, 1
-	i32.add 	$push16=, $pop15, $pop164
-	i32.store	k($pop166), $pop16
-	i32.const	$push163=, 0
-	i32.store	0($0), $pop163
-	i32.const	$push162=, 0
-	i32.const	$push161=, 0
-	i32.store8	u($pop162), $pop161
-	i32.const	$push160=, 0
-	i32.load	$push17=, j($pop160)
+	i32.const	$push383=, 0
+	i32.const	$push382=, 0
+	i32.load	$push15=, k($pop382)
+	i32.const	$push381=, 1
+	i32.add 	$push16=, $pop15, $pop381
+	i32.store	k($pop383), $pop16
+	i32.const	$push380=, 0
+	i32.store	0($0), $pop380
+	i32.const	$push379=, 0
+	i32.const	$push378=, 0
+	i32.store8	u($pop379), $pop378
+	i32.const	$push377=, 0
+	i32.load	$push17=, j($pop377)
 	i32.load	$push18=, 0($pop17)
 	i32.load	$push19=, 0($pop18)
-	i32.eqz 	$push255=, $pop19
-	br_if   	0, $pop255      # 0: up to label6
+	i32.eqz 	$push613=, $pop19
+	br_if   	0, $pop613      # 0: up to label6
 .LBB2_7:                                # %for.end.i
                                         #   in Loop: Header=BB2_4 Depth=2
 	end_loop
 	end_block                       # label5:
-	i32.const	$push187=, 0
-	i32.load	$push20=, j($pop187)
+	i32.const	$push404=, 0
+	i32.load	$push20=, j($pop404)
 	i32.load	$push21=, 0($pop20)
-	i32.store	0($2), $pop21
-	i32.const	$push186=, 0
-	i32.load	$push22=, i($pop186)
-	i32.const	$push185=, 0
-	i32.load	$push23=, j($pop185)
+	i32.store	0($1), $pop21
+	i32.const	$push403=, 0
+	i32.load	$push22=, i($pop403)
+	i32.const	$push402=, 0
+	i32.load	$push23=, j($pop402)
 	i32.load	$push24=, 0($pop23)
 	i32.store	0($pop22), $pop24
-	i32.const	$push184=, 0
-	i32.load	$0=, j($pop184)
-	i32.const	$push183=, 0
-	i32.load	$push26=, i($pop183)
-	i32.load	$push25=, 0($0)
-	i32.store	0($pop26), $pop25
-	i32.const	$push182=, 0
-	i32.load	$push27=, i($pop182)
-	i32.const	$push181=, 0
-	i32.load	$push28=, j($pop181)
-	i32.load	$push29=, 0($pop28)
-	i32.store	0($pop27), $pop29
-	i32.const	$push180=, 0
-	i32.load	$push30=, i($pop180)
-	i32.const	$push179=, 0
-	i32.load	$push31=, j($pop179)
-	i32.load	$push32=, 0($pop31)
-	i32.store	0($pop30), $pop32
-	i32.const	$push178=, 0
-	i32.load	$push33=, i($pop178)
-	i32.const	$push177=, 0
-	i32.load	$push34=, j($pop177)
-	i32.load	$push35=, 0($pop34)
-	i32.store	0($pop33), $pop35
-	i32.const	$push176=, 0
-	i32.load	$push36=, i($pop176)
-	i32.const	$push175=, 0
-	i32.store	0($pop36), $pop175
-	i32.const	$push174=, 0
-	i32.const	$push173=, 0
-	i32.load	$push37=, h($pop173)
-	i32.const	$push172=, 1
-	i32.add 	$push38=, $pop37, $pop172
-	i32.store	h($pop174), $pop38
-	i32.const	$push171=, 0
-	i32.load	$push39=, e($pop171)
-	i32.const	$push170=, 0
-	i32.store	0($pop39), $pop170
-	i32.const	$push169=, 0
-	i32.const	$push168=, 0
-	i32.store	o($pop169), $pop168
-	i32.const	$push167=, 0
-	i32.load	$push40=, p($pop167)
-	i32.eqz 	$push256=, $pop40
-	br_if   	0, $pop256      # 0: up to label4
+	i32.const	$push401=, 0
+	i32.load	$push25=, i($pop401)
+	i32.const	$push400=, 0
+	i32.load	$push26=, j($pop400)
+	i32.load	$push27=, 0($pop26)
+	i32.store	0($pop25), $pop27
+	i32.const	$push399=, 0
+	i32.load	$push28=, i($pop399)
+	i32.const	$push398=, 0
+	i32.load	$push29=, j($pop398)
+	i32.load	$push30=, 0($pop29)
+	i32.store	0($pop28), $pop30
+	i32.const	$push397=, 0
+	i32.load	$push31=, i($pop397)
+	i32.const	$push396=, 0
+	i32.load	$push32=, j($pop396)
+	i32.load	$push33=, 0($pop32)
+	i32.store	0($pop31), $pop33
+	i32.const	$push395=, 0
+	i32.load	$push34=, i($pop395)
+	i32.const	$push394=, 0
+	i32.load	$push35=, j($pop394)
+	i32.load	$push36=, 0($pop35)
+	i32.store	0($pop34), $pop36
+	i32.const	$push393=, 0
+	i32.load	$push37=, i($pop393)
+	i32.const	$push392=, 0
+	i32.store	0($pop37), $pop392
+	i32.const	$push391=, 0
+	i32.const	$push390=, 0
+	i32.load	$push38=, h($pop390)
+	i32.const	$push389=, 1
+	i32.add 	$push39=, $pop38, $pop389
+	i32.store	h($pop391), $pop39
+	i32.const	$push388=, 0
+	i32.load	$push40=, e($pop388)
+	i32.const	$push387=, 0
+	i32.store	0($pop40), $pop387
+	i32.const	$push386=, 0
+	i32.const	$push385=, 0
+	i32.store	o($pop386), $pop385
+	i32.const	$push384=, 0
+	i32.load	$push41=, p($pop384)
+	i32.eqz 	$push614=, $pop41
+	br_if   	0, $pop614      # 0: up to label4
 .LBB2_8:                                # %foo.exit.thread
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	end_block                       # label3:
-	i32.const	$push190=, 0
-	i32.const	$push189=, 0
-	i32.store	f($pop190), $pop189
-	i32.const	$push188=, 0
-	i32.load	$0=, n($pop188)
+	i32.const	$push407=, 0
+	i32.const	$push406=, 0
+	i32.store	f($pop407), $pop406
+	i32.const	$push405=, 0
+	i32.load	$0=, n($pop405)
 .LBB2_9:                                # %for.inc7
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label1:
-	i32.const	$push196=, 0
-	i32.const	$push195=, -1
-	i32.add 	$push194=, $0, $pop195
-	tee_local	$push193=, $0=, $pop194
-	i32.store	n($pop196), $pop193
-	i32.const	$push192=, 0
-	i32.const	$push191=, 0
-	i32.store8	u($pop192), $pop191
+	i32.const	$push413=, 0
+	i32.const	$push412=, -1
+	i32.add 	$push411=, $0, $pop412
+	tee_local	$push410=, $0=, $pop411
+	i32.store	n($pop413), $pop410
+	i32.const	$push409=, 0
+	i32.const	$push408=, 0
+	i32.store8	u($pop409), $pop408
 	br_if   	0, $0           # 0: up to label0
 # BB#10:                                # %for.end8
 	end_loop
 	block   	
-	i32.const	$push199=, 0
-	i32.load	$push198=, b($pop199)
-	tee_local	$push197=, $1=, $pop198
-	i32.eqz 	$push257=, $pop197
-	br_if   	0, $pop257      # 0: down to label7
-# BB#11:                                # %for.cond12.preheader.lr.ph
-	i32.const	$push200=, 0
-	i32.load	$2=, c($pop200)
-.LBB2_12:                               # %for.cond12.preheader
-                                        # =>This Loop Header: Depth=1
-                                        #     Child Loop BB2_13 Depth 2
+	i32.const	$push416=, 0
+	i32.load	$push415=, b($pop416)
+	tee_local	$push414=, $1=, $pop415
+	i32.eqz 	$push615=, $pop414
+	br_if   	0, $pop615      # 0: down to label7
+# BB#11:                                # %for.body11.lr.ph
+	i32.const	$push417=, 0
+	i32.load	$0=, c($pop417)
+.LBB2_12:                               # %for.body11
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$0=, 10
-.LBB2_13:                               # %for.body15
-                                        #   Parent Loop BB2_12 Depth=1
-                                        # =>  This Inner Loop Header: Depth=2
-	loop    	                # label9:
-	i32.const	$push219=, 2
-	i32.shl 	$push41=, $2, $pop219
-	i32.const	$push218=, a
-	i32.add 	$push42=, $pop41, $pop218
-	i32.load	$push43=, 0($pop42)
-	i32.const	$push217=, 2
-	i32.shl 	$push44=, $pop43, $pop217
-	i32.const	$push216=, a
-	i32.add 	$push45=, $pop44, $pop216
-	i32.load	$push46=, 0($pop45)
-	i32.const	$push215=, 2
-	i32.shl 	$push47=, $pop46, $pop215
-	i32.const	$push214=, a
-	i32.add 	$push48=, $pop47, $pop214
-	i32.load	$push49=, 0($pop48)
-	i32.const	$push213=, 2
-	i32.shl 	$push50=, $pop49, $pop213
-	i32.const	$push212=, a
-	i32.add 	$push51=, $pop50, $pop212
-	i32.load	$push52=, 0($pop51)
-	i32.const	$push211=, 2
-	i32.shl 	$push53=, $pop52, $pop211
-	i32.const	$push210=, a
-	i32.add 	$push54=, $pop53, $pop210
-	i32.load	$push55=, 0($pop54)
-	i32.const	$push209=, 2
-	i32.shl 	$push56=, $pop55, $pop209
-	i32.const	$push208=, a
-	i32.add 	$push57=, $pop56, $pop208
-	i32.load	$push58=, 0($pop57)
-	i32.const	$push207=, 2
-	i32.shl 	$push59=, $pop58, $pop207
-	i32.const	$push206=, a
-	i32.add 	$push60=, $pop59, $pop206
-	i32.load	$push61=, 0($pop60)
-	i32.const	$push205=, 2
-	i32.shl 	$push62=, $pop61, $pop205
-	i32.const	$push204=, a
-	i32.add 	$push63=, $pop62, $pop204
-	i32.load	$2=, 0($pop63)
-	i32.const	$push203=, -1
-	i32.add 	$push202=, $0, $pop203
-	tee_local	$push201=, $0=, $pop202
-	br_if   	0, $pop201      # 0: up to label9
-# BB#14:                                # %for.inc27
-                                        #   in Loop: Header=BB2_12 Depth=1
+	i32.const	$push580=, 2
+	i32.shl 	$push42=, $0, $pop580
+	i32.const	$push579=, a
+	i32.add 	$push43=, $pop42, $pop579
+	i32.load	$push44=, 0($pop43)
+	i32.const	$push578=, 2
+	i32.shl 	$push45=, $pop44, $pop578
+	i32.const	$push577=, a
+	i32.add 	$push46=, $pop45, $pop577
+	i32.load	$push47=, 0($pop46)
+	i32.const	$push576=, 2
+	i32.shl 	$push48=, $pop47, $pop576
+	i32.const	$push575=, a
+	i32.add 	$push49=, $pop48, $pop575
+	i32.load	$push50=, 0($pop49)
+	i32.const	$push574=, 2
+	i32.shl 	$push51=, $pop50, $pop574
+	i32.const	$push573=, a
+	i32.add 	$push52=, $pop51, $pop573
+	i32.load	$push53=, 0($pop52)
+	i32.const	$push572=, 2
+	i32.shl 	$push54=, $pop53, $pop572
+	i32.const	$push571=, a
+	i32.add 	$push55=, $pop54, $pop571
+	i32.load	$push56=, 0($pop55)
+	i32.const	$push570=, 2
+	i32.shl 	$push57=, $pop56, $pop570
+	i32.const	$push569=, a
+	i32.add 	$push58=, $pop57, $pop569
+	i32.load	$push59=, 0($pop58)
+	i32.const	$push568=, 2
+	i32.shl 	$push60=, $pop59, $pop568
+	i32.const	$push567=, a
+	i32.add 	$push61=, $pop60, $pop567
+	i32.load	$push62=, 0($pop61)
+	i32.const	$push566=, 2
+	i32.shl 	$push63=, $pop62, $pop566
+	i32.const	$push565=, a
+	i32.add 	$push64=, $pop63, $pop565
+	i32.load	$push65=, 0($pop64)
+	i32.const	$push564=, 2
+	i32.shl 	$push66=, $pop65, $pop564
+	i32.const	$push563=, a
+	i32.add 	$push67=, $pop66, $pop563
+	i32.load	$push68=, 0($pop67)
+	i32.const	$push562=, 2
+	i32.shl 	$push69=, $pop68, $pop562
+	i32.const	$push561=, a
+	i32.add 	$push70=, $pop69, $pop561
+	i32.load	$push71=, 0($pop70)
+	i32.const	$push560=, 2
+	i32.shl 	$push72=, $pop71, $pop560
+	i32.const	$push559=, a
+	i32.add 	$push73=, $pop72, $pop559
+	i32.load	$push74=, 0($pop73)
+	i32.const	$push558=, 2
+	i32.shl 	$push75=, $pop74, $pop558
+	i32.const	$push557=, a
+	i32.add 	$push76=, $pop75, $pop557
+	i32.load	$push77=, 0($pop76)
+	i32.const	$push556=, 2
+	i32.shl 	$push78=, $pop77, $pop556
+	i32.const	$push555=, a
+	i32.add 	$push79=, $pop78, $pop555
+	i32.load	$push80=, 0($pop79)
+	i32.const	$push554=, 2
+	i32.shl 	$push81=, $pop80, $pop554
+	i32.const	$push553=, a
+	i32.add 	$push82=, $pop81, $pop553
+	i32.load	$push83=, 0($pop82)
+	i32.const	$push552=, 2
+	i32.shl 	$push84=, $pop83, $pop552
+	i32.const	$push551=, a
+	i32.add 	$push85=, $pop84, $pop551
+	i32.load	$push86=, 0($pop85)
+	i32.const	$push550=, 2
+	i32.shl 	$push87=, $pop86, $pop550
+	i32.const	$push549=, a
+	i32.add 	$push88=, $pop87, $pop549
+	i32.load	$push89=, 0($pop88)
+	i32.const	$push548=, 2
+	i32.shl 	$push90=, $pop89, $pop548
+	i32.const	$push547=, a
+	i32.add 	$push91=, $pop90, $pop547
+	i32.load	$push92=, 0($pop91)
+	i32.const	$push546=, 2
+	i32.shl 	$push93=, $pop92, $pop546
+	i32.const	$push545=, a
+	i32.add 	$push94=, $pop93, $pop545
+	i32.load	$push95=, 0($pop94)
+	i32.const	$push544=, 2
+	i32.shl 	$push96=, $pop95, $pop544
+	i32.const	$push543=, a
+	i32.add 	$push97=, $pop96, $pop543
+	i32.load	$push98=, 0($pop97)
+	i32.const	$push542=, 2
+	i32.shl 	$push99=, $pop98, $pop542
+	i32.const	$push541=, a
+	i32.add 	$push100=, $pop99, $pop541
+	i32.load	$push101=, 0($pop100)
+	i32.const	$push540=, 2
+	i32.shl 	$push102=, $pop101, $pop540
+	i32.const	$push539=, a
+	i32.add 	$push103=, $pop102, $pop539
+	i32.load	$push104=, 0($pop103)
+	i32.const	$push538=, 2
+	i32.shl 	$push105=, $pop104, $pop538
+	i32.const	$push537=, a
+	i32.add 	$push106=, $pop105, $pop537
+	i32.load	$push107=, 0($pop106)
+	i32.const	$push536=, 2
+	i32.shl 	$push108=, $pop107, $pop536
+	i32.const	$push535=, a
+	i32.add 	$push109=, $pop108, $pop535
+	i32.load	$push110=, 0($pop109)
+	i32.const	$push534=, 2
+	i32.shl 	$push111=, $pop110, $pop534
+	i32.const	$push533=, a
+	i32.add 	$push112=, $pop111, $pop533
+	i32.load	$push113=, 0($pop112)
+	i32.const	$push532=, 2
+	i32.shl 	$push114=, $pop113, $pop532
+	i32.const	$push531=, a
+	i32.add 	$push115=, $pop114, $pop531
+	i32.load	$push116=, 0($pop115)
+	i32.const	$push530=, 2
+	i32.shl 	$push117=, $pop116, $pop530
+	i32.const	$push529=, a
+	i32.add 	$push118=, $pop117, $pop529
+	i32.load	$push119=, 0($pop118)
+	i32.const	$push528=, 2
+	i32.shl 	$push120=, $pop119, $pop528
+	i32.const	$push527=, a
+	i32.add 	$push121=, $pop120, $pop527
+	i32.load	$push122=, 0($pop121)
+	i32.const	$push526=, 2
+	i32.shl 	$push123=, $pop122, $pop526
+	i32.const	$push525=, a
+	i32.add 	$push124=, $pop123, $pop525
+	i32.load	$push125=, 0($pop124)
+	i32.const	$push524=, 2
+	i32.shl 	$push126=, $pop125, $pop524
+	i32.const	$push523=, a
+	i32.add 	$push127=, $pop126, $pop523
+	i32.load	$push128=, 0($pop127)
+	i32.const	$push522=, 2
+	i32.shl 	$push129=, $pop128, $pop522
+	i32.const	$push521=, a
+	i32.add 	$push130=, $pop129, $pop521
+	i32.load	$push131=, 0($pop130)
+	i32.const	$push520=, 2
+	i32.shl 	$push132=, $pop131, $pop520
+	i32.const	$push519=, a
+	i32.add 	$push133=, $pop132, $pop519
+	i32.load	$push134=, 0($pop133)
+	i32.const	$push518=, 2
+	i32.shl 	$push135=, $pop134, $pop518
+	i32.const	$push517=, a
+	i32.add 	$push136=, $pop135, $pop517
+	i32.load	$push137=, 0($pop136)
+	i32.const	$push516=, 2
+	i32.shl 	$push138=, $pop137, $pop516
+	i32.const	$push515=, a
+	i32.add 	$push139=, $pop138, $pop515
+	i32.load	$push140=, 0($pop139)
+	i32.const	$push514=, 2
+	i32.shl 	$push141=, $pop140, $pop514
+	i32.const	$push513=, a
+	i32.add 	$push142=, $pop141, $pop513
+	i32.load	$push143=, 0($pop142)
+	i32.const	$push512=, 2
+	i32.shl 	$push144=, $pop143, $pop512
+	i32.const	$push511=, a
+	i32.add 	$push145=, $pop144, $pop511
+	i32.load	$push146=, 0($pop145)
+	i32.const	$push510=, 2
+	i32.shl 	$push147=, $pop146, $pop510
+	i32.const	$push509=, a
+	i32.add 	$push148=, $pop147, $pop509
+	i32.load	$push149=, 0($pop148)
+	i32.const	$push508=, 2
+	i32.shl 	$push150=, $pop149, $pop508
+	i32.const	$push507=, a
+	i32.add 	$push151=, $pop150, $pop507
+	i32.load	$push152=, 0($pop151)
+	i32.const	$push506=, 2
+	i32.shl 	$push153=, $pop152, $pop506
+	i32.const	$push505=, a
+	i32.add 	$push154=, $pop153, $pop505
+	i32.load	$push155=, 0($pop154)
+	i32.const	$push504=, 2
+	i32.shl 	$push156=, $pop155, $pop504
+	i32.const	$push503=, a
+	i32.add 	$push157=, $pop156, $pop503
+	i32.load	$push158=, 0($pop157)
+	i32.const	$push502=, 2
+	i32.shl 	$push159=, $pop158, $pop502
+	i32.const	$push501=, a
+	i32.add 	$push160=, $pop159, $pop501
+	i32.load	$push161=, 0($pop160)
+	i32.const	$push500=, 2
+	i32.shl 	$push162=, $pop161, $pop500
+	i32.const	$push499=, a
+	i32.add 	$push163=, $pop162, $pop499
+	i32.load	$push164=, 0($pop163)
+	i32.const	$push498=, 2
+	i32.shl 	$push165=, $pop164, $pop498
+	i32.const	$push497=, a
+	i32.add 	$push166=, $pop165, $pop497
+	i32.load	$push167=, 0($pop166)
+	i32.const	$push496=, 2
+	i32.shl 	$push168=, $pop167, $pop496
+	i32.const	$push495=, a
+	i32.add 	$push169=, $pop168, $pop495
+	i32.load	$push170=, 0($pop169)
+	i32.const	$push494=, 2
+	i32.shl 	$push171=, $pop170, $pop494
+	i32.const	$push493=, a
+	i32.add 	$push172=, $pop171, $pop493
+	i32.load	$push173=, 0($pop172)
+	i32.const	$push492=, 2
+	i32.shl 	$push174=, $pop173, $pop492
+	i32.const	$push491=, a
+	i32.add 	$push175=, $pop174, $pop491
+	i32.load	$push176=, 0($pop175)
+	i32.const	$push490=, 2
+	i32.shl 	$push177=, $pop176, $pop490
+	i32.const	$push489=, a
+	i32.add 	$push178=, $pop177, $pop489
+	i32.load	$push179=, 0($pop178)
+	i32.const	$push488=, 2
+	i32.shl 	$push180=, $pop179, $pop488
+	i32.const	$push487=, a
+	i32.add 	$push181=, $pop180, $pop487
+	i32.load	$push182=, 0($pop181)
+	i32.const	$push486=, 2
+	i32.shl 	$push183=, $pop182, $pop486
+	i32.const	$push485=, a
+	i32.add 	$push184=, $pop183, $pop485
+	i32.load	$push185=, 0($pop184)
+	i32.const	$push484=, 2
+	i32.shl 	$push186=, $pop185, $pop484
+	i32.const	$push483=, a
+	i32.add 	$push187=, $pop186, $pop483
+	i32.load	$push188=, 0($pop187)
+	i32.const	$push482=, 2
+	i32.shl 	$push189=, $pop188, $pop482
+	i32.const	$push481=, a
+	i32.add 	$push190=, $pop189, $pop481
+	i32.load	$push191=, 0($pop190)
+	i32.const	$push480=, 2
+	i32.shl 	$push192=, $pop191, $pop480
+	i32.const	$push479=, a
+	i32.add 	$push193=, $pop192, $pop479
+	i32.load	$push194=, 0($pop193)
+	i32.const	$push478=, 2
+	i32.shl 	$push195=, $pop194, $pop478
+	i32.const	$push477=, a
+	i32.add 	$push196=, $pop195, $pop477
+	i32.load	$push197=, 0($pop196)
+	i32.const	$push476=, 2
+	i32.shl 	$push198=, $pop197, $pop476
+	i32.const	$push475=, a
+	i32.add 	$push199=, $pop198, $pop475
+	i32.load	$push200=, 0($pop199)
+	i32.const	$push474=, 2
+	i32.shl 	$push201=, $pop200, $pop474
+	i32.const	$push473=, a
+	i32.add 	$push202=, $pop201, $pop473
+	i32.load	$push203=, 0($pop202)
+	i32.const	$push472=, 2
+	i32.shl 	$push204=, $pop203, $pop472
+	i32.const	$push471=, a
+	i32.add 	$push205=, $pop204, $pop471
+	i32.load	$push206=, 0($pop205)
+	i32.const	$push470=, 2
+	i32.shl 	$push207=, $pop206, $pop470
+	i32.const	$push469=, a
+	i32.add 	$push208=, $pop207, $pop469
+	i32.load	$push209=, 0($pop208)
+	i32.const	$push468=, 2
+	i32.shl 	$push210=, $pop209, $pop468
+	i32.const	$push467=, a
+	i32.add 	$push211=, $pop210, $pop467
+	i32.load	$push212=, 0($pop211)
+	i32.const	$push466=, 2
+	i32.shl 	$push213=, $pop212, $pop466
+	i32.const	$push465=, a
+	i32.add 	$push214=, $pop213, $pop465
+	i32.load	$push215=, 0($pop214)
+	i32.const	$push464=, 2
+	i32.shl 	$push216=, $pop215, $pop464
+	i32.const	$push463=, a
+	i32.add 	$push217=, $pop216, $pop463
+	i32.load	$push218=, 0($pop217)
+	i32.const	$push462=, 2
+	i32.shl 	$push219=, $pop218, $pop462
+	i32.const	$push461=, a
+	i32.add 	$push220=, $pop219, $pop461
+	i32.load	$push221=, 0($pop220)
+	i32.const	$push460=, 2
+	i32.shl 	$push222=, $pop221, $pop460
+	i32.const	$push459=, a
+	i32.add 	$push223=, $pop222, $pop459
+	i32.load	$push224=, 0($pop223)
+	i32.const	$push458=, 2
+	i32.shl 	$push225=, $pop224, $pop458
+	i32.const	$push457=, a
+	i32.add 	$push226=, $pop225, $pop457
+	i32.load	$push227=, 0($pop226)
+	i32.const	$push456=, 2
+	i32.shl 	$push228=, $pop227, $pop456
+	i32.const	$push455=, a
+	i32.add 	$push229=, $pop228, $pop455
+	i32.load	$push230=, 0($pop229)
+	i32.const	$push454=, 2
+	i32.shl 	$push231=, $pop230, $pop454
+	i32.const	$push453=, a
+	i32.add 	$push232=, $pop231, $pop453
+	i32.load	$push233=, 0($pop232)
+	i32.const	$push452=, 2
+	i32.shl 	$push234=, $pop233, $pop452
+	i32.const	$push451=, a
+	i32.add 	$push235=, $pop234, $pop451
+	i32.load	$push236=, 0($pop235)
+	i32.const	$push450=, 2
+	i32.shl 	$push237=, $pop236, $pop450
+	i32.const	$push449=, a
+	i32.add 	$push238=, $pop237, $pop449
+	i32.load	$push239=, 0($pop238)
+	i32.const	$push448=, 2
+	i32.shl 	$push240=, $pop239, $pop448
+	i32.const	$push447=, a
+	i32.add 	$push241=, $pop240, $pop447
+	i32.load	$push242=, 0($pop241)
+	i32.const	$push446=, 2
+	i32.shl 	$push243=, $pop242, $pop446
+	i32.const	$push445=, a
+	i32.add 	$push244=, $pop243, $pop445
+	i32.load	$push245=, 0($pop244)
+	i32.const	$push444=, 2
+	i32.shl 	$push246=, $pop245, $pop444
+	i32.const	$push443=, a
+	i32.add 	$push247=, $pop246, $pop443
+	i32.load	$push248=, 0($pop247)
+	i32.const	$push442=, 2
+	i32.shl 	$push249=, $pop248, $pop442
+	i32.const	$push441=, a
+	i32.add 	$push250=, $pop249, $pop441
+	i32.load	$push251=, 0($pop250)
+	i32.const	$push440=, 2
+	i32.shl 	$push252=, $pop251, $pop440
+	i32.const	$push439=, a
+	i32.add 	$push253=, $pop252, $pop439
+	i32.load	$push254=, 0($pop253)
+	i32.const	$push438=, 2
+	i32.shl 	$push255=, $pop254, $pop438
+	i32.const	$push437=, a
+	i32.add 	$push256=, $pop255, $pop437
+	i32.load	$push257=, 0($pop256)
+	i32.const	$push436=, 2
+	i32.shl 	$push258=, $pop257, $pop436
+	i32.const	$push435=, a
+	i32.add 	$push259=, $pop258, $pop435
+	i32.load	$push260=, 0($pop259)
+	i32.const	$push434=, 2
+	i32.shl 	$push261=, $pop260, $pop434
+	i32.const	$push433=, a
+	i32.add 	$push262=, $pop261, $pop433
+	i32.load	$push263=, 0($pop262)
+	i32.const	$push432=, 2
+	i32.shl 	$push264=, $pop263, $pop432
+	i32.const	$push431=, a
+	i32.add 	$push265=, $pop264, $pop431
+	i32.load	$push266=, 0($pop265)
+	i32.const	$push430=, 2
+	i32.shl 	$push267=, $pop266, $pop430
+	i32.const	$push429=, a
+	i32.add 	$push268=, $pop267, $pop429
+	i32.load	$push269=, 0($pop268)
+	i32.const	$push428=, 2
+	i32.shl 	$push270=, $pop269, $pop428
+	i32.const	$push427=, a
+	i32.add 	$push271=, $pop270, $pop427
+	i32.load	$push272=, 0($pop271)
+	i32.const	$push426=, 2
+	i32.shl 	$push273=, $pop272, $pop426
+	i32.const	$push425=, a
+	i32.add 	$push274=, $pop273, $pop425
+	i32.load	$push275=, 0($pop274)
+	i32.const	$push424=, 2
+	i32.shl 	$push276=, $pop275, $pop424
+	i32.const	$push423=, a
+	i32.add 	$push277=, $pop276, $pop423
+	i32.load	$push278=, 0($pop277)
+	i32.const	$push422=, 2
+	i32.shl 	$push279=, $pop278, $pop422
+	i32.const	$push421=, a
+	i32.add 	$push280=, $pop279, $pop421
+	i32.load	$0=, 0($pop280)
+	i32.const	$push420=, 1
+	i32.add 	$push419=, $1, $pop420
+	tee_local	$push418=, $1=, $pop419
+	br_if   	0, $pop418      # 0: up to label8
+# BB#13:                                # %for.cond9.for.end29_crit_edge
 	end_loop
-	i32.const	$push222=, 1
-	i32.add 	$push221=, $1, $pop222
-	tee_local	$push220=, $1=, $pop221
-	br_if   	0, $pop220      # 0: up to label8
-# BB#15:                                # %for.cond9.for.end29_crit_edge
-	end_loop
-	i32.const	$push64=, 0
-	i32.store	c($pop64), $2
-	i32.const	$push224=, 0
-	i32.const	$push223=, 0
-	i32.store	b($pop224), $pop223
-.LBB2_16:                               # %for.end29
+	i32.const	$push281=, 0
+	i32.store	c($pop281), $0
+	i32.const	$push582=, 0
+	i32.const	$push581=, 0
+	i32.store	b($pop582), $pop581
+.LBB2_14:                               # %for.end29
 	end_block                       # label7:
 	call    	baz@FUNCTION
 	block   	
-	i32.const	$push253=, 0
-	i32.load8_s	$push65=, u($pop253)
-	i32.const	$push66=, 2
-	i32.shl 	$push67=, $pop65, $pop66
-	i32.const	$push68=, a
-	i32.add 	$push69=, $pop67, $pop68
-	i32.load	$push70=, 0($pop69)
-	i32.const	$push252=, 2
-	i32.shl 	$push71=, $pop70, $pop252
-	i32.const	$push251=, a
-	i32.add 	$push72=, $pop71, $pop251
-	i32.load	$push73=, 0($pop72)
-	i32.const	$push250=, 2
-	i32.shl 	$push74=, $pop73, $pop250
-	i32.const	$push249=, a
-	i32.add 	$push75=, $pop74, $pop249
-	i32.load	$push76=, 0($pop75)
-	i32.const	$push248=, 2
-	i32.shl 	$push77=, $pop76, $pop248
-	i32.const	$push247=, a
-	i32.add 	$push78=, $pop77, $pop247
-	i32.load	$push79=, 0($pop78)
-	i32.const	$push246=, 2
-	i32.shl 	$push80=, $pop79, $pop246
-	i32.const	$push245=, a
-	i32.add 	$push81=, $pop80, $pop245
-	i32.load	$push82=, 0($pop81)
-	i32.const	$push244=, 2
-	i32.shl 	$push83=, $pop82, $pop244
-	i32.const	$push243=, a
-	i32.add 	$push84=, $pop83, $pop243
-	i32.load	$push85=, 0($pop84)
-	i32.const	$push242=, 2
-	i32.shl 	$push86=, $pop85, $pop242
-	i32.const	$push241=, a
-	i32.add 	$push87=, $pop86, $pop241
-	i32.load	$push88=, 0($pop87)
-	i32.const	$push240=, 2
-	i32.shl 	$push89=, $pop88, $pop240
-	i32.const	$push239=, a
-	i32.add 	$push90=, $pop89, $pop239
-	i32.load	$push91=, 0($pop90)
-	i32.const	$push238=, 2
-	i32.shl 	$push92=, $pop91, $pop238
-	i32.const	$push237=, a
-	i32.add 	$push93=, $pop92, $pop237
-	i32.load	$push94=, 0($pop93)
-	i32.const	$push236=, 2
-	i32.shl 	$push95=, $pop94, $pop236
-	i32.const	$push235=, a
-	i32.add 	$push96=, $pop95, $pop235
-	i32.load	$push97=, 0($pop96)
-	i32.const	$push234=, 2
-	i32.shl 	$push98=, $pop97, $pop234
-	i32.const	$push233=, a
-	i32.add 	$push99=, $pop98, $pop233
-	i32.load	$push100=, 0($pop99)
-	i32.const	$push232=, 2
-	i32.shl 	$push101=, $pop100, $pop232
-	i32.const	$push231=, a
-	i32.add 	$push102=, $pop101, $pop231
-	i32.load	$push103=, 0($pop102)
-	i32.const	$push230=, 2
-	i32.shl 	$push104=, $pop103, $pop230
-	i32.const	$push229=, a
-	i32.add 	$push105=, $pop104, $pop229
-	i32.load	$push106=, 0($pop105)
-	i32.const	$push228=, 2
-	i32.shl 	$push107=, $pop106, $pop228
-	i32.const	$push227=, a
-	i32.add 	$push108=, $pop107, $pop227
-	i32.load	$push109=, 0($pop108)
-	i32.const	$push226=, 2
-	i32.shl 	$push110=, $pop109, $pop226
-	i32.const	$push225=, a
-	i32.add 	$push111=, $pop110, $pop225
-	i32.load	$push112=, 0($pop111)
-	i32.eqz 	$push258=, $pop112
-	br_if   	0, $pop258      # 0: down to label10
-# BB#17:                                # %if.end47
-	i32.const	$push120=, 0
-	i32.const	$push118=, 32
-	i32.add 	$push119=, $3, $pop118
-	i32.store	__stack_pointer($pop120), $pop119
-	i32.const	$push113=, 0
-	return  	$pop113
-.LBB2_18:                               # %if.then46
-	end_block                       # label10:
+	i32.const	$push611=, 0
+	i32.load8_s	$push282=, u($pop611)
+	i32.const	$push283=, 2
+	i32.shl 	$push284=, $pop282, $pop283
+	i32.const	$push285=, a
+	i32.add 	$push286=, $pop284, $pop285
+	i32.load	$push287=, 0($pop286)
+	i32.const	$push610=, 2
+	i32.shl 	$push288=, $pop287, $pop610
+	i32.const	$push609=, a
+	i32.add 	$push289=, $pop288, $pop609
+	i32.load	$push290=, 0($pop289)
+	i32.const	$push608=, 2
+	i32.shl 	$push291=, $pop290, $pop608
+	i32.const	$push607=, a
+	i32.add 	$push292=, $pop291, $pop607
+	i32.load	$push293=, 0($pop292)
+	i32.const	$push606=, 2
+	i32.shl 	$push294=, $pop293, $pop606
+	i32.const	$push605=, a
+	i32.add 	$push295=, $pop294, $pop605
+	i32.load	$push296=, 0($pop295)
+	i32.const	$push604=, 2
+	i32.shl 	$push297=, $pop296, $pop604
+	i32.const	$push603=, a
+	i32.add 	$push298=, $pop297, $pop603
+	i32.load	$push299=, 0($pop298)
+	i32.const	$push602=, 2
+	i32.shl 	$push300=, $pop299, $pop602
+	i32.const	$push601=, a
+	i32.add 	$push301=, $pop300, $pop601
+	i32.load	$push302=, 0($pop301)
+	i32.const	$push600=, 2
+	i32.shl 	$push303=, $pop302, $pop600
+	i32.const	$push599=, a
+	i32.add 	$push304=, $pop303, $pop599
+	i32.load	$push305=, 0($pop304)
+	i32.const	$push598=, 2
+	i32.shl 	$push306=, $pop305, $pop598
+	i32.const	$push597=, a
+	i32.add 	$push307=, $pop306, $pop597
+	i32.load	$push308=, 0($pop307)
+	i32.const	$push596=, 2
+	i32.shl 	$push309=, $pop308, $pop596
+	i32.const	$push595=, a
+	i32.add 	$push310=, $pop309, $pop595
+	i32.load	$push311=, 0($pop310)
+	i32.const	$push594=, 2
+	i32.shl 	$push312=, $pop311, $pop594
+	i32.const	$push593=, a
+	i32.add 	$push313=, $pop312, $pop593
+	i32.load	$push314=, 0($pop313)
+	i32.const	$push592=, 2
+	i32.shl 	$push315=, $pop314, $pop592
+	i32.const	$push591=, a
+	i32.add 	$push316=, $pop315, $pop591
+	i32.load	$push317=, 0($pop316)
+	i32.const	$push590=, 2
+	i32.shl 	$push318=, $pop317, $pop590
+	i32.const	$push589=, a
+	i32.add 	$push319=, $pop318, $pop589
+	i32.load	$push320=, 0($pop319)
+	i32.const	$push588=, 2
+	i32.shl 	$push321=, $pop320, $pop588
+	i32.const	$push587=, a
+	i32.add 	$push322=, $pop321, $pop587
+	i32.load	$push323=, 0($pop322)
+	i32.const	$push586=, 2
+	i32.shl 	$push324=, $pop323, $pop586
+	i32.const	$push585=, a
+	i32.add 	$push325=, $pop324, $pop585
+	i32.load	$push326=, 0($pop325)
+	i32.const	$push584=, 2
+	i32.shl 	$push327=, $pop326, $pop584
+	i32.const	$push583=, a
+	i32.add 	$push328=, $pop327, $pop583
+	i32.load	$push329=, 0($pop328)
+	i32.eqz 	$push616=, $pop329
+	br_if   	0, $pop616      # 0: down to label9
+# BB#15:                                # %if.end47
+	i32.const	$push337=, 0
+	i32.const	$push335=, 32
+	i32.add 	$push336=, $2, $pop335
+	i32.store	__stack_pointer($pop337), $pop336
+	i32.const	$push330=, 0
+	return  	$pop330
+.LBB2_16:                               # %if.then46
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	e                       # @e
 	.type	e,@object
 	.section	.bss.e,"aw",@nobits
@@ -566,5 +913,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58277-2.c.s b/test/torture-s/pr58277-2.c.s
index ad2a0177a..067ee2f98 100644
--- a/test/torture-s/pr58277-2.c.s
+++ b/test/torture-s/pr58277-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58277-2.c"
+	.file	"pr58277-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -20,7 +20,7 @@ main:                                   # @main
 	i32.const	$push8=, 0
 	i32.load	$drop=, d($pop8)
 	br      	1               # 1: down to label0
-.LBB0_2:                                # %for.body4.preheader.i
+.LBB0_2:                                # %if.then.i
 	end_block                       # label1:
 	i32.const	$push11=, 0
 	i32.const	$push1=, 1
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	n                       # @n
 	.type	n,@object
 	.section	.bss.n,"aw",@nobits
@@ -121,4 +121,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr58364.c.s b/test/torture-s/pr58364.c.s
index 34fa5ac9d..60ee4fec6 100644
--- a/test/torture-s/pr58364.c.s
+++ b/test/torture-s/pr58364.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58364.c"
+	.file	"pr58364.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -16,9 +16,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -73,5 +73,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58365.c.s b/test/torture-s/pr58365.c.s
index 73d743bac..8ca6d48d7 100644
--- a/test/torture-s/pr58365.c.s
+++ b/test/torture-s/pr58365.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58365.c"
+	.file	"pr58365.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,92 +13,84 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push29=, 0
-	i32.const	$push26=, 0
-	i32.load	$push27=, __stack_pointer($pop26)
-	i32.const	$push28=, 32
-	i32.sub 	$push35=, $pop27, $pop28
-	tee_local	$push34=, $0=, $pop35
-	i32.store	__stack_pointer($pop29), $pop34
+	i32.const	$push25=, 0
+	i32.const	$push23=, 0
+	i32.load	$push22=, __stack_pointer($pop23)
+	i32.const	$push24=, 32
+	i32.sub 	$push31=, $pop22, $pop24
+	tee_local	$push30=, $0=, $pop31
+	i32.store	__stack_pointer($pop25), $pop30
 	block   	
 	block   	
-	i32.const	$push33=, 0
-	i32.load8_u	$push0=, i($pop33)
-	i32.eqz 	$push49=, $pop0
-	br_if   	0, $pop49       # 0: down to label1
+	i32.const	$push29=, 0
+	i32.load8_u	$push0=, i($pop29)
+	i32.eqz 	$push43=, $pop0
+	br_if   	0, $pop43       # 0: down to label1
 # BB#1:                                 # %if.then.i
 	i32.const	$push2=, 24
 	i32.add 	$push3=, $0, $pop2
-	i32.const	$push38=, 0
-	i32.load	$push1=, f+16($pop38)
+	i32.const	$push34=, 0
+	i32.load	$push1=, f+16($pop34)
 	i32.store	0($pop3), $pop1
 	i32.const	$push5=, 16
 	i32.add 	$push6=, $0, $pop5
-	i32.const	$push37=, 0
-	i64.load	$push4=, f+8($pop37):p2align=2
+	i32.const	$push33=, 0
+	i64.load	$push4=, f+8($pop33):p2align=2
 	i64.store	0($pop6), $pop4
-	i32.const	$push36=, 0
-	i64.load	$push7=, f($pop36):p2align=2
+	i32.const	$push32=, 0
+	i64.load	$push7=, f($pop32):p2align=2
 	i64.store	8($0), $pop7
 	br      	1               # 1: down to label0
 .LBB1_2:                                # %if.end.i
 	end_block                       # label1:
 	i32.const	$push8=, 24
 	i32.add 	$push9=, $0, $pop8
-	i32.const	$push40=, 0
-	i32.store	0($pop9), $pop40
+	i32.const	$push36=, 0
+	i32.store	0($pop9), $pop36
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $0, $pop10
 	i64.const	$push12=, 0
 	i64.store	0($pop11), $pop12
-	i64.const	$push39=, 0
-	i64.store	8($0), $pop39
+	i64.const	$push35=, 0
+	i64.store	8($0), $pop35
 .LBB1_3:                                # %bar.exit
 	end_block                       # label0:
-	i32.const	$push47=, 0
-	i32.load	$push13=, 12($0)
-	i32.store	h+4($pop47), $pop13
-	i32.const	$push46=, 0
-	i32.load	$push14=, 8($0)
-	i32.store	h($pop46), $pop14
-	i32.const	$push45=, 0
+	i32.const	$push41=, 0
+	i64.load	$push13=, 8($0)
+	i64.store	h($pop41):p2align=2, $pop13
+	i32.const	$push40=, 0
+	i32.const	$push14=, 1
+	i32.store	f+4($pop40), $pop14
+	i32.const	$push39=, 0
 	i32.const	$push15=, 24
 	i32.add 	$push16=, $0, $pop15
 	i32.load	$push17=, 0($pop16)
-	i32.store	h+16($pop45), $pop17
-	i32.const	$push44=, 0
-	i32.const	$push18=, 20
+	i32.store	h+16($pop39), $pop17
+	i32.const	$push38=, 0
+	i32.const	$push18=, 16
 	i32.add 	$push19=, $0, $pop18
-	i32.load	$push20=, 0($pop19)
-	i32.store	h+12($pop44), $pop20
-	i32.const	$push43=, 0
-	i32.const	$push21=, 16
-	i32.add 	$push22=, $0, $pop21
-	i32.load	$push23=, 0($pop22)
-	i32.store	h+8($pop43), $pop23
-	i32.const	$push42=, 0
-	i32.const	$push24=, 1
-	i32.store	f+4($pop42), $pop24
+	i64.load	$push20=, 0($pop19)
+	i64.store	h+8($pop38):p2align=2, $pop20
 	block   	
-	i32.const	$push41=, 0
-	i32.load	$push25=, h+4($pop41)
-	br_if   	0, $pop25       # 0: down to label2
+	i32.const	$push37=, 0
+	i32.load	$push21=, h+4($pop37)
+	br_if   	0, $pop21       # 0: down to label2
 # BB#4:                                 # %if.end
-	i32.const	$push32=, 0
-	i32.const	$push30=, 32
-	i32.add 	$push31=, $0, $pop30
-	i32.store	__stack_pointer($pop32), $pop31
-	i32.const	$push48=, 0
-	return  	$pop48
+	i32.const	$push28=, 0
+	i32.const	$push26=, 32
+	i32.add 	$push27=, $0, $pop26
+	i32.store	__stack_pointer($pop28), $pop27
+	i32.const	$push42=, 0
+	return  	$pop42
 .LBB1_5:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -106,7 +98,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -133,5 +125,5 @@ f:
 	.size	f, 20
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58385.c.s b/test/torture-s/pr58385.c.s
index 0819188e1..88b7c6921 100644
--- a/test/torture-s/pr58385.c.s
+++ b/test/torture-s/pr58385.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58385.c"
+	.file	"pr58385.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -15,9 +15,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -31,7 +31,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.data.b,"aw",@progbits
@@ -51,4 +51,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr58387.c.s b/test/torture-s/pr58387.c.s
index fcb5f058e..1e38c7373 100644
--- a/test/torture-s/pr58387.c.s
+++ b/test/torture-s/pr58387.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58387.c"
+	.file	"pr58387.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -23,7 +23,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -34,5 +34,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58419.c.s b/test/torture-s/pr58419.c.s
index f7eb11c58..4660ff7a8 100644
--- a/test/torture-s/pr58419.c.s
+++ b/test/torture-s/pr58419.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58419.c"
+	.file	"pr58419.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -37,9 +37,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -287,7 +287,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -368,5 +368,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	getpid, i32
diff --git a/test/torture-s/pr58431.c.s b/test/torture-s/pr58431.c.s
index 76706c683..80254f5ed 100644
--- a/test/torture-s/pr58431.c.s
+++ b/test/torture-s/pr58431.c.s
@@ -1,103 +1,100 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58431.c"
+	.file	"pr58431.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %for.body
-	i32.const	$3=, 1
+	.local  	i32, i32, i32
+# BB#0:                                 # %entry
+	i32.const	$push25=, 0
+	i32.const	$push24=, 0
+	i32.load	$push0=, k($pop24)
+	i32.store	g($pop25), $pop0
+	i32.const	$2=, 1
 	i32.const	$push23=, 0
 	i32.const	$push22=, 0
-	i32.load16_u	$push0=, i($pop22)
+	i32.load16_u	$push1=, i($pop22)
 	i32.const	$push21=, 1
-	i32.xor 	$push20=, $pop0, $pop21
+	i32.xor 	$push20=, $pop1, $pop21
 	tee_local	$push19=, $1=, $pop20
 	i32.store16	i($pop23), $pop19
 	i32.const	$push18=, 0
 	i32.const	$push17=, 0
 	i32.store	b($pop18), $pop17
-	i32.const	$push16=, 0
-	i32.load8_s	$0=, a($pop16)
-	i32.const	$push15=, 0
-	i32.load	$2=, j($pop15)
-	i32.const	$push14=, 0
-	i32.const	$push13=, 0
-	i32.load	$push1=, k($pop13)
-	i32.store	g($pop14), $pop1
 	i32.const	$push2=, 24
 	i32.shl 	$push3=, $1, $pop2
-	i32.const	$push12=, 24
-	i32.shr_s	$1=, $pop3, $pop12
+	i32.const	$push16=, 24
+	i32.shr_s	$1=, $pop3, $pop16
+	i32.const	$push15=, 0
+	i32.load8_s	$0=, a($pop15)
 	block   	
-	br_if   	0, $2           # 0: down to label0
+	i32.const	$push14=, 0
+	i32.load	$push4=, j($pop14)
+	br_if   	0, $pop4        # 0: down to label0
 # BB#1:                                 # %lor.rhs
-	i32.const	$push25=, 0
-	i32.load	$push4=, c($pop25)
-	i32.const	$push24=, 0
-	i32.ne  	$3=, $pop4, $pop24
+	i32.const	$push27=, 0
+	i32.load	$push5=, c($pop27)
+	i32.const	$push26=, 0
+	i32.ne  	$2=, $pop5, $pop26
 .LBB0_2:                                # %lor.end
 	end_block                       # label0:
-	i32.const	$push26=, 0
-	i32.store	j($pop26), $3
+	i32.const	$push28=, 0
+	i32.store	j($pop28), $2
 	block   	
 	block   	
+	i32.eq  	$push6=, $1, $0
+	br_if   	0, $pop6        # 0: down to label2
+# BB#3:                                 # %if.then
 	block   	
-	i32.ne  	$push5=, $0, $1
-	br_if   	0, $pop5        # 0: down to label3
-# BB#3:                                 # %if.else
+	i32.const	$push30=, 0
+	i32.load	$push7=, d($pop30)
 	i32.const	$push29=, 0
-	i32.const	$push28=, 1
-	i32.store8	h($pop29), $pop28
-	i32.const	$push27=, 0
-	i32.load	$push9=, e($pop27)
-	i32.eqz 	$push40=, $pop9
-	br_if   	2, $pop40       # 2: down to label1
-# BB#4:                                 # %for.inc17.preheader
+	i32.gt_s	$push8=, $pop7, $pop29
+	br_if   	0, $pop8        # 0: down to label3
+# BB#4:                                 # %for.inc.lr.ph
 	i32.const	$push31=, 0
-	i32.const	$push30=, 0
-	i32.store	e($pop31), $pop30
-	br      	1               # 1: down to label2
-.LBB0_5:                                # %for.cond10thread-pre-split
+	i32.const	$push9=, 1
+	i32.store	d($pop31), $pop9
+.LBB0_5:                                # %if.end
 	end_block                       # label3:
 	i32.const	$push33=, 0
-	i32.load	$push6=, d($pop33)
+	i32.const	$push10=, 1
+	i32.store	b($pop33), $pop10
 	i32.const	$push32=, 0
-	i32.gt_s	$push7=, $pop6, $pop32
-	br_if   	0, $pop7        # 0: down to label2
-# BB#6:                                 # %for.inc.preheader
-	i32.const	$push34=, 0
-	i32.const	$push8=, 1
-	i32.store	d($pop34), $pop8
-.LBB0_7:                                # %for.end22
+	i32.load8_u	$push11=, h($pop32)
+	br_if   	1, $pop11       # 1: down to label1
+# BB#6:                                 # %if.end27
+	i32.const	$push12=, 0
+	return  	$pop12
+.LBB0_7:                                # %if.else
 	end_block                       # label2:
 	i32.const	$push36=, 0
-	i32.const	$push10=, 1
-	i32.store	b($pop36), $pop10
+	i32.const	$push35=, 1
+	i32.store8	h($pop36), $pop35
 	block   	
-	i32.const	$push35=, 0
-	i32.load8_u	$push11=, h($pop35)
-	br_if   	0, $pop11       # 0: down to label4
-# BB#8:                                 # %if.end27
+	i32.const	$push34=, 0
+	i32.load	$push13=, e($pop34)
+	i32.eqz 	$push41=, $pop13
+	br_if   	0, $pop41       # 0: down to label4
+# BB#8:                                 # %for.inc17.lr.ph
+	i32.const	$push38=, 0
 	i32.const	$push37=, 0
-	return  	$pop37
-.LBB0_9:                                # %if.then26
+	i32.store	e($pop38), $pop37
+.LBB0_9:                                # %if.end.thread
 	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_10:                               # %for.end22.thread
+	i32.const	$push40=, 0
+	i32.const	$push39=, 1
+	i32.store	b($pop40), $pop39
+.LBB0_10:                               # %if.then26
 	end_block                       # label1:
-	i32.const	$push39=, 0
-	i32.const	$push38=, 1
-	i32.store	b($pop39), $pop38
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -187,5 +184,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58564.c.s b/test/torture-s/pr58564.c.s
index 32bd5502d..9956e0b66 100644
--- a/test/torture-s/pr58564.c.s
+++ b/test/torture-s/pr58564.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58564.c"
+	.file	"pr58564.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.bss.c,"aw",@nobits
@@ -53,4 +53,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr58570.c.s b/test/torture-s/pr58570.c.s
index f66ab1733..da1879140 100644
--- a/test/torture-s/pr58570.c.s
+++ b/test/torture-s/pr58570.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58570.c"
+	.file	"pr58570.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -60,7 +60,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	e                       # @e
 	.type	e,@object
 	.section	.data.e,"aw",@progbits
@@ -87,5 +87,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58574.c.s b/test/torture-s/pr58574.c.s
index 3f633882c..ec431687e 100644
--- a/test/torture-s/pr58574.c.s
+++ b/test/torture-s/pr58574.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58574.c"
+	.file	"pr58574.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -1816,9 +1816,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1849,7 +1849,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58640-2.c.s b/test/torture-s/pr58640-2.c.s
index eb1637f09..456e0f265 100644
--- a/test/torture-s/pr58640-2.c.s
+++ b/test/torture-s/pr58640-2.c.s
@@ -1,59 +1,37 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58640-2.c"
+	.file	"pr58640-2.c"
 	.section	.text.fn1,"ax",@progbits
-	.hidden	fn1
+	.hidden	fn1                     # -- Begin function fn1
 	.globl	fn1
 	.type	fn1,@function
 fn1:                                    # @fn1
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
-	i32.const	$push0=, 0
-	i32.const	$push26=, 0
-	i32.load	$push25=, a+36($pop26)
-	tee_local	$push24=, $0=, $pop25
-	i32.store	a($pop0), $pop24
-	i32.const	$push23=, 0
-	i32.const	$push1=, 1
-	i32.store	a+48($pop23), $pop1
-	i32.const	$push22=, 0
-	i32.const	$push21=, 1
-	i32.store	c($pop22), $pop21
-	i32.const	$push20=, 0
-	i32.store	a+4($pop20), $0
-	i32.const	$push19=, 0
-	i32.const	$push18=, 1
-	i32.store	a($pop19), $pop18
-	i32.const	$push17=, 0
-	i32.const	$push16=, 1
-	i32.store	c($pop17), $pop16
-	i32.const	$push15=, 0
-	i32.const	$push14=, 1
-	i32.store	a+4($pop15), $pop14
-	i32.const	$push13=, 0
-	i32.const	$push12=, 1
-	i32.store	c($pop13), $pop12
+# BB#0:                                 # %for.body3.split
+	i32.const	$push1=, 0
+	i64.const	$push0=, 4294967297
+	i64.store	a($pop1), $pop0
 	i32.const	$push11=, 0
-	i32.const	$push10=, 1
-	i32.store	c($pop11), $pop10
-	i32.const	$push9=, 0
+	i32.const	$push2=, 1
+	i32.store	a+48($pop11), $pop2
+	i32.const	$push10=, 0
+	i32.const	$push9=, 1
+	i32.store	c($pop10), $pop9
 	i32.const	$push8=, 0
-	i32.load	$push7=, a+60($pop8)
-	tee_local	$push6=, $0=, $pop7
-	i32.store	a($pop9), $pop6
-	i32.const	$push5=, 0
-	i32.store	a+4($pop5), $0
+	i32.const	$push7=, 0
+	i32.load	$push6=, a+60($pop7)
+	tee_local	$push5=, $0=, $pop6
+	i32.store	a($pop8), $pop5
 	i32.const	$push4=, 0
-	i32.const	$push3=, 1
-	i32.store	c($pop4), $pop3
-	i32.const	$push2=, 0
-                                        # fallthrough-return: $pop2
+	i32.store	a+4($pop4), $0
+	i32.const	$push3=, 0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	fn1, .Lfunc_end0-fn1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -85,7 +63,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -114,5 +92,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58640.c.s b/test/torture-s/pr58640.c.s
index a1436317b..08b793e0c 100644
--- a/test/torture-s/pr58640.c.s
+++ b/test/torture-s/pr58640.c.s
@@ -1,47 +1,70 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58640.c"
+	.file	"pr58640.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 # BB#0:                                 # %entry
+	call    	foo@FUNCTION
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
+	unreachable
+	.endfunc
+.Lfunc_end0:
+	.size	main, .Lfunc_end0-main
+                                        # -- End function
+	.section	.text.foo,"ax",@progbits
+	.type	foo,@function           # -- Begin function foo
+foo:                                    # @foo
+	.local  	i32, i32, i32
+# BB#0:                                 # %entry
 	block   	
 	i32.const	$push9=, 0
-	i32.load	$push0=, b($pop9)
-	i32.const	$push8=, 0
-	i32.gt_s	$push1=, $pop0, $pop8
-	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body3.lr.ph.i
+	i32.load	$push8=, b($pop9)
+	tee_local	$push7=, $2=, $pop8
+	i32.const	$push6=, 0
+	i32.le_s	$push0=, $pop7, $pop6
+	br_if   	0, $pop0        # 0: down to label0
+# BB#1:                                 # %cleanup
+	return
+.LBB1_2:                                # %for.body3.lr.ph
+	end_block                       # label0:
 	block   	
 	i32.const	$push10=, 0
-	i32.load	$push2=, d($pop10)
-	br_if   	0, $pop2        # 0: down to label1
-# BB#2:                                 # %for.body3.i.preheader
-	i32.const	$push7=, 0
-	i32.const	$push6=, 1
-	i32.store	b($pop7), $pop6
+	i32.load	$push1=, d($pop10)
+	i32.eqz 	$push16=, $pop1
+	br_if   	0, $pop16       # 0: down to label1
+# BB#3:                                 # %if.then.split
+	i32.const	$push3=, 0
+	i32.const	$push2=, 4
+	i32.store	c($pop3), $pop2
 	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
-	unreachable
-.LBB0_3:                                # %for.cond4.preheader.split.i
+	i32.const	$push4=, 1
+	i32.store	e($pop11), $pop4
+	return
+.LBB1_4:                                # %for.body3.preheader
 	end_block                       # label1:
-	i32.const	$push4=, 0
-	i32.const	$push3=, 4
-	i32.store	c($pop4), $pop3
-	i32.const	$push12=, 0
-	i32.const	$push5=, 1
-	i32.store	e($pop12), $pop5
-.LBB0_4:                                # %foo.exit
-	end_block                       # label0:
-	i32.const	$push13=, 0
-	call    	exit@FUNCTION, $pop13
-	unreachable
+.LBB1_5:                                # %for.body3
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label2:
+	i32.const	$push15=, 0
+	i32.lt_s	$1=, $2, $pop15
+	i32.const	$push14=, 1
+	i32.add 	$push13=, $2, $pop14
+	tee_local	$push12=, $0=, $pop13
+	copy_local	$2=, $pop12
+	br_if   	0, $1           # 0: up to label2
+# BB#6:                                 # %for.inc28
+	end_loop
+	i32.const	$push5=, 0
+	i32.store	b($pop5), $0
+                                        # fallthrough-return
 	.endfunc
-.Lfunc_end0:
-	.size	main, .Lfunc_end0-main
-
+.Lfunc_end1:
+	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.data.d,"aw",@progbits
@@ -88,5 +111,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr58662.c.s b/test/torture-s/pr58662.c.s
index 682acc0a7..279307790 100644
--- a/test/torture-s/pr58662.c.s
+++ b/test/torture-s/pr58662.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58662.c"
+	.file	"pr58662.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -41,7 +41,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -79,5 +79,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58726.c.s b/test/torture-s/pr58726.c.s
index b092b7591..098565213 100644
--- a/test/torture-s/pr58726.c.s
+++ b/test/torture-s/pr58726.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58726.c"
+	.file	"pr58726.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -21,9 +21,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -40,7 +40,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -69,4 +69,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr58831.c.s b/test/torture-s/pr58831.c.s
index 2764e5ffd..d758fce0c 100644
--- a/test/torture-s/pr58831.c.s
+++ b/test/torture-s/pr58831.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58831.c"
+	.file	"pr58831.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -19,9 +19,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.fn2,"ax",@progbits
-	.type	fn2,@function
+	.type	fn2,@function           # -- Begin function fn2
 fn2:                                    # @fn2
 # BB#0:                                 # %entry
 	i32.const	$push1=, 0
@@ -34,9 +34,9 @@ fn2:                                    # @fn2
 	.endfunc
 .Lfunc_end1:
 	.size	fn2, .Lfunc_end1-fn2
-
+                                        # -- End function
 	.section	.text.fn1,"ax",@progbits
-	.type	fn1,@function
+	.type	fn1,@function           # -- Begin function fn1
 fn1:                                    # @fn1
 	.param  	i32
 	.local  	i32
@@ -73,7 +73,7 @@ fn1:                                    # @fn1
 	.endfunc
 .Lfunc_end2:
 	.size	fn1, .Lfunc_end2-fn1
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -174,4 +174,4 @@ j:
 	.size	j, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr58943.c.s b/test/torture-s/pr58943.c.s
index 91f667724..35d84248e 100644
--- a/test/torture-s/pr58943.c.s
+++ b/test/torture-s/pr58943.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58943.c"
+	.file	"pr58943.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,7 +48,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -59,5 +59,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58984.c.s b/test/torture-s/pr58984.c.s
index d910c4b71..9b77fd680 100644
--- a/test/torture-s/pr58984.c.s
+++ b/test/torture-s/pr58984.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr58984.c"
+	.file	"pr58984.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,14 +56,14 @@ main:                                   # @main
 # BB#4:                                 # %if.end11
 	i32.const	$push31=, 0
 	return  	$pop31
-.LBB0_5:                                # %if.then10
+.LBB0_5:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -119,5 +119,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59014-2.c.s b/test/torture-s/pr59014-2.c.s
index 20a390d89..79767665a 100644
--- a/test/torture-s/pr59014-2.c.s
+++ b/test/torture-s/pr59014-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59014-2.c"
+	.file	"pr59014-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,9 +17,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59014.c.s b/test/torture-s/pr59014.c.s
index 00553a7b4..d44ce0c26 100644
--- a/test/torture-s/pr59014.c.s
+++ b/test/torture-s/pr59014.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59014.c"
+	.file	"pr59014.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -10,14 +10,14 @@ foo:                                    # @foo
 # BB#0:                                 # %entry
 	block   	
 	i32.const	$push9=, 0
-	i32.load	$push2=, b($pop9)
-	i32.const	$push8=, 0
-	i32.gt_s	$push3=, $pop2, $pop8
-	i32.const	$push7=, 0
-	i32.load	$push6=, a($pop7)
-	tee_local	$push5=, $0=, $pop6
-	i32.const	$push0=, 1
-	i32.and 	$push1=, $pop5, $pop0
+	i32.load	$push8=, a($pop9)
+	tee_local	$push7=, $0=, $pop8
+	i32.const	$push2=, 1
+	i32.and 	$push3=, $pop7, $pop2
+	i32.const	$push6=, 0
+	i32.load	$push0=, b($pop6)
+	i32.const	$push5=, 0
+	i32.gt_s	$push1=, $pop0, $pop5
 	i32.or  	$push4=, $pop3, $pop1
 	i32.eqz 	$push12=, $pop4
 	br_if   	0, $pop12       # 0: down to label0
@@ -35,9 +35,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,14 +46,14 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	block   	
 	i32.const	$push12=, 0
-	i32.load	$push2=, b($pop12)
-	i32.const	$push11=, 0
-	i32.gt_s	$push3=, $pop2, $pop11
-	i32.const	$push10=, 0
-	i32.load	$push9=, a($pop10)
-	tee_local	$push8=, $0=, $pop9
-	i32.const	$push0=, 1
-	i32.and 	$push1=, $pop8, $pop0
+	i32.load	$push11=, a($pop12)
+	tee_local	$push10=, $0=, $pop11
+	i32.const	$push2=, 1
+	i32.and 	$push3=, $pop10, $pop2
+	i32.const	$push9=, 0
+	i32.load	$push0=, b($pop9)
+	i32.const	$push8=, 0
+	i32.gt_s	$push1=, $pop0, $pop8
 	i32.or  	$push4=, $pop3, $pop1
 	i32.eqz 	$push14=, $pop4
 	br_if   	0, $pop14       # 0: down to label2
@@ -80,7 +80,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -118,5 +118,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59101.c.s b/test/torture-s/pr59101.c.s
index c7dceda9b..0ce20014a 100644
--- a/test/torture-s/pr59101.c.s
+++ b/test/torture-s/pr59101.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59101.c"
+	.file	"pr59101.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59221.c.s b/test/torture-s/pr59221.c.s
index eb6e33aec..3c87ff028 100644
--- a/test/torture-s/pr59221.c.s
+++ b/test/torture-s/pr59221.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59221.c"
+	.file	"pr59221.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	i32.load	$push0=, b($pop10)
 	i32.eqz 	$push21=, $pop0
 	br_if   	0, $pop21       # 0: down to label0
-# BB#1:                                 # %for.inc.preheader
+# BB#1:                                 # %for.inc.lr.ph
 	i32.const	$push12=, 0
 	i32.const	$push11=, 0
 	i32.store	b($pop12), $pop11
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -87,5 +87,5 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59229.c.s b/test/torture-s/pr59229.c.s
index 2d58540b0..fbcb78dce 100644
--- a/test/torture-s/pr59229.c.s
+++ b/test/torture-s/pr59229.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59229.c"
+	.file	"pr59229.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -35,16 +35,16 @@ bar:                                    # @bar
 	i32.const	$push15=, 8224
 	i32.store16	0($pop14):p2align=0, $pop15
 	return
-.LBB0_3:                                # %if.then3
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -52,10 +52,10 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop7, $pop8
+	i32.sub 	$push18=, $pop6, $pop8
 	tee_local	$push17=, $2=, $pop18
 	i32.store	__stack_pointer($pop9), $pop17
 	block   	
@@ -83,42 +83,43 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
 	i32.const	$push3=, 0
-	i32.store	i($pop4), $pop3
-	i32.const	$0=, 0
+	i32.const	$push2=, 0
+	i32.store	i($pop3), $pop2
+	i32.const	$1=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push11=, .L.str.1
-	call    	foo@FUNCTION, $pop11, $0
+	i32.const	$push12=, .L.str.1
+	call    	foo@FUNCTION, $pop12, $1
+	i32.const	$push11=, 0
 	i32.const	$push10=, 0
-	i32.const	$push9=, 0
-	i32.load	$push0=, i($pop9)
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $pop0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	i32.store	i($pop10), $pop6
-	i32.const	$push5=, 16
-	i32.lt_s	$push1=, $0, $pop5
-	br_if   	0, $pop1        # 0: up to label2
+	i32.load	$push9=, i($pop10)
+	tee_local	$push8=, $0=, $pop9
+	i32.const	$push7=, 1
+	i32.add 	$push6=, $pop8, $pop7
+	tee_local	$push5=, $1=, $pop6
+	i32.store	i($pop11), $pop5
+	i32.const	$push4=, 15
+	i32.lt_s	$push0=, $0, $pop4
+	br_if   	0, $pop0        # 0: up to label2
 # BB#2:                                 # %for.end
 	end_loop
-	i32.const	$push2=, 0
-                                        # fallthrough-return: $pop2
+	i32.const	$push1=, 0
+                                        # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.bss.i,"aw",@nobits
@@ -140,6 +141,6 @@ i:
 	.size	.L.str.1, 17
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	memcmp, i32, i32, i32, i32
diff --git a/test/torture-s/pr59358.c.s b/test/torture-s/pr59358.c.s
index e2921f54a..8bf0c5a91 100644
--- a/test/torture-s/pr59358.c.s
+++ b/test/torture-s/pr59358.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59358.c"
+	.file	"pr59358.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -42,133 +42,144 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$push27=, $pop15, $pop16
-	tee_local	$push26=, $6=, $pop27
-	i32.store	__stack_pointer($pop17), $pop26
-	i32.const	$push25=, 1
-	i32.store	12($6), $pop25
+	i32.const	$push20=, 0
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
+	i32.const	$push19=, 16
+	i32.sub 	$push30=, $pop17, $pop19
+	tee_local	$push29=, $6=, $pop30
+	i32.store	__stack_pointer($pop20), $pop29
+	i32.const	$push28=, 1
+	i32.store	12($6), $pop28
+	i32.const	$1=, 0
 	i32.const	$0=, 2
-	i32.const	$1=, 2
 	i32.const	$2=, 1
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	i32.const	$push21=, 12
-	i32.add 	$push22=, $6, $pop21
-	i32.const	$push33=, 16
-	i32.call	$5=, foo@FUNCTION, $pop22, $pop33
+	i32.const	$push24=, 12
+	i32.add 	$push25=, $6, $pop24
+	i32.const	$push36=, 16
+	i32.call	$3=, foo@FUNCTION, $pop25, $pop36
 	copy_local	$4=, $0
 	block   	
 	block   	
-	i32.const	$push32=, -1
-	i32.add 	$push31=, $1, $pop32
-	tee_local	$push30=, $3=, $pop31
-	i32.const	$push29=, -8
-	i32.and 	$push1=, $pop30, $pop29
-	i32.const	$push28=, 8
-	i32.eq  	$push2=, $pop1, $pop28
+	i32.const	$push35=, 1
+	i32.add 	$push34=, $1, $pop35
+	tee_local	$push33=, $5=, $pop34
+	i32.const	$push32=, -8
+	i32.and 	$push1=, $pop33, $pop32
+	i32.const	$push31=, 8
+	i32.eq  	$push2=, $pop1, $pop31
 	br_if   	0, $pop2        # 0: down to label6
 # BB#2:                                 # %if.else
                                         #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	i32.const	$push35=, -4
-	i32.and 	$push3=, $3, $pop35
-	i32.const	$push34=, 4
-	i32.ne  	$push4=, $pop3, $pop34
+	i32.const	$push38=, -4
+	i32.and 	$push3=, $5, $pop38
+	i32.const	$push37=, 4
+	i32.ne  	$push4=, $pop3, $pop37
 	br_if   	0, $pop4        # 0: down to label7
 # BB#3:                                 # %if.then6
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push36=, 2
-	i32.shl 	$push13=, $2, $pop36
-	i32.eq  	$push6=, $5, $pop13
+	i32.const	$push39=, 2
+	i32.shl 	$push15=, $2, $pop39
+	i32.eq  	$push6=, $3, $pop15
 	br_if   	2, $pop6        # 2: down to label5
 	br      	4               # 4: down to label3
 .LBB1_4:                                # %if.else10
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label7:
-	i32.const	$push39=, 24
-	i32.const	$push38=, 16
-	i32.const	$push37=, 4
-	i32.eq  	$push5=, $1, $pop37
-	i32.select	$4=, $pop39, $pop38, $pop5
+	i32.const	$push42=, 24
+	i32.const	$push41=, 16
+	i32.const	$push40=, 2
+	i32.eq  	$push5=, $1, $pop40
+	i32.select	$4=, $pop42, $pop41, $pop5
 .LBB1_5:                                # %if.end15
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label6:
-	i32.ne  	$push7=, $5, $4
+	i32.ne  	$push7=, $3, $4
 	br_if   	2, $pop7        # 2: down to label3
 .LBB1_6:                                # %if.end18
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label5:
-	i32.const	$push23=, 12
-	i32.add 	$push24=, $6, $pop23
-	i32.const	$push41=, 7
-	i32.call	$4=, foo@FUNCTION, $pop24, $pop41
-	copy_local	$5=, $2
+	i32.const	$push26=, 12
+	i32.add 	$push27=, $6, $pop26
+	i32.const	$push44=, 7
+	i32.call	$3=, foo@FUNCTION, $pop27, $pop44
+	block   	
 	block   	
-	i32.const	$push40=, 6
-	i32.gt_s	$push8=, $3, $pop40
-	br_if   	0, $pop8        # 0: down to label8
+	i32.const	$push43=, 6
+	i32.gt_u	$push8=, $5, $pop43
+	br_if   	0, $pop8        # 0: down to label9
 # BB#7:                                 # %if.else22
                                         #   in Loop: Header=BB1_1 Depth=1
-	copy_local	$5=, $0
-	i32.const	$push42=, 3
-	i32.gt_s	$push9=, $3, $pop42
-	br_if   	0, $pop9        # 0: down to label8
-# BB#8:                                 # %if.else28
+	block   	
+	i32.const	$push45=, 4
+	i32.lt_u	$push9=, $5, $pop45
+	br_if   	0, $pop9        # 0: down to label10
+# BB#8:                                 # %if.then24
+                                        #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push46=, 1
+	i32.shl 	$push16=, $2, $pop46
+	i32.eq  	$push11=, $3, $pop16
+	br_if   	2, $pop11       # 2: down to label8
+	br      	4               # 4: down to label3
+.LBB1_9:                                # %if.else28
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push45=, 12
-	i32.const	$push44=, 8
-	i32.const	$push43=, 4
-	i32.eq  	$push10=, $1, $pop43
-	i32.select	$5=, $pop45, $pop44, $pop10
-.LBB1_9:                                # %if.end34
+	end_block                       # label10:
+	i32.const	$push49=, 12
+	i32.const	$push48=, 8
+	i32.const	$push47=, 2
+	i32.eq  	$push10=, $1, $pop47
+	i32.select	$5=, $pop49, $pop48, $pop10
+.LBB1_10:                               # %if.end34
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label8:
-	i32.ne  	$push11=, $4, $5
-	br_if   	1, $pop11       # 1: down to label3
-# BB#10:                                # %if.end37
+	end_block                       # label9:
+	i32.ne  	$push12=, $3, $5
+	br_if   	2, $pop12       # 2: down to label3
+.LBB1_11:                               # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push49=, 2
-	i32.add 	$0=, $0, $pop49
-	i32.const	$push48=, 1
-	i32.add 	$2=, $2, $pop48
-	i32.store	12($6), $1
-	i32.const	$push47=, 17
-	i32.lt_s	$3=, $1, $pop47
-	i32.const	$push46=, 1
-	i32.add 	$push0=, $1, $pop46
-	copy_local	$1=, $pop0
-	br_if   	0, $3           # 0: up to label4
-# BB#11:                                # %for.end
+	end_block                       # label8:
+	i32.const	$push56=, 1
+	i32.add 	$2=, $2, $pop56
+	i32.const	$push55=, 2
+	i32.add 	$push0=, $1, $pop55
+	i32.store	12($6), $pop0
+	i32.const	$push54=, 2
+	i32.add 	$0=, $0, $pop54
+	i32.const	$push53=, 1
+	i32.add 	$push52=, $1, $pop53
+	tee_local	$push51=, $1=, $pop52
+	i32.const	$push50=, 15
+	i32.le_u	$push13=, $pop51, $pop50
+	br_if   	0, $pop13       # 0: up to label4
+# BB#12:                                # %for.end
 	end_loop
-	i32.const	$push20=, 0
-	i32.const	$push18=, 16
-	i32.add 	$push19=, $6, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
-	i32.const	$push12=, 0
-	return  	$pop12
-.LBB1_12:                               # %if.then36
+	i32.const	$push23=, 0
+	i32.const	$push21=, 16
+	i32.add 	$push22=, $6, $pop21
+	i32.store	__stack_pointer($pop23), $pop22
+	i32.const	$push14=, 0
+	return  	$pop14
+.LBB1_13:                               # %if.then17
 	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59387.c.s b/test/torture-s/pr59387.c.s
index 5dac85529..29e16dd92 100644
--- a/test/torture-s/pr59387.c.s
+++ b/test/torture-s/pr59387.c.s
@@ -1,20 +1,20 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59387.c"
+	.file	"pr59387.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$0=, -19
+	i32.const	$1=, -19
 	i32.const	$push6=, 0
 	i32.const	$push5=, -19
 	i32.store	a($pop6), $pop5
 	i32.const	$push4=, 0
-	i32.load8_u	$1=, c($pop4)
-.LBB0_1:                                # %for.cond1.preheader
+	i32.load8_u	$0=, c($pop4)
+.LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
@@ -23,19 +23,19 @@ main:                                   # @main
 	i32.const	$push9=, f
 	i32.store	0($pop0), $pop9
 	i32.const	$push8=, -24
-	i32.add 	$1=, $1, $pop8
+	i32.add 	$0=, $0, $pop8
 	i32.const	$push7=, 0
 	i32.load	$push1=, d($pop7)
 	i32.eqz 	$push17=, $pop1
 	br_if   	1, $pop17       # 1: down to label0
-# BB#2:                                 # %for.inc4
+# BB#2:                                 # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.const	$push14=, 0
 	i32.const	$push13=, 1
-	i32.add 	$push12=, $0, $pop13
-	tee_local	$push11=, $0=, $pop12
+	i32.add 	$push12=, $1, $pop13
+	tee_local	$push11=, $1=, $pop12
 	i32.store	a($pop14), $pop11
-	br_if   	0, $0           # 0: up to label1
+	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %return
 	end_loop
 	end_block                       # label0:
@@ -43,13 +43,13 @@ main:                                   # @main
 	i32.const	$push2=, 24
 	i32.store	b($pop3), $pop2
 	i32.const	$push16=, 0
-	i32.store8	c($pop16), $1
+	i32.store8	c($pop16), $0
 	i32.const	$push15=, 0
                                         # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	d                       # @d
 	.type	d,@object
 	.section	.bss.d,"aw",@nobits
@@ -104,4 +104,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr59388.c.s b/test/torture-s/pr59388.c.s
index ab2f39316..77b1c4094 100644
--- a/test/torture-s/pr59388.c.s
+++ b/test/torture-s/pr59388.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59388.c"
+	.file	"pr59388.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -20,7 +20,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -40,4 +40,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr59413.c.s b/test/torture-s/pr59413.c.s
index 40d15d416..812d50784 100644
--- a/test/torture-s/pr59413.c.s
+++ b/test/torture-s/pr59413.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59413.c"
+	.file	"pr59413.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -35,4 +35,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr59643.c.s b/test/torture-s/pr59643.c.s
index b7852eced..67e31ae17 100644
--- a/test/torture-s/pr59643.c.s
+++ b/test/torture-s/pr59643.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59643.c"
+	.file	"pr59643.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,49 +9,47 @@ foo:                                    # @foo
 	.local  	i32, i32, f64, f64
 # BB#0:                                 # %entry
 	block   	
-	i32.const	$push13=, -1
-	i32.add 	$push0=, $5, $pop13
-	i32.const	$push1=, 2
-	i32.lt_s	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
-	i32.const	$push3=, 16
-	i32.add 	$6=, $0, $pop3
-	i32.const	$push4=, -2
-	i32.add 	$7=, $5, $pop4
-	i32.const	$push15=, 8
-	i32.add 	$5=, $2, $pop15
-	i32.const	$push14=, 8
-	i32.add 	$1=, $1, $pop14
+	i32.const	$push0=, 3
+	i32.lt_s	$push1=, $5, $pop0
+	br_if   	0, $pop1        # 0: down to label0
+# BB#1:                                 # %for.body.lr.ph
+	i32.const	$push2=, 16
+	i32.add 	$6=, $0, $pop2
+	i32.const	$push3=, -2
+	i32.add 	$7=, $5, $pop3
+	i32.const	$push13=, 8
+	i32.add 	$5=, $2, $pop13
+	i32.const	$push12=, 8
+	i32.add 	$1=, $1, $pop12
 	f64.load	$8=, 8($0)
 	f64.load	$9=, 0($0)
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push26=, -8
-	i32.add 	$push12=, $6, $pop26
-	f64.mul 	$push5=, $8, $4
-	f64.load	$push7=, 0($1)
-	f64.load	$push6=, 0($5)
-	f64.add 	$push8=, $pop7, $pop6
-	f64.add 	$push9=, $pop8, $9
-	f64.load	$push25=, 0($6)
-	tee_local	$push24=, $8=, $pop25
-	f64.add 	$push10=, $pop9, $pop24
-	f64.mul 	$push11=, $pop10, $3
-	f64.add 	$push23=, $pop5, $pop11
-	tee_local	$push22=, $9=, $pop23
-	f64.store	0($pop12), $pop22
-	i32.const	$push21=, 8
-	i32.add 	$6=, $6, $pop21
-	i32.const	$push20=, 8
-	i32.add 	$5=, $5, $pop20
+	i32.const	$push24=, -8
+	i32.add 	$push11=, $6, $pop24
+	f64.mul 	$push4=, $8, $4
+	f64.load	$push6=, 0($1)
+	f64.load	$push5=, 0($5)
+	f64.add 	$push7=, $pop6, $pop5
+	f64.add 	$push8=, $pop7, $9
+	f64.load	$push23=, 0($6)
+	tee_local	$push22=, $8=, $pop23
+	f64.add 	$push9=, $pop8, $pop22
+	f64.mul 	$push10=, $pop9, $3
+	f64.add 	$push21=, $pop4, $pop10
+	tee_local	$push20=, $9=, $pop21
+	f64.store	0($pop11), $pop20
 	i32.const	$push19=, 8
-	i32.add 	$1=, $1, $pop19
-	i32.const	$push18=, -1
-	i32.add 	$push17=, $7, $pop18
-	tee_local	$push16=, $7=, $pop17
-	br_if   	0, $pop16       # 0: up to label1
+	i32.add 	$6=, $6, $pop19
+	i32.const	$push18=, 8
+	i32.add 	$5=, $5, $pop18
+	i32.const	$push17=, 8
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, -1
+	i32.add 	$push15=, $7, $pop16
+	tee_local	$push14=, $7=, $pop15
+	br_if   	0, $pop14       # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
@@ -59,9 +57,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -69,10 +67,10 @@ main:                                   # @main
 	.local  	i32, f64, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 768
-	i32.sub 	$push34=, $pop17, $pop18
+	i32.sub 	$push34=, $pop16, $pop18
 	tee_local	$push33=, $6=, $pop34
 	i32.store	__stack_pointer($pop19), $pop33
 	i32.const	$5=, 0
@@ -123,8 +121,8 @@ main:                                   # @main
 	f64.const	$push7=, 0x1.8p1
 	i32.const	$push6=, 32
 	call    	foo@FUNCTION, $pop28, $pop30, $6, $pop8, $pop7, $pop6
+	i32.const	$4=, -1
 	i32.const	$5=, 0
-	i32.const	$4=, 0
 .LBB1_3:                                # %for.body12
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -145,8 +143,8 @@ main:                                   # @main
 	i32.const	$push53=, 1
 	i32.add 	$push52=, $4, $pop53
 	tee_local	$push51=, $4=, $pop52
-	i32.const	$push50=, 31
-	i32.le_s	$push14=, $pop51, $pop50
+	i32.const	$push50=, 30
+	i32.le_u	$push14=, $pop51, $pop50
 	br_if   	0, $pop14       # 0: up to label4
 # BB#5:                                 # %for.end19
 	end_loop
@@ -163,7 +161,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	expected                # @expected
 	.type	expected,@object
 	.section	.data.expected,"aw",@progbits
@@ -205,5 +203,5 @@ expected:
 	.size	expected, 256
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59747.c.s b/test/torture-s/pr59747.c.s
index d45306cac..4d6894d19 100644
--- a/test/torture-s/pr59747.c.s
+++ b/test/torture-s/pr59747.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr59747.c"
+	.file	"pr59747.c"
 	.section	.text.fn1,"ax",@progbits
-	.hidden	fn1
+	.hidden	fn1                     # -- Begin function fn1
 	.globl	fn1
 	.type	fn1,@function
 fn1:                                    # @fn1
@@ -17,9 +17,9 @@ fn1:                                    # @fn1
 	.endfunc
 .Lfunc_end0:
 	.size	fn1, .Lfunc_end0-fn1
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,7 +70,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -108,6 +108,6 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr60017.c.s b/test/torture-s/pr60017.c.s
index 5390ed33f..8b55f0bd1 100644
--- a/test/torture-s/pr60017.c.s
+++ b/test/torture-s/pr60017.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr60017.c"
+	.file	"pr60017.c"
 	.section	.text.func,"ax",@progbits
-	.hidden	func
+	.hidden	func                    # -- Begin function func
 	.globl	func
 	.type	func,@function
 func:                                   # @func
@@ -19,9 +19,9 @@ func:                                   # @func
 	.endfunc
 .Lfunc_end0:
 	.size	func, .Lfunc_end0-func
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -62,5 +62,5 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr60062.c.s b/test/torture-s/pr60062.c.s
index de7e9ce38..34ac83d65 100644
--- a/test/torture-s/pr60062.c.s
+++ b/test/torture-s/pr60062.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr60062.c"
+	.file	"pr60062.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,7 +12,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.bss.a,"aw",@nobits
@@ -23,4 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr60072.c.s b/test/torture-s/pr60072.c.s
index e030340ab..2ccfaa45e 100644
--- a/test/torture-s/pr60072.c.s
+++ b/test/torture-s/pr60072.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr60072.c"
+	.file	"pr60072.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	c                       # @c
 	.type	c,@object
 	.section	.data.c,"aw",@progbits
@@ -26,4 +26,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr60454.c.s b/test/torture-s/pr60454.c.s
index c118dc249..ef2ba828a 100644
--- a/test/torture-s/pr60454.c.s
+++ b/test/torture-s/pr60454.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr60454.c"
+	.file	"pr60454.c"
 	.section	.text.fake_swap32,"ax",@progbits
-	.hidden	fake_swap32
+	.hidden	fake_swap32             # -- Begin function fake_swap32
 	.globl	fake_swap32
 	.type	fake_swap32,@function
 fake_swap32:                            # @fake_swap32
@@ -30,9 +30,9 @@ fake_swap32:                            # @fake_swap32
 	.endfunc
 .Lfunc_end0:
 	.size	fake_swap32, .Lfunc_end0-fake_swap32
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,7 +54,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr60960.c.s b/test/torture-s/pr60960.c.s
index d3258cac7..7d0d87b8f 100644
--- a/test/torture-s/pr60960.c.s
+++ b/test/torture-s/pr60960.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr60960.c"
+	.file	"pr60960.c"
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -9,37 +9,37 @@ f1:                                     # @f1
 # BB#0:                                 # %entry
 	i32.const	$push0=, 3
 	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, 255
+	i32.const	$push2=, 254
 	i32.and 	$push3=, $4, $pop2
-	i32.const	$push4=, 0
-	i32.div_u	$push5=, $pop3, $pop4
+	i32.const	$push4=, 1
+	i32.shr_u	$push5=, $pop3, $pop4
 	i32.store8	0($pop1), $pop5
 	i32.const	$push6=, 2
 	i32.add 	$push7=, $0, $pop6
-	i32.const	$push21=, 255
+	i32.const	$push21=, 254
 	i32.and 	$push8=, $3, $pop21
-	i32.const	$push20=, 0
-	i32.div_u	$push9=, $pop8, $pop20
+	i32.const	$push20=, 1
+	i32.shr_u	$push9=, $pop8, $pop20
 	i32.store8	0($pop7), $pop9
-	i32.const	$push10=, 1
-	i32.add 	$push11=, $0, $pop10
-	i32.const	$push19=, 255
-	i32.and 	$push12=, $2, $pop19
-	i32.const	$push18=, 0
-	i32.div_u	$push13=, $pop12, $pop18
-	i32.store8	0($pop11), $pop13
-	i32.const	$push14=, 254
-	i32.and 	$push15=, $1, $pop14
+	i32.const	$push19=, 1
+	i32.add 	$push10=, $0, $pop19
+	i32.const	$push18=, 254
+	i32.and 	$push11=, $2, $pop18
 	i32.const	$push17=, 1
-	i32.shr_u	$push16=, $pop15, $pop17
-	i32.store8	0($0), $pop16
+	i32.shr_u	$push12=, $pop11, $pop17
+	i32.store8	0($pop10), $pop12
+	i32.const	$push16=, 254
+	i32.and 	$push13=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.shr_u	$push14=, $pop13, $pop15
+	i32.store8	0($0), $pop14
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f1, .Lfunc_end0-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -75,9 +75,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end1:
 	.size	f2, .Lfunc_end1-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -117,9 +117,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -127,10 +127,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push29=, $pop11, $pop12
+	i32.sub 	$push29=, $pop10, $pop12
 	tee_local	$push28=, $0=, $pop29
 	i32.store	__stack_pointer($pop13), $pop28
 	i32.const	$push17=, 12
@@ -180,14 +180,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop16), $pop15
 	i32.const	$push9=, 0
 	return  	$pop9
-.LBB3_4:                                # %if.then10
+.LBB3_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-1.c.s b/test/torture-s/pr61306-1.c.s
index c32f65fd0..c1e01adb0 100644
--- a/test/torture-s/pr61306-1.c.s
+++ b/test/torture-s/pr61306-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61306-1.c"
+	.file	"pr61306-1.c"
 	.section	.text.fake_bswap32,"ax",@progbits
-	.hidden	fake_bswap32
+	.hidden	fake_bswap32            # -- Begin function fake_bswap32
 	.globl	fake_bswap32
 	.type	fake_bswap32,@function
 fake_bswap32:                           # @fake_bswap32
@@ -27,9 +27,9 @@ fake_bswap32:                           # @fake_bswap32
 	.endfunc
 .Lfunc_end0:
 	.size	fake_bswap32, .Lfunc_end0-fake_bswap32
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-2.c.s b/test/torture-s/pr61306-2.c.s
index f02a883ca..38f468dec 100644
--- a/test/torture-s/pr61306-2.c.s
+++ b/test/torture-s/pr61306-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61306-2.c"
+	.file	"pr61306-2.c"
 	.section	.text.fake_bswap32,"ax",@progbits
-	.hidden	fake_bswap32
+	.hidden	fake_bswap32            # -- Begin function fake_bswap32
 	.globl	fake_bswap32
 	.type	fake_bswap32,@function
 fake_bswap32:                           # @fake_bswap32
@@ -29,9 +29,9 @@ fake_bswap32:                           # @fake_bswap32
 	.endfunc
 .Lfunc_end0:
 	.size	fake_bswap32, .Lfunc_end0-fake_bswap32
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -53,7 +53,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-3.c.s b/test/torture-s/pr61306-3.c.s
index 4da537104..ca57db8a5 100644
--- a/test/torture-s/pr61306-3.c.s
+++ b/test/torture-s/pr61306-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61306-3.c"
+	.file	"pr61306-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -35,7 +35,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	a                       # @a
 	.type	a,@object
 	.section	.data.a,"aw",@progbits
@@ -63,5 +63,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61375.c.s b/test/torture-s/pr61375.c.s
index d6a0bf2da..c9bb9a0f3 100644
--- a/test/torture-s/pr61375.c.s
+++ b/test/torture-s/pr61375.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61375.c"
+	.file	"pr61375.c"
 	.section	.text.uint128_central_bitsi_ior,"ax",@progbits
-	.hidden	uint128_central_bitsi_ior
+	.hidden	uint128_central_bitsi_ior # -- Begin function uint128_central_bitsi_ior
 	.globl	uint128_central_bitsi_ior
 	.type	uint128_central_bitsi_ior,@function
 uint128_central_bitsi_ior:              # @uint128_central_bitsi_ior
@@ -20,9 +20,9 @@ uint128_central_bitsi_ior:              # @uint128_central_bitsi_ior
 	.endfunc
 .Lfunc_end0:
 	.size	uint128_central_bitsi_ior, .Lfunc_end0-uint128_central_bitsi_ior
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,7 +47,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61673.c.s b/test/torture-s/pr61673.c.s
index 8b0c252de..36fdb5218 100644
--- a/test/torture-s/pr61673.c.s
+++ b/test/torture-s/pr61673.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61673.c"
+	.file	"pr61673.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -26,9 +26,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -38,21 +38,23 @@ foo:                                    # @foo
 	i32.load8_s	$push4=, 0($0)
 	tee_local	$push3=, $0=, $pop4
 	i32.const	$push0=, -1
-	i32.gt_s	$push1=, $pop3, $pop0
+	i32.le_s	$push1=, $pop3, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %if.then
+# BB#1:                                 # %if.end
+	call    	bar@FUNCTION, $0
+	return
+.LBB1_2:                                # %if.then
+	end_block                       # label2:
 	i32.const	$push2=, 0
 	i32.store8	e($pop2), $0
-.LBB1_2:                                # %if.end
-	end_block                       # label2:
 	call    	bar@FUNCTION, $0
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.baz,"ax",@progbits
-	.hidden	baz
+	.hidden	baz                     # -- Begin function baz
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
@@ -62,20 +64,21 @@ baz:                                    # @baz
 	i32.load8_s	$push4=, 0($0)
 	tee_local	$push3=, $0=, $pop4
 	i32.const	$push0=, -1
-	i32.gt_s	$push1=, $pop3, $pop0
+	i32.le_s	$push1=, $pop3, $pop0
 	br_if   	0, $pop1        # 0: down to label3
-# BB#1:                                 # %if.then
+# BB#1:                                 # %if.end
+	return
+.LBB2_2:                                # %if.then
+	end_block                       # label3:
 	i32.const	$push2=, 0
 	i32.store8	e($pop2), $0
-.LBB2_2:                                # %if.end
-	end_block                       # label3:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
 	.size	baz, .Lfunc_end2-baz
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -122,14 +125,14 @@ main:                                   # @main
 # BB#4:                                 # %if.end16
 	i32.const	$push16=, 0
 	return  	$pop16
-.LBB3_5:                                # %if.then15
+.LBB3_5:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	e                       # @e
 	.type	e,@object
 	.section	.bss.e,"aw",@nobits
@@ -145,5 +148,5 @@ main.c:
 	.size	main.c, 2
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61725.c.s b/test/torture-s/pr61725.c.s
index 4128a51e0..a627fd53f 100644
--- a/test/torture-s/pr61725.c.s
+++ b/test/torture-s/pr61725.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr61725.c"
+	.file	"pr61725.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr63209.c.s b/test/torture-s/pr63209.c.s
index 4dc2063af..7df5f4370 100644
--- a/test/torture-s/pr63209.c.s
+++ b/test/torture-s/pr63209.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr63209.c"
+	.file	"pr63209.c"
 	.section	.text.Predictor,"ax",@progbits
-	.hidden	Predictor
+	.hidden	Predictor               # -- Begin function Predictor
 	.globl	Predictor
 	.type	Predictor,@function
 Predictor:                              # @Predictor
@@ -24,15 +24,15 @@ Predictor:                              # @Predictor
 	i32.shr_u	$push8=, $1, $pop13
 	i32.const	$push12=, 255
 	i32.and 	$push9=, $pop8, $pop12
-	i32.le_s	$push10=, $pop7, $pop9
-	i32.select	$push11=, $pop16, $0, $pop10
+	i32.gt_s	$push10=, $pop7, $pop9
+	i32.select	$push11=, $0, $pop16, $pop10
                                         # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
 	.size	Predictor, .Lfunc_end0-Predictor
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -47,7 +47,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.top,@object        # @main.top
 	.section	.rodata.main.top,"a",@progbits
 	.p2align	2
@@ -57,4 +57,4 @@ main.top:
 	.size	main.top, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pr63302.c.s b/test/torture-s/pr63302.c.s
index 849be66ac..ed8ee998d 100644
--- a/test/torture-s/pr63302.c.s
+++ b/test/torture-s/pr63302.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr63302.c"
+	.file	"pr63302.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,9 +24,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -44,9 +44,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -152,14 +152,14 @@ main:                                   # @main
 # BB#18:                                # %if.end51
 	i32.const	$push50=, 0
 	return  	$pop50
-.LBB2_19:                               # %if.then50
+.LBB2_19:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr63659.c.s b/test/torture-s/pr63659.c.s
index 00de6ee9a..e46c5e538 100644
--- a/test/torture-s/pr63659.c.s
+++ b/test/torture-s/pr63659.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr63659.c"
+	.file	"pr63659.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,7 +61,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	b                       # @b
 	.type	b,@object
 	.section	.bss.b,"aw",@nobits
@@ -142,5 +142,5 @@ e:
 	.size	e, 1
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pr7284-1.c.s b/test/torture-s/pr7284-1.c.s
index af01a611c..706108cba 100644
--- a/test/torture-s/pr7284-1.c.s
+++ b/test/torture-s/pr7284-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pr7284-1.c"
+	.file	"pr7284-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -16,9 +16,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +43,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -54,6 +54,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/printf-1.c.s b/test/torture-s/printf-1.c.s
index 4fb009ee2..0683bc567 100644
--- a/test/torture-s/printf-1.c.s
+++ b/test/torture-s/printf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/printf-1.c"
+	.file	"printf-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push45=, 0
-	i32.const	$push42=, 0
-	i32.load	$push43=, __stack_pointer($pop42)
+	i32.const	$push43=, 0
+	i32.load	$push42=, __stack_pointer($pop43)
 	i32.const	$push44=, 176
-	i32.sub 	$push74=, $pop43, $pop44
+	i32.sub 	$push74=, $pop42, $pop44
 	tee_local	$push73=, $0=, $pop74
 	i32.store	__stack_pointer($pop45), $pop73
 	i32.const	$push72=, .Lstr
@@ -146,14 +146,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop48), $pop47
 	i32.const	$push92=, 0
 	return  	$pop92
-.LBB0_11:                               # %if.then50
+.LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	.L.str.1,@object        # @.str.1
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str.1:
@@ -196,7 +196,7 @@ main:                                   # @main
 	.size	.Lstr, 6
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	printf, i32, i32
 	.functype	abort, void
 	.functype	puts, i32, i32
diff --git a/test/torture-s/printf-chk-1.c.s b/test/torture-s/printf-chk-1.c.s
index a1921e85c..2c98a2882 100644
--- a/test/torture-s/printf-chk-1.c.s
+++ b/test/torture-s/printf-chk-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/printf-chk-1.c"
+	.file	"printf-chk-1.c"
 	.section	.text.__printf_chk,"ax",@progbits
-	.hidden	__printf_chk
+	.hidden	__printf_chk            # -- Begin function __printf_chk
 	.globl	__printf_chk
 	.type	__printf_chk,@function
 __printf_chk:                           # @__printf_chk
@@ -10,10 +10,10 @@ __printf_chk:                           # @__printf_chk
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop3, $pop4
+	i32.sub 	$push11=, $pop2, $pop4
 	tee_local	$push10=, $3=, $pop11
 	i32.store	__stack_pointer($pop5), $pop10
 	block   	
@@ -38,9 +38,9 @@ __printf_chk:                           # @__printf_chk
 	.endfunc
 .Lfunc_end0:
 	.size	__printf_chk, .Lfunc_end0-__printf_chk
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -48,10 +48,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push56=, 0
-	i32.const	$push53=, 0
-	i32.load	$push54=, __stack_pointer($pop53)
+	i32.const	$push54=, 0
+	i32.load	$push53=, __stack_pointer($pop54)
 	i32.const	$push55=, 224
-	i32.sub 	$push92=, $pop54, $pop55
+	i32.sub 	$push92=, $pop53, $pop55
 	tee_local	$push91=, $0=, $pop92
 	i32.store	__stack_pointer($pop56), $pop91
 	i32.const	$push90=, 0
@@ -383,14 +383,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop59), $pop58
 	i32.const	$push196=, 0
 	return  	$pop196
-.LBB1_34:                               # %if.then115
+.LBB1_34:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	should_optimize         # @should_optimize
 	.type	should_optimize,@object
 	.section	.bss.should_optimize,"aw",@nobits
@@ -442,6 +442,6 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	vprintf, i32, i32, i32
diff --git a/test/torture-s/pta-field-1.c.s b/test/torture-s/pta-field-1.c.s
index 04040ed19..27d412cf2 100644
--- a/test/torture-s/pta-field-1.c.s
+++ b/test/torture-s/pta-field-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pta-field-1.c"
+	.file	"pta-field-1.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -14,9 +14,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -24,20 +24,20 @@ foo:                                    # @foo
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop3, $pop4
+	i32.sub 	$push14=, $pop2, $pop4
 	tee_local	$push13=, $1=, $pop14
 	i32.store	__stack_pointer($pop5), $pop13
 	i32.const	$push0=, 1
 	i32.store	4($1), $pop0
 	i32.const	$push1=, 2
 	i32.store	0($1), $pop1
-	i32.store	12($1), $1
 	i32.const	$push9=, 4
 	i32.add 	$push10=, $1, $pop9
 	i32.store	8($1), $pop10
+	i32.store	12($1), $1
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $1, $pop11
 	call    	bar@FUNCTION, $pop12
@@ -51,9 +51,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,20 +61,20 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $0=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i32.const	$push0=, 1
 	i32.store	4($0), $pop0
 	i32.const	$push1=, 2
 	i32.store	0($0), $pop1
-	i32.store	12($0), $0
 	i32.const	$push11=, 4
 	i32.add 	$push12=, $0, $pop11
 	i32.store	8($0), $pop12
+	i32.store	12($0), $0
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $0, $pop13
 	call    	bar@FUNCTION, $pop14
@@ -95,7 +95,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/pta-field-2.c.s b/test/torture-s/pta-field-2.c.s
index db8a840f6..a38428518 100644
--- a/test/torture-s/pta-field-2.c.s
+++ b/test/torture-s/pta-field-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pta-field-2.c"
+	.file	"pta-field-2.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -16,9 +16,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -26,20 +26,20 @@ foo:                                    # @foo
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop5, $pop6
+	i32.sub 	$push16=, $pop4, $pop6
 	tee_local	$push15=, $1=, $pop16
 	i32.store	__stack_pointer($pop7), $pop15
 	i32.const	$push0=, 1
 	i32.store	4($1), $pop0
 	i32.const	$push1=, 2
 	i32.store	0($1), $pop1
-	i32.store	12($1), $1
 	i32.const	$push11=, 4
 	i32.add 	$push12=, $1, $pop11
 	i32.store	8($1), $pop12
+	i32.store	12($1), $1
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $1, $pop13
 	i32.const	$push2=, 4
@@ -55,9 +55,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,20 +65,20 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop7, $pop8
+	i32.sub 	$push18=, $pop6, $pop8
 	tee_local	$push17=, $0=, $pop18
 	i32.store	__stack_pointer($pop9), $pop17
 	i32.const	$push0=, 1
 	i32.store	4($0), $pop0
 	i32.const	$push1=, 2
 	i32.store	0($0), $pop1
-	i32.store	12($0), $0
 	i32.const	$push13=, 4
 	i32.add 	$push14=, $0, $pop13
 	i32.store	8($0), $pop14
+	i32.store	12($0), $0
 	i32.const	$push15=, 8
 	i32.add 	$push16=, $0, $pop15
 	i32.const	$push2=, 4
@@ -101,7 +101,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/ptr-arith-1.c.s b/test/torture-s/ptr-arith-1.c.s
index 7a74b4142..a64d0d5d0 100644
--- a/test/torture-s/ptr-arith-1.c.s
+++ b/test/torture-s/ptr-arith-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/ptr-arith-1.c"
+	.file	"ptr-arith-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -15,21 +15,21 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pure-1.c.s b/test/torture-s/pure-1.c.s
index 40eb8b44c..cd8b00d2a 100644
--- a/test/torture-s/pure-1.c.s
+++ b/test/torture-s/pure-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pure-1.c"
+	.file	"pure-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,9 +12,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.func0,"ax",@progbits
-	.hidden	func0
+	.hidden	func0                   # -- Begin function func0
 	.globl	func0
 	.type	func0,@function
 func0:                                  # @func0
@@ -28,9 +28,9 @@ func0:                                  # @func0
 	.endfunc
 .Lfunc_end1:
 	.size	func0, .Lfunc_end1-func0
-
+                                        # -- End function
 	.section	.text.func1,"ax",@progbits
-	.hidden	func1
+	.hidden	func1                   # -- Begin function func1
 	.globl	func1
 	.type	func1,@function
 func1:                                  # @func1
@@ -42,7 +42,7 @@ func1:                                  # @func1
 	.endfunc
 .Lfunc_end2:
 	.size	func1, .Lfunc_end2-func1
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -53,4 +53,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/pushpop_macro.c.s b/test/torture-s/pushpop_macro.c.s
index 5fcfd1ed2..fe1341a8b 100644
--- a/test/torture-s/pushpop_macro.c.s
+++ b/test/torture-s/pushpop_macro.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/pushpop_macro.c"
+	.file	"pushpop_macro.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/regstack-1.c.s b/test/torture-s/regstack-1.c.s
index eff8f90db..23061b767 100644
--- a/test/torture-s/regstack-1.c.s
+++ b/test/torture-s/regstack-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/regstack-1.c"
+	.file	"regstack-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,213 +9,211 @@ main:                                   # @main
 	.local  	i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32
 # BB#0:                                 # %entry
 	i32.const	$push59=, 0
-	i32.const	$push56=, 0
-	i32.load	$push57=, __stack_pointer($pop56)
+	i32.const	$push57=, 0
+	i32.load	$push56=, __stack_pointer($pop57)
 	i32.const	$push58=, 320
-	i32.sub 	$push243=, $pop57, $pop58
+	i32.sub 	$push243=, $pop56, $pop58
 	tee_local	$push242=, $16=, $pop243
 	i32.store	__stack_pointer($pop59), $pop242
 	i32.const	$push60=, 304
 	i32.add 	$push61=, $16, $pop60
 	i32.const	$push0=, 0
 	i64.load	$push241=, C($pop0)
-	tee_local	$push240=, $11=, $pop241
+	tee_local	$push240=, $7=, $pop241
 	i32.const	$push239=, 0
 	i64.load	$push238=, C+8($pop239)
-	tee_local	$push237=, $10=, $pop238
+	tee_local	$push237=, $6=, $pop238
 	i32.const	$push236=, 0
 	i64.load	$push235=, U($pop236)
-	tee_local	$push234=, $7=, $pop235
+	tee_local	$push234=, $5=, $pop235
 	i32.const	$push233=, 0
 	i64.load	$push232=, U+8($pop233)
-	tee_local	$push231=, $6=, $pop232
+	tee_local	$push231=, $4=, $pop232
 	call    	__addtf3@FUNCTION, $pop61, $pop240, $pop237, $pop234, $pop231
 	i32.const	$push62=, 240
 	i32.add 	$push63=, $16, $pop62
-	call    	__subtf3@FUNCTION, $pop63, $11, $10, $7, $6
+	call    	__subtf3@FUNCTION, $pop63, $7, $6, $5, $4
 	i32.const	$push66=, 288
 	i32.add 	$push67=, $16, $pop66
 	i64.load	$push230=, 304($16)
-	tee_local	$push229=, $13=, $pop230
+	tee_local	$push229=, $15=, $pop230
 	i32.const	$push64=, 304
 	i32.add 	$push65=, $16, $pop64
 	i32.const	$push1=, 8
 	i32.add 	$push2=, $pop65, $pop1
 	i64.load	$push228=, 0($pop2)
-	tee_local	$push227=, $12=, $pop228
-	call    	__addtf3@FUNCTION, $pop67, $7, $6, $pop229, $pop227
-	i32.const	$push70=, 224
-	i32.add 	$push71=, $16, $pop70
-	i64.load	$push226=, 240($16)
-	tee_local	$push225=, $15=, $pop226
-	i32.const	$push68=, 240
+	tee_local	$push227=, $14=, $pop228
+	call    	__addtf3@FUNCTION, $pop67, $5, $4, $pop229, $pop227
+	i32.const	$push68=, 128
 	i32.add 	$push69=, $16, $pop68
-	i32.const	$push224=, 8
-	i32.add 	$push3=, $pop69, $pop224
-	i64.load	$push223=, 0($pop3)
-	tee_local	$push222=, $14=, $pop223
-	call    	__subtf3@FUNCTION, $pop71, $pop225, $pop222, $7, $6
-	i32.const	$push74=, 272
-	i32.add 	$push75=, $16, $pop74
-	i64.load	$push221=, 288($16)
-	tee_local	$push220=, $9=, $pop221
-	i32.const	$push72=, 288
+	i32.const	$push226=, 0
+	i64.load	$push225=, Y2($pop226)
+	tee_local	$push224=, $7=, $pop225
+	i32.const	$push223=, 0
+	i64.load	$push222=, Y2+8($pop223)
+	tee_local	$push221=, $6=, $pop222
+	call    	__addtf3@FUNCTION, $pop69, $5, $4, $pop224, $pop221
+	i32.const	$push72=, 224
 	i32.add 	$push73=, $16, $pop72
-	i32.const	$push219=, 8
-	i32.add 	$push4=, $pop73, $pop219
-	i64.load	$push218=, 0($pop4)
-	tee_local	$push217=, $8=, $pop218
-	call    	__addtf3@FUNCTION, $pop75, $7, $6, $pop220, $pop217
-	i32.const	$push76=, 128
+	i64.load	$push220=, 240($16)
+	tee_local	$push219=, $9=, $pop220
+	i32.const	$push70=, 240
+	i32.add 	$push71=, $16, $pop70
+	i32.const	$push218=, 8
+	i32.add 	$push3=, $pop71, $pop218
+	i64.load	$push217=, 0($pop3)
+	tee_local	$push216=, $8=, $pop217
+	call    	__subtf3@FUNCTION, $pop73, $pop219, $pop216, $5, $4
+	i32.const	$push76=, 272
 	i32.add 	$push77=, $16, $pop76
-	i32.const	$push216=, 0
-	i64.load	$push215=, Y2($pop216)
+	i64.load	$push215=, 288($16)
 	tee_local	$push214=, $11=, $pop215
-	i32.const	$push213=, 0
-	i64.load	$push212=, Y2+8($pop213)
+	i32.const	$push74=, 288
+	i32.add 	$push75=, $16, $pop74
+	i32.const	$push213=, 8
+	i32.add 	$push4=, $pop75, $pop213
+	i64.load	$push212=, 0($pop4)
 	tee_local	$push211=, $10=, $pop212
-	call    	__addtf3@FUNCTION, $pop77, $7, $6, $pop214, $pop211
-	i32.const	$push78=, 192
+	call    	__addtf3@FUNCTION, $pop77, $5, $4, $pop214, $pop211
+	i32.const	$push78=, 16
 	i32.add 	$push79=, $16, $pop78
-	call    	__multf3@FUNCTION, $pop79, $13, $12, $11, $10
-	i32.const	$push80=, 112
-	i32.add 	$push81=, $16, $pop80
 	i32.const	$push210=, 0
 	i64.load	$push209=, Y1($pop210)
 	tee_local	$push208=, $13=, $pop209
 	i32.const	$push207=, 0
 	i64.load	$push206=, Y1+8($pop207)
 	tee_local	$push205=, $12=, $pop206
-	call    	__multf3@FUNCTION, $pop81, $15, $14, $pop208, $pop205
-	i32.const	$push84=, 80
+	call    	__multf3@FUNCTION, $pop79, $7, $6, $pop208, $pop205
+	i32.const	$push80=, 112
+	i32.add 	$push81=, $16, $pop80
+	call    	__multf3@FUNCTION, $pop81, $9, $8, $13, $12
+	i32.const	$push84=, 48
 	i32.add 	$push85=, $16, $pop84
-	i64.load	$push204=, 224($16)
-	tee_local	$push203=, $15=, $pop204
-	i32.const	$push82=, 224
+	i64.load	$push7=, 128($16)
+	i32.const	$push82=, 128
 	i32.add 	$push83=, $16, $pop82
-	i32.const	$push202=, 8
-	i32.add 	$push5=, $pop83, $pop202
-	i64.load	$push201=, 0($pop5)
-	tee_local	$push200=, $14=, $pop201
-	call    	__multf3@FUNCTION, $pop85, $13, $12, $pop203, $pop200
-	i32.const	$push86=, 208
+	i32.const	$push204=, 8
+	i32.add 	$push5=, $pop83, $pop204
+	i64.load	$push6=, 0($pop5)
+	call    	__multf3@FUNCTION, $pop85, $pop7, $pop6, $13, $12
+	i32.const	$push86=, 192
 	i32.add 	$push87=, $16, $pop86
-	call    	__subtf3@FUNCTION, $pop87, $7, $6, $15, $14
-	i32.const	$push88=, 160
+	call    	__multf3@FUNCTION, $pop87, $15, $14, $7, $6
+	i32.const	$push90=, 80
+	i32.add 	$push91=, $16, $pop90
+	i64.load	$push203=, 224($16)
+	tee_local	$push202=, $15=, $pop203
+	i32.const	$push88=, 224
 	i32.add 	$push89=, $16, $pop88
-	call    	__multf3@FUNCTION, $pop89, $11, $10, $9, $8
-	i32.const	$push92=, 256
+	i32.const	$push201=, 8
+	i32.add 	$push8=, $pop89, $pop201
+	i64.load	$push200=, 0($pop8)
+	tee_local	$push199=, $14=, $pop200
+	call    	__multf3@FUNCTION, $pop91, $pop202, $pop199, $13, $12
+	i32.const	$push92=, 208
 	i32.add 	$push93=, $16, $pop92
-	i64.load	$push199=, 272($16)
-	tee_local	$push198=, $9=, $pop199
-	i32.const	$push90=, 272
-	i32.add 	$push91=, $16, $pop90
-	i32.const	$push197=, 8
-	i32.add 	$push6=, $pop91, $pop197
-	i64.load	$push196=, 0($pop6)
-	tee_local	$push195=, $8=, $pop196
-	call    	__addtf3@FUNCTION, $pop93, $7, $6, $pop198, $pop195
-	i32.const	$push96=, 48
-	i32.add 	$push97=, $16, $pop96
-	i64.load	$push9=, 128($16)
-	i32.const	$push94=, 128
+	call    	__subtf3@FUNCTION, $pop93, $5, $4, $15, $14
+	i32.const	$push94=, 160
 	i32.add 	$push95=, $16, $pop94
-	i32.const	$push194=, 8
-	i32.add 	$push7=, $pop95, $pop194
-	i64.load	$push8=, 0($pop7)
-	call    	__multf3@FUNCTION, $pop97, $pop9, $pop8, $13, $12
-	i32.const	$push98=, 16
+	call    	__multf3@FUNCTION, $pop95, $7, $6, $11, $10
+	i32.const	$push98=, 256
 	i32.add 	$push99=, $16, $pop98
-	call    	__multf3@FUNCTION, $pop99, $11, $10, $13, $12
-	i32.const	$push102=, 176
-	i32.add 	$push103=, $16, $pop102
-	i64.load	$push12=, 192($16)
-	i32.const	$push100=, 192
+	i64.load	$push198=, 272($16)
+	tee_local	$push197=, $13=, $pop198
+	i32.const	$push96=, 272
+	i32.add 	$push97=, $16, $pop96
+	i32.const	$push196=, 8
+	i32.add 	$push9=, $pop97, $pop196
+	i64.load	$push195=, 0($pop9)
+	tee_local	$push194=, $12=, $pop195
+	call    	__addtf3@FUNCTION, $pop99, $5, $4, $pop197, $pop194
+	i64.load	$push13=, 16($16)
+	i32.const	$push100=, 16
 	i32.add 	$push101=, $16, $pop100
 	i32.const	$push193=, 8
 	i32.add 	$push10=, $pop101, $pop193
 	i64.load	$push11=, 0($pop10)
-	call    	__subtf3@FUNCTION, $pop103, $pop12, $pop11, $9, $8
-	i32.const	$push106=, 96
-	i32.add 	$push107=, $16, $pop106
-	i64.load	$push15=, 112($16)
-	i32.const	$push104=, 112
+	i64.const	$push192=, 0
+	i64.const	$push12=, -4612248968380809216
+	call    	__addtf3@FUNCTION, $16, $pop13, $pop11, $pop192, $pop12
+	i32.const	$push104=, 96
 	i32.add 	$push105=, $16, $pop104
-	i32.const	$push192=, 8
-	i32.add 	$push13=, $pop105, $pop192
-	i64.load	$push14=, 0($pop13)
-	call    	__subtf3@FUNCTION, $pop107, $pop15, $pop14, $15, $14
-	i32.const	$push112=, 64
-	i32.add 	$push113=, $16, $pop112
-	i64.load	$push21=, 208($16)
-	i32.const	$push110=, 208
-	i32.add 	$push111=, $16, $pop110
+	i64.load	$push16=, 112($16)
+	i32.const	$push102=, 112
+	i32.add 	$push103=, $16, $pop102
 	i32.const	$push191=, 8
-	i32.add 	$push18=, $pop111, $pop191
-	i64.load	$push19=, 0($pop18)
-	i64.load	$push20=, 80($16)
-	i32.const	$push108=, 80
+	i32.add 	$push14=, $pop103, $pop191
+	i64.load	$push15=, 0($pop14)
+	call    	__subtf3@FUNCTION, $pop105, $pop16, $pop15, $15, $14
+	i32.const	$push108=, 32
 	i32.add 	$push109=, $16, $pop108
+	i64.load	$push19=, 48($16)
+	i32.const	$push106=, 48
+	i32.add 	$push107=, $16, $pop106
 	i32.const	$push190=, 8
-	i32.add 	$push16=, $pop109, $pop190
-	i64.load	$push17=, 0($pop16)
-	call    	__addtf3@FUNCTION, $pop113, $pop21, $pop19, $pop20, $pop17
-	i32.const	$push118=, 144
+	i32.add 	$push17=, $pop107, $pop190
+	i64.load	$push18=, 0($pop17)
+	call    	__subtf3@FUNCTION, $pop109, $pop19, $pop18, $7, $6
+	i32.const	$push112=, 176
+	i32.add 	$push113=, $16, $pop112
+	i64.load	$push22=, 192($16)
+	i32.const	$push110=, 192
+	i32.add 	$push111=, $16, $pop110
+	i32.const	$push189=, 8
+	i32.add 	$push20=, $pop111, $pop189
+	i64.load	$push21=, 0($pop20)
+	call    	__subtf3@FUNCTION, $pop113, $pop22, $pop21, $13, $12
+	i32.const	$push118=, 64
 	i32.add 	$push119=, $16, $pop118
-	i64.load	$push189=, 160($16)
-	tee_local	$push188=, $7=, $pop189
-	i32.const	$push114=, 160
+	i64.load	$push28=, 208($16)
+	i32.const	$push116=, 208
+	i32.add 	$push117=, $16, $pop116
+	i32.const	$push188=, 8
+	i32.add 	$push25=, $pop117, $pop188
+	i64.load	$push26=, 0($pop25)
+	i64.load	$push27=, 80($16)
+	i32.const	$push114=, 80
 	i32.add 	$push115=, $16, $pop114
 	i32.const	$push187=, 8
-	i32.add 	$push22=, $pop115, $pop187
-	i64.load	$push186=, 0($pop22)
-	tee_local	$push185=, $6=, $pop186
-	i64.load	$push25=, 256($16)
-	i32.const	$push116=, 256
-	i32.add 	$push117=, $16, $pop116
-	i32.const	$push184=, 8
-	i32.add 	$push23=, $pop117, $pop184
+	i32.add 	$push23=, $pop115, $pop187
 	i64.load	$push24=, 0($pop23)
-	call    	__subtf3@FUNCTION, $pop119, $pop188, $pop185, $pop25, $pop24
-	i32.const	$push122=, 32
-	i32.add 	$push123=, $16, $pop122
-	i64.load	$push28=, 48($16)
-	i32.const	$push120=, 48
-	i32.add 	$push121=, $16, $pop120
-	i32.const	$push183=, 8
-	i32.add 	$push26=, $pop121, $pop183
-	i64.load	$push27=, 0($pop26)
-	call    	__subtf3@FUNCTION, $pop123, $pop28, $pop27, $11, $10
-	i64.load	$push32=, 16($16)
-	i32.const	$push124=, 16
+	call    	__addtf3@FUNCTION, $pop119, $pop28, $pop26, $pop27, $pop24
+	i32.const	$push124=, 144
 	i32.add 	$push125=, $16, $pop124
-	i32.const	$push182=, 8
-	i32.add 	$push29=, $pop125, $pop182
-	i64.load	$push30=, 0($pop29)
-	i64.const	$push181=, 0
-	i64.const	$push31=, -4612248968380809216
-	call    	__addtf3@FUNCTION, $16, $pop32, $pop30, $pop181, $pop31
+	i64.load	$push186=, 160($16)
+	tee_local	$push185=, $5=, $pop186
+	i32.const	$push120=, 160
+	i32.add 	$push121=, $16, $pop120
+	i32.const	$push184=, 8
+	i32.add 	$push29=, $pop121, $pop184
+	i64.load	$push183=, 0($pop29)
+	tee_local	$push182=, $4=, $pop183
+	i64.load	$push32=, 256($16)
+	i32.const	$push122=, 256
+	i32.add 	$push123=, $16, $pop122
+	i32.const	$push181=, 8
+	i32.add 	$push30=, $pop123, $pop181
+	i64.load	$push31=, 0($pop30)
+	call    	__subtf3@FUNCTION, $pop125, $pop185, $pop182, $pop32, $pop31
 	i32.const	$push180=, 0
-	i64.store	S+8($pop180), $6
-	i32.const	$push179=, 0
-	i64.store	S($pop179), $7
-	i32.const	$push178=, 0
-	i32.const	$push126=, 176
-	i32.add 	$push127=, $16, $pop126
-	i32.const	$push177=, 8
-	i32.add 	$push33=, $pop127, $pop177
-	i64.load	$push176=, 0($pop33)
-	tee_local	$push175=, $9=, $pop176
-	i64.store	X+8($pop178), $pop175
-	i32.const	$push174=, 0
-	i64.load	$push173=, 176($16)
-	tee_local	$push172=, $8=, $pop173
-	i64.store	X($pop174), $pop172
+	i32.const	$push179=, 8
+	i32.add 	$push33=, $16, $pop179
+	i64.load	$push178=, 0($pop33)
+	tee_local	$push177=, $9=, $pop178
+	i64.store	Y1+8($pop180), $pop177
+	i32.const	$push176=, 0
+	i64.load	$push175=, 0($16)
+	tee_local	$push174=, $8=, $pop175
+	i64.store	Y1($pop176), $pop174
+	i32.const	$push173=, 0
+	i64.store	S+8($pop173), $4
+	i32.const	$push172=, 0
+	i64.store	S($pop172), $5
 	i32.const	$push171=, 0
-	i32.const	$push128=, 96
-	i32.add 	$push129=, $16, $pop128
+	i32.const	$push126=, 96
+	i32.add 	$push127=, $16, $pop126
 	i32.const	$push170=, 8
-	i32.add 	$push34=, $pop129, $pop170
+	i32.add 	$push34=, $pop127, $pop170
 	i64.load	$push169=, 0($pop34)
 	tee_local	$push168=, $13=, $pop169
 	i64.store	T+8($pop171), $pop168
@@ -224,55 +222,57 @@ main:                                   # @main
 	tee_local	$push165=, $12=, $pop166
 	i64.store	T($pop167), $pop165
 	i32.const	$push164=, 0
-	i32.const	$push130=, 64
-	i32.add 	$push131=, $16, $pop130
+	i32.const	$push128=, 32
+	i32.add 	$push129=, $16, $pop128
 	i32.const	$push163=, 8
-	i32.add 	$push35=, $pop131, $pop163
+	i32.add 	$push35=, $pop129, $pop163
 	i64.load	$push162=, 0($pop35)
-	tee_local	$push161=, $5=, $pop162
-	i64.store	Y+8($pop164), $pop161
+	tee_local	$push161=, $15=, $pop162
+	i64.store	R+8($pop164), $pop161
 	i32.const	$push160=, 0
-	i64.load	$push159=, 64($16)
-	tee_local	$push158=, $4=, $pop159
-	i64.store	Y($pop160), $pop158
+	i64.load	$push159=, 32($16)
+	tee_local	$push158=, $14=, $pop159
+	i64.store	R($pop160), $pop158
 	i32.const	$push157=, 0
-	i32.const	$push132=, 144
-	i32.add 	$push133=, $16, $pop132
+	i32.const	$push130=, 176
+	i32.add 	$push131=, $16, $pop130
 	i32.const	$push156=, 8
-	i32.add 	$push36=, $pop133, $pop156
+	i32.add 	$push36=, $pop131, $pop156
 	i64.load	$push155=, 0($pop36)
-	tee_local	$push154=, $3=, $pop155
-	i64.store	Z+8($pop157), $pop154
+	tee_local	$push154=, $11=, $pop155
+	i64.store	X+8($pop157), $pop154
 	i32.const	$push153=, 0
-	i64.load	$push152=, 144($16)
-	tee_local	$push151=, $2=, $pop152
-	i64.store	Z($pop153), $pop151
+	i64.load	$push152=, 176($16)
+	tee_local	$push151=, $10=, $pop152
+	i64.store	X($pop153), $pop151
 	i32.const	$push150=, 0
-	i32.const	$push134=, 32
-	i32.add 	$push135=, $16, $pop134
+	i32.const	$push132=, 64
+	i32.add 	$push133=, $16, $pop132
 	i32.const	$push149=, 8
-	i32.add 	$push37=, $pop135, $pop149
+	i32.add 	$push37=, $pop133, $pop149
 	i64.load	$push148=, 0($pop37)
-	tee_local	$push147=, $15=, $pop148
-	i64.store	R+8($pop150), $pop147
+	tee_local	$push147=, $3=, $pop148
+	i64.store	Y+8($pop150), $pop147
 	i32.const	$push146=, 0
-	i64.load	$push145=, 32($16)
-	tee_local	$push144=, $14=, $pop145
-	i64.store	R($pop146), $pop144
+	i64.load	$push145=, 64($16)
+	tee_local	$push144=, $2=, $pop145
+	i64.store	Y($pop146), $pop144
 	i32.const	$push143=, 0
+	i32.const	$push134=, 144
+	i32.add 	$push135=, $16, $pop134
 	i32.const	$push142=, 8
-	i32.add 	$push38=, $16, $pop142
+	i32.add 	$push38=, $pop135, $pop142
 	i64.load	$push141=, 0($pop38)
 	tee_local	$push140=, $1=, $pop141
-	i64.store	Y1+8($pop143), $pop140
+	i64.store	Z+8($pop143), $pop140
 	i32.const	$push139=, 0
-	i64.load	$push138=, 0($16)
+	i64.load	$push138=, 144($16)
 	tee_local	$push137=, $0=, $pop138
-	i64.store	Y1($pop139), $pop137
+	i64.store	Z($pop139), $pop137
 	block   	
 	i64.const	$push136=, 0
 	i64.const	$push39=, 4612354521497075712
-	i32.call	$push40=, __netf2@FUNCTION, $11, $10, $pop136, $pop39
+	i32.call	$push40=, __netf2@FUNCTION, $7, $6, $pop136, $pop39
 	br_if   	0, $pop40       # 0: down to label0
 # BB#1:                                 # %entry
 	i64.const	$push244=, 0
@@ -282,7 +282,7 @@ main:                                   # @main
 # BB#2:                                 # %entry
 	i64.const	$push245=, 0
 	i64.const	$push43=, 4613150567915585536
-	i32.call	$push44=, __netf2@FUNCTION, $7, $6, $pop245, $pop43
+	i32.call	$push44=, __netf2@FUNCTION, $5, $4, $pop245, $pop43
 	br_if   	0, $pop44       # 0: down to label0
 # BB#3:                                 # %entry
 	i64.const	$push246=, 0
@@ -292,22 +292,22 @@ main:                                   # @main
 # BB#4:                                 # %entry
 	i64.const	$push247=, 0
 	i64.const	$push47=, 4613503511148101632
-	i32.call	$push48=, __netf2@FUNCTION, $0, $1, $pop247, $pop47
+	i32.call	$push48=, __netf2@FUNCTION, $8, $9, $pop247, $pop47
 	br_if   	0, $pop48       # 0: down to label0
 # BB#5:                                 # %entry
 	i64.const	$push248=, 0
-	i64.const	$push49=, 4613110985496985600
-	i32.call	$push50=, __netf2@FUNCTION, $2, $3, $pop248, $pop49
+	i64.const	$push49=, 4613040616752807936
+	i32.call	$push50=, __netf2@FUNCTION, $10, $11, $pop248, $pop49
 	br_if   	0, $pop50       # 0: down to label0
 # BB#6:                                 # %entry
 	i64.const	$push249=, 0
-	i64.const	$push51=, 4612961451915608064
-	i32.call	$push52=, __netf2@FUNCTION, $4, $5, $pop249, $pop51
+	i64.const	$push51=, 4613110985496985600
+	i32.call	$push52=, __netf2@FUNCTION, $0, $1, $pop249, $pop51
 	br_if   	0, $pop52       # 0: down to label0
 # BB#7:                                 # %entry
 	i64.const	$push250=, 0
-	i64.const	$push53=, 4613040616752807936
-	i32.call	$push54=, __eqtf2@FUNCTION, $8, $9, $pop250, $pop53
+	i64.const	$push53=, 4612961451915608064
+	i32.call	$push54=, __eqtf2@FUNCTION, $2, $3, $pop250, $pop53
 	br_if   	0, $pop54       # 0: down to label0
 # BB#8:                                 # %if.end
 	i32.const	$push55=, 0
@@ -320,7 +320,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	C                       # @C
 	.type	C,@object
 	.section	.data.C,"aw",@progbits
@@ -422,6 +422,6 @@ S:
 	.size	S, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/restrict-1.c.s b/test/torture-s/restrict-1.c.s
index 286d3a91f..0a3c4262a 100644
--- a/test/torture-s/restrict-1.c.s
+++ b/test/torture-s/restrict-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/restrict-1.c"
+	.file	"restrict-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -17,25 +17,25 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.load	$push0=, 0($0)
-	i32.const	$push1=, 1
-	i32.shl 	$push6=, $pop0, $pop1
+	i32.load	$push6=, 0($0)
 	tee_local	$push5=, $1=, $pop6
-	i64.extend_u/i32	$push2=, $pop5
+	i32.const	$push0=, 1
+	i32.shl 	$push1=, $pop5, $pop0
+	i64.extend_u/i32	$push2=, $pop1
 	i64.store	0($0):p2align=2, $pop2
 	block   	
-	i32.const	$push3=, 2
-	i32.ne  	$push4=, $1, $pop3
-	br_if   	0, $pop4        # 0: down to label0
+	i32.const	$push4=, 1
+	i32.ne  	$push3=, $1, $pop4
+	br_if   	0, $pop3        # 0: down to label0
 # BB#1:                                 # %if.end
 	return
 .LBB1_2:                                # %if.then
@@ -45,9 +45,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -58,7 +58,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec1.c.s b/test/torture-s/scal-to-vec1.c.s
new file mode 100644
index 000000000..b03137aae
--- /dev/null
+++ b/test/torture-s/scal-to-vec1.c.s
@@ -0,0 +1,831 @@
+	.text
+	.file	"scal-to-vec1.c"
+	.section	.text.main,"ax",@progbits
+	.hidden	main                    # -- Begin function main
+	.globl	main
+	.type	main,@function
+main:                                   # @main
+	.param  	i32, i32
+	.result 	i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
+# BB#0:                                 # %entry
+	block   	
+	i32.const	$push2=, 0
+	i32.load	$push317=, one($pop2)
+	tee_local	$push316=, $2=, $pop317
+	i32.const	$push3=, 16
+	i32.shl 	$push315=, $pop316, $pop3
+	tee_local	$push314=, $3=, $pop315
+	i32.const	$push313=, 16
+	i32.shr_s	$push312=, $pop314, $pop313
+	tee_local	$push311=, $4=, $pop312
+	i32.const	$push310=, 2
+	i32.add 	$push7=, $pop311, $pop310
+	i32.const	$push4=, 131072
+	i32.add 	$push5=, $3, $pop4
+	i32.const	$push309=, 16
+	i32.shr_s	$push6=, $pop5, $pop309
+	i32.ne  	$push8=, $pop7, $pop6
+	br_if   	0, $pop8        # 0: down to label0
+# BB#1:                                 # %entry
+	i32.const	$push319=, 3
+	i32.const	$push318=, 3
+	i32.ne  	$push9=, $pop319, $pop318
+	br_if   	0, $pop9        # 0: down to label0
+# BB#2:                                 # %entry
+	i32.const	$push321=, 4
+	i32.const	$push320=, 4
+	i32.ne  	$push10=, $pop321, $pop320
+	br_if   	0, $pop10       # 0: down to label0
+# BB#3:                                 # %entry
+	i32.const	$push323=, 5
+	i32.const	$push322=, 5
+	i32.ne  	$push11=, $pop323, $pop322
+	br_if   	0, $pop11       # 0: down to label0
+# BB#4:                                 # %entry
+	i32.const	$push325=, 6
+	i32.const	$push324=, 6
+	i32.ne  	$push12=, $pop325, $pop324
+	br_if   	0, $pop12       # 0: down to label0
+# BB#5:                                 # %entry
+	i32.const	$push327=, 7
+	i32.const	$push326=, 7
+	i32.ne  	$push13=, $pop327, $pop326
+	br_if   	0, $pop13       # 0: down to label0
+# BB#6:                                 # %entry
+	i32.const	$push0=, 8
+	i32.const	$push328=, 8
+	i32.ne  	$push14=, $pop0, $pop328
+	br_if   	0, $pop14       # 0: down to label0
+# BB#7:                                 # %entry
+	i32.const	$push1=, 9
+	i32.const	$push329=, 9
+	i32.ne  	$push15=, $pop1, $pop329
+	br_if   	0, $pop15       # 0: down to label0
+# BB#8:                                 # %for.cond.7
+	i32.const	$push332=, 2
+	i32.sub 	$push23=, $pop332, $4
+	i32.const	$push331=, 2
+	i32.sub 	$push24=, $pop331, $2
+	i32.const	$push25=, 16
+	i32.shl 	$push26=, $pop24, $pop25
+	i32.const	$push330=, 16
+	i32.shr_s	$push27=, $pop26, $pop330
+	i32.ne  	$push28=, $pop23, $pop27
+	br_if   	0, $pop28       # 0: down to label0
+# BB#9:                                 # %for.cond.7
+	i32.const	$push334=, 2
+	i32.const	$push333=, 1
+	i32.sub 	$push16=, $pop334, $pop333
+	i32.const	$push29=, 1
+	i32.ne  	$push30=, $pop16, $pop29
+	br_if   	0, $pop30       # 0: down to label0
+# BB#10:                                # %for.cond.7
+	i32.const	$push336=, 2
+	i32.const	$push335=, 2
+	i32.sub 	$push17=, $pop336, $pop335
+	br_if   	0, $pop17       # 0: down to label0
+# BB#11:                                # %for.cond.7
+	i32.const	$push338=, 2
+	i32.const	$push337=, 3
+	i32.sub 	$push18=, $pop338, $pop337
+	i32.const	$push31=, -1
+	i32.ne  	$push32=, $pop18, $pop31
+	br_if   	0, $pop32       # 0: down to label0
+# BB#12:                                # %for.cond.7
+	i32.const	$push340=, 2
+	i32.const	$push339=, 4
+	i32.sub 	$push19=, $pop340, $pop339
+	i32.const	$push33=, -2
+	i32.ne  	$push34=, $pop19, $pop33
+	br_if   	0, $pop34       # 0: down to label0
+# BB#13:                                # %for.cond.7
+	i32.const	$push342=, 2
+	i32.const	$push341=, 5
+	i32.sub 	$push20=, $pop342, $pop341
+	i32.const	$push35=, -3
+	i32.ne  	$push36=, $pop20, $pop35
+	br_if   	0, $pop36       # 0: down to label0
+# BB#14:                                # %for.cond.7
+	i32.const	$push344=, 2
+	i32.const	$push343=, 6
+	i32.sub 	$push21=, $pop344, $pop343
+	i32.const	$push37=, -4
+	i32.ne  	$push38=, $pop21, $pop37
+	br_if   	0, $pop38       # 0: down to label0
+# BB#15:                                # %for.cond.7
+	i32.const	$push346=, 2
+	i32.const	$push345=, 7
+	i32.sub 	$push22=, $pop346, $pop345
+	i32.const	$push39=, -5
+	i32.ne  	$push40=, $pop22, $pop39
+	br_if   	0, $pop40       # 0: down to label0
+# BB#16:                                # %for.cond17.7
+	i32.const	$push48=, 15
+	i32.shr_s	$push49=, $3, $pop48
+	i32.const	$push50=, 17
+	i32.shl 	$push51=, $2, $pop50
+	i32.const	$push52=, 16
+	i32.shr_s	$push53=, $pop51, $pop52
+	i32.ne  	$push54=, $pop49, $pop53
+	br_if   	0, $pop54       # 0: down to label0
+# BB#17:                                # %for.cond17.7
+	i32.const	$push348=, 1
+	i32.const	$push347=, 1
+	i32.shl 	$push41=, $pop348, $pop347
+	i32.const	$push55=, 2
+	i32.ne  	$push56=, $pop41, $pop55
+	br_if   	0, $pop56       # 0: down to label0
+# BB#18:                                # %for.cond17.7
+	i32.const	$push350=, 2
+	i32.const	$push349=, 1
+	i32.shl 	$push42=, $pop350, $pop349
+	i32.const	$push57=, 4
+	i32.ne  	$push58=, $pop42, $pop57
+	br_if   	0, $pop58       # 0: down to label0
+# BB#19:                                # %for.cond17.7
+	i32.const	$push352=, 3
+	i32.const	$push351=, 1
+	i32.shl 	$push43=, $pop352, $pop351
+	i32.const	$push59=, 6
+	i32.ne  	$push60=, $pop43, $pop59
+	br_if   	0, $pop60       # 0: down to label0
+# BB#20:                                # %for.cond17.7
+	i32.const	$push354=, 4
+	i32.const	$push353=, 1
+	i32.shl 	$push44=, $pop354, $pop353
+	i32.const	$push61=, 8
+	i32.ne  	$push62=, $pop44, $pop61
+	br_if   	0, $pop62       # 0: down to label0
+# BB#21:                                # %for.cond17.7
+	i32.const	$push356=, 5
+	i32.const	$push355=, 1
+	i32.shl 	$push45=, $pop356, $pop355
+	i32.const	$push63=, 10
+	i32.ne  	$push64=, $pop45, $pop63
+	br_if   	0, $pop64       # 0: down to label0
+# BB#22:                                # %for.cond17.7
+	i32.const	$push358=, 6
+	i32.const	$push357=, 1
+	i32.shl 	$push46=, $pop358, $pop357
+	i32.const	$push65=, 12
+	i32.ne  	$push66=, $pop46, $pop65
+	br_if   	0, $pop66       # 0: down to label0
+# BB#23:                                # %for.cond17.7
+	i32.const	$push360=, 7
+	i32.const	$push359=, 1
+	i32.shl 	$push47=, $pop360, $pop359
+	i32.const	$push67=, 14
+	i32.ne  	$push68=, $pop47, $pop67
+	br_if   	0, $pop68       # 0: down to label0
+# BB#24:                                # %for.cond37.7
+	i32.const	$push70=, 2
+	i32.div_s	$3=, $pop70, $4
+	i32.const	$push377=, 2
+	i32.const	$push376=, 1
+	i32.div_u	$5=, $pop377, $pop376
+	i32.const	$push375=, 2
+	i32.const	$push374=, 2
+	i32.div_s	$6=, $pop375, $pop374
+	i32.const	$push373=, 2
+	i32.const	$push372=, 16
+	i32.shl 	$push82=, $2, $pop372
+	i32.const	$push371=, 16
+	i32.shr_s	$push83=, $pop82, $pop371
+	i32.div_s	$7=, $pop373, $pop83
+	i32.const	$push370=, 2
+	i32.const	$push369=, 3
+	i32.div_s	$push71=, $pop370, $pop369
+	i32.const	$push368=, 2
+	i32.const	$push367=, 4
+	i32.div_s	$push72=, $pop368, $pop367
+	i32.or  	$push73=, $pop71, $pop72
+	i32.const	$push366=, 2
+	i32.const	$push365=, 5
+	i32.div_s	$push74=, $pop366, $pop365
+	i32.or  	$push75=, $pop73, $pop74
+	i32.const	$push364=, 2
+	i32.const	$push363=, 6
+	i32.div_s	$push76=, $pop364, $pop363
+	i32.or  	$push77=, $pop75, $pop76
+	i32.const	$push362=, 2
+	i32.const	$push361=, 7
+	i32.div_s	$push78=, $pop362, $pop361
+	i32.or  	$push79=, $pop77, $pop78
+	i32.const	$push80=, 65535
+	i32.and 	$push81=, $pop79, $pop80
+	br_if   	0, $pop81       # 0: down to label0
+# BB#25:                                # %for.cond37.7
+	i32.const	$push379=, 16
+	i32.shl 	$push84=, $7, $pop379
+	i32.const	$push378=, 16
+	i32.shr_s	$push69=, $pop84, $pop378
+	i32.ne  	$push85=, $3, $pop69
+	br_if   	0, $pop85       # 0: down to label0
+# BB#26:                                # %for.cond37.7
+	i32.const	$push86=, 2
+	i32.ne  	$push87=, $5, $pop86
+	br_if   	0, $pop87       # 0: down to label0
+# BB#27:                                # %for.cond37.7
+	i32.const	$push380=, 65535
+	i32.and 	$push88=, $6, $pop380
+	i32.const	$push89=, 1
+	i32.ne  	$push90=, $pop88, $pop89
+	br_if   	0, $pop90       # 0: down to label0
+# BB#28:                                # %for.cond57.7
+	i32.const	$push92=, 2
+	i32.rem_s	$3=, $pop92, $4
+	i32.const	$push398=, 2
+	i32.const	$push397=, 3
+	i32.rem_s	$5=, $pop398, $pop397
+	i32.const	$push396=, 2
+	i32.const	$push395=, 4
+	i32.rem_s	$6=, $pop396, $pop395
+	i32.const	$push394=, 2
+	i32.const	$push393=, 16
+	i32.shl 	$push97=, $2, $pop393
+	i32.const	$push392=, 16
+	i32.shr_s	$push98=, $pop97, $pop392
+	i32.rem_s	$7=, $pop394, $pop98
+	i32.const	$push391=, 2
+	i32.const	$push390=, 5
+	i32.rem_s	$8=, $pop391, $pop390
+	i32.const	$push389=, 2
+	i32.const	$push388=, 6
+	i32.rem_s	$9=, $pop389, $pop388
+	i32.const	$push387=, 2
+	i32.const	$push386=, 7
+	i32.rem_s	$10=, $pop387, $pop386
+	i32.const	$push385=, 2
+	i32.const	$push384=, 1
+	i32.rem_u	$push93=, $pop385, $pop384
+	i32.const	$push383=, 2
+	i32.const	$push382=, 2
+	i32.rem_s	$push94=, $pop383, $pop382
+	i32.or  	$push95=, $pop93, $pop94
+	i32.const	$push381=, 65535
+	i32.and 	$push96=, $pop95, $pop381
+	br_if   	0, $pop96       # 0: down to label0
+# BB#29:                                # %for.cond57.7
+	i32.const	$push400=, 16
+	i32.shl 	$push99=, $7, $pop400
+	i32.const	$push399=, 16
+	i32.shr_s	$push91=, $pop99, $pop399
+	i32.ne  	$push100=, $3, $pop91
+	br_if   	0, $pop100      # 0: down to label0
+# BB#30:                                # %for.cond57.7
+	i32.const	$push402=, 65535
+	i32.and 	$push101=, $5, $pop402
+	i32.const	$push401=, 2
+	i32.ne  	$push102=, $pop101, $pop401
+	br_if   	0, $pop102      # 0: down to label0
+# BB#31:                                # %for.cond57.7
+	i32.const	$push404=, 65535
+	i32.and 	$push103=, $6, $pop404
+	i32.const	$push403=, 2
+	i32.ne  	$push104=, $pop103, $pop403
+	br_if   	0, $pop104      # 0: down to label0
+# BB#32:                                # %for.cond57.7
+	i32.const	$push406=, 65535
+	i32.and 	$push105=, $8, $pop406
+	i32.const	$push405=, 2
+	i32.ne  	$push106=, $pop105, $pop405
+	br_if   	0, $pop106      # 0: down to label0
+# BB#33:                                # %for.cond57.7
+	i32.const	$push408=, 65535
+	i32.and 	$push107=, $9, $pop408
+	i32.const	$push407=, 2
+	i32.ne  	$push108=, $pop107, $pop407
+	br_if   	0, $pop108      # 0: down to label0
+# BB#34:                                # %for.cond57.7
+	i32.const	$push410=, 65535
+	i32.and 	$push109=, $10, $pop410
+	i32.const	$push409=, 2
+	i32.ne  	$push110=, $pop109, $pop409
+	br_if   	0, $pop110      # 0: down to label0
+# BB#35:                                # %for.cond77.7
+	i32.const	$push414=, 2
+	i32.xor 	$push118=, $2, $pop414
+	i32.const	$push413=, 65535
+	i32.and 	$push412=, $pop118, $pop413
+	tee_local	$push411=, $3=, $pop412
+	i32.ne  	$push119=, $pop411, $3
+	br_if   	0, $pop119      # 0: down to label0
+# BB#36:                                # %for.cond77.7
+	i32.const	$push416=, 1
+	i32.const	$push415=, 2
+	i32.or  	$push111=, $pop416, $pop415
+	i32.const	$push120=, 3
+	i32.ne  	$push121=, $pop111, $pop120
+	br_if   	0, $pop121      # 0: down to label0
+# BB#37:                                # %for.cond77.7
+	i32.const	$push418=, 2
+	i32.const	$push417=, 2
+	i32.xor 	$push112=, $pop418, $pop417
+	br_if   	0, $pop112      # 0: down to label0
+# BB#38:                                # %for.cond77.7
+	i32.const	$push420=, 3
+	i32.const	$push419=, 2
+	i32.xor 	$push113=, $pop420, $pop419
+	i32.const	$push122=, 1
+	i32.ne  	$push123=, $pop113, $pop122
+	br_if   	0, $pop123      # 0: down to label0
+# BB#39:                                # %for.cond77.7
+	i32.const	$push422=, 4
+	i32.const	$push421=, 2
+	i32.xor 	$push114=, $pop422, $pop421
+	i32.const	$push124=, 6
+	i32.ne  	$push125=, $pop114, $pop124
+	br_if   	0, $pop125      # 0: down to label0
+# BB#40:                                # %for.cond77.7
+	i32.const	$push424=, 5
+	i32.const	$push423=, 2
+	i32.xor 	$push115=, $pop424, $pop423
+	i32.const	$push126=, 7
+	i32.ne  	$push127=, $pop115, $pop126
+	br_if   	0, $pop127      # 0: down to label0
+# BB#41:                                # %for.cond77.7
+	i32.const	$push426=, 6
+	i32.const	$push425=, 2
+	i32.xor 	$push116=, $pop426, $pop425
+	i32.const	$push128=, 4
+	i32.ne  	$push129=, $pop116, $pop128
+	br_if   	0, $pop129      # 0: down to label0
+# BB#42:                                # %for.cond77.7
+	i32.const	$push428=, 7
+	i32.const	$push427=, 2
+	i32.xor 	$push117=, $pop428, $pop427
+	i32.const	$push130=, 5
+	i32.ne  	$push131=, $pop117, $pop130
+	br_if   	0, $pop131      # 0: down to label0
+# BB#43:                                # %for.cond97.7
+	i32.const	$push431=, 4
+	i32.const	$push430=, 5
+	i32.or  	$push136=, $pop431, $pop430
+	i32.const	$push429=, 2
+	i32.and 	$push137=, $pop136, $pop429
+	br_if   	0, $pop137      # 0: down to label0
+# BB#44:                                # %for.cond97.7
+	i32.const	$push434=, 2
+	i32.and 	$push433=, $2, $pop434
+	tee_local	$push432=, $3=, $pop433
+	i32.ne  	$push138=, $pop432, $3
+	br_if   	0, $pop138      # 0: down to label0
+# BB#45:                                # %for.cond97.7
+	i32.const	$push139=, 0
+	br_if   	0, $pop139      # 0: down to label0
+# BB#46:                                # %for.cond97.7
+	i32.const	$push437=, 2
+	i32.const	$push436=, 2
+	i32.and 	$push132=, $pop437, $pop436
+	i32.const	$push435=, 2
+	i32.ne  	$push140=, $pop132, $pop435
+	br_if   	0, $pop140      # 0: down to label0
+# BB#47:                                # %for.cond97.7
+	i32.const	$push440=, 3
+	i32.const	$push439=, 2
+	i32.and 	$push133=, $pop440, $pop439
+	i32.const	$push438=, 2
+	i32.ne  	$push141=, $pop133, $pop438
+	br_if   	0, $pop141      # 0: down to label0
+# BB#48:                                # %for.cond97.7
+	i32.const	$push443=, 6
+	i32.const	$push442=, 2
+	i32.and 	$push134=, $pop443, $pop442
+	i32.const	$push441=, 2
+	i32.ne  	$push142=, $pop134, $pop441
+	br_if   	0, $pop142      # 0: down to label0
+# BB#49:                                # %for.cond97.7
+	i32.const	$push446=, 7
+	i32.const	$push445=, 2
+	i32.and 	$push135=, $pop446, $pop445
+	i32.const	$push444=, 2
+	i32.ne  	$push143=, $pop135, $pop444
+	br_if   	0, $pop143      # 0: down to label0
+# BB#50:                                # %for.cond117.7
+	i32.const	$push449=, 2
+	i32.or  	$push151=, $2, $pop449
+	i32.const	$push152=, 65535
+	i32.and 	$push448=, $pop151, $pop152
+	tee_local	$push447=, $3=, $pop448
+	i32.ne  	$push153=, $pop447, $3
+	br_if   	0, $pop153      # 0: down to label0
+# BB#51:                                # %for.cond117.7
+	i32.const	$push451=, 1
+	i32.const	$push450=, 2
+	i32.or  	$push144=, $pop451, $pop450
+	i32.const	$push154=, 3
+	i32.ne  	$push155=, $pop144, $pop154
+	br_if   	0, $pop155      # 0: down to label0
+# BB#52:                                # %for.cond117.7
+	i32.const	$push453=, 2
+	i32.const	$push452=, 2
+	i32.or  	$push145=, $pop453, $pop452
+	i32.const	$push156=, 2
+	i32.ne  	$push157=, $pop145, $pop156
+	br_if   	0, $pop157      # 0: down to label0
+# BB#53:                                # %for.cond117.7
+	i32.const	$push455=, 3
+	i32.const	$push454=, 2
+	i32.or  	$push146=, $pop455, $pop454
+	i32.const	$push158=, 3
+	i32.ne  	$push159=, $pop146, $pop158
+	br_if   	0, $pop159      # 0: down to label0
+# BB#54:                                # %for.cond117.7
+	i32.const	$push457=, 4
+	i32.const	$push456=, 2
+	i32.or  	$push147=, $pop457, $pop456
+	i32.const	$push160=, 6
+	i32.ne  	$push161=, $pop147, $pop160
+	br_if   	0, $pop161      # 0: down to label0
+# BB#55:                                # %for.cond117.7
+	i32.const	$push459=, 5
+	i32.const	$push458=, 2
+	i32.or  	$push148=, $pop459, $pop458
+	i32.const	$push162=, 7
+	i32.ne  	$push163=, $pop148, $pop162
+	br_if   	0, $pop163      # 0: down to label0
+# BB#56:                                # %for.cond117.7
+	i32.const	$push461=, 6
+	i32.const	$push460=, 2
+	i32.or  	$push149=, $pop461, $pop460
+	i32.const	$push164=, 6
+	i32.ne  	$push165=, $pop149, $pop164
+	br_if   	0, $pop165      # 0: down to label0
+# BB#57:                                # %for.cond117.7
+	i32.const	$push463=, 7
+	i32.const	$push462=, 2
+	i32.or  	$push150=, $pop463, $pop462
+	i32.const	$push166=, 7
+	i32.ne  	$push167=, $pop150, $pop166
+	br_if   	0, $pop167      # 0: down to label0
+# BB#58:                                # %for.cond137.7
+	i32.const	$push467=, 2
+	i32.shl 	$push175=, $pop467, $4
+	i32.const	$push466=, 2
+	i32.const	$push465=, 65535
+	i32.and 	$push176=, $2, $pop465
+	i32.shl 	$push177=, $pop466, $pop176
+	i32.const	$push178=, 16
+	i32.shl 	$push179=, $pop177, $pop178
+	i32.const	$push464=, 16
+	i32.shr_s	$push180=, $pop179, $pop464
+	i32.ne  	$push181=, $pop175, $pop180
+	br_if   	0, $pop181      # 0: down to label0
+# BB#59:                                # %for.cond137.7
+	i32.const	$push470=, 2
+	i32.const	$push469=, 1
+	i32.shl 	$push168=, $pop470, $pop469
+	i32.const	$push468=, 65535
+	i32.and 	$push188=, $pop168, $pop468
+	i32.const	$push189=, 4
+	i32.ne  	$push190=, $pop188, $pop189
+	br_if   	0, $pop190      # 0: down to label0
+# BB#60:                                # %for.cond137.7
+	i32.const	$push474=, 2
+	i32.const	$push473=, 2
+	i32.const	$push472=, 65535
+	i32.and 	$push182=, $pop473, $pop472
+	i32.shl 	$push169=, $pop474, $pop182
+	i32.const	$push471=, 65535
+	i32.and 	$push191=, $pop169, $pop471
+	i32.const	$push192=, 8
+	i32.ne  	$push193=, $pop191, $pop192
+	br_if   	0, $pop193      # 0: down to label0
+# BB#61:                                # %for.cond137.7
+	i32.const	$push478=, 2
+	i32.const	$push477=, 3
+	i32.const	$push476=, 65535
+	i32.and 	$push183=, $pop477, $pop476
+	i32.shl 	$push170=, $pop478, $pop183
+	i32.const	$push475=, 65535
+	i32.and 	$push194=, $pop170, $pop475
+	i32.const	$push195=, 16
+	i32.ne  	$push196=, $pop194, $pop195
+	br_if   	0, $pop196      # 0: down to label0
+# BB#62:                                # %for.cond137.7
+	i32.const	$push482=, 2
+	i32.const	$push481=, 4
+	i32.const	$push480=, 65535
+	i32.and 	$push184=, $pop481, $pop480
+	i32.shl 	$push171=, $pop482, $pop184
+	i32.const	$push479=, 65535
+	i32.and 	$push197=, $pop171, $pop479
+	i32.const	$push198=, 32
+	i32.ne  	$push199=, $pop197, $pop198
+	br_if   	0, $pop199      # 0: down to label0
+# BB#63:                                # %for.cond137.7
+	i32.const	$push486=, 2
+	i32.const	$push485=, 5
+	i32.const	$push484=, 65535
+	i32.and 	$push185=, $pop485, $pop484
+	i32.shl 	$push172=, $pop486, $pop185
+	i32.const	$push483=, 65535
+	i32.and 	$push200=, $pop172, $pop483
+	i32.const	$push201=, 64
+	i32.ne  	$push202=, $pop200, $pop201
+	br_if   	0, $pop202      # 0: down to label0
+# BB#64:                                # %for.cond137.7
+	i32.const	$push490=, 2
+	i32.const	$push489=, 6
+	i32.const	$push488=, 65535
+	i32.and 	$push186=, $pop489, $pop488
+	i32.shl 	$push173=, $pop490, $pop186
+	i32.const	$push487=, 65535
+	i32.and 	$push203=, $pop173, $pop487
+	i32.const	$push204=, 128
+	i32.ne  	$push205=, $pop203, $pop204
+	br_if   	0, $pop205      # 0: down to label0
+# BB#65:                                # %for.cond137.7
+	i32.const	$push494=, 2
+	i32.const	$push493=, 7
+	i32.const	$push492=, 65535
+	i32.and 	$push187=, $pop493, $pop492
+	i32.shl 	$push174=, $pop494, $pop187
+	i32.const	$push491=, 65535
+	i32.and 	$push206=, $pop174, $pop491
+	i32.const	$push207=, 256
+	i32.ne  	$push208=, $pop206, $pop207
+	br_if   	0, $pop208      # 0: down to label0
+# BB#66:                                # %for.cond157.7
+	i32.const	$push513=, 2
+	i32.const	$push512=, 2
+	i32.const	$push511=, 65535
+	i32.and 	$push212=, $pop512, $pop511
+	i32.shr_u	$push213=, $pop513, $pop212
+	i32.const	$push510=, 2
+	i32.const	$push509=, 3
+	i32.const	$push508=, 65535
+	i32.and 	$push214=, $pop509, $pop508
+	i32.shr_u	$push215=, $pop510, $pop214
+	i32.or  	$push216=, $pop213, $pop215
+	i32.const	$push507=, 2
+	i32.const	$push506=, 4
+	i32.const	$push505=, 65535
+	i32.and 	$push217=, $pop506, $pop505
+	i32.shr_u	$push218=, $pop507, $pop217
+	i32.or  	$push219=, $pop216, $pop218
+	i32.const	$push504=, 2
+	i32.const	$push503=, 5
+	i32.const	$push502=, 65535
+	i32.and 	$push220=, $pop503, $pop502
+	i32.shr_u	$push221=, $pop504, $pop220
+	i32.or  	$push222=, $pop219, $pop221
+	i32.const	$push501=, 2
+	i32.const	$push500=, 6
+	i32.const	$push499=, 65535
+	i32.and 	$push223=, $pop500, $pop499
+	i32.shr_u	$push224=, $pop501, $pop223
+	i32.or  	$push225=, $pop222, $pop224
+	i32.const	$push498=, 2
+	i32.const	$push497=, 7
+	i32.const	$push496=, 65535
+	i32.and 	$push226=, $pop497, $pop496
+	i32.shr_u	$push227=, $pop498, $pop226
+	i32.or  	$push228=, $pop225, $pop227
+	i32.const	$push495=, 65535
+	i32.and 	$push229=, $pop228, $pop495
+	br_if   	0, $pop229      # 0: down to label0
+# BB#67:                                # %for.cond157.7
+	i32.const	$push517=, 2
+	i32.shr_u	$push209=, $pop517, $4
+	i32.const	$push516=, 2
+	i32.const	$push515=, 65535
+	i32.and 	$push230=, $2, $pop515
+	i32.shr_u	$push231=, $pop516, $pop230
+	i32.const	$push232=, 16
+	i32.shl 	$push233=, $pop231, $pop232
+	i32.const	$push514=, 16
+	i32.shr_s	$push210=, $pop233, $pop514
+	i32.ne  	$push234=, $pop209, $pop210
+	br_if   	0, $pop234      # 0: down to label0
+# BB#68:                                # %for.cond157.7
+	i32.const	$push519=, 2
+	i32.const	$push518=, 1
+	i32.shr_u	$push211=, $pop519, $pop518
+	i32.const	$push235=, 65535
+	i32.and 	$push236=, $pop211, $pop235
+	i32.const	$push237=, 1
+	i32.ne  	$push238=, $pop236, $pop237
+	br_if   	0, $pop238      # 0: down to label0
+# BB#69:                                # %for.cond198.7
+	i32.const	$push521=, -2
+	i32.add 	$push246=, $4, $pop521
+	i32.const	$push247=, 16
+	i32.shl 	$push248=, $2, $pop247
+	i32.const	$push249=, -131072
+	i32.add 	$push250=, $pop248, $pop249
+	i32.const	$push520=, 16
+	i32.shr_s	$push251=, $pop250, $pop520
+	i32.ne  	$push252=, $pop246, $pop251
+	br_if   	0, $pop252      # 0: down to label0
+# BB#70:                                # %for.cond198.7
+	i32.const	$push523=, 1
+	i32.const	$push522=, -2
+	i32.or  	$push239=, $pop523, $pop522
+	i32.const	$push253=, -1
+	i32.ne  	$push254=, $pop239, $pop253
+	br_if   	0, $pop254      # 0: down to label0
+# BB#71:                                # %for.cond198.7
+	i32.const	$push525=, 2
+	i32.const	$push524=, -2
+	i32.add 	$push240=, $pop525, $pop524
+	br_if   	0, $pop240      # 0: down to label0
+# BB#72:                                # %for.cond198.7
+	i32.const	$push527=, 3
+	i32.const	$push526=, -2
+	i32.add 	$push241=, $pop527, $pop526
+	i32.const	$push255=, 1
+	i32.ne  	$push256=, $pop241, $pop255
+	br_if   	0, $pop256      # 0: down to label0
+# BB#73:                                # %for.cond198.7
+	i32.const	$push529=, 4
+	i32.const	$push528=, -2
+	i32.add 	$push242=, $pop529, $pop528
+	i32.const	$push257=, 2
+	i32.ne  	$push258=, $pop242, $pop257
+	br_if   	0, $pop258      # 0: down to label0
+# BB#74:                                # %for.cond198.7
+	i32.const	$push531=, 5
+	i32.const	$push530=, -2
+	i32.add 	$push243=, $pop531, $pop530
+	i32.const	$push259=, 3
+	i32.ne  	$push260=, $pop243, $pop259
+	br_if   	0, $pop260      # 0: down to label0
+# BB#75:                                # %for.cond198.7
+	i32.const	$push533=, 6
+	i32.const	$push532=, -2
+	i32.add 	$push244=, $pop533, $pop532
+	i32.const	$push261=, 4
+	i32.ne  	$push262=, $pop244, $pop261
+	br_if   	0, $pop262      # 0: down to label0
+# BB#76:                                # %for.cond198.7
+	i32.const	$push535=, 7
+	i32.const	$push534=, -2
+	i32.add 	$push245=, $pop535, $pop534
+	i32.const	$push263=, 5
+	i32.ne  	$push264=, $pop245, $pop263
+	br_if   	0, $pop264      # 0: down to label0
+# BB#77:                                # %for.cond240.7
+	i32.const	$push552=, 2
+	i32.const	$push267=, 2
+	i32.div_s	$3=, $pop552, $pop267
+	i32.const	$push551=, 3
+	i32.const	$push550=, 2
+	i32.div_s	$5=, $pop551, $pop550
+	i32.const	$push549=, 4
+	i32.const	$push548=, 2
+	i32.div_s	$6=, $pop549, $pop548
+	i32.const	$push547=, 5
+	i32.const	$push546=, 2
+	i32.div_s	$7=, $pop547, $pop546
+	i32.const	$push545=, 6
+	i32.const	$push544=, 2
+	i32.div_s	$8=, $pop545, $pop544
+	i32.const	$push543=, 7
+	i32.const	$push542=, 2
+	i32.div_s	$9=, $pop543, $pop542
+	i32.const	$push265=, 16
+	i32.shl 	$push266=, $2, $pop265
+	i32.const	$push541=, 16
+	i32.shr_s	$push540=, $pop266, $pop541
+	tee_local	$push539=, $10=, $pop540
+	i32.const	$push538=, 2
+	i32.div_s	$push271=, $pop539, $pop538
+	i32.const	$push269=, 65535
+	i32.and 	$push272=, $pop271, $pop269
+	i32.const	$push537=, 2
+	i32.div_s	$push268=, $10, $pop537
+	i32.const	$push536=, 65535
+	i32.and 	$push270=, $pop268, $pop536
+	i32.ne  	$push273=, $pop272, $pop270
+	br_if   	0, $pop273      # 0: down to label0
+# BB#78:                                # %for.cond240.7
+	i32.const	$push274=, 0
+	br_if   	0, $pop274      # 0: down to label0
+# BB#79:                                # %for.cond240.7
+	i32.const	$push554=, 65535
+	i32.and 	$push275=, $3, $pop554
+	i32.const	$push553=, 1
+	i32.ne  	$push276=, $pop275, $pop553
+	br_if   	0, $pop276      # 0: down to label0
+# BB#80:                                # %for.cond240.7
+	i32.const	$push556=, 65535
+	i32.and 	$push277=, $5, $pop556
+	i32.const	$push555=, 1
+	i32.ne  	$push278=, $pop277, $pop555
+	br_if   	0, $pop278      # 0: down to label0
+# BB#81:                                # %for.cond240.7
+	i32.const	$push558=, 65535
+	i32.and 	$push279=, $6, $pop558
+	i32.const	$push557=, 2
+	i32.ne  	$push280=, $pop279, $pop557
+	br_if   	0, $pop280      # 0: down to label0
+# BB#82:                                # %for.cond240.7
+	i32.const	$push560=, 65535
+	i32.and 	$push281=, $7, $pop560
+	i32.const	$push559=, 2
+	i32.ne  	$push282=, $pop281, $pop559
+	br_if   	0, $pop282      # 0: down to label0
+# BB#83:                                # %for.cond240.7
+	i32.const	$push562=, 65535
+	i32.and 	$push283=, $8, $pop562
+	i32.const	$push561=, 3
+	i32.ne  	$push284=, $pop283, $pop561
+	br_if   	0, $pop284      # 0: down to label0
+# BB#84:                                # %for.cond240.7
+	i32.const	$push564=, 65535
+	i32.and 	$push285=, $9, $pop564
+	i32.const	$push563=, 3
+	i32.ne  	$push286=, $pop285, $pop563
+	br_if   	0, $pop286      # 0: down to label0
+# BB#85:                                # %for.cond261.7
+	i32.const	$push580=, 2
+	i32.const	$push287=, 2
+	i32.rem_s	$3=, $pop580, $pop287
+	i32.const	$push579=, 3
+	i32.const	$push578=, 2
+	i32.rem_s	$5=, $pop579, $pop578
+	i32.const	$push577=, 4
+	i32.const	$push576=, 2
+	i32.rem_s	$6=, $pop577, $pop576
+	i32.const	$push575=, 5
+	i32.const	$push574=, 2
+	i32.rem_s	$7=, $pop575, $pop574
+	i32.const	$push573=, 6
+	i32.const	$push572=, 2
+	i32.rem_s	$8=, $pop573, $pop572
+	i32.const	$push571=, 7
+	i32.const	$push570=, 2
+	i32.rem_s	$9=, $pop571, $pop570
+	i32.const	$push569=, 2
+	i32.rem_s	$push288=, $4, $pop569
+	i32.const	$push289=, 16
+	i32.shl 	$push290=, $2, $pop289
+	i32.const	$push568=, 16
+	i32.shr_s	$push291=, $pop290, $pop568
+	i32.const	$push567=, 2
+	i32.rem_s	$push292=, $pop291, $pop567
+	i32.const	$push566=, 16
+	i32.shl 	$push293=, $pop292, $pop566
+	i32.const	$push565=, 16
+	i32.shr_s	$push294=, $pop293, $pop565
+	i32.ne  	$push295=, $pop288, $pop294
+	br_if   	0, $pop295      # 0: down to label0
+# BB#86:                                # %for.cond261.7
+	i32.const	$push581=, 1
+	i32.eqz 	$push588=, $pop581
+	br_if   	0, $pop588      # 0: down to label0
+# BB#87:                                # %for.cond261.7
+	i32.const	$push582=, 65535
+	i32.and 	$push296=, $3, $pop582
+	br_if   	0, $pop296      # 0: down to label0
+# BB#88:                                # %for.cond261.7
+	i32.const	$push583=, 65535
+	i32.and 	$push297=, $5, $pop583
+	i32.const	$push298=, 1
+	i32.ne  	$push299=, $pop297, $pop298
+	br_if   	0, $pop299      # 0: down to label0
+# BB#89:                                # %for.cond261.7
+	i32.const	$push584=, 65535
+	i32.and 	$push300=, $6, $pop584
+	br_if   	0, $pop300      # 0: down to label0
+# BB#90:                                # %for.cond261.7
+	i32.const	$push585=, 65535
+	i32.and 	$push301=, $7, $pop585
+	i32.const	$push302=, 1
+	i32.ne  	$push303=, $pop301, $pop302
+	br_if   	0, $pop303      # 0: down to label0
+# BB#91:                                # %for.cond261.7
+	i32.const	$push586=, 65535
+	i32.and 	$push304=, $8, $pop586
+	br_if   	0, $pop304      # 0: down to label0
+# BB#92:                                # %for.cond261.7
+	i32.const	$push587=, 65535
+	i32.and 	$push305=, $9, $pop587
+	i32.const	$push306=, 1
+	i32.ne  	$push307=, $pop305, $pop306
+	br_if   	0, $pop307      # 0: down to label0
+# BB#93:                                # %for.cond667.1
+	i32.const	$push308=, 0
+	return  	$pop308
+.LBB0_94:                               # %if.then
+	end_block                       # label0:
+	call    	abort@FUNCTION
+	unreachable
+	.endfunc
+.Lfunc_end0:
+	.size	main, .Lfunc_end0-main
+                                        # -- End function
+	.hidden	one                     # @one
+	.type	one,@object
+	.section	.data.one,"aw",@progbits
+	.globl	one
+	.p2align	2
+one:
+	.int32	1                       # 0x1
+	.size	one, 4
+
+
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec2.c.s b/test/torture-s/scal-to-vec2.c.s
new file mode 100644
index 000000000..dfb018170
--- /dev/null
+++ b/test/torture-s/scal-to-vec2.c.s
@@ -0,0 +1,405 @@
+	.text
+	.file	"scal-to-vec2.c"
+	.section	.text.vlng,"ax",@progbits
+	.hidden	vlng                    # -- Begin function vlng
+	.globl	vlng
+	.type	vlng,@function
+vlng:                                   # @vlng
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 42
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end0:
+	.size	vlng, .Lfunc_end0-vlng
+                                        # -- End function
+	.section	.text.vint,"ax",@progbits
+	.hidden	vint                    # -- Begin function vint
+	.globl	vint
+	.type	vint,@function
+vint:                                   # @vint
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 43
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end1:
+	.size	vint, .Lfunc_end1-vint
+                                        # -- End function
+	.section	.text.vsrt,"ax",@progbits
+	.hidden	vsrt                    # -- Begin function vsrt
+	.globl	vsrt
+	.type	vsrt,@function
+vsrt:                                   # @vsrt
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 42
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end2:
+	.size	vsrt, .Lfunc_end2-vsrt
+                                        # -- End function
+	.section	.text.vchr,"ax",@progbits
+	.hidden	vchr                    # -- Begin function vchr
+	.globl	vchr
+	.type	vchr,@function
+vchr:                                   # @vchr
+	.result 	i32
+# BB#0:                                 # %entry
+	i32.const	$push0=, 42
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end3:
+	.size	vchr, .Lfunc_end3-vchr
+                                        # -- End function
+	.section	.text.main,"ax",@progbits
+	.hidden	main                    # -- Begin function main
+	.globl	main
+	.type	main,@function
+main:                                   # @main
+	.param  	i32, i32
+	.result 	i32
+	.local  	i32, i32
+# BB#0:                                 # %entry
+	i32.const	$push108=, 0
+	i32.const	$push106=, 0
+	i32.load	$push105=, __stack_pointer($pop106)
+	i32.const	$push107=, 48
+	i32.sub 	$push143=, $pop105, $pop107
+	tee_local	$push142=, $3=, $pop143
+	i32.store	__stack_pointer($pop108), $pop142
+	i32.const	$push141=, 7
+	i32.store8	47($3), $pop141
+	i32.const	$push140=, 6
+	i32.store8	46($3), $pop140
+	i32.const	$push139=, 5
+	i32.store8	45($3), $pop139
+	i32.const	$push138=, 4
+	i32.store8	44($3), $pop138
+	i32.const	$push137=, 3
+	i32.store8	43($3), $pop137
+	i32.const	$push136=, 2
+	i32.store8	42($3), $pop136
+	i32.const	$push135=, 1
+	i32.store8	41($3), $pop135
+	i32.store8	40($3), $0
+	i32.const	$push134=, 7
+	i32.store8	39($3), $pop134
+	i32.const	$push133=, 6
+	i32.store8	38($3), $pop133
+	i32.const	$push132=, 5
+	i32.store8	37($3), $pop132
+	i32.const	$push131=, 4
+	i32.store8	36($3), $pop131
+	i32.const	$push130=, 3
+	i32.store8	35($3), $pop130
+	i32.const	$push129=, 2
+	i32.store8	34($3), $pop129
+	i32.const	$push128=, 1
+	i32.store8	33($3), $pop128
+	i32.store8	32($3), $0
+	i32.const	$push127=, 7
+	i32.store16	30($3), $pop127
+	i32.const	$push126=, 6
+	i32.store16	28($3), $pop126
+	i32.const	$push125=, 5
+	i32.store16	26($3), $pop125
+	i32.const	$push124=, 4
+	i32.store16	24($3), $pop124
+	i32.const	$push123=, 3
+	i32.store16	22($3), $pop123
+	i32.const	$push122=, 2
+	i32.store16	20($3), $pop122
+	i32.const	$push121=, 1
+	i32.store16	18($3), $pop121
+	i32.store16	16($3), $0
+	i32.const	$push120=, 3
+	i32.store	12($3), $pop120
+	i32.const	$push119=, 2
+	i32.store	8($3), $pop119
+	i32.const	$push118=, 1
+	i32.store	4($3), $pop118
+	i32.store	0($3), $0
+	block   	
+	i32.const	$push12=, 24
+	i32.shl 	$push15=, $0, $pop12
+	i32.const	$push117=, 24
+	i32.shr_s	$push16=, $pop15, $pop117
+	i32.const	$push11=, 42
+	i32.add 	$push17=, $pop16, $pop11
+	i32.const	$push116=, 42
+	i32.add 	$push115=, $0, $pop116
+	tee_local	$push114=, $2=, $pop115
+	i32.const	$push113=, 24
+	i32.shl 	$push13=, $pop114, $pop113
+	i32.const	$push112=, 24
+	i32.shr_s	$push14=, $pop13, $pop112
+	i32.ne  	$push18=, $pop17, $pop14
+	br_if   	0, $pop18       # 0: down to label0
+# BB#1:                                 # %entry
+	i32.const	$push145=, 43
+	i32.const	$push144=, 43
+	i32.ne  	$push22=, $pop145, $pop144
+	br_if   	0, $pop22       # 0: down to label0
+# BB#2:                                 # %entry
+	i32.const	$push147=, 44
+	i32.const	$push146=, 44
+	i32.ne  	$push23=, $pop147, $pop146
+	br_if   	0, $pop23       # 0: down to label0
+# BB#3:                                 # %entry
+	i32.const	$push149=, 45
+	i32.const	$push148=, 45
+	i32.ne  	$push24=, $pop149, $pop148
+	br_if   	0, $pop24       # 0: down to label0
+# BB#4:                                 # %entry
+	i32.const	$push151=, 46
+	i32.const	$push150=, 46
+	i32.ne  	$push25=, $pop151, $pop150
+	br_if   	0, $pop25       # 0: down to label0
+# BB#5:                                 # %entry
+	i32.const	$push153=, 47
+	i32.const	$push152=, 47
+	i32.ne  	$push26=, $pop153, $pop152
+	br_if   	0, $pop26       # 0: down to label0
+# BB#6:                                 # %entry
+	i32.const	$push155=, 48
+	i32.const	$push154=, 48
+	i32.ne  	$push27=, $pop155, $pop154
+	br_if   	0, $pop27       # 0: down to label0
+# BB#7:                                 # %entry
+	i32.const	$push157=, 49
+	i32.const	$push156=, 49
+	i32.ne  	$push28=, $pop157, $pop156
+	br_if   	0, $pop28       # 0: down to label0
+# BB#8:                                 # %for.cond.7
+	i32.const	$push29=, 24
+	i32.shl 	$push30=, $0, $pop29
+	i32.const	$push160=, 24
+	i32.shr_s	$push31=, $pop30, $pop160
+	i32.const	$push32=, 42
+	i32.add 	$push33=, $pop31, $pop32
+	i32.const	$push159=, 24
+	i32.shl 	$push34=, $2, $pop159
+	i32.const	$push158=, 24
+	i32.shr_s	$push35=, $pop34, $pop158
+	i32.ne  	$push36=, $pop33, $pop35
+	br_if   	0, $pop36       # 0: down to label0
+# BB#9:                                 # %for.cond.7
+	i32.const	$push161=, 43
+	i32.const	$push37=, 43
+	i32.ne  	$push38=, $pop161, $pop37
+	br_if   	0, $pop38       # 0: down to label0
+# BB#10:                                # %for.cond.7
+	i32.const	$push162=, 44
+	i32.const	$push39=, 44
+	i32.ne  	$push40=, $pop162, $pop39
+	br_if   	0, $pop40       # 0: down to label0
+# BB#11:                                # %for.cond.7
+	i32.const	$push163=, 45
+	i32.const	$push41=, 45
+	i32.ne  	$push42=, $pop163, $pop41
+	br_if   	0, $pop42       # 0: down to label0
+# BB#12:                                # %for.cond.11
+	i32.load8_s	$push43=, 44($3)
+	i32.const	$push165=, 42
+	i32.add 	$push44=, $pop43, $pop165
+	i32.const	$push164=, 46
+	i32.ne  	$push45=, $pop44, $pop164
+	br_if   	0, $pop45       # 0: down to label0
+# BB#13:                                # %for.cond.12
+	i32.load8_s	$push46=, 45($3)
+	i32.const	$push167=, 42
+	i32.add 	$push47=, $pop46, $pop167
+	i32.const	$push166=, 47
+	i32.ne  	$push48=, $pop47, $pop166
+	br_if   	0, $pop48       # 0: down to label0
+# BB#14:                                # %for.cond.13
+	i32.load8_s	$push49=, 46($3)
+	i32.const	$push169=, 42
+	i32.add 	$push50=, $pop49, $pop169
+	i32.const	$push168=, 48
+	i32.ne  	$push51=, $pop50, $pop168
+	br_if   	0, $pop51       # 0: down to label0
+# BB#15:                                # %for.cond.14
+	i32.load8_s	$push52=, 47($3)
+	i32.const	$push171=, 42
+	i32.add 	$push53=, $pop52, $pop171
+	i32.const	$push170=, 49
+	i32.ne  	$push54=, $pop53, $pop170
+	br_if   	0, $pop54       # 0: down to label0
+# BB#16:                                # %for.cond.15
+	i32.const	$push19=, 65535
+	i32.and 	$push20=, $0, $pop19
+	i32.const	$push21=, 65536
+	i32.or  	$push0=, $pop20, $pop21
+	i32.const	$push56=, 16
+	i32.shl 	$push59=, $pop0, $pop56
+	i32.const	$push176=, 16
+	i32.shr_s	$push60=, $pop59, $pop176
+	i32.const	$push175=, 42
+	i32.add 	$push61=, $pop60, $pop175
+	i32.const	$push174=, 42
+	i32.add 	$push4=, $0, $pop174
+	i32.const	$push173=, 16
+	i32.shl 	$push57=, $pop4, $pop173
+	i32.const	$push172=, 16
+	i32.shr_s	$push58=, $pop57, $pop172
+	i32.ne  	$push62=, $pop61, $pop58
+	br_if   	0, $pop62       # 0: down to label0
+# BB#17:                                # %for.cond.15
+	i32.const	$push178=, 1
+	i32.const	$push177=, 42
+	i32.or  	$push55=, $pop178, $pop177
+	i32.const	$push63=, 43
+	i32.ne  	$push64=, $pop55, $pop63
+	br_if   	0, $pop64       # 0: down to label0
+# BB#18:                                # %for.cond.15
+	i32.const	$push180=, 2
+	i32.const	$push179=, 42
+	i32.add 	$push5=, $pop180, $pop179
+	i32.const	$push65=, 44
+	i32.ne  	$push66=, $pop5, $pop65
+	br_if   	0, $pop66       # 0: down to label0
+# BB#19:                                # %for.cond.15
+	i32.const	$push182=, 3
+	i32.const	$push181=, 42
+	i32.add 	$push6=, $pop182, $pop181
+	i32.const	$push67=, 45
+	i32.ne  	$push68=, $pop6, $pop67
+	br_if   	0, $pop68       # 0: down to label0
+# BB#20:                                # %for.cond.15
+	i32.const	$push184=, 4
+	i32.const	$push183=, 42
+	i32.add 	$push7=, $pop184, $pop183
+	i32.const	$push69=, 46
+	i32.ne  	$push70=, $pop7, $pop69
+	br_if   	0, $pop70       # 0: down to label0
+# BB#21:                                # %for.cond.15
+	i32.const	$push186=, 5
+	i32.const	$push185=, 42
+	i32.add 	$push8=, $pop186, $pop185
+	i32.const	$push71=, 47
+	i32.ne  	$push72=, $pop8, $pop71
+	br_if   	0, $pop72       # 0: down to label0
+# BB#22:                                # %for.cond47.5
+	i32.load16_s	$push73=, 28($3)
+	i32.const	$push189=, 42
+	i32.add 	$push74=, $pop73, $pop189
+	i32.const	$push188=, 6
+	i32.const	$push187=, 42
+	i32.add 	$push9=, $pop188, $pop187
+	i32.ne  	$push75=, $pop74, $pop9
+	br_if   	0, $pop75       # 0: down to label0
+# BB#23:                                # %for.cond47.6
+	i32.load16_s	$push76=, 30($3)
+	i32.const	$push192=, 42
+	i32.add 	$push77=, $pop76, $pop192
+	i32.const	$push191=, 7
+	i32.const	$push190=, 42
+	i32.add 	$push10=, $pop191, $pop190
+	i32.ne  	$push78=, $pop77, $pop10
+	br_if   	0, $pop78       # 0: down to label0
+# BB#24:                                # %for.cond74.7
+	i32.const	$push195=, 43
+	i32.mul 	$push194=, $0, $pop195
+	tee_local	$push193=, $2=, $pop194
+	i32.ne  	$push79=, $pop193, $2
+	br_if   	0, $pop79       # 0: down to label0
+# BB#25:                                # %for.cond74.7
+	i32.const	$push198=, 1
+	i32.const	$push197=, 43
+	i32.mul 	$push1=, $pop198, $pop197
+	i32.const	$push196=, 43
+	i32.ne  	$push80=, $pop1, $pop196
+	br_if   	0, $pop80       # 0: down to label0
+# BB#26:                                # %for.cond74.7
+	i32.const	$push200=, 2
+	i32.const	$push199=, 43
+	i32.mul 	$push2=, $pop200, $pop199
+	i32.const	$push81=, 86
+	i32.ne  	$push82=, $pop2, $pop81
+	br_if   	0, $pop82       # 0: down to label0
+# BB#27:                                # %for.cond99.2
+	i32.const	$push204=, 3
+	i32.const	$push203=, 43
+	i32.mul 	$push3=, $pop204, $pop203
+	i32.load	$push202=, 12($3)
+	tee_local	$push201=, $2=, $pop202
+	i32.const	$push83=, 43
+	i32.mul 	$push84=, $pop201, $pop83
+	i32.ne  	$push85=, $pop3, $pop84
+	br_if   	0, $pop85       # 0: down to label0
+# BB#28:                                # %for.cond99.3
+	i32.load	$push91=, 0($3)
+	i32.const	$push206=, 42
+	i32.mul 	$push92=, $pop91, $pop206
+	i32.const	$push205=, 42
+	i32.mul 	$push90=, $0, $pop205
+	i32.ne  	$push93=, $pop92, $pop90
+	br_if   	0, $pop93       # 0: down to label0
+# BB#29:                                # %for.cond99.3
+	i32.const	$push209=, 1
+	i32.const	$push208=, 42
+	i32.mul 	$push86=, $pop209, $pop208
+	i32.const	$push207=, 42
+	i32.ne  	$push94=, $pop86, $pop207
+	br_if   	0, $pop94       # 0: down to label0
+# BB#30:                                # %for.cond99.3
+	i32.const	$push211=, 2
+	i32.const	$push210=, 42
+	i32.mul 	$push87=, $pop211, $pop210
+	i32.const	$push95=, 84
+	i32.ne  	$push96=, $pop87, $pop95
+	br_if   	0, $pop96       # 0: down to label0
+# BB#31:                                # %for.cond99.3
+	i32.const	$push214=, 3
+	i32.const	$push213=, 42
+	i32.mul 	$push88=, $pop214, $pop213
+	i32.const	$push212=, 42
+	i32.mul 	$push89=, $2, $pop212
+	i32.ne  	$push97=, $pop88, $pop89
+	br_if   	0, $pop97       # 0: down to label0
+# BB#32:                                # %for.cond148.3
+	i32.const	$push217=, 42
+	i32.mul 	$push216=, $0, $pop217
+	tee_local	$push215=, $2=, $pop216
+	i32.ne  	$push99=, $pop215, $2
+	br_if   	0, $pop99       # 0: down to label0
+# BB#33:                                # %for.cond148.3
+	i32.const	$push220=, 1
+	i32.const	$push219=, 42
+	i32.mul 	$push98=, $pop220, $pop219
+	i32.const	$push218=, 42
+	i32.ne  	$push100=, $pop98, $pop218
+	br_if   	0, $pop100      # 0: down to label0
+# BB#34:                                # %for.cond172.1
+	i32.const	$push223=, 43
+	i32.mul 	$push222=, $0, $pop223
+	tee_local	$push221=, $0=, $pop222
+	i32.ne  	$push102=, $pop221, $0
+	br_if   	0, $pop102      # 0: down to label0
+# BB#35:                                # %for.cond172.1
+	i32.const	$push226=, 1
+	i32.const	$push225=, 43
+	i32.mul 	$push101=, $pop226, $pop225
+	i32.const	$push224=, 43
+	i32.ne  	$push103=, $pop101, $pop224
+	br_if   	0, $pop103      # 0: down to label0
+# BB#36:                                # %for.cond244.1
+	i32.const	$push111=, 0
+	i32.const	$push109=, 48
+	i32.add 	$push110=, $3, $pop109
+	i32.store	__stack_pointer($pop111), $pop110
+	i32.const	$push104=, 0
+	return  	$pop104
+.LBB4_37:                               # %if.then
+	end_block                       # label0:
+	call    	abort@FUNCTION
+	unreachable
+	.endfunc
+.Lfunc_end4:
+	.size	main, .Lfunc_end4-main
+                                        # -- End function
+
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec3.c.s b/test/torture-s/scal-to-vec3.c.s
new file mode 100644
index 000000000..1f0755c48
--- /dev/null
+++ b/test/torture-s/scal-to-vec3.c.s
@@ -0,0 +1,18 @@
+	.text
+	.file	"scal-to-vec3.c"
+	.section	.text.main,"ax",@progbits
+	.hidden	main                    # -- Begin function main
+	.globl	main
+	.type	main,@function
+main:                                   # @main
+	.param  	i32, i32
+	.result 	i32
+# BB#0:                                 # %for.cond258.1
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end0:
+	.size	main, .Lfunc_end0-main
+                                        # -- End function
+
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/scope-1.c.s b/test/torture-s/scope-1.c.s
index 22884d32b..d26ddc302 100644
--- a/test/torture-s/scope-1.c.s
+++ b/test/torture-s/scope-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/scope-1.c"
+	.file	"scope-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -23,9 +23,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,7 +38,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	v                       # @v
 	.type	v,@object
 	.section	.data.v,"aw",@progbits
@@ -49,6 +49,6 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/shiftdi.c.s b/test/torture-s/shiftdi.c.s
index 0065e1674..ca5cdee86 100644
--- a/test/torture-s/shiftdi.c.s
+++ b/test/torture-s/shiftdi.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/shiftdi.c"
+	.file	"shiftdi.c"
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -26,9 +26,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,6 +39,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/shiftopt-1.c.s b/test/torture-s/shiftopt-1.c.s
index 1759e8e1d..b94aa42bb 100644
--- a/test/torture-s/shiftopt-1.c.s
+++ b/test/torture-s/shiftopt-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c"
+	.file	"shiftopt-1.c"
 	.section	.text.utest,"ax",@progbits
-	.hidden	utest
+	.hidden	utest                   # -- Begin function utest
 	.globl	utest
 	.type	utest,@function
 utest:                                  # @utest
@@ -11,9 +11,9 @@ utest:                                  # @utest
 	.endfunc
 .Lfunc_end0:
 	.size	utest, .Lfunc_end0-utest
-
+                                        # -- End function
 	.section	.text.stest,"ax",@progbits
-	.hidden	stest
+	.hidden	stest                   # -- Begin function stest
 	.globl	stest
 	.type	stest,@function
 stest:                                  # @stest
@@ -23,9 +23,9 @@ stest:                                  # @stest
 	.endfunc
 .Lfunc_end1:
 	.size	stest, .Lfunc_end1-stest
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,6 +36,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/simd-1.c.s b/test/torture-s/simd-1.c.s
index 486c5207e..7f1072403 100644
--- a/test/torture-s/simd-1.c.s
+++ b/test/torture-s/simd-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/simd-1.c"
+	.file	"simd-1.c"
 	.section	.text.verify,"ax",@progbits
-	.hidden	verify
+	.hidden	verify                  # -- Begin function verify
 	.globl	verify
 	.type	verify,@function
 verify:                                 # @verify
@@ -28,9 +28,9 @@ verify:                                 # @verify
 	.endfunc
 .Lfunc_end0:
 	.size	verify, .Lfunc_end0-verify
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -264,33 +264,33 @@ main:                                   # @main
 	call    	verify@FUNCTION, $3, $2, $1, $0, $pop59, $pop58, $pop57, $pop56
 	i32.const	$push160=, 0
 	i32.const	$push159=, 0
-	i32.load	$push61=, i+12($pop159)
+	i32.load	$push61=, j+12($pop159)
 	i32.const	$push158=, 0
-	i32.load	$push60=, j+12($pop158)
+	i32.load	$push60=, i+12($pop158)
 	i32.xor 	$push157=, $pop61, $pop60
 	tee_local	$push156=, $0=, $pop157
 	i32.store	k+12($pop160), $pop156
 	i32.const	$push155=, 0
 	i32.const	$push154=, 0
-	i32.load	$push63=, i+8($pop154)
+	i32.load	$push63=, j+8($pop154)
 	i32.const	$push153=, 0
-	i32.load	$push62=, j+8($pop153)
+	i32.load	$push62=, i+8($pop153)
 	i32.xor 	$push152=, $pop63, $pop62
 	tee_local	$push151=, $1=, $pop152
 	i32.store	k+8($pop155), $pop151
 	i32.const	$push150=, 0
 	i32.const	$push149=, 0
-	i32.load	$push65=, i+4($pop149)
+	i32.load	$push65=, j+4($pop149)
 	i32.const	$push148=, 0
-	i32.load	$push64=, j+4($pop148)
+	i32.load	$push64=, i+4($pop148)
 	i32.xor 	$push147=, $pop65, $pop64
 	tee_local	$push146=, $2=, $pop147
 	i32.store	k+4($pop150), $pop146
 	i32.const	$push145=, 0
 	i32.const	$push144=, 0
-	i32.load	$push67=, i($pop144)
+	i32.load	$push67=, j($pop144)
 	i32.const	$push143=, 0
-	i32.load	$push66=, j($pop143)
+	i32.load	$push66=, i($pop143)
 	i32.xor 	$push142=, $pop67, $pop66
 	tee_local	$push141=, $3=, $pop142
 	i32.store	k($pop145), $pop141
@@ -395,7 +395,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -439,6 +439,6 @@ res:
 	.size	res, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/simd-2.c.s b/test/torture-s/simd-2.c.s
index 7a8b86136..64caf6a26 100644
--- a/test/torture-s/simd-2.c.s
+++ b/test/torture-s/simd-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/simd-2.c"
+	.file	"simd-2.c"
 	.section	.text.verify,"ax",@progbits
-	.hidden	verify
+	.hidden	verify                  # -- Begin function verify
 	.globl	verify
 	.type	verify,@function
 verify:                                 # @verify
@@ -28,9 +28,9 @@ verify:                                 # @verify
 	.endfunc
 .Lfunc_end0:
 	.size	verify, .Lfunc_end0-verify
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -544,65 +544,65 @@ main:                                   # @main
 	call    	verify@FUNCTION, $pop136, $pop134, $pop132, $pop130, $pop140, $pop139, $pop138, $pop137
 	i32.const	$push377=, 0
 	i32.const	$push376=, 0
-	i32.load16_u	$push142=, i+14($pop376)
+	i32.load16_u	$push142=, j+14($pop376)
 	i32.const	$push375=, 0
-	i32.load16_u	$push141=, j+14($pop375)
+	i32.load16_u	$push141=, i+14($pop375)
 	i32.xor 	$push374=, $pop142, $pop141
 	tee_local	$push373=, $0=, $pop374
 	i32.store16	k+14($pop377), $pop373
 	i32.const	$push372=, 0
 	i32.const	$push371=, 0
-	i32.load16_u	$push144=, i+12($pop371)
+	i32.load16_u	$push144=, j+12($pop371)
 	i32.const	$push370=, 0
-	i32.load16_u	$push143=, j+12($pop370)
+	i32.load16_u	$push143=, i+12($pop370)
 	i32.xor 	$push369=, $pop144, $pop143
 	tee_local	$push368=, $1=, $pop369
 	i32.store16	k+12($pop372), $pop368
 	i32.const	$push367=, 0
 	i32.const	$push366=, 0
-	i32.load16_u	$push146=, i+10($pop366)
+	i32.load16_u	$push146=, j+10($pop366)
 	i32.const	$push365=, 0
-	i32.load16_u	$push145=, j+10($pop365)
+	i32.load16_u	$push145=, i+10($pop365)
 	i32.xor 	$push364=, $pop146, $pop145
 	tee_local	$push363=, $2=, $pop364
 	i32.store16	k+10($pop367), $pop363
 	i32.const	$push362=, 0
 	i32.const	$push361=, 0
-	i32.load16_u	$push148=, i+8($pop361)
+	i32.load16_u	$push148=, j+8($pop361)
 	i32.const	$push360=, 0
-	i32.load16_u	$push147=, j+8($pop360)
+	i32.load16_u	$push147=, i+8($pop360)
 	i32.xor 	$push359=, $pop148, $pop147
 	tee_local	$push358=, $3=, $pop359
 	i32.store16	k+8($pop362), $pop358
 	i32.const	$push357=, 0
 	i32.const	$push356=, 0
-	i32.load16_u	$push150=, i+6($pop356)
+	i32.load16_u	$push150=, j+6($pop356)
 	i32.const	$push355=, 0
-	i32.load16_u	$push149=, j+6($pop355)
+	i32.load16_u	$push149=, i+6($pop355)
 	i32.xor 	$push354=, $pop150, $pop149
 	tee_local	$push353=, $4=, $pop354
 	i32.store16	k+6($pop357), $pop353
 	i32.const	$push352=, 0
 	i32.const	$push351=, 0
-	i32.load16_u	$push152=, i+4($pop351)
+	i32.load16_u	$push152=, j+4($pop351)
 	i32.const	$push350=, 0
-	i32.load16_u	$push151=, j+4($pop350)
+	i32.load16_u	$push151=, i+4($pop350)
 	i32.xor 	$push349=, $pop152, $pop151
 	tee_local	$push348=, $5=, $pop349
 	i32.store16	k+4($pop352), $pop348
 	i32.const	$push347=, 0
 	i32.const	$push346=, 0
-	i32.load16_u	$push154=, i+2($pop346)
+	i32.load16_u	$push154=, j+2($pop346)
 	i32.const	$push345=, 0
-	i32.load16_u	$push153=, j+2($pop345)
+	i32.load16_u	$push153=, i+2($pop345)
 	i32.xor 	$push344=, $pop154, $pop153
 	tee_local	$push343=, $6=, $pop344
 	i32.store16	k+2($pop347), $pop343
 	i32.const	$push342=, 0
 	i32.const	$push341=, 0
-	i32.load16_u	$push156=, i($pop341)
+	i32.load16_u	$push156=, j($pop341)
 	i32.const	$push340=, 0
-	i32.load16_u	$push155=, j($pop340)
+	i32.load16_u	$push155=, i($pop340)
 	i32.xor 	$push339=, $pop156, $pop155
 	tee_local	$push338=, $7=, $pop339
 	i32.store16	k($pop342), $pop338
@@ -835,7 +835,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	i                       # @i
 	.type	i,@object
 	.section	.data.i,"aw",@progbits
@@ -887,6 +887,6 @@ res:
 	.size	res, 16
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/simd-4.c.s b/test/torture-s/simd-4.c.s
index 73f62966c..88e1ddf42 100644
--- a/test/torture-s/simd-4.c.s
+++ b/test/torture-s/simd-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/simd-4.c"
+	.file	"simd-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -15,7 +15,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s64                     # @s64
 	.type	s64,@object
 	.section	.bss.s64,"aw",@nobits
@@ -26,4 +26,4 @@ s64:
 	.size	s64, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/simd-5.c.s b/test/torture-s/simd-5.c.s
index 21d33ea5f..341511b34 100644
--- a/test/torture-s/simd-5.c.s
+++ b/test/torture-s/simd-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/simd-5.c"
+	.file	"simd-5.c"
 	.section	.text.func0,"ax",@progbits
-	.hidden	func0
+	.hidden	func0                   # -- Begin function func0
 	.globl	func0
 	.type	func0,@function
 func0:                                  # @func0
@@ -13,9 +13,9 @@ func0:                                  # @func0
 	.endfunc
 .Lfunc_end0:
 	.size	func0, .Lfunc_end0-func0
-
+                                        # -- End function
 	.section	.text.func1,"ax",@progbits
-	.hidden	func1
+	.hidden	func1                   # -- Begin function func1
 	.globl	func1
 	.type	func1,@function
 func1:                                  # @func1
@@ -106,9 +106,9 @@ func1:                                  # @func1
 	.endfunc
 .Lfunc_end1:
 	.size	func1, .Lfunc_end1-func1
-
+                                        # -- End function
 	.section	.text.func2,"ax",@progbits
-	.hidden	func2
+	.hidden	func2                   # -- Begin function func2
 	.globl	func2
 	.type	func2,@function
 func2:                                  # @func2
@@ -199,9 +199,9 @@ func2:                                  # @func2
 	.endfunc
 .Lfunc_end2:
 	.size	func2, .Lfunc_end2-func2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -239,14 +239,14 @@ main:                                   # @main
 # BB#4:                                 # %if.end12
 	i32.const	$push12=, 0
 	return  	$pop12
-.LBB3_5:                                # %if.then11
+.LBB3_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	q1                      # @q1
 	.type	q1,@object
 	.section	.data.q1,"aw",@progbits
@@ -377,5 +377,5 @@ z4:
 	.size	z4, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/simd-6.c.s b/test/torture-s/simd-6.c.s
index fd5f58a24..df66911d1 100644
--- a/test/torture-s/simd-6.c.s
+++ b/test/torture-s/simd-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/simd-6.c"
+	.file	"simd-6.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -41,9 +41,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,6 +54,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/stdarg-1.c.s b/test/torture-s/stdarg-1.c.s
index 23933d6a9..89ffee24b 100644
--- a/test/torture-s/stdarg-1.c.s
+++ b/test/torture-s/stdarg-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/stdarg-1.c"
+	.file	"stdarg-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -23,9 +23,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -55,11 +55,10 @@ bar:                                    # @bar
 	i32.add 	$push45=, $pop46, $pop34
 	tee_local	$push44=, $2=, $pop45
 	i32.store	gap($pop49), $pop44
-	block   	
 	f64.load	$push35=, 0($1)
 	f64.const	$push36=, 0x1.1p4
 	f64.ne  	$push37=, $pop35, $pop36
-	br_if   	0, $pop37       # 0: down to label4
+	br_if   	2, $pop37       # 2: down to label1
 # BB#3:                                 # %lor.lhs.false
 	i32.const	$push50=, 0
 	i32.const	$push38=, 12
@@ -68,12 +67,9 @@ bar:                                    # @bar
 	i32.load	$push40=, 0($2)
 	i32.const	$push41=, 129
 	i32.eq  	$push42=, $pop40, $pop41
-	br_if   	2, $pop42       # 2: down to label2
-.LBB1_4:                                # %if.then5
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_5:                                # %if.then7
+	br_if   	1, $pop42       # 1: down to label2
+	br      	2               # 2: down to label1
+.LBB1_4:                                # %if.then7
 	end_block                       # label3:
 	i32.const	$push55=, 0
 	i32.load	$push54=, pap($pop55)
@@ -91,7 +87,7 @@ bar:                                    # @bar
 	i64.const	$push11=, 14
 	i64.ne  	$push12=, $pop10, $pop11
 	br_if   	1, $pop12       # 1: down to label1
-# BB#6:                                 # %lor.lhs.false11
+# BB#5:                                 # %lor.lhs.false11
 	i32.const	$push60=, 0
 	i32.load	$push59=, pap($pop60)
 	tee_local	$push58=, $1=, $pop59
@@ -110,7 +106,7 @@ bar:                                    # @bar
 	i64.const	$push21=, 4613381465357418496
 	i32.call	$push23=, __netf2@FUNCTION, $pop20, $pop19, $pop22, $pop21
 	br_if   	1, $pop23       # 1: down to label1
-# BB#7:                                 # %lor.lhs.false15
+# BB#6:                                 # %lor.lhs.false15
 	i32.const	$push24=, 0
 	i32.load	$push64=, pap($pop24)
 	tee_local	$push63=, $1=, $pop64
@@ -123,21 +119,21 @@ bar:                                    # @bar
 	i32.const	$push28=, 17
 	i32.ne  	$push29=, $pop27, $pop28
 	br_if   	1, $pop29       # 1: down to label1
-.LBB1_8:                                # %if.end22
+.LBB1_7:                                # %if.end22
 	end_block                       # label2:
 	i32.const	$push43=, 0
 	i32.store	bar_arg($pop43), $0
 	return
-.LBB1_9:                                # %if.then19
+.LBB1_8:                                # %if.then5
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.f0,"ax",@progbits
-	.hidden	f0
+	.hidden	f0                      # -- Begin function f0
 	.globl	f0
 	.type	f0,@function
 f0:                                     # @f0
@@ -147,9 +143,9 @@ f0:                                     # @f0
 	.endfunc
 .Lfunc_end2:
 	.size	f0, .Lfunc_end2-f0
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -159,48 +155,232 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end3:
 	.size	f1, .Lfunc_end3-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32
-	.local  	i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
-	i32.const	$push7=, 16
-	i32.sub 	$push18=, $pop6, $pop7
-	tee_local	$push17=, $2=, $pop18
-	i32.store	__stack_pointer($pop8), $pop17
-	i32.store	12($2), $1
-	i32.const	$push0=, 0
-	f64.load	$push1=, d($pop0)
-	i32.trunc_s/f64	$push2=, $pop1
-	call    	bar@FUNCTION, $pop2
-	i32.load	$push16=, 12($2)
-	tee_local	$push15=, $1=, $pop16
-	i32.const	$push3=, 4
-	i32.add 	$push4=, $pop15, $pop3
-	i32.store	12($2), $pop4
-	i32.const	$push14=, 0
-	i32.load	$push13=, 0($1)
-	tee_local	$push12=, $1=, $pop13
-	i32.store	x($pop14), $pop12
-	call    	bar@FUNCTION, $1
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
-                                        # fallthrough-return
+	i32.const	$push91=, 0
+	i32.const	$push89=, 0
+	i32.load	$push88=, __stack_pointer($pop89)
+	i32.const	$push90=, 16
+	i32.sub 	$push99=, $pop88, $pop90
+	tee_local	$push98=, $4=, $pop99
+	i32.store	__stack_pointer($pop91), $pop98
+	i32.store	12($4), $1
+	block   	
+	block   	
+	block   	
+	i32.const	$push97=, 0
+	f64.load	$push0=, d($pop97)
+	i32.trunc_s/f64	$push96=, $pop0
+	tee_local	$push95=, $1=, $pop96
+	i32.const	$push1=, 16392
+	i32.eq  	$push2=, $pop95, $pop1
+	br_if   	0, $pop2        # 0: down to label6
+# BB#1:                                 # %entry
+	i32.const	$push3=, 16390
+	i32.ne  	$push4=, $1, $pop3
+	br_if   	1, $pop4        # 1: down to label5
+# BB#2:                                 # %if.then.i
+	i32.const	$push105=, 0
+	i32.const	$push104=, 0
+	i32.load	$push30=, gap($pop104)
+	i32.const	$push31=, 7
+	i32.add 	$push32=, $pop30, $pop31
+	i32.const	$push33=, -8
+	i32.and 	$push103=, $pop32, $pop33
+	tee_local	$push102=, $2=, $pop103
+	i32.const	$push34=, 8
+	i32.add 	$push101=, $pop102, $pop34
+	tee_local	$push100=, $3=, $pop101
+	i32.store	gap($pop105), $pop100
+	f64.load	$push35=, 0($2)
+	f64.const	$push36=, 0x1.1p4
+	f64.ne  	$push37=, $pop35, $pop36
+	br_if   	2, $pop37       # 2: down to label4
+# BB#3:                                 # %lor.lhs.false.i
+	i32.const	$push106=, 0
+	i32.const	$push38=, 12
+	i32.add 	$push39=, $2, $pop38
+	i32.store	gap($pop106), $pop39
+	i32.load	$push40=, 0($3)
+	i32.const	$push41=, 129
+	i32.eq  	$push42=, $pop40, $pop41
+	br_if   	1, $pop42       # 1: down to label5
+	br      	2               # 2: down to label4
+.LBB4_4:                                # %if.then7.i
+	end_block                       # label6:
+	i32.const	$push111=, 0
+	i32.load	$push110=, pap($pop111)
+	tee_local	$push109=, $2=, $pop110
+	i32.load	$push5=, 0($2)
+	i32.const	$push6=, 7
+	i32.add 	$push7=, $pop5, $pop6
+	i32.const	$push8=, -8
+	i32.and 	$push108=, $pop7, $pop8
+	tee_local	$push107=, $2=, $pop108
+	i32.const	$push9=, 8
+	i32.add 	$push10=, $pop107, $pop9
+	i32.store	0($pop109), $pop10
+	i64.load	$push11=, 0($2)
+	i64.const	$push12=, 14
+	i64.ne  	$push13=, $pop11, $pop12
+	br_if   	1, $pop13       # 1: down to label4
+# BB#5:                                 # %lor.lhs.false11.i
+	i32.const	$push116=, 0
+	i32.load	$push115=, pap($pop116)
+	tee_local	$push114=, $2=, $pop115
+	i32.load	$push14=, 0($2)
+	i32.const	$push15=, 15
+	i32.add 	$push16=, $pop14, $pop15
+	i32.const	$push17=, -16
+	i32.and 	$push113=, $pop16, $pop17
+	tee_local	$push112=, $2=, $pop113
+	i32.const	$push18=, 16
+	i32.add 	$push19=, $pop112, $pop18
+	i32.store	0($pop114), $pop19
+	i64.load	$push21=, 0($2)
+	i64.load	$push20=, 8($2)
+	i64.const	$push23=, 0
+	i64.const	$push22=, 4613381465357418496
+	i32.call	$push24=, __netf2@FUNCTION, $pop21, $pop20, $pop23, $pop22
+	br_if   	1, $pop24       # 1: down to label4
+# BB#6:                                 # %lor.lhs.false15.i
+	i32.const	$push121=, 0
+	i32.load	$push120=, pap($pop121)
+	tee_local	$push119=, $2=, $pop120
+	i32.load	$push118=, 0($2)
+	tee_local	$push117=, $2=, $pop118
+	i32.const	$push25=, 4
+	i32.add 	$push26=, $pop117, $pop25
+	i32.store	0($pop119), $pop26
+	i32.load	$push27=, 0($2)
+	i32.const	$push28=, 17
+	i32.ne  	$push29=, $pop27, $pop28
+	br_if   	1, $pop29       # 1: down to label4
+.LBB4_7:                                # %bar.exit
+	end_block                       # label5:
+	i32.const	$push127=, 0
+	i32.store	bar_arg($pop127), $1
+	i32.load	$push126=, 12($4)
+	tee_local	$push125=, $1=, $pop126
+	i32.const	$push43=, 4
+	i32.add 	$push44=, $pop125, $pop43
+	i32.store	12($4), $pop44
+	i32.const	$push124=, 0
+	i32.load	$push123=, 0($1)
+	tee_local	$push122=, $1=, $pop123
+	i32.store	x($pop124), $pop122
+	block   	
+	block   	
+	i32.const	$push45=, 16392
+	i32.eq  	$push46=, $1, $pop45
+	br_if   	0, $pop46       # 0: down to label8
+# BB#8:                                 # %bar.exit
+	i32.const	$push47=, 16390
+	i32.ne  	$push48=, $1, $pop47
+	br_if   	1, $pop48       # 1: down to label7
+# BB#9:                                 # %if.then.i7
+	i32.const	$push133=, 0
+	i32.const	$push132=, 0
+	i32.load	$push74=, gap($pop132)
+	i32.const	$push75=, 7
+	i32.add 	$push76=, $pop74, $pop75
+	i32.const	$push77=, -8
+	i32.and 	$push131=, $pop76, $pop77
+	tee_local	$push130=, $2=, $pop131
+	i32.const	$push78=, 8
+	i32.add 	$push129=, $pop130, $pop78
+	tee_local	$push128=, $3=, $pop129
+	i32.store	gap($pop133), $pop128
+	f64.load	$push79=, 0($2)
+	f64.const	$push80=, 0x1.1p4
+	f64.ne  	$push81=, $pop79, $pop80
+	br_if   	2, $pop81       # 2: down to label4
+# BB#10:                                # %lor.lhs.false.i10
+	i32.const	$push134=, 0
+	i32.const	$push82=, 12
+	i32.add 	$push83=, $2, $pop82
+	i32.store	gap($pop134), $pop83
+	i32.load	$push84=, 0($3)
+	i32.const	$push85=, 129
+	i32.eq  	$push86=, $pop84, $pop85
+	br_if   	1, $pop86       # 1: down to label7
+	br      	2               # 2: down to label4
+.LBB4_11:                               # %if.then7.i16
+	end_block                       # label8:
+	i32.const	$push139=, 0
+	i32.load	$push138=, pap($pop139)
+	tee_local	$push137=, $2=, $pop138
+	i32.load	$push49=, 0($2)
+	i32.const	$push50=, 7
+	i32.add 	$push51=, $pop49, $pop50
+	i32.const	$push52=, -8
+	i32.and 	$push136=, $pop51, $pop52
+	tee_local	$push135=, $2=, $pop136
+	i32.const	$push53=, 8
+	i32.add 	$push54=, $pop135, $pop53
+	i32.store	0($pop137), $pop54
+	i64.load	$push55=, 0($2)
+	i64.const	$push56=, 14
+	i64.ne  	$push57=, $pop55, $pop56
+	br_if   	1, $pop57       # 1: down to label4
+# BB#12:                                # %lor.lhs.false11.i21
+	i32.const	$push144=, 0
+	i32.load	$push143=, pap($pop144)
+	tee_local	$push142=, $2=, $pop143
+	i32.load	$push58=, 0($2)
+	i32.const	$push59=, 15
+	i32.add 	$push60=, $pop58, $pop59
+	i32.const	$push61=, -16
+	i32.and 	$push141=, $pop60, $pop61
+	tee_local	$push140=, $2=, $pop141
+	i32.const	$push62=, 16
+	i32.add 	$push63=, $pop140, $pop62
+	i32.store	0($pop142), $pop63
+	i64.load	$push65=, 0($2)
+	i64.load	$push64=, 8($2)
+	i64.const	$push67=, 0
+	i64.const	$push66=, 4613381465357418496
+	i32.call	$push68=, __netf2@FUNCTION, $pop65, $pop64, $pop67, $pop66
+	br_if   	1, $pop68       # 1: down to label4
+# BB#13:                                # %lor.lhs.false15.i25
+	i32.const	$push149=, 0
+	i32.load	$push148=, pap($pop149)
+	tee_local	$push147=, $2=, $pop148
+	i32.load	$push146=, 0($2)
+	tee_local	$push145=, $2=, $pop146
+	i32.const	$push69=, 4
+	i32.add 	$push70=, $pop145, $pop69
+	i32.store	0($pop147), $pop70
+	i32.load	$push71=, 0($2)
+	i32.const	$push72=, 17
+	i32.ne  	$push73=, $pop71, $pop72
+	br_if   	1, $pop73       # 1: down to label4
+.LBB4_14:                               # %bar.exit27
+	end_block                       # label7:
+	i32.const	$push87=, 0
+	i32.store	bar_arg($pop87), $1
+	i32.const	$push94=, 0
+	i32.const	$push92=, 16
+	i32.add 	$push93=, $4, $pop92
+	i32.store	__stack_pointer($pop94), $pop93
+	return
+.LBB4_15:                               # %if.then5.i
+	end_block                       # label4:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	f2, .Lfunc_end4-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -208,11 +388,7 @@ f3:                                     # @f3
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push13=, $pop8, $pop9
-	tee_local	$push12=, $2=, $pop13
-	i32.store	12($pop12), $1
+	i32.load	$2=, __stack_pointer($pop7)
 	i32.const	$push4=, 0
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
@@ -221,16 +397,18 @@ f3:                                     # @f3
 	tee_local	$push10=, $1=, $pop11
 	i64.load	$push3=, 0($pop10)
 	i64.store	d($pop4), $pop3
+	i32.const	$push8=, 16
+	i32.sub 	$push9=, $2, $pop8
 	i32.const	$push5=, 8
 	i32.add 	$push6=, $1, $pop5
-	i32.store	12($2), $pop6
+	i32.store	12($pop9), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
 	.size	f3, .Lfunc_end5-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -238,13 +416,12 @@ f4:                                     # @f4
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push12=, 0
-	i32.const	$push9=, 0
-	i32.load	$push10=, __stack_pointer($pop9)
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 16
-	i32.sub 	$push22=, $pop10, $pop11
+	i32.sub 	$push22=, $pop9, $pop11
 	tee_local	$push21=, $2=, $pop22
 	i32.store	__stack_pointer($pop12), $pop21
-	i32.store	12($2), $1
 	i32.const	$push20=, 0
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
@@ -261,7 +438,7 @@ f4:                                     # @f4
 	block   	
 	i32.const	$push6=, 5
 	i32.ne  	$push7=, $0, $pop6
-	br_if   	0, $pop7        # 0: down to label5
+	br_if   	0, $pop7        # 0: down to label9
 # BB#1:                                 # %foo.exit
 	i32.const	$push23=, 0
 	i32.load	$push8=, 0($1)
@@ -272,154 +449,600 @@ f4:                                     # @f4
 	i32.store	__stack_pointer($pop15), $pop14
 	return
 .LBB6_2:                                # %sw.default.i
-	end_block                       # label5:
+	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	f4, .Lfunc_end6-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32, i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
-	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
-	tee_local	$push8=, $2=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
-	i32.const	$push0=, 0
-	i32.store	gap($pop0), $1
-	i32.store	12($2), $1
-	call    	bar@FUNCTION, $0
-	i32.const	$push7=, 0
-	i32.const	$push5=, 16
-	i32.add 	$push6=, $2, $pop5
-	i32.store	__stack_pointer($pop7), $pop6
-                                        # fallthrough-return
+	i32.const	$push46=, 0
+	i32.const	$push44=, 0
+	i32.load	$push43=, __stack_pointer($pop44)
+	i32.const	$push45=, 16
+	i32.sub 	$push52=, $pop43, $pop45
+	tee_local	$push51=, $3=, $pop52
+	i32.store	__stack_pointer($pop46), $pop51
+	i32.const	$push50=, 0
+	i32.store	gap($pop50), $1
+	i32.store	12($3), $1
+	block   	
+	block   	
+	block   	
+	i32.const	$push0=, 16392
+	i32.eq  	$push1=, $0, $pop0
+	br_if   	0, $pop1        # 0: down to label12
+# BB#1:                                 # %entry
+	i32.const	$push2=, 16390
+	i32.ne  	$push3=, $0, $pop2
+	br_if   	1, $pop3        # 1: down to label11
+# BB#2:                                 # %if.then.i
+	i32.const	$push58=, 0
+	i32.const	$push57=, 0
+	i32.load	$push29=, gap($pop57)
+	i32.const	$push30=, 7
+	i32.add 	$push31=, $pop29, $pop30
+	i32.const	$push32=, -8
+	i32.and 	$push56=, $pop31, $pop32
+	tee_local	$push55=, $1=, $pop56
+	i32.const	$push33=, 8
+	i32.add 	$push54=, $pop55, $pop33
+	tee_local	$push53=, $2=, $pop54
+	i32.store	gap($pop58), $pop53
+	f64.load	$push34=, 0($1)
+	f64.const	$push35=, 0x1.1p4
+	f64.ne  	$push36=, $pop34, $pop35
+	br_if   	2, $pop36       # 2: down to label10
+# BB#3:                                 # %lor.lhs.false.i
+	i32.const	$push59=, 0
+	i32.const	$push37=, 12
+	i32.add 	$push38=, $1, $pop37
+	i32.store	gap($pop59), $pop38
+	i32.load	$push39=, 0($2)
+	i32.const	$push40=, 129
+	i32.eq  	$push41=, $pop39, $pop40
+	br_if   	1, $pop41       # 1: down to label11
+	br      	2               # 2: down to label10
+.LBB7_4:                                # %if.then7.i
+	end_block                       # label12:
+	i32.const	$push64=, 0
+	i32.load	$push63=, pap($pop64)
+	tee_local	$push62=, $1=, $pop63
+	i32.load	$push4=, 0($1)
+	i32.const	$push5=, 7
+	i32.add 	$push6=, $pop4, $pop5
+	i32.const	$push7=, -8
+	i32.and 	$push61=, $pop6, $pop7
+	tee_local	$push60=, $1=, $pop61
+	i32.const	$push8=, 8
+	i32.add 	$push9=, $pop60, $pop8
+	i32.store	0($pop62), $pop9
+	i64.load	$push10=, 0($1)
+	i64.const	$push11=, 14
+	i64.ne  	$push12=, $pop10, $pop11
+	br_if   	1, $pop12       # 1: down to label10
+# BB#5:                                 # %lor.lhs.false11.i
+	i32.const	$push69=, 0
+	i32.load	$push68=, pap($pop69)
+	tee_local	$push67=, $1=, $pop68
+	i32.load	$push13=, 0($1)
+	i32.const	$push14=, 15
+	i32.add 	$push15=, $pop13, $pop14
+	i32.const	$push16=, -16
+	i32.and 	$push66=, $pop15, $pop16
+	tee_local	$push65=, $1=, $pop66
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $pop65, $pop17
+	i32.store	0($pop67), $pop18
+	i64.load	$push20=, 0($1)
+	i64.load	$push19=, 8($1)
+	i64.const	$push22=, 0
+	i64.const	$push21=, 4613381465357418496
+	i32.call	$push23=, __netf2@FUNCTION, $pop20, $pop19, $pop22, $pop21
+	br_if   	1, $pop23       # 1: down to label10
+# BB#6:                                 # %lor.lhs.false15.i
+	i32.const	$push74=, 0
+	i32.load	$push73=, pap($pop74)
+	tee_local	$push72=, $1=, $pop73
+	i32.load	$push71=, 0($1)
+	tee_local	$push70=, $1=, $pop71
+	i32.const	$push24=, 4
+	i32.add 	$push25=, $pop70, $pop24
+	i32.store	0($pop72), $pop25
+	i32.load	$push26=, 0($1)
+	i32.const	$push27=, 17
+	i32.ne  	$push28=, $pop26, $pop27
+	br_if   	1, $pop28       # 1: down to label10
+.LBB7_7:                                # %bar.exit
+	end_block                       # label11:
+	i32.const	$push42=, 0
+	i32.store	bar_arg($pop42), $0
+	i32.const	$push49=, 0
+	i32.const	$push47=, 16
+	i32.add 	$push48=, $3, $pop47
+	i32.store	__stack_pointer($pop49), $pop48
+	return
+.LBB7_8:                                # %if.then5.i
+	end_block                       # label10:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end7:
 	.size	f5, .Lfunc_end7-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
-	i32.const	$push7=, 16
-	i32.sub 	$push18=, $pop6, $pop7
-	tee_local	$push17=, $3=, $pop18
-	i32.store	__stack_pointer($pop8), $pop17
-	i32.store	12($3), $1
-	i32.const	$push0=, 0
-	f64.load	$push1=, d($pop0)
-	i32.trunc_s/f64	$push2=, $pop1
-	call    	bar@FUNCTION, $pop2
-	i32.const	$push16=, 0
-	i32.load	$push15=, 12($3)
-	tee_local	$push14=, $1=, $pop15
-	i32.load	$push13=, 8($pop14)
-	tee_local	$push12=, $2=, $pop13
-	i32.store	x($pop16), $pop12
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $1, $pop3
-	i32.store	12($3), $pop4
-	call    	bar@FUNCTION, $2
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $3, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
-                                        # fallthrough-return
+	i32.const	$push91=, 0
+	i32.const	$push89=, 0
+	i32.load	$push88=, __stack_pointer($pop89)
+	i32.const	$push90=, 16
+	i32.sub 	$push99=, $pop88, $pop90
+	tee_local	$push98=, $4=, $pop99
+	i32.store	__stack_pointer($pop91), $pop98
+	i32.store	12($4), $1
+	block   	
+	block   	
+	block   	
+	i32.const	$push97=, 0
+	f64.load	$push0=, d($pop97)
+	i32.trunc_s/f64	$push96=, $pop0
+	tee_local	$push95=, $1=, $pop96
+	i32.const	$push1=, 16392
+	i32.eq  	$push2=, $pop95, $pop1
+	br_if   	0, $pop2        # 0: down to label15
+# BB#1:                                 # %entry
+	i32.const	$push3=, 16390
+	i32.ne  	$push4=, $1, $pop3
+	br_if   	1, $pop4        # 1: down to label14
+# BB#2:                                 # %if.then.i
+	i32.const	$push105=, 0
+	i32.const	$push104=, 0
+	i32.load	$push30=, gap($pop104)
+	i32.const	$push31=, 7
+	i32.add 	$push32=, $pop30, $pop31
+	i32.const	$push33=, -8
+	i32.and 	$push103=, $pop32, $pop33
+	tee_local	$push102=, $3=, $pop103
+	i32.const	$push34=, 8
+	i32.add 	$push101=, $pop102, $pop34
+	tee_local	$push100=, $2=, $pop101
+	i32.store	gap($pop105), $pop100
+	f64.load	$push35=, 0($3)
+	f64.const	$push36=, 0x1.1p4
+	f64.ne  	$push37=, $pop35, $pop36
+	br_if   	2, $pop37       # 2: down to label13
+# BB#3:                                 # %lor.lhs.false.i
+	i32.const	$push106=, 0
+	i32.const	$push38=, 12
+	i32.add 	$push39=, $3, $pop38
+	i32.store	gap($pop106), $pop39
+	i32.load	$push40=, 0($2)
+	i32.const	$push41=, 129
+	i32.eq  	$push42=, $pop40, $pop41
+	br_if   	1, $pop42       # 1: down to label14
+	br      	2               # 2: down to label13
+.LBB8_4:                                # %if.then7.i
+	end_block                       # label15:
+	i32.const	$push111=, 0
+	i32.load	$push110=, pap($pop111)
+	tee_local	$push109=, $3=, $pop110
+	i32.load	$push5=, 0($3)
+	i32.const	$push6=, 7
+	i32.add 	$push7=, $pop5, $pop6
+	i32.const	$push8=, -8
+	i32.and 	$push108=, $pop7, $pop8
+	tee_local	$push107=, $3=, $pop108
+	i32.const	$push9=, 8
+	i32.add 	$push10=, $pop107, $pop9
+	i32.store	0($pop109), $pop10
+	i64.load	$push11=, 0($3)
+	i64.const	$push12=, 14
+	i64.ne  	$push13=, $pop11, $pop12
+	br_if   	1, $pop13       # 1: down to label13
+# BB#5:                                 # %lor.lhs.false11.i
+	i32.const	$push116=, 0
+	i32.load	$push115=, pap($pop116)
+	tee_local	$push114=, $3=, $pop115
+	i32.load	$push14=, 0($3)
+	i32.const	$push15=, 15
+	i32.add 	$push16=, $pop14, $pop15
+	i32.const	$push17=, -16
+	i32.and 	$push113=, $pop16, $pop17
+	tee_local	$push112=, $3=, $pop113
+	i32.const	$push18=, 16
+	i32.add 	$push19=, $pop112, $pop18
+	i32.store	0($pop114), $pop19
+	i64.load	$push21=, 0($3)
+	i64.load	$push20=, 8($3)
+	i64.const	$push23=, 0
+	i64.const	$push22=, 4613381465357418496
+	i32.call	$push24=, __netf2@FUNCTION, $pop21, $pop20, $pop23, $pop22
+	br_if   	1, $pop24       # 1: down to label13
+# BB#6:                                 # %lor.lhs.false15.i
+	i32.const	$push121=, 0
+	i32.load	$push120=, pap($pop121)
+	tee_local	$push119=, $3=, $pop120
+	i32.load	$push118=, 0($3)
+	tee_local	$push117=, $3=, $pop118
+	i32.const	$push25=, 4
+	i32.add 	$push26=, $pop117, $pop25
+	i32.store	0($pop119), $pop26
+	i32.load	$push27=, 0($3)
+	i32.const	$push28=, 17
+	i32.ne  	$push29=, $pop27, $pop28
+	br_if   	1, $pop29       # 1: down to label13
+.LBB8_7:                                # %bar.exit
+	end_block                       # label14:
+	i32.const	$push127=, 0
+	i32.store	bar_arg($pop127), $1
+	i32.const	$push126=, 0
+	i32.load	$push125=, 12($4)
+	tee_local	$push124=, $3=, $pop125
+	i32.load	$push123=, 8($pop124)
+	tee_local	$push122=, $1=, $pop123
+	i32.store	x($pop126), $pop122
+	i32.const	$push43=, 12
+	i32.add 	$push44=, $3, $pop43
+	i32.store	12($4), $pop44
+	block   	
+	block   	
+	i32.const	$push45=, 16392
+	i32.eq  	$push46=, $1, $pop45
+	br_if   	0, $pop46       # 0: down to label17
+# BB#8:                                 # %bar.exit
+	i32.const	$push47=, 16390
+	i32.ne  	$push48=, $1, $pop47
+	br_if   	1, $pop48       # 1: down to label16
+# BB#9:                                 # %if.then.i11
+	i32.const	$push133=, 0
+	i32.const	$push132=, 0
+	i32.load	$push74=, gap($pop132)
+	i32.const	$push75=, 7
+	i32.add 	$push76=, $pop74, $pop75
+	i32.const	$push77=, -8
+	i32.and 	$push131=, $pop76, $pop77
+	tee_local	$push130=, $3=, $pop131
+	i32.const	$push78=, 8
+	i32.add 	$push129=, $pop130, $pop78
+	tee_local	$push128=, $2=, $pop129
+	i32.store	gap($pop133), $pop128
+	f64.load	$push79=, 0($3)
+	f64.const	$push80=, 0x1.1p4
+	f64.ne  	$push81=, $pop79, $pop80
+	br_if   	2, $pop81       # 2: down to label13
+# BB#10:                                # %lor.lhs.false.i14
+	i32.const	$push134=, 0
+	i32.const	$push82=, 12
+	i32.add 	$push83=, $3, $pop82
+	i32.store	gap($pop134), $pop83
+	i32.load	$push84=, 0($2)
+	i32.const	$push85=, 129
+	i32.eq  	$push86=, $pop84, $pop85
+	br_if   	1, $pop86       # 1: down to label16
+	br      	2               # 2: down to label13
+.LBB8_11:                               # %if.then7.i20
+	end_block                       # label17:
+	i32.const	$push139=, 0
+	i32.load	$push138=, pap($pop139)
+	tee_local	$push137=, $3=, $pop138
+	i32.load	$push49=, 0($3)
+	i32.const	$push50=, 7
+	i32.add 	$push51=, $pop49, $pop50
+	i32.const	$push52=, -8
+	i32.and 	$push136=, $pop51, $pop52
+	tee_local	$push135=, $3=, $pop136
+	i32.const	$push53=, 8
+	i32.add 	$push54=, $pop135, $pop53
+	i32.store	0($pop137), $pop54
+	i64.load	$push55=, 0($3)
+	i64.const	$push56=, 14
+	i64.ne  	$push57=, $pop55, $pop56
+	br_if   	1, $pop57       # 1: down to label13
+# BB#12:                                # %lor.lhs.false11.i25
+	i32.const	$push144=, 0
+	i32.load	$push143=, pap($pop144)
+	tee_local	$push142=, $3=, $pop143
+	i32.load	$push58=, 0($3)
+	i32.const	$push59=, 15
+	i32.add 	$push60=, $pop58, $pop59
+	i32.const	$push61=, -16
+	i32.and 	$push141=, $pop60, $pop61
+	tee_local	$push140=, $3=, $pop141
+	i32.const	$push62=, 16
+	i32.add 	$push63=, $pop140, $pop62
+	i32.store	0($pop142), $pop63
+	i64.load	$push65=, 0($3)
+	i64.load	$push64=, 8($3)
+	i64.const	$push67=, 0
+	i64.const	$push66=, 4613381465357418496
+	i32.call	$push68=, __netf2@FUNCTION, $pop65, $pop64, $pop67, $pop66
+	br_if   	1, $pop68       # 1: down to label13
+# BB#13:                                # %lor.lhs.false15.i29
+	i32.const	$push149=, 0
+	i32.load	$push148=, pap($pop149)
+	tee_local	$push147=, $3=, $pop148
+	i32.load	$push146=, 0($3)
+	tee_local	$push145=, $3=, $pop146
+	i32.const	$push69=, 4
+	i32.add 	$push70=, $pop145, $pop69
+	i32.store	0($pop147), $pop70
+	i32.load	$push71=, 0($3)
+	i32.const	$push72=, 17
+	i32.ne  	$push73=, $pop71, $pop72
+	br_if   	1, $pop73       # 1: down to label13
+.LBB8_14:                               # %bar.exit31
+	end_block                       # label16:
+	i32.const	$push87=, 0
+	i32.store	bar_arg($pop87), $1
+	i32.const	$push94=, 0
+	i32.const	$push92=, 16
+	i32.add 	$push93=, $4, $pop92
+	i32.store	__stack_pointer($pop94), $pop93
+	return
+.LBB8_15:                               # %if.then5.i
+	end_block                       # label13:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end8:
 	.size	f6, .Lfunc_end8-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
 	.param  	i32, i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
-	i32.const	$push3=, 16
-	i32.sub 	$push11=, $pop2, $pop3
-	tee_local	$push10=, $2=, $pop11
-	i32.store	__stack_pointer($pop4), $pop10
+	i32.const	$push44=, 0
+	i32.const	$push42=, 0
+	i32.load	$push41=, __stack_pointer($pop42)
+	i32.const	$push43=, 16
+	i32.sub 	$push51=, $pop41, $pop43
+	tee_local	$push50=, $3=, $pop51
+	i32.store	__stack_pointer($pop44), $pop50
 	i32.const	$push0=, 0
-	i32.const	$push8=, 12
-	i32.add 	$push9=, $2, $pop8
-	i32.store	pap($pop0), $pop9
-	i32.store	12($2), $1
-	call    	bar@FUNCTION, $0
-	i32.const	$push7=, 0
-	i32.const	$push5=, 16
-	i32.add 	$push6=, $2, $pop5
-	i32.store	__stack_pointer($pop7), $pop6
-                                        # fallthrough-return
+	i32.const	$push48=, 12
+	i32.add 	$push49=, $3, $pop48
+	i32.store	pap($pop0), $pop49
+	i32.store	12($3), $1
+	block   	
+	block   	
+	block   	
+	i32.const	$push1=, 16392
+	i32.eq  	$push2=, $0, $pop1
+	br_if   	0, $pop2        # 0: down to label20
+# BB#1:                                 # %entry
+	i32.const	$push3=, 16390
+	i32.ne  	$push4=, $0, $pop3
+	br_if   	1, $pop4        # 1: down to label19
+# BB#2:                                 # %if.then.i
+	i32.const	$push57=, 0
+	i32.const	$push56=, 0
+	i32.load	$push27=, gap($pop56)
+	i32.const	$push28=, 7
+	i32.add 	$push29=, $pop27, $pop28
+	i32.const	$push30=, -8
+	i32.and 	$push55=, $pop29, $pop30
+	tee_local	$push54=, $1=, $pop55
+	i32.const	$push31=, 8
+	i32.add 	$push53=, $pop54, $pop31
+	tee_local	$push52=, $2=, $pop53
+	i32.store	gap($pop57), $pop52
+	f64.load	$push32=, 0($1)
+	f64.const	$push33=, 0x1.1p4
+	f64.ne  	$push34=, $pop32, $pop33
+	br_if   	2, $pop34       # 2: down to label18
+# BB#3:                                 # %lor.lhs.false.i
+	i32.const	$push58=, 0
+	i32.const	$push35=, 12
+	i32.add 	$push36=, $1, $pop35
+	i32.store	gap($pop58), $pop36
+	i32.load	$push37=, 0($2)
+	i32.const	$push38=, 129
+	i32.eq  	$push39=, $pop37, $pop38
+	br_if   	1, $pop39       # 1: down to label19
+	br      	2               # 2: down to label18
+.LBB9_4:                                # %if.then7.i
+	end_block                       # label20:
+	i32.load	$push6=, 12($3)
+	i32.const	$push5=, 7
+	i32.add 	$push7=, $pop6, $pop5
+	i32.const	$push8=, -8
+	i32.and 	$push62=, $pop7, $pop8
+	tee_local	$push61=, $1=, $pop62
+	i32.const	$push9=, 8
+	i32.add 	$push60=, $pop61, $pop9
+	tee_local	$push59=, $2=, $pop60
+	i32.store	12($3), $pop59
+	i64.load	$push10=, 0($1)
+	i64.const	$push11=, 14
+	i64.ne  	$push12=, $pop10, $pop11
+	br_if   	1, $pop12       # 1: down to label18
+# BB#5:                                 # %lor.lhs.false11.i
+	i32.const	$push13=, 15
+	i32.add 	$push14=, $2, $pop13
+	i32.const	$push15=, -16
+	i32.and 	$push66=, $pop14, $pop15
+	tee_local	$push65=, $1=, $pop66
+	i32.const	$push16=, 16
+	i32.add 	$push64=, $pop65, $pop16
+	tee_local	$push63=, $2=, $pop64
+	i32.store	12($3), $pop63
+	i64.load	$push18=, 0($1)
+	i64.load	$push17=, 8($1)
+	i64.const	$push20=, 0
+	i64.const	$push19=, 4613381465357418496
+	i32.call	$push21=, __netf2@FUNCTION, $pop18, $pop17, $pop20, $pop19
+	br_if   	1, $pop21       # 1: down to label18
+# BB#6:                                 # %lor.lhs.false15.i
+	i32.const	$push22=, 20
+	i32.add 	$push23=, $1, $pop22
+	i32.store	12($3), $pop23
+	i32.load	$push24=, 0($2)
+	i32.const	$push25=, 17
+	i32.ne  	$push26=, $pop24, $pop25
+	br_if   	1, $pop26       # 1: down to label18
+.LBB9_7:                                # %bar.exit
+	end_block                       # label19:
+	i32.const	$push40=, 0
+	i32.store	bar_arg($pop40), $0
+	i32.const	$push47=, 0
+	i32.const	$push45=, 16
+	i32.add 	$push46=, $3, $pop45
+	i32.store	__stack_pointer($pop47), $pop46
+	return
+.LBB9_8:                                # %if.then5.i
+	end_block                       # label18:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end9:
 	.size	f7, .Lfunc_end9-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32, i32
-	.local  	i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push21=, $pop9, $pop10
-	tee_local	$push20=, $2=, $pop21
-	i32.store	__stack_pointer($pop11), $pop20
+	i32.const	$push51=, 0
+	i32.const	$push49=, 0
+	i32.load	$push48=, __stack_pointer($pop49)
+	i32.const	$push50=, 16
+	i32.sub 	$push58=, $pop48, $pop50
+	tee_local	$push57=, $3=, $pop58
+	i32.store	__stack_pointer($pop51), $pop57
 	i32.const	$push0=, 0
-	i32.const	$push15=, 12
-	i32.add 	$push16=, $2, $pop15
-	i32.store	pap($pop0), $pop16
-	i32.store	12($2), $1
-	call    	bar@FUNCTION, $0
-	i32.const	$push19=, 0
-	i32.load	$push2=, 12($2)
-	i32.const	$push1=, 7
-	i32.add 	$push3=, $pop2, $pop1
-	i32.const	$push4=, -8
-	i32.and 	$push18=, $pop3, $pop4
-	tee_local	$push17=, $0=, $pop18
-	i64.load	$push5=, 0($pop17)
-	i64.store	d($pop19), $pop5
-	i32.const	$push6=, 8
-	i32.add 	$push7=, $0, $pop6
-	i32.store	12($2), $pop7
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $2, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
-                                        # fallthrough-return
+	i32.const	$push55=, 12
+	i32.add 	$push56=, $3, $pop55
+	i32.store	pap($pop0), $pop56
+	i32.store	12($3), $1
+	block   	
+	block   	
+	block   	
+	i32.const	$push1=, 16392
+	i32.eq  	$push2=, $0, $pop1
+	br_if   	0, $pop2        # 0: down to label23
+# BB#1:                                 # %entry
+	i32.const	$push3=, 16390
+	i32.ne  	$push4=, $0, $pop3
+	br_if   	1, $pop4        # 1: down to label22
+# BB#2:                                 # %if.then.i
+	i32.const	$push64=, 0
+	i32.const	$push63=, 0
+	i32.load	$push27=, gap($pop63)
+	i32.const	$push28=, 7
+	i32.add 	$push29=, $pop27, $pop28
+	i32.const	$push30=, -8
+	i32.and 	$push62=, $pop29, $pop30
+	tee_local	$push61=, $1=, $pop62
+	i32.const	$push31=, 8
+	i32.add 	$push60=, $pop61, $pop31
+	tee_local	$push59=, $2=, $pop60
+	i32.store	gap($pop64), $pop59
+	f64.load	$push32=, 0($1)
+	f64.const	$push33=, 0x1.1p4
+	f64.ne  	$push34=, $pop32, $pop33
+	br_if   	2, $pop34       # 2: down to label21
+# BB#3:                                 # %lor.lhs.false.i
+	i32.const	$push65=, 0
+	i32.const	$push35=, 12
+	i32.add 	$push36=, $1, $pop35
+	i32.store	gap($pop65), $pop36
+	i32.load	$push37=, 0($2)
+	i32.const	$push38=, 129
+	i32.eq  	$push39=, $pop37, $pop38
+	br_if   	1, $pop39       # 1: down to label22
+	br      	2               # 2: down to label21
+.LBB10_4:                               # %if.then7.i
+	end_block                       # label23:
+	i32.load	$push6=, 12($3)
+	i32.const	$push5=, 7
+	i32.add 	$push7=, $pop6, $pop5
+	i32.const	$push8=, -8
+	i32.and 	$push69=, $pop7, $pop8
+	tee_local	$push68=, $1=, $pop69
+	i32.const	$push9=, 8
+	i32.add 	$push67=, $pop68, $pop9
+	tee_local	$push66=, $2=, $pop67
+	i32.store	12($3), $pop66
+	i64.load	$push10=, 0($1)
+	i64.const	$push11=, 14
+	i64.ne  	$push12=, $pop10, $pop11
+	br_if   	1, $pop12       # 1: down to label21
+# BB#5:                                 # %lor.lhs.false11.i
+	i32.const	$push13=, 15
+	i32.add 	$push14=, $2, $pop13
+	i32.const	$push15=, -16
+	i32.and 	$push73=, $pop14, $pop15
+	tee_local	$push72=, $1=, $pop73
+	i32.const	$push16=, 16
+	i32.add 	$push71=, $pop72, $pop16
+	tee_local	$push70=, $2=, $pop71
+	i32.store	12($3), $pop70
+	i64.load	$push18=, 0($1)
+	i64.load	$push17=, 8($1)
+	i64.const	$push20=, 0
+	i64.const	$push19=, 4613381465357418496
+	i32.call	$push21=, __netf2@FUNCTION, $pop18, $pop17, $pop20, $pop19
+	br_if   	1, $pop21       # 1: down to label21
+# BB#6:                                 # %lor.lhs.false15.i
+	i32.const	$push22=, 20
+	i32.add 	$push23=, $1, $pop22
+	i32.store	12($3), $pop23
+	i32.load	$push24=, 0($2)
+	i32.const	$push25=, 17
+	i32.ne  	$push26=, $pop24, $pop25
+	br_if   	1, $pop26       # 1: down to label21
+.LBB10_7:                               # %bar.exit
+	end_block                       # label22:
+	i32.const	$push40=, 0
+	i32.store	bar_arg($pop40), $0
+	i32.const	$push76=, 0
+	i32.load	$push42=, 12($3)
+	i32.const	$push41=, 7
+	i32.add 	$push43=, $pop42, $pop41
+	i32.const	$push44=, -8
+	i32.and 	$push75=, $pop43, $pop44
+	tee_local	$push74=, $0=, $pop75
+	i64.load	$push45=, 0($pop74)
+	i64.store	d($pop76), $pop45
+	i32.const	$push46=, 8
+	i32.add 	$push47=, $0, $pop46
+	i32.store	12($3), $pop47
+	i32.const	$push54=, 0
+	i32.const	$push52=, 16
+	i32.add 	$push53=, $3, $pop52
+	i32.store	__stack_pointer($pop54), $pop53
+	return
+.LBB10_8:                               # %if.then5.i
+	end_block                       # label21:
+	call    	abort@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	f8, .Lfunc_end10-f8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -427,10 +1050,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push44=, 0
-	i32.const	$push41=, 0
-	i32.load	$push42=, __stack_pointer($pop41)
+	i32.const	$push42=, 0
+	i32.load	$push41=, __stack_pointer($pop42)
 	i32.const	$push43=, 176
-	i32.sub 	$push71=, $pop42, $pop43
+	i32.sub 	$push71=, $pop41, $pop43
 	tee_local	$push70=, $0=, $pop71
 	i32.store	__stack_pointer($pop44), $pop70
 	i32.const	$push69=, 0
@@ -446,13 +1069,13 @@ main:                                   # @main
 	i32.load	$push2=, bar_arg($pop67)
 	i32.const	$push66=, 28
 	i32.ne  	$push3=, $pop2, $pop66
-	br_if   	0, $pop3        # 0: down to label6
+	br_if   	0, $pop3        # 0: down to label24
 # BB#1:                                 # %entry
 	i32.const	$push73=, 0
 	i32.load	$push0=, x($pop73)
 	i32.const	$push72=, 28
 	i32.ne  	$push4=, $pop0, $pop72
-	br_if   	0, $pop4        # 0: down to label6
+	br_if   	0, $pop4        # 0: down to label24
 # BB#2:                                 # %if.end
 	i64.const	$push5=, 4638813169307877376
 	i64.store	144($0), $pop5
@@ -463,7 +1086,7 @@ main:                                   # @main
 	f64.load	$push6=, d($pop74)
 	f64.const	$push7=, 0x1.06p7
 	f64.ne  	$push8=, $pop6, $pop7
-	br_if   	0, $pop8        # 0: down to label6
+	br_if   	0, $pop8        # 0: down to label24
 # BB#3:                                 # %if.end4
 	i32.const	$push76=, 128
 	i32.store	136($0), $pop76
@@ -477,13 +1100,13 @@ main:                                   # @main
 	i32.load	$push12=, x($pop75)
 	i32.const	$push13=, 16
 	i32.ne  	$push14=, $pop12, $pop13
-	br_if   	0, $pop14       # 0: down to label6
+	br_if   	0, $pop14       # 0: down to label24
 # BB#4:                                 # %if.end4
 	i32.const	$push78=, 0
 	i32.load	$push9=, foo_arg($pop78)
 	i32.const	$push77=, 128
 	i32.ne  	$push15=, $pop9, $pop77
-	br_if   	0, $pop15       # 0: down to label6
+	br_if   	0, $pop15       # 0: down to label24
 # BB#5:                                 # %if.end9
 	i32.const	$push16=, 129
 	i32.store	120($0), $pop16
@@ -497,7 +1120,7 @@ main:                                   # @main
 	i32.load	$push19=, bar_arg($pop80)
 	i32.const	$push79=, 16390
 	i32.ne  	$push20=, $pop19, $pop79
-	br_if   	0, $pop20       # 0: down to label6
+	br_if   	0, $pop20       # 0: down to label24
 # BB#6:                                 # %if.end12
 	i64.const	$push21=, 60129542156
 	i64.store	96($0), $pop21
@@ -510,7 +1133,7 @@ main:                                   # @main
 	i32.load	$push23=, bar_arg($pop82)
 	i32.const	$push81=, -31
 	i32.ne  	$push24=, $pop23, $pop81
-	br_if   	0, $pop24       # 0: down to label6
+	br_if   	0, $pop24       # 0: down to label24
 # BB#7:                                 # %if.end15
 	i32.const	$push58=, 48
 	i32.add 	$push59=, $0, $pop58
@@ -542,7 +1165,7 @@ main:                                   # @main
 	i32.load	$push29=, bar_arg($pop84)
 	i32.const	$push83=, 16392
 	i32.ne  	$push30=, $pop29, $pop83
-	br_if   	0, $pop30       # 0: down to label6
+	br_if   	0, $pop30       # 0: down to label24
 # BB#8:                                 # %if.end18
 	i32.const	$push102=, 32
 	i32.add 	$push32=, $0, $pop102
@@ -566,13 +1189,13 @@ main:                                   # @main
 	i32.load	$push36=, bar_arg($pop94)
 	i32.const	$push93=, 16392
 	i32.ne  	$push37=, $pop36, $pop93
-	br_if   	0, $pop37       # 0: down to label6
+	br_if   	0, $pop37       # 0: down to label24
 # BB#9:                                 # %if.end18
 	i32.const	$push103=, 0
 	f64.load	$push31=, d($pop103)
 	f64.const	$push38=, 0x1.bp4
 	f64.ne  	$push39=, $pop31, $pop38
-	br_if   	0, $pop39       # 0: down to label6
+	br_if   	0, $pop39       # 0: down to label24
 # BB#10:                                # %if.end23
 	i32.const	$push47=, 0
 	i32.const	$push45=, 176
@@ -580,14 +1203,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop47), $pop46
 	i32.const	$push40=, 0
 	return  	$pop40
-.LBB11_11:                              # %if.then22
-	end_block                       # label6:
+.LBB11_11:                              # %if.then
+	end_block                       # label24:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end11:
 	.size	main, .Lfunc_end11-main
-
+                                        # -- End function
 	.hidden	foo_arg                 # @foo_arg
 	.type	foo_arg,@object
 	.section	.bss.foo_arg,"aw",@nobits
@@ -643,5 +1266,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-2.c.s b/test/torture-s/stdarg-2.c.s
index 3b102a6b1..dbaac26d8 100644
--- a/test/torture-s/stdarg-2.c.s
+++ b/test/torture-s/stdarg-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/stdarg-2.c"
+	.file	"stdarg-2.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,90 +9,90 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push41=, 0
-	i32.const	$push38=, 0
-	i32.load	$push39=, __stack_pointer($pop38)
+	i32.const	$push39=, 0
+	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 32
-	i32.sub 	$push50=, $pop39, $pop40
+	i32.sub 	$push50=, $pop38, $pop40
 	tee_local	$push49=, $2=, $pop50
 	i32.store	__stack_pointer($pop41), $pop49
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label3
+	br_if   	0, $pop1        # 0: down to label2
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	1, $pop3        # 1: down to label2
+	br_if   	0, $pop3        # 0: down to label3
 # BB#2:                                 # %entry
 	i32.const	$push4=, 5
 	i32.ne  	$push5=, $0, $pop4
 	br_if   	3, $pop5        # 3: down to label0
 # BB#3:                                 # %sw.bb
 	i32.const	$push33=, 0
-	i32.load	$push30=, 0($1)
-	f64.convert_s/i32	$push31=, $pop30
 	i32.const	$push26=, 11
 	i32.add 	$push27=, $1, $pop26
 	i32.const	$push28=, -8
 	i32.and 	$push54=, $pop27, $pop28
 	tee_local	$push53=, $0=, $pop54
 	f64.load	$push29=, 0($pop53)
-	f64.add 	$push32=, $pop31, $pop29
+	i32.load	$push30=, 0($1)
+	f64.convert_s/i32	$push31=, $pop30
+	f64.add 	$push32=, $pop29, $pop31
 	i32.trunc_s/f64	$push52=, $pop32
 	tee_local	$push51=, $1=, $pop52
 	i32.store	foo_arg($pop33), $pop51
-	i64.extend_u/i32	$push35=, $1
 	i64.load	$push34=, 8($0)
-	i64.add 	$push36=, $pop35, $pop34
+	i64.extend_u/i32	$push35=, $1
+	i64.add 	$push36=, $pop34, $pop35
 	i32.wrap/i64	$0=, $pop36
 	br      	2               # 2: down to label1
-.LBB0_4:                                # %sw.bb18
+.LBB0_4:                                # %sw.bb9
 	end_block                       # label3:
+	i32.const	$push22=, 0
+	i32.const	$push19=, 7
+	i32.add 	$push20=, $1, $pop19
+	i32.const	$push21=, -8
+	i32.and 	$push58=, $pop20, $pop21
+	tee_local	$push57=, $0=, $pop58
+	i32.load	$push56=, 0($pop57)
+	tee_local	$push55=, $1=, $pop56
+	i32.store	foo_arg($pop22), $pop55
+	f64.load	$push23=, 8($0)
+	f64.convert_s/i32	$push24=, $1
+	f64.add 	$push25=, $pop23, $pop24
+	i32.trunc_s/f64	$0=, $pop25
+	br      	1               # 1: down to label1
+.LBB0_5:                                # %sw.bb18
+	end_block                       # label2:
 	i32.const	$push45=, 16
 	i32.add 	$push46=, $2, $pop45
-	i32.load	$push59=, 0($1)
-	tee_local	$push58=, $0=, $pop59
-	call    	__floatsitf@FUNCTION, $pop46, $pop58
+	i32.load	$push63=, 0($1)
+	tee_local	$push62=, $0=, $pop63
+	call    	__floatsitf@FUNCTION, $pop46, $pop62
+	i32.const	$push6=, 19
+	i32.add 	$push7=, $1, $pop6
+	i32.const	$push8=, -16
+	i32.and 	$push61=, $pop7, $pop8
+	tee_local	$push60=, $1=, $pop61
+	i64.load	$push10=, 0($pop60)
+	i64.load	$push9=, 8($1)
 	i64.load	$push14=, 16($2)
 	i32.const	$push47=, 16
 	i32.add 	$push48=, $2, $pop47
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $pop48, $pop11
 	i64.load	$push13=, 0($pop12)
-	i32.const	$push6=, 19
-	i32.add 	$push7=, $1, $pop6
-	i32.const	$push8=, -16
-	i32.and 	$push57=, $pop7, $pop8
-	tee_local	$push56=, $1=, $pop57
-	i64.load	$push10=, 0($pop56)
-	i64.load	$push9=, 8($1)
-	call    	__addtf3@FUNCTION, $2, $pop14, $pop13, $pop10, $pop9
+	call    	__addtf3@FUNCTION, $2, $pop10, $pop9, $pop14, $pop13
 	i32.const	$push15=, 0
 	i32.store	foo_arg($pop15), $0
 	i64.load	$push18=, 0($2)
-	i32.const	$push55=, 8
-	i32.add 	$push16=, $2, $pop55
+	i32.const	$push59=, 8
+	i32.add 	$push16=, $2, $pop59
 	i64.load	$push17=, 0($pop16)
 	i32.call	$0=, __fixtfsi@FUNCTION, $pop18, $pop17
-	br      	1               # 1: down to label1
-.LBB0_5:                                # %sw.bb9
-	end_block                       # label2:
-	i32.const	$push22=, 0
-	i32.const	$push19=, 7
-	i32.add 	$push20=, $1, $pop19
-	i32.const	$push21=, -8
-	i32.and 	$push63=, $pop20, $pop21
-	tee_local	$push62=, $0=, $pop63
-	i32.load	$push61=, 0($pop62)
-	tee_local	$push60=, $1=, $pop61
-	i32.store	foo_arg($pop22), $pop60
-	f64.convert_s/i32	$push24=, $1
-	f64.load	$push23=, 8($0)
-	f64.add 	$push25=, $pop24, $pop23
-	i32.trunc_s/f64	$0=, $pop25
 .LBB0_6:                                # %sw.epilog
 	end_block                       # label1:
 	i32.const	$push37=, 0
@@ -109,9 +109,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -162,20 +162,18 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	i32.store	gap($pop0), $1
-	i32.const	$push5=, 0
-	i32.const	$push1=, 4
-	i32.add 	$push2=, $1, $pop1
-	i32.store	gap($pop5), $pop2
+	i32.const	$push2=, 0
+	i32.const	$push0=, 4
+	i32.add 	$push1=, $1, $pop0
+	i32.store	gap($pop2), $pop1
 	i32.const	$push4=, 0
 	i32.load	$push3=, 0($1)
 	i32.store	x($pop4), $pop3
@@ -183,9 +181,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end2:
 	.size	f1, .Lfunc_end2-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -238,24 +236,21 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 48
-	i32.sub 	$push8=, $pop5, $pop6
-	tee_local	$push7=, $2=, $pop8
-	i32.store	16($pop7), $1
+	i32.sub 	$push7=, $pop4, $pop6
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $1, $pop0
-	i32.store	16($2), $pop1
+	i32.store	16($pop7), $pop1
 	i32.const	$push3=, 0
 	i32.load	$push2=, 0($1)
 	i32.store	x($pop3), $pop2
@@ -263,9 +258,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end4:
 	.size	f3, .Lfunc_end4-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -273,10 +268,10 @@ f4:                                     # @f4
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push18=, 0
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 48
-	i32.sub 	$push23=, $pop16, $pop17
+	i32.sub 	$push23=, $pop15, $pop17
 	tee_local	$push22=, $3=, $pop23
 	i32.store	__stack_pointer($pop18), $pop22
 	i32.store	16($3), $1
@@ -328,9 +323,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end5:
 	.size	f4, .Lfunc_end5-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -338,91 +333,91 @@ f5:                                     # @f5
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push41=, 0
-	i32.const	$push38=, 0
-	i32.load	$push39=, __stack_pointer($pop38)
+	i32.const	$push39=, 0
+	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 80
-	i32.sub 	$push50=, $pop39, $pop40
+	i32.sub 	$push50=, $pop38, $pop40
 	tee_local	$push49=, $2=, $pop50
 	i32.store	__stack_pointer($pop41), $pop49
 	i32.store	48($2), $1
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label13
+	br_if   	0, $pop1        # 0: down to label12
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	1, $pop3        # 1: down to label12
+	br_if   	0, $pop3        # 0: down to label13
 # BB#2:                                 # %entry
 	i32.const	$push4=, 5
 	i32.ne  	$push5=, $0, $pop4
 	br_if   	3, $pop5        # 3: down to label10
 # BB#3:                                 # %sw.bb.i
 	i32.const	$push33=, 0
-	i32.load	$push30=, 0($1)
-	f64.convert_s/i32	$push31=, $pop30
 	i32.const	$push26=, 11
 	i32.add 	$push27=, $1, $pop26
 	i32.const	$push28=, -8
 	i32.and 	$push54=, $pop27, $pop28
-	tee_local	$push53=, $1=, $pop54
+	tee_local	$push53=, $0=, $pop54
 	f64.load	$push29=, 0($pop53)
-	f64.add 	$push32=, $pop31, $pop29
+	i32.load	$push30=, 0($1)
+	f64.convert_s/i32	$push31=, $pop30
+	f64.add 	$push32=, $pop29, $pop31
 	i32.trunc_s/f64	$push52=, $pop32
-	tee_local	$push51=, $0=, $pop52
+	tee_local	$push51=, $1=, $pop52
 	i32.store	foo_arg($pop33), $pop51
-	i64.extend_u/i32	$push35=, $0
-	i64.load	$push34=, 8($1)
-	i64.add 	$push36=, $pop35, $pop34
+	i64.load	$push34=, 8($0)
+	i64.extend_u/i32	$push35=, $1
+	i64.add 	$push36=, $pop34, $pop35
 	i32.wrap/i64	$1=, $pop36
 	br      	2               # 2: down to label11
-.LBB6_4:                                # %sw.bb18.i
+.LBB6_4:                                # %sw.bb9.i
 	end_block                       # label13:
+	i32.const	$push22=, 0
+	i32.const	$push19=, 7
+	i32.add 	$push20=, $1, $pop19
+	i32.const	$push21=, -8
+	i32.and 	$push58=, $pop20, $pop21
+	tee_local	$push57=, $1=, $pop58
+	i32.load	$push56=, 0($pop57)
+	tee_local	$push55=, $0=, $pop56
+	i32.store	foo_arg($pop22), $pop55
+	f64.load	$push23=, 8($1)
+	f64.convert_s/i32	$push24=, $0
+	f64.add 	$push25=, $pop23, $pop24
+	i32.trunc_s/f64	$1=, $pop25
+	br      	1               # 1: down to label11
+.LBB6_5:                                # %sw.bb18.i
+	end_block                       # label12:
 	i32.const	$push45=, 16
 	i32.add 	$push46=, $2, $pop45
-	i32.load	$push59=, 0($1)
-	tee_local	$push58=, $0=, $pop59
-	call    	__floatsitf@FUNCTION, $pop46, $pop58
+	i32.load	$push63=, 0($1)
+	tee_local	$push62=, $0=, $pop63
+	call    	__floatsitf@FUNCTION, $pop46, $pop62
+	i32.const	$push6=, 19
+	i32.add 	$push7=, $1, $pop6
+	i32.const	$push8=, -16
+	i32.and 	$push61=, $pop7, $pop8
+	tee_local	$push60=, $1=, $pop61
+	i64.load	$push10=, 0($pop60)
+	i64.load	$push9=, 8($1)
 	i64.load	$push14=, 16($2)
 	i32.const	$push47=, 16
 	i32.add 	$push48=, $2, $pop47
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $pop48, $pop11
 	i64.load	$push13=, 0($pop12)
-	i32.const	$push6=, 19
-	i32.add 	$push7=, $1, $pop6
-	i32.const	$push8=, -16
-	i32.and 	$push57=, $pop7, $pop8
-	tee_local	$push56=, $1=, $pop57
-	i64.load	$push10=, 0($pop56)
-	i64.load	$push9=, 8($1)
-	call    	__addtf3@FUNCTION, $2, $pop14, $pop13, $pop10, $pop9
+	call    	__addtf3@FUNCTION, $2, $pop10, $pop9, $pop14, $pop13
 	i32.const	$push15=, 0
 	i32.store	foo_arg($pop15), $0
 	i64.load	$push18=, 0($2)
-	i32.const	$push55=, 8
-	i32.add 	$push16=, $2, $pop55
+	i32.const	$push59=, 8
+	i32.add 	$push16=, $2, $pop59
 	i64.load	$push17=, 0($pop16)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop18, $pop17
-	br      	1               # 1: down to label11
-.LBB6_5:                                # %sw.bb9.i
-	end_block                       # label12:
-	i32.const	$push22=, 0
-	i32.const	$push19=, 7
-	i32.add 	$push20=, $1, $pop19
-	i32.const	$push21=, -8
-	i32.and 	$push63=, $pop20, $pop21
-	tee_local	$push62=, $1=, $pop63
-	i32.load	$push61=, 0($pop62)
-	tee_local	$push60=, $0=, $pop61
-	i32.store	foo_arg($pop22), $pop60
-	f64.convert_s/i32	$push24=, $0
-	f64.load	$push23=, 8($1)
-	f64.add 	$push25=, $pop24, $pop23
-	i32.trunc_s/f64	$1=, $pop25
 .LBB6_6:                                # %foo.exit
 	end_block                       # label11:
 	i32.const	$push37=, 0
@@ -439,24 +434,21 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end6:
 	.size	f5, .Lfunc_end6-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push8=, $pop5, $pop6
-	tee_local	$push7=, $2=, $pop8
-	i32.store	4($pop7), $1
+	i32.sub 	$push7=, $pop4, $pop6
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $1, $pop0
-	i32.store	4($2), $pop1
+	i32.store	4($pop7), $pop1
 	i32.const	$push3=, 0
 	i32.load	$push2=, 0($1)
 	i32.store	x($pop3), $pop2
@@ -464,9 +456,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end7:
 	.size	f6, .Lfunc_end7-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -474,10 +466,10 @@ f7:                                     # @f7
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push18=, 0
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push23=, $pop16, $pop17
+	i32.sub 	$push23=, $pop15, $pop17
 	tee_local	$push22=, $3=, $pop23
 	i32.store	__stack_pointer($pop18), $pop22
 	i32.store	4($3), $1
@@ -529,9 +521,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end8:
 	.size	f7, .Lfunc_end8-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -539,91 +531,91 @@ f8:                                     # @f8
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push41=, 0
-	i32.const	$push38=, 0
-	i32.load	$push39=, __stack_pointer($pop38)
+	i32.const	$push39=, 0
+	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 48
-	i32.sub 	$push50=, $pop39, $pop40
+	i32.sub 	$push50=, $pop38, $pop40
 	tee_local	$push49=, $2=, $pop50
 	i32.store	__stack_pointer($pop41), $pop49
 	i32.store	36($2), $1
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label19
+	br_if   	0, $pop1        # 0: down to label18
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	1, $pop3        # 1: down to label18
+	br_if   	0, $pop3        # 0: down to label19
 # BB#2:                                 # %entry
 	i32.const	$push4=, 5
 	i32.ne  	$push5=, $0, $pop4
 	br_if   	3, $pop5        # 3: down to label16
 # BB#3:                                 # %sw.bb.i
 	i32.const	$push33=, 0
-	i32.load	$push30=, 0($1)
-	f64.convert_s/i32	$push31=, $pop30
 	i32.const	$push26=, 11
 	i32.add 	$push27=, $1, $pop26
 	i32.const	$push28=, -8
 	i32.and 	$push54=, $pop27, $pop28
-	tee_local	$push53=, $1=, $pop54
+	tee_local	$push53=, $0=, $pop54
 	f64.load	$push29=, 0($pop53)
-	f64.add 	$push32=, $pop31, $pop29
+	i32.load	$push30=, 0($1)
+	f64.convert_s/i32	$push31=, $pop30
+	f64.add 	$push32=, $pop29, $pop31
 	i32.trunc_s/f64	$push52=, $pop32
-	tee_local	$push51=, $0=, $pop52
+	tee_local	$push51=, $1=, $pop52
 	i32.store	foo_arg($pop33), $pop51
-	i64.extend_u/i32	$push35=, $0
-	i64.load	$push34=, 8($1)
-	i64.add 	$push36=, $pop35, $pop34
+	i64.load	$push34=, 8($0)
+	i64.extend_u/i32	$push35=, $1
+	i64.add 	$push36=, $pop34, $pop35
 	i32.wrap/i64	$1=, $pop36
 	br      	2               # 2: down to label17
-.LBB9_4:                                # %sw.bb18.i
+.LBB9_4:                                # %sw.bb9.i
 	end_block                       # label19:
+	i32.const	$push22=, 0
+	i32.const	$push19=, 7
+	i32.add 	$push20=, $1, $pop19
+	i32.const	$push21=, -8
+	i32.and 	$push58=, $pop20, $pop21
+	tee_local	$push57=, $1=, $pop58
+	i32.load	$push56=, 0($pop57)
+	tee_local	$push55=, $0=, $pop56
+	i32.store	foo_arg($pop22), $pop55
+	f64.load	$push23=, 8($1)
+	f64.convert_s/i32	$push24=, $0
+	f64.add 	$push25=, $pop23, $pop24
+	i32.trunc_s/f64	$1=, $pop25
+	br      	1               # 1: down to label17
+.LBB9_5:                                # %sw.bb18.i
+	end_block                       # label18:
 	i32.const	$push45=, 16
 	i32.add 	$push46=, $2, $pop45
-	i32.load	$push59=, 0($1)
-	tee_local	$push58=, $0=, $pop59
-	call    	__floatsitf@FUNCTION, $pop46, $pop58
+	i32.load	$push63=, 0($1)
+	tee_local	$push62=, $0=, $pop63
+	call    	__floatsitf@FUNCTION, $pop46, $pop62
+	i32.const	$push6=, 19
+	i32.add 	$push7=, $1, $pop6
+	i32.const	$push8=, -16
+	i32.and 	$push61=, $pop7, $pop8
+	tee_local	$push60=, $1=, $pop61
+	i64.load	$push10=, 0($pop60)
+	i64.load	$push9=, 8($1)
 	i64.load	$push14=, 16($2)
 	i32.const	$push47=, 16
 	i32.add 	$push48=, $2, $pop47
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $pop48, $pop11
 	i64.load	$push13=, 0($pop12)
-	i32.const	$push6=, 19
-	i32.add 	$push7=, $1, $pop6
-	i32.const	$push8=, -16
-	i32.and 	$push57=, $pop7, $pop8
-	tee_local	$push56=, $1=, $pop57
-	i64.load	$push10=, 0($pop56)
-	i64.load	$push9=, 8($1)
-	call    	__addtf3@FUNCTION, $2, $pop14, $pop13, $pop10, $pop9
+	call    	__addtf3@FUNCTION, $2, $pop10, $pop9, $pop14, $pop13
 	i32.const	$push15=, 0
 	i32.store	foo_arg($pop15), $0
 	i64.load	$push18=, 0($2)
-	i32.const	$push55=, 8
-	i32.add 	$push16=, $2, $pop55
+	i32.const	$push59=, 8
+	i32.add 	$push16=, $2, $pop59
 	i64.load	$push17=, 0($pop16)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop18, $pop17
-	br      	1               # 1: down to label17
-.LBB9_5:                                # %sw.bb9.i
-	end_block                       # label18:
-	i32.const	$push22=, 0
-	i32.const	$push19=, 7
-	i32.add 	$push20=, $1, $pop19
-	i32.const	$push21=, -8
-	i32.and 	$push63=, $pop20, $pop21
-	tee_local	$push62=, $1=, $pop63
-	i32.load	$push61=, 0($pop62)
-	tee_local	$push60=, $0=, $pop61
-	i32.store	foo_arg($pop22), $pop60
-	f64.convert_s/i32	$push24=, $0
-	f64.load	$push23=, 8($1)
-	f64.add 	$push25=, $pop24, $pop23
-	i32.trunc_s/f64	$1=, $pop25
 .LBB9_6:                                # %foo.exit
 	end_block                       # label17:
 	i32.const	$push37=, 0
@@ -640,36 +632,33 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end9:
 	.size	f8, .Lfunc_end9-f8
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
 	.param  	i32, i32
-	.local  	i32
 # BB#0:                                 # %entry
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 16
+	i32.sub 	$push9=, $pop6, $pop8
+	i32.const	$push2=, 12
+	i32.add 	$push3=, $pop9, $pop2
+	i32.const	$push0=, 4
+	i32.add 	$push1=, $1, $pop0
+	i32.store	0($pop3), $pop1
 	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
-	i32.const	$push7=, 16
-	i32.sub 	$push8=, $pop6, $pop7
-	i32.const	$push0=, 12
-	i32.add 	$push10=, $pop8, $pop0
-	tee_local	$push9=, $2=, $pop10
-	i32.store	0($pop9), $1
-	i32.const	$push1=, 4
-	i32.add 	$push2=, $1, $pop1
-	i32.store	0($2), $pop2
-	i32.const	$push4=, 0
-	i32.load	$push3=, 0($1)
-	i32.store	x($pop4), $pop3
+	i32.load	$push4=, 0($1)
+	i32.store	x($pop5), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
 	.size	f10, .Lfunc_end10-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
@@ -677,10 +666,10 @@ f11:                                    # @f11
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push25=, $pop18, $pop19
+	i32.sub 	$push25=, $pop17, $pop19
 	tee_local	$push24=, $3=, $pop25
 	i32.store	__stack_pointer($pop20), $pop24
 	i32.const	$push1=, 12
@@ -734,9 +723,9 @@ f11:                                    # @f11
 	.endfunc
 .Lfunc_end11:
 	.size	f11, .Lfunc_end11-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
@@ -744,10 +733,10 @@ f12:                                    # @f12
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push43=, 0
-	i32.const	$push40=, 0
-	i32.load	$push41=, __stack_pointer($pop40)
+	i32.const	$push41=, 0
+	i32.load	$push40=, __stack_pointer($pop41)
 	i32.const	$push42=, 48
-	i32.sub 	$push52=, $pop41, $pop42
+	i32.sub 	$push52=, $pop40, $pop42
 	tee_local	$push51=, $2=, $pop52
 	i32.store	__stack_pointer($pop43), $pop51
 	i32.const	$push1=, 44
@@ -756,81 +745,81 @@ f12:                                    # @f12
 	block   	
 	block   	
 	block   	
-	block   	
 	i32.const	$push2=, 11
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label25
+	br_if   	0, $pop3        # 0: down to label24
 # BB#1:                                 # %entry
+	block   	
 	i32.const	$push4=, 8
 	i32.eq  	$push5=, $0, $pop4
-	br_if   	1, $pop5        # 1: down to label24
+	br_if   	0, $pop5        # 0: down to label25
 # BB#2:                                 # %entry
 	i32.const	$push6=, 5
 	i32.ne  	$push7=, $0, $pop6
 	br_if   	3, $pop7        # 3: down to label22
 # BB#3:                                 # %sw.bb.i
 	i32.const	$push35=, 0
-	i32.load	$push32=, 0($1)
-	f64.convert_s/i32	$push33=, $pop32
 	i32.const	$push28=, 11
 	i32.add 	$push29=, $1, $pop28
 	i32.const	$push30=, -8
 	i32.and 	$push56=, $pop29, $pop30
-	tee_local	$push55=, $1=, $pop56
+	tee_local	$push55=, $0=, $pop56
 	f64.load	$push31=, 0($pop55)
-	f64.add 	$push34=, $pop33, $pop31
+	i32.load	$push32=, 0($1)
+	f64.convert_s/i32	$push33=, $pop32
+	f64.add 	$push34=, $pop31, $pop33
 	i32.trunc_s/f64	$push54=, $pop34
-	tee_local	$push53=, $0=, $pop54
+	tee_local	$push53=, $1=, $pop54
 	i32.store	foo_arg($pop35), $pop53
-	i64.extend_u/i32	$push37=, $0
-	i64.load	$push36=, 8($1)
-	i64.add 	$push38=, $pop37, $pop36
+	i64.load	$push36=, 8($0)
+	i64.extend_u/i32	$push37=, $1
+	i64.add 	$push38=, $pop36, $pop37
 	i32.wrap/i64	$1=, $pop38
 	br      	2               # 2: down to label23
-.LBB12_4:                               # %sw.bb18.i
+.LBB12_4:                               # %sw.bb9.i
 	end_block                       # label25:
+	i32.const	$push24=, 0
+	i32.const	$push21=, 7
+	i32.add 	$push22=, $1, $pop21
+	i32.const	$push23=, -8
+	i32.and 	$push60=, $pop22, $pop23
+	tee_local	$push59=, $1=, $pop60
+	i32.load	$push58=, 0($pop59)
+	tee_local	$push57=, $0=, $pop58
+	i32.store	foo_arg($pop24), $pop57
+	f64.load	$push25=, 8($1)
+	f64.convert_s/i32	$push26=, $0
+	f64.add 	$push27=, $pop25, $pop26
+	i32.trunc_s/f64	$1=, $pop27
+	br      	1               # 1: down to label23
+.LBB12_5:                               # %sw.bb18.i
+	end_block                       # label24:
 	i32.const	$push47=, 16
 	i32.add 	$push48=, $2, $pop47
-	i32.load	$push61=, 0($1)
-	tee_local	$push60=, $0=, $pop61
-	call    	__floatsitf@FUNCTION, $pop48, $pop60
+	i32.load	$push65=, 0($1)
+	tee_local	$push64=, $0=, $pop65
+	call    	__floatsitf@FUNCTION, $pop48, $pop64
+	i32.const	$push8=, 19
+	i32.add 	$push9=, $1, $pop8
+	i32.const	$push10=, -16
+	i32.and 	$push63=, $pop9, $pop10
+	tee_local	$push62=, $1=, $pop63
+	i64.load	$push12=, 0($pop62)
+	i64.load	$push11=, 8($1)
 	i64.load	$push16=, 16($2)
 	i32.const	$push49=, 16
 	i32.add 	$push50=, $2, $pop49
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $pop50, $pop13
 	i64.load	$push15=, 0($pop14)
-	i32.const	$push8=, 19
-	i32.add 	$push9=, $1, $pop8
-	i32.const	$push10=, -16
-	i32.and 	$push59=, $pop9, $pop10
-	tee_local	$push58=, $1=, $pop59
-	i64.load	$push12=, 0($pop58)
-	i64.load	$push11=, 8($1)
-	call    	__addtf3@FUNCTION, $2, $pop16, $pop15, $pop12, $pop11
+	call    	__addtf3@FUNCTION, $2, $pop12, $pop11, $pop16, $pop15
 	i32.const	$push17=, 0
 	i32.store	foo_arg($pop17), $0
 	i64.load	$push20=, 0($2)
-	i32.const	$push57=, 8
-	i32.add 	$push18=, $2, $pop57
+	i32.const	$push61=, 8
+	i32.add 	$push18=, $2, $pop61
 	i64.load	$push19=, 0($pop18)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop20, $pop19
-	br      	1               # 1: down to label23
-.LBB12_5:                               # %sw.bb9.i
-	end_block                       # label24:
-	i32.const	$push24=, 0
-	i32.const	$push21=, 7
-	i32.add 	$push22=, $1, $pop21
-	i32.const	$push23=, -8
-	i32.and 	$push65=, $pop22, $pop23
-	tee_local	$push64=, $1=, $pop65
-	i32.load	$push63=, 0($pop64)
-	tee_local	$push62=, $0=, $pop63
-	i32.store	foo_arg($pop24), $pop62
-	f64.convert_s/i32	$push26=, $0
-	f64.load	$push25=, 8($1)
-	f64.add 	$push27=, $pop26, $pop25
-	i32.trunc_s/f64	$1=, $pop27
 .LBB12_6:                               # %foo.exit
 	end_block                       # label23:
 	i32.const	$push39=, 0
@@ -847,9 +836,9 @@ f12:                                    # @f12
 	.endfunc
 .Lfunc_end12:
 	.size	f12, .Lfunc_end12-f12
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -857,10 +846,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push54=, 0
-	i32.const	$push51=, 0
-	i32.load	$push52=, __stack_pointer($pop51)
+	i32.const	$push52=, 0
+	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 176
-	i32.sub 	$push77=, $pop52, $pop53
+	i32.sub 	$push77=, $pop51, $pop53
 	tee_local	$push76=, $0=, $pop77
 	i32.store	__stack_pointer($pop54), $pop76
 	i32.const	$push0=, 79
@@ -1006,14 +995,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop57), $pop56
 	i32.const	$push97=, 0
 	return  	$pop97
-.LBB13_12:                              # %if.then29
+.LBB13_12:                              # %if.then
 	end_block                       # label26:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end13:
 	.size	main, .Lfunc_end13-main
-
+                                        # -- End function
 	.hidden	foo_arg                 # @foo_arg
 	.type	foo_arg,@object
 	.section	.bss.foo_arg,"aw",@nobits
@@ -1060,5 +1049,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-3.c.s b/test/torture-s/stdarg-3.c.s
index a668da02c..5070c18df 100644
--- a/test/torture-s/stdarg-3.c.s
+++ b/test/torture-s/stdarg-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/stdarg-3.c"
+	.file	"stdarg-3.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -13,26 +13,26 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $3=, $pop8
 	i32.store	12($pop7), $1
 	block   	
 	i32.const	$push6=, 1
 	i32.lt_s	$push0=, $0, $pop6
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# BB#1:                                 # %while.body.lr.ph
 	i32.const	$push9=, 1
 	i32.add 	$1=, $0, $pop9
 	i32.load	$0=, 12($3)
@@ -60,19 +60,19 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop5, $pop6
+	i32.sub 	$push9=, $pop4, $pop6
 	tee_local	$push8=, $2=, $pop9
 	i32.store	12($pop8), $1
 	block   	
@@ -111,19 +111,19 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end2:
 	.size	f2, .Lfunc_end2-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$4=, $pop4, $pop5
+	i32.sub 	$4=, $pop3, $pop5
 	block   	
 	i32.const	$push6=, 1
 	i32.lt_s	$push0=, $0, $pop6
@@ -136,7 +136,6 @@ f3:                                     # @f3
 .LBB3_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.store	12($4), $1
 	i32.store	12($4), $2
 	i32.const	$push15=, 0
 	i32.load	$push14=, 0($1)
@@ -157,19 +156,19 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end3:
 	.size	f3, .Lfunc_end3-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32
-	.local  	i32, i32, i32
+	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$4=, $pop11, $pop12
+	i32.sub 	$3=, $pop10, $pop12
 	block   	
 	i32.const	$push13=, 1
 	i32.lt_s	$push0=, $0, $pop13
@@ -181,15 +180,14 @@ f4:                                     # @f4
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
 	i32.and 	$push15=, $pop2, $pop3
-	tee_local	$push14=, $2=, $pop15
+	tee_local	$push14=, $1=, $pop15
 	i32.const	$push8=, 8
-	i32.add 	$3=, $pop14, $pop8
+	i32.add 	$2=, $pop14, $pop8
 .LBB4_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.store	12($4), $1
 	i32.const	$push24=, 0
-	i64.load	$push4=, 0($2)
+	i64.load	$push4=, 0($1)
 	i64.store	d($pop24), $pop4
 	i32.const	$push23=, 0
 	i32.const	$push22=, 0
@@ -198,7 +196,7 @@ f4:                                     # @f4
 	f64.add 	$push6=, $pop5, $pop21
 	i32.trunc_s/f64	$push7=, $pop6
 	i32.store	bar_arg($pop23), $pop7
-	i32.store	12($4), $3
+	i32.store	12($3), $2
 	i32.const	$push20=, -1
 	i32.add 	$push19=, $0, $pop20
 	tee_local	$push18=, $0=, $pop19
@@ -212,19 +210,19 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end4:
 	.size	f4, .Lfunc_end4-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push15=, $pop11, $pop12
+	i32.sub 	$push15=, $pop10, $pop12
 	tee_local	$push14=, $2=, $pop15
 	i32.store	12($pop14), $1
 	block   	
@@ -278,19 +276,19 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end5:
 	.size	f5, .Lfunc_end5-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push11=, $pop7, $pop8
+	i32.sub 	$push11=, $pop6, $pop8
 	tee_local	$push10=, $2=, $pop11
 	i32.store	12($pop10), $1
 	block   	
@@ -334,84 +332,65 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end6:
 	.size	f6, .Lfunc_end6-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push21=, 0
-	i32.load	$push22=, __stack_pointer($pop21)
-	i32.const	$push23=, 16
-	i32.sub 	$10=, $pop22, $pop23
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
+	i32.const	$push16=, 16
+	i32.sub 	$6=, $pop14, $pop16
 	block   	
-	i32.const	$push24=, 1
-	i32.lt_s	$push0=, $0, $pop24
+	i32.const	$push17=, 1
+	i32.lt_s	$push0=, $0, $pop17
 	br_if   	0, $pop0        # 0: down to label12
 # BB#1:                                 # %while.body.lr.ph
-	i32.const	$push27=, 1
-	i32.add 	$9=, $0, $pop27
+	i32.const	$push20=, 1
+	i32.add 	$0=, $0, $pop20
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push26=, $pop2, $pop3
-	tee_local	$push25=, $0=, $pop26
-	i32.const	$push5=, 28
-	i32.add 	$2=, $pop25, $pop5
-	i32.const	$push7=, 24
-	i32.add 	$3=, $0, $pop7
-	i32.const	$push9=, 20
-	i32.add 	$4=, $0, $pop9
-	i32.const	$push11=, 16
-	i32.add 	$5=, $0, $pop11
-	i32.const	$push13=, 12
-	i32.add 	$6=, $0, $pop13
-	i32.const	$push15=, 8
-	i32.add 	$7=, $0, $pop15
-	i32.const	$push17=, 32
-	i32.add 	$8=, $0, $pop17
+	i32.and 	$push19=, $pop2, $pop3
+	tee_local	$push18=, $1=, $pop19
+	i32.const	$push5=, 8
+	i32.add 	$2=, $pop18, $pop5
+	i32.const	$push7=, 16
+	i32.add 	$3=, $1, $pop7
+	i32.const	$push9=, 24
+	i32.add 	$4=, $1, $pop9
+	i32.const	$push12=, 32
+	i32.add 	$5=, $1, $pop12
 .LBB7_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	i32.store	12($10), $1
-	i32.const	$push41=, 0
-	i32.load	$push4=, 4($0)
-	i32.store	s1+4($pop41), $pop4
-	i32.const	$push40=, 0
-	i32.load	$push6=, 0($2)
-	i32.store	s1+28($pop40), $pop6
-	i32.const	$push39=, 0
-	i32.load	$push8=, 0($3)
-	i32.store	s1+24($pop39), $pop8
-	i32.const	$push38=, 0
-	i32.load	$push10=, 0($4)
-	i32.store	s1+20($pop38), $pop10
-	i32.const	$push37=, 0
-	i32.load	$push12=, 0($5)
-	i32.store	s1+16($pop37), $pop12
-	i32.const	$push36=, 0
-	i32.load	$push14=, 0($6)
-	i32.store	s1+12($pop36), $pop14
-	i32.const	$push35=, 0
-	i32.load	$push16=, 0($7)
-	i32.store	s1+8($pop35), $pop16
-	i32.store	12($10), $8
-	i32.const	$push34=, 0
-	i32.load	$push18=, 0($0)
-	i32.store	s1($pop34), $pop18
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load	$push19=, s1($pop32)
-	i32.store	bar_arg($pop33), $pop19
-	i32.const	$push31=, -1
-	i32.add 	$push30=, $9, $pop31
-	tee_local	$push29=, $9=, $pop30
-	i32.const	$push28=, 1
-	i32.gt_s	$push20=, $pop29, $pop28
-	br_if   	0, $pop20       # 0: up to label13
+	i32.const	$push30=, 0
+	i64.load	$push4=, 0($1)
+	i64.store	s1($pop30), $pop4
+	i32.const	$push29=, 0
+	i64.load	$push6=, 0($2)
+	i64.store	s1+8($pop29), $pop6
+	i32.const	$push28=, 0
+	i64.load	$push8=, 0($3)
+	i64.store	s1+16($pop28), $pop8
+	i32.const	$push27=, 0
+	i64.load	$push10=, 0($4)
+	i64.store	s1+24($pop27), $pop10
+	i32.const	$push26=, 0
+	i32.const	$push25=, 0
+	i32.load	$push11=, s1($pop25)
+	i32.store	bar_arg($pop26), $pop11
+	i32.store	12($6), $5
+	i32.const	$push24=, -1
+	i32.add 	$push23=, $0, $pop24
+	tee_local	$push22=, $0=, $pop23
+	i32.const	$push21=, 1
+	i32.gt_s	$push13=, $pop22, $pop21
+	br_if   	0, $pop13       # 0: up to label13
 .LBB7_3:                                # %while.end
 	end_loop
 	end_block                       # label12:
@@ -419,67 +398,58 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end7:
 	.size	f7, .Lfunc_end7-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$6=, $pop15, $pop16
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
+	i32.const	$push13=, 16
+	i32.sub 	$4=, $pop11, $pop13
 	block   	
-	i32.const	$push17=, 1
-	i32.lt_s	$push0=, $0, $pop17
+	i32.const	$push14=, 1
+	i32.lt_s	$push0=, $0, $pop14
 	br_if   	0, $pop0        # 0: down to label14
 # BB#1:                                 # %while.body.lr.ph
-	i32.const	$push20=, 1
-	i32.add 	$5=, $0, $pop20
+	i32.const	$push17=, 1
+	i32.add 	$3=, $0, $pop17
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push19=, $pop2, $pop3
-	tee_local	$push18=, $0=, $pop19
-	i32.const	$push6=, 12
-	i32.add 	$2=, $pop18, $pop6
-	i32.const	$push8=, 8
-	i32.add 	$3=, $0, $pop8
-	i32.const	$push10=, 20
-	i32.add 	$4=, $0, $pop10
+	i32.and 	$push16=, $pop2, $pop3
+	tee_local	$push15=, $0=, $pop16
+	i32.const	$push4=, 8
+	i32.add 	$1=, $pop15, $pop4
+	i32.const	$push9=, 20
+	i32.add 	$2=, $0, $pop9
 .LBB8_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.store	12($6), $1
-	i32.const	$push31=, 0
-	i32.load	$push4=, 4($0)
-	i32.store	s2+4($pop31), $pop4
-	i32.const	$push30=, 0
-	i32.load	$push5=, 0($0)
-	i32.store	s2($pop30), $pop5
-	i32.const	$push29=, 0
-	i32.load	$push7=, 0($2)
-	i32.store	s2+12($pop29), $pop7
-	i32.const	$push28=, 0
-	i32.load	$push9=, 0($3)
-	i32.store	s2+8($pop28), $pop9
-	i32.store	12($6), $4
-	i32.const	$push27=, 0
-	i32.load	$push11=, 16($0)
-	i32.store	y($pop27), $pop11
 	i32.const	$push26=, 0
+	i64.load	$push5=, 0($1)
+	i64.store	s2+8($pop26), $pop5
 	i32.const	$push25=, 0
-	i32.load	$push12=, s2+8($pop25)
-	i32.store	bar_arg($pop26), $pop12
-	i32.const	$push24=, -1
-	i32.add 	$push23=, $5, $pop24
-	tee_local	$push22=, $5=, $pop23
-	i32.const	$push21=, 1
-	i32.gt_s	$push13=, $pop22, $pop21
-	br_if   	0, $pop13       # 0: up to label15
+	i64.load	$push6=, 0($0)
+	i64.store	s2($pop25), $pop6
+	i32.const	$push24=, 0
+	i32.load	$push7=, 16($0)
+	i32.store	y($pop24), $pop7
+	i32.const	$push23=, 0
+	i32.const	$push22=, 0
+	i32.load	$push8=, s2+8($pop22)
+	i32.store	bar_arg($pop23), $pop8
+	i32.store	12($4), $2
+	i32.const	$push21=, -1
+	i32.add 	$push20=, $3, $pop21
+	tee_local	$push19=, $3=, $pop20
+	i32.const	$push18=, 1
+	i32.gt_s	$push10=, $pop19, $pop18
+	br_if   	0, $pop10       # 0: up to label15
 .LBB8_3:                                # %while.end
 	end_loop
 	end_block                       # label14:
@@ -487,711 +457,679 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end8:
 	.size	f8, .Lfunc_end8-f8
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i64, i64, i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push237=, 0
-	i32.const	$push234=, 0
-	i32.load	$push235=, __stack_pointer($pop234)
-	i32.const	$push236=, 752
-	i32.sub 	$push423=, $pop235, $pop236
-	tee_local	$push422=, $3=, $pop423
-	i32.store	__stack_pointer($pop237), $pop422
-	i32.const	$push241=, 624
-	i32.add 	$push242=, $3, $pop241
-	i32.const	$push421=, 24
-	i32.add 	$push0=, $pop242, $pop421
+	i32.const	$push200=, 0
+	i32.const	$push198=, 0
+	i32.load	$push197=, __stack_pointer($pop198)
+	i32.const	$push199=, 752
+	i32.sub 	$push378=, $pop197, $pop199
+	tee_local	$push377=, $4=, $pop378
+	i32.store	__stack_pointer($pop200), $pop377
+	i32.const	$push204=, 624
+	i32.add 	$push205=, $4, $pop204
+	i32.const	$push376=, 24
+	i32.add 	$push0=, $pop205, $pop376
 	i64.const	$push1=, 55834574859
 	i64.store	0($pop0), $pop1
-	i32.const	$push243=, 624
-	i32.add 	$push244=, $3, $pop243
-	i32.const	$push420=, 16
-	i32.add 	$push2=, $pop244, $pop420
+	i32.const	$push206=, 624
+	i32.add 	$push207=, $4, $pop206
+	i32.const	$push375=, 16
+	i32.add 	$push2=, $pop207, $pop375
 	i64.const	$push3=, 38654705671
 	i64.store	0($pop2), $pop3
 	i64.const	$push4=, 21474836483
-	i64.store	632($3), $pop4
+	i64.store	632($4), $pop4
 	i64.const	$push5=, 8589934593
-	i64.store	624($3), $pop5
+	i64.store	624($4), $pop5
 	i32.const	$push6=, 7
-	i32.const	$push245=, 624
-	i32.add 	$push246=, $3, $pop245
-	call    	f1@FUNCTION, $pop6, $pop246
+	i32.const	$push208=, 624
+	i32.add 	$push209=, $4, $pop208
+	call    	f1@FUNCTION, $pop6, $pop209
 	block   	
-	i32.const	$push419=, 0
-	i32.load	$push7=, x($pop419)
+	i32.const	$push374=, 0
+	i32.load	$push7=, x($pop374)
 	i32.const	$push8=, 11
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label16
 # BB#1:                                 # %if.end
 	i32.const	$push10=, 608
-	i32.add 	$push11=, $3, $pop10
+	i32.add 	$push11=, $4, $pop10
 	i64.const	$push12=, 4634204016564240384
 	i64.store	0($pop11), $pop12
 	i32.const	$push13=, 600
-	i32.add 	$push14=, $3, $pop13
+	i32.add 	$push14=, $4, $pop13
 	i64.const	$push15=, 4629700416936869888
 	i64.store	0($pop14), $pop15
 	i32.const	$push16=, 592
-	i32.add 	$push17=, $3, $pop16
+	i32.add 	$push17=, $4, $pop16
 	i64.const	$push18=, 4625196817309499392
 	i64.store	0($pop17), $pop18
-	i32.const	$push247=, 560
-	i32.add 	$push248=, $3, $pop247
-	i32.const	$push426=, 24
-	i32.add 	$push19=, $pop248, $pop426
+	i32.const	$push210=, 560
+	i32.add 	$push211=, $4, $pop210
+	i32.const	$push381=, 24
+	i32.add 	$push19=, $pop211, $pop381
 	i64.const	$push20=, 4620693217682128896
 	i64.store	0($pop19), $pop20
-	i32.const	$push249=, 560
-	i32.add 	$push250=, $3, $pop249
-	i32.const	$push425=, 16
-	i32.add 	$push21=, $pop250, $pop425
+	i32.const	$push212=, 560
+	i32.add 	$push213=, $4, $pop212
+	i32.const	$push380=, 16
+	i32.add 	$push21=, $pop213, $pop380
 	i64.const	$push22=, 4616189618054758400
 	i64.store	0($pop21), $pop22
 	i64.const	$push23=, 4611686018427387904
-	i64.store	568($3), $pop23
+	i64.store	568($4), $pop23
 	i64.const	$push24=, 4607182418800017408
-	i64.store	560($3), $pop24
+	i64.store	560($4), $pop24
 	i32.const	$push25=, 6
-	i32.const	$push251=, 560
-	i32.add 	$push252=, $3, $pop251
-	call    	f2@FUNCTION, $pop25, $pop252
-	i32.const	$push424=, 0
-	f64.load	$push26=, d($pop424)
+	i32.const	$push214=, 560
+	i32.add 	$push215=, $4, $pop214
+	call    	f2@FUNCTION, $pop25, $pop215
+	i32.const	$push379=, 0
+	f64.load	$push26=, d($pop379)
 	f64.const	$push27=, 0x1p5
 	f64.ne  	$push28=, $pop26, $pop27
 	br_if   	0, $pop28       # 0: down to label16
 # BB#2:                                 # %if.end3
 	i64.const	$push30=, 12884901889
-	i64.store	544($3), $pop30
+	i64.store	544($4), $pop30
 	i32.const	$push31=, 2
-	i32.const	$push253=, 544
-	i32.add 	$push254=, $3, $pop253
-	call    	f3@FUNCTION, $pop31, $pop254
-	i32.const	$push428=, 0
-	i32.load	$push32=, bar_arg($pop428)
-	i32.const	$push427=, 1
-	i32.ne  	$push33=, $pop32, $pop427
+	i32.const	$push216=, 544
+	i32.add 	$push217=, $4, $pop216
+	call    	f3@FUNCTION, $pop31, $pop217
+	i32.const	$push383=, 0
+	i32.load	$push32=, bar_arg($pop383)
+	i32.const	$push382=, 1
+	i32.ne  	$push33=, $pop32, $pop382
 	br_if   	0, $pop33       # 0: down to label16
 # BB#3:                                 # %if.end3
-	i32.const	$push430=, 0
-	i32.load	$push29=, x($pop430)
-	i32.const	$push429=, 1
-	i32.ne  	$push34=, $pop29, $pop429
+	i32.const	$push385=, 0
+	i32.load	$push29=, x($pop385)
+	i32.const	$push384=, 1
+	i32.ne  	$push34=, $pop29, $pop384
 	br_if   	0, $pop34       # 0: down to label16
 # BB#4:                                 # %if.end7
 	i64.const	$push36=, 4626041242239631360
-	i64.store	536($3), $pop36
+	i64.store	536($4), $pop36
 	i64.const	$push37=, 4625478292286210048
-	i64.store	528($3), $pop37
+	i64.store	528($4), $pop37
 	i32.const	$push38=, 2
-	i32.const	$push255=, 528
-	i32.add 	$push256=, $3, $pop255
-	call    	f4@FUNCTION, $pop38, $pop256
-	i32.const	$push431=, 0
-	i32.load	$push39=, bar_arg($pop431)
+	i32.const	$push218=, 528
+	i32.add 	$push219=, $4, $pop218
+	call    	f4@FUNCTION, $pop38, $pop219
+	i32.const	$push386=, 0
+	i32.load	$push39=, bar_arg($pop386)
 	i32.const	$push40=, 21
 	i32.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label16
 # BB#5:                                 # %if.end7
-	i32.const	$push432=, 0
-	f64.load	$push35=, d($pop432)
+	i32.const	$push387=, 0
+	f64.load	$push35=, d($pop387)
 	f64.const	$push42=, 0x1.1p4
 	f64.ne  	$push43=, $pop35, $pop42
 	br_if   	0, $pop43       # 0: down to label16
 # BB#6:                                 # %if.end12
 	i32.const	$push47=, 251
-	i32.store	736($3), $pop47
-	i32.const	$push257=, 688
-	i32.add 	$push258=, $3, $pop257
+	i32.store	736($4), $pop47
+	i32.const	$push220=, 688
+	i32.add 	$push221=, $4, $pop220
 	i32.const	$push48=, 16
-	i32.add 	$push450=, $pop258, $pop48
-	tee_local	$push449=, $0=, $pop450
-	i32.const	$push448=, 251
-	i32.store	0($pop449), $pop448
-	i64.const	$push49=, 4624633867356078080
-	i64.store	728($3), $pop49
-	i32.const	$push259=, 688
-	i32.add 	$push260=, $3, $pop259
-	i32.const	$push50=, 8
-	i32.add 	$push447=, $pop260, $pop50
-	tee_local	$push446=, $1=, $pop447
-	i64.const	$push445=, 4624633867356078080
-	i64.store	0($pop446), $pop445
-	i32.const	$push261=, 688
-	i32.add 	$push262=, $3, $pop261
-	i32.const	$push51=, 20
-	i32.add 	$push52=, $pop262, $pop51
-	i32.const	$push263=, 720
-	i32.add 	$push264=, $3, $pop263
-	i32.const	$push444=, 20
-	i32.add 	$push53=, $pop264, $pop444
-	i32.load	$push54=, 0($pop53)
-	i32.store	0($pop52), $pop54
+	i32.add 	$push409=, $pop221, $pop48
+	tee_local	$push408=, $0=, $pop409
+	i64.load	$push407=, 736($4)
+	tee_local	$push406=, $1=, $pop407
+	i64.store	0($pop408), $pop406
+	i32.const	$push405=, 254
+	i32.store	0($0), $pop405
+	i32.const	$push222=, 688
+	i32.add 	$push223=, $4, $pop222
+	i32.const	$push49=, 8
+	i32.add 	$push50=, $pop223, $pop49
+	i64.const	$push51=, 4624633867356078080
+	i64.store	0($pop50), $pop51
+	i32.const	$push224=, 496
+	i32.add 	$push225=, $4, $pop224
+	i32.const	$push404=, 8
+	i32.add 	$push52=, $pop225, $pop404
+	i64.const	$push403=, 4624633867356078080
+	i64.store	0($pop52), $pop403
+	i32.const	$push226=, 496
+	i32.add 	$push227=, $4, $pop226
+	i32.const	$push53=, 24
+	i32.add 	$push54=, $pop227, $pop53
 	i64.const	$push55=, 4640924231633207296
-	i64.store	744($3), $pop55
-	i32.const	$push56=, 131
-	i32.store	720($3), $pop56
-	i64.load	$push57=, 720($3)
-	i64.store	688($3), $pop57
-	i32.const	$push443=, 254
-	i32.store	0($0), $pop443
-	i32.const	$push265=, 496
-	i32.add 	$push266=, $3, $pop265
-	i32.const	$push442=, 16
-	i32.add 	$push58=, $pop266, $pop442
-	i64.load	$push59=, 736($3)
-	i64.store	0($pop58), $pop59
-	i64.const	$push60=, 4640466834796052480
-	i64.store	712($3), $pop60
-	i32.const	$push267=, 496
-	i32.add 	$push268=, $3, $pop267
-	i32.const	$push61=, 24
-	i32.add 	$push62=, $pop268, $pop61
-	i64.load	$push63=, 744($3)
-	i64.store	0($pop62), $pop63
-	i32.const	$push269=, 496
-	i32.add 	$push270=, $3, $pop269
-	i32.const	$push441=, 8
-	i32.add 	$push64=, $pop270, $pop441
-	i64.load	$push65=, 728($3)
-	i64.store	0($pop64), $pop65
-	i64.load	$push66=, 720($3)
-	i64.store	496($3), $pop66
-	i32.const	$push271=, 464
-	i32.add 	$push272=, $3, $pop271
-	i32.const	$push440=, 24
-	i32.add 	$push67=, $pop272, $pop440
-	i64.load	$push68=, 712($3)
+	i64.store	0($pop54), $pop55
+	i32.const	$push228=, 464
+	i32.add 	$push229=, $4, $pop228
+	i32.const	$push402=, 24
+	i32.add 	$push56=, $pop229, $pop402
+	i64.const	$push57=, 4640466834796052480
+	i64.store	0($pop56), $pop57
+	i32.const	$push230=, 464
+	i32.add 	$push231=, $4, $pop230
+	i32.const	$push401=, 8
+	i32.add 	$push58=, $pop231, $pop401
+	i64.const	$push400=, 4624633867356078080
+	i64.store	0($pop58), $pop400
+	i32.const	$push232=, 496
+	i32.add 	$push233=, $4, $pop232
+	i32.const	$push399=, 16
+	i32.add 	$push59=, $pop233, $pop399
+	i64.store	0($pop59), $1
+	i32.const	$push234=, 464
+	i32.add 	$push235=, $4, $pop234
+	i32.const	$push398=, 16
+	i32.add 	$push60=, $pop235, $pop398
+	i64.load	$push61=, 0($0)
+	i64.store	0($pop60), $pop61
+	i64.const	$push397=, 4624633867356078080
+	i64.store	728($4), $pop397
+	i64.const	$push396=, 4640924231633207296
+	i64.store	744($4), $pop396
+	i64.const	$push395=, 4640466834796052480
+	i64.store	712($4), $pop395
+	i32.const	$push62=, 131
+	i32.store	720($4), $pop62
+	i64.load	$push394=, 720($4)
+	tee_local	$push393=, $1=, $pop394
+	i64.store	496($4), $pop393
+	i64.store	464($4), $1
+	i64.store	688($4), $1
+	i32.const	$push236=, 432
+	i32.add 	$push237=, $4, $pop236
+	i32.const	$push392=, 24
+	i32.add 	$push63=, $pop237, $pop392
+	i64.load	$push64=, 744($4)
+	i64.store	0($pop63), $pop64
+	i32.const	$push238=, 432
+	i32.add 	$push239=, $4, $pop238
+	i32.const	$push391=, 16
+	i32.add 	$push65=, $pop239, $pop391
+	i64.load	$push66=, 736($4)
+	i64.store	0($pop65), $pop66
+	i32.const	$push240=, 432
+	i32.add 	$push241=, $4, $pop240
+	i32.const	$push390=, 8
+	i32.add 	$push67=, $pop241, $pop390
+	i64.load	$push68=, 728($4)
 	i64.store	0($pop67), $pop68
-	i32.const	$push273=, 464
-	i32.add 	$push274=, $3, $pop273
-	i32.const	$push439=, 16
-	i32.add 	$push69=, $pop274, $pop439
-	i64.load	$push70=, 0($0)
-	i64.store	0($pop69), $pop70
-	i32.const	$push275=, 464
-	i32.add 	$push276=, $3, $pop275
-	i32.const	$push438=, 8
-	i32.add 	$push71=, $pop276, $pop438
-	i64.load	$push72=, 0($1)
-	i64.store	0($pop71), $pop72
-	i64.load	$push73=, 688($3)
-	i64.store	464($3), $pop73
-	i32.const	$push277=, 432
-	i32.add 	$push278=, $3, $pop277
-	i32.const	$push437=, 24
-	i32.add 	$push74=, $pop278, $pop437
-	i64.load	$push75=, 744($3)
-	i64.store	0($pop74), $pop75
-	i32.const	$push279=, 432
-	i32.add 	$push280=, $3, $pop279
-	i32.const	$push436=, 16
-	i32.add 	$push76=, $pop280, $pop436
-	i64.load	$push77=, 736($3)
-	i64.store	0($pop76), $pop77
-	i32.const	$push281=, 432
-	i32.add 	$push282=, $3, $pop281
-	i32.const	$push435=, 8
-	i32.add 	$push78=, $pop282, $pop435
-	i64.load	$push79=, 728($3)
-	i64.store	0($pop78), $pop79
-	i64.load	$push80=, 720($3)
-	i64.store	432($3), $pop80
-	i32.const	$push283=, 432
-	i32.add 	$push284=, $3, $pop283
-	i32.store	424($3), $pop284
-	i32.const	$push285=, 464
-	i32.add 	$push286=, $3, $pop285
-	i32.store	420($3), $pop286
-	i32.const	$push287=, 496
-	i32.add 	$push288=, $3, $pop287
-	i32.store	416($3), $pop288
-	i32.const	$push81=, 2
-	i32.const	$push289=, 416
-	i32.add 	$push290=, $3, $pop289
-	call    	f5@FUNCTION, $pop81, $pop290
-	i32.const	$push434=, 0
-	i32.load	$push82=, s1($pop434)
-	i32.const	$push433=, 131
-	i32.ne  	$push83=, $pop82, $pop433
-	br_if   	0, $pop83       # 0: down to label16
+	i64.load	$push69=, 720($4)
+	i64.store	432($4), $pop69
+	i32.const	$push242=, 432
+	i32.add 	$push243=, $4, $pop242
+	i32.store	424($4), $pop243
+	i32.const	$push244=, 464
+	i32.add 	$push245=, $4, $pop244
+	i32.store	420($4), $pop245
+	i32.const	$push246=, 496
+	i32.add 	$push247=, $4, $pop246
+	i32.store	416($4), $pop247
+	i32.const	$push70=, 2
+	i32.const	$push248=, 416
+	i32.add 	$push249=, $4, $pop248
+	call    	f5@FUNCTION, $pop70, $pop249
+	i32.const	$push389=, 0
+	i32.load	$push71=, s1($pop389)
+	i32.const	$push388=, 131
+	i32.ne  	$push72=, $pop71, $pop388
+	br_if   	0, $pop72       # 0: down to label16
 # BB#7:                                 # %if.end12
-	i32.const	$push452=, 0
-	i32.load	$push44=, s1+16($pop452)
-	i32.const	$push451=, 254
-	i32.ne  	$push84=, $pop44, $pop451
-	br_if   	0, $pop84       # 0: down to label16
+	i32.const	$push411=, 0
+	i32.load	$push44=, s1+16($pop411)
+	i32.const	$push410=, 254
+	i32.ne  	$push73=, $pop44, $pop410
+	br_if   	0, $pop73       # 0: down to label16
 # BB#8:                                 # %if.end12
-	i32.const	$push453=, 0
-	f64.load	$push45=, s1+8($pop453)
-	f64.const	$push85=, 0x1.ep3
-	f64.ne  	$push86=, $pop45, $pop85
-	br_if   	0, $pop86       # 0: down to label16
+	i32.const	$push412=, 0
+	f64.load	$push45=, s1+8($pop412)
+	f64.const	$push74=, 0x1.ep3
+	f64.ne  	$push75=, $pop45, $pop74
+	br_if   	0, $pop75       # 0: down to label16
 # BB#9:                                 # %if.end12
-	i32.const	$push454=, 0
-	f64.load	$push46=, s1+24($pop454)
-	f64.const	$push87=, 0x1.64p7
-	f64.ne  	$push88=, $pop46, $pop87
-	br_if   	0, $pop88       # 0: down to label16
+	i32.const	$push413=, 0
+	f64.load	$push46=, s1+24($pop413)
+	f64.const	$push76=, 0x1.64p7
+	f64.ne  	$push77=, $pop46, $pop76
+	br_if   	0, $pop77       # 0: down to label16
 # BB#10:                                # %if.end23
-	i32.const	$push291=, 384
-	i32.add 	$push292=, $3, $pop291
-	i32.const	$push92=, 24
-	i32.add 	$push93=, $pop292, $pop92
-	i32.const	$push293=, 720
-	i32.add 	$push294=, $3, $pop293
-	i32.const	$push473=, 24
-	i32.add 	$push472=, $pop294, $pop473
-	tee_local	$push471=, $0=, $pop472
-	i64.load	$push94=, 0($pop471)
-	i64.store	0($pop93), $pop94
-	i32.const	$push295=, 384
-	i32.add 	$push296=, $3, $pop295
-	i32.const	$push95=, 16
-	i32.add 	$push96=, $pop296, $pop95
-	i32.const	$push297=, 720
-	i32.add 	$push298=, $3, $pop297
-	i32.const	$push470=, 16
-	i32.add 	$push469=, $pop298, $pop470
-	tee_local	$push468=, $1=, $pop469
-	i64.load	$push97=, 0($pop468)
-	i64.store	0($pop96), $pop97
-	i32.const	$push299=, 384
-	i32.add 	$push300=, $3, $pop299
-	i32.const	$push98=, 8
-	i32.add 	$push99=, $pop300, $pop98
-	i32.const	$push301=, 720
-	i32.add 	$push302=, $3, $pop301
-	i32.const	$push467=, 8
-	i32.add 	$push466=, $pop302, $pop467
-	tee_local	$push465=, $2=, $pop466
-	i64.load	$push100=, 0($pop465)
-	i64.store	0($pop99), $pop100
-	i64.load	$push101=, 720($3)
-	i64.store	384($3), $pop101
-	i32.const	$push303=, 352
-	i32.add 	$push304=, $3, $pop303
-	i32.const	$push464=, 24
-	i32.add 	$push102=, $pop304, $pop464
-	i32.const	$push305=, 688
-	i32.add 	$push306=, $3, $pop305
-	i32.const	$push463=, 24
-	i32.add 	$push103=, $pop306, $pop463
-	i64.load	$push104=, 0($pop103)
-	i64.store	0($pop102), $pop104
-	i32.const	$push307=, 352
-	i32.add 	$push308=, $3, $pop307
-	i32.const	$push462=, 16
-	i32.add 	$push105=, $pop308, $pop462
-	i32.const	$push309=, 688
-	i32.add 	$push310=, $3, $pop309
-	i32.const	$push461=, 16
-	i32.add 	$push106=, $pop310, $pop461
-	i64.load	$push107=, 0($pop106)
-	i64.store	0($pop105), $pop107
-	i32.const	$push311=, 352
-	i32.add 	$push312=, $3, $pop311
-	i32.const	$push460=, 8
-	i32.add 	$push108=, $pop312, $pop460
-	i32.const	$push313=, 688
-	i32.add 	$push314=, $3, $pop313
-	i32.const	$push459=, 8
-	i32.add 	$push109=, $pop314, $pop459
-	i64.load	$push110=, 0($pop109)
-	i64.store	0($pop108), $pop110
-	i64.load	$push111=, 688($3)
-	i64.store	352($3), $pop111
-	i32.const	$push315=, 320
-	i32.add 	$push316=, $3, $pop315
-	i32.const	$push458=, 24
-	i32.add 	$push112=, $pop316, $pop458
-	i64.load	$push113=, 0($0)
-	i64.store	0($pop112), $pop113
-	i32.const	$push317=, 320
-	i32.add 	$push318=, $3, $pop317
-	i32.const	$push457=, 16
-	i32.add 	$push114=, $pop318, $pop457
-	i64.load	$push115=, 0($1)
-	i64.store	0($pop114), $pop115
-	i32.const	$push319=, 320
-	i32.add 	$push320=, $3, $pop319
-	i32.const	$push456=, 8
-	i32.add 	$push116=, $pop320, $pop456
-	i64.load	$push117=, 0($2)
-	i64.store	0($pop116), $pop117
-	i64.load	$push118=, 720($3)
-	i64.store	320($3), $pop118
-	i32.const	$push321=, 320
-	i32.add 	$push322=, $3, $pop321
-	i32.store	312($3), $pop322
-	i32.const	$push323=, 352
-	i32.add 	$push324=, $3, $pop323
-	i32.store	308($3), $pop324
-	i32.const	$push325=, 384
-	i32.add 	$push326=, $3, $pop325
-	i32.store	304($3), $pop326
-	i32.const	$push119=, 3
-	i32.const	$push327=, 304
-	i32.add 	$push328=, $3, $pop327
-	call    	f5@FUNCTION, $pop119, $pop328
-	i32.const	$push455=, 0
-	i32.load	$push120=, s1($pop455)
-	i32.const	$push121=, 131
-	i32.ne  	$push122=, $pop120, $pop121
-	br_if   	0, $pop122      # 0: down to label16
+	i32.const	$push250=, 384
+	i32.add 	$push251=, $4, $pop250
+	i32.const	$push81=, 24
+	i32.add 	$push82=, $pop251, $pop81
+	i32.const	$push252=, 720
+	i32.add 	$push253=, $4, $pop252
+	i32.const	$push434=, 24
+	i32.add 	$push83=, $pop253, $pop434
+	i64.load	$push433=, 0($pop83)
+	tee_local	$push432=, $1=, $pop433
+	i64.store	0($pop82), $pop432
+	i32.const	$push254=, 384
+	i32.add 	$push255=, $4, $pop254
+	i32.const	$push84=, 16
+	i32.add 	$push85=, $pop255, $pop84
+	i32.const	$push256=, 720
+	i32.add 	$push257=, $4, $pop256
+	i32.const	$push431=, 16
+	i32.add 	$push86=, $pop257, $pop431
+	i64.load	$push430=, 0($pop86)
+	tee_local	$push429=, $2=, $pop430
+	i64.store	0($pop85), $pop429
+	i32.const	$push258=, 384
+	i32.add 	$push259=, $4, $pop258
+	i32.const	$push87=, 8
+	i32.add 	$push88=, $pop259, $pop87
+	i32.const	$push260=, 720
+	i32.add 	$push261=, $4, $pop260
+	i32.const	$push428=, 8
+	i32.add 	$push89=, $pop261, $pop428
+	i64.load	$push427=, 0($pop89)
+	tee_local	$push426=, $3=, $pop427
+	i64.store	0($pop88), $pop426
+	i32.const	$push262=, 352
+	i32.add 	$push263=, $4, $pop262
+	i32.const	$push425=, 8
+	i32.add 	$push90=, $pop263, $pop425
+	i32.const	$push264=, 688
+	i32.add 	$push265=, $4, $pop264
+	i32.const	$push424=, 8
+	i32.add 	$push91=, $pop265, $pop424
+	i64.load	$push92=, 0($pop91)
+	i64.store	0($pop90), $pop92
+	i32.const	$push266=, 352
+	i32.add 	$push267=, $4, $pop266
+	i32.const	$push423=, 16
+	i32.add 	$push93=, $pop267, $pop423
+	i32.const	$push268=, 688
+	i32.add 	$push269=, $4, $pop268
+	i32.const	$push422=, 16
+	i32.add 	$push94=, $pop269, $pop422
+	i64.load	$push95=, 0($pop94)
+	i64.store	0($pop93), $pop95
+	i32.const	$push270=, 352
+	i32.add 	$push271=, $4, $pop270
+	i32.const	$push421=, 24
+	i32.add 	$push96=, $pop271, $pop421
+	i32.const	$push272=, 688
+	i32.add 	$push273=, $4, $pop272
+	i32.const	$push420=, 24
+	i32.add 	$push97=, $pop273, $pop420
+	i64.load	$push98=, 0($pop97)
+	i64.store	0($pop96), $pop98
+	i32.const	$push274=, 320
+	i32.add 	$push275=, $4, $pop274
+	i32.const	$push419=, 8
+	i32.add 	$push99=, $pop275, $pop419
+	i64.store	0($pop99), $3
+	i32.const	$push276=, 320
+	i32.add 	$push277=, $4, $pop276
+	i32.const	$push418=, 16
+	i32.add 	$push100=, $pop277, $pop418
+	i64.store	0($pop100), $2
+	i32.const	$push278=, 320
+	i32.add 	$push279=, $4, $pop278
+	i32.const	$push417=, 24
+	i32.add 	$push101=, $pop279, $pop417
+	i64.store	0($pop101), $1
+	i64.load	$push416=, 720($4)
+	tee_local	$push415=, $1=, $pop416
+	i64.store	384($4), $pop415
+	i64.load	$push102=, 688($4)
+	i64.store	352($4), $pop102
+	i64.store	320($4), $1
+	i32.const	$push280=, 320
+	i32.add 	$push281=, $4, $pop280
+	i32.store	312($4), $pop281
+	i32.const	$push282=, 352
+	i32.add 	$push283=, $4, $pop282
+	i32.store	308($4), $pop283
+	i32.const	$push284=, 384
+	i32.add 	$push285=, $4, $pop284
+	i32.store	304($4), $pop285
+	i32.const	$push103=, 3
+	i32.const	$push286=, 304
+	i32.add 	$push287=, $4, $pop286
+	call    	f5@FUNCTION, $pop103, $pop287
+	i32.const	$push414=, 0
+	i32.load	$push104=, s1($pop414)
+	i32.const	$push105=, 131
+	i32.ne  	$push106=, $pop104, $pop105
+	br_if   	0, $pop106      # 0: down to label16
 # BB#11:                                # %if.end23
-	i32.const	$push474=, 0
-	i32.load	$push89=, s1+16($pop474)
-	i32.const	$push123=, 251
-	i32.ne  	$push124=, $pop89, $pop123
-	br_if   	0, $pop124      # 0: down to label16
+	i32.const	$push435=, 0
+	i32.load	$push78=, s1+16($pop435)
+	i32.const	$push107=, 251
+	i32.ne  	$push108=, $pop78, $pop107
+	br_if   	0, $pop108      # 0: down to label16
 # BB#12:                                # %if.end23
-	i32.const	$push475=, 0
-	f64.load	$push90=, s1+8($pop475)
-	f64.const	$push125=, 0x1.ep3
-	f64.ne  	$push126=, $pop90, $pop125
-	br_if   	0, $pop126      # 0: down to label16
+	i32.const	$push436=, 0
+	f64.load	$push79=, s1+8($pop436)
+	f64.const	$push109=, 0x1.ep3
+	f64.ne  	$push110=, $pop79, $pop109
+	br_if   	0, $pop110      # 0: down to label16
 # BB#13:                                # %if.end23
-	i32.const	$push476=, 0
-	f64.load	$push91=, s1+24($pop476)
-	f64.const	$push127=, 0x1.7ep7
-	f64.ne  	$push128=, $pop91, $pop127
-	br_if   	0, $pop128      # 0: down to label16
+	i32.const	$push437=, 0
+	f64.load	$push80=, s1+24($pop437)
+	f64.const	$push111=, 0x1.7ep7
+	f64.ne  	$push112=, $pop80, $pop111
+	br_if   	0, $pop112      # 0: down to label16
 # BB#14:                                # %if.end32
-	i64.const	$push130=, 4625196817309499392
-	i64.store	672($3), $pop130
-	i32.const	$push131=, 138
-	i32.store	680($3), $pop131
-	i64.const	$push132=, 4640396466051874816
-	i64.store	656($3), $pop132
-	i32.const	$push133=, 257
-	i32.store	664($3), $pop133
-	i32.const	$push329=, 288
-	i32.add 	$push330=, $3, $pop329
-	i32.const	$push134=, 12
-	i32.add 	$push135=, $pop330, $pop134
-	i32.const	$push331=, 672
-	i32.add 	$push332=, $3, $pop331
-	i32.const	$push481=, 12
-	i32.add 	$push136=, $pop332, $pop481
-	i32.load	$push137=, 0($pop136)
-	i32.store	0($pop135), $pop137
-	i32.const	$push333=, 288
-	i32.add 	$push334=, $3, $pop333
-	i32.const	$push138=, 8
-	i32.add 	$push139=, $pop334, $pop138
-	i32.load	$push140=, 680($3)
-	i32.store	0($pop139), $pop140
-	i32.load	$push141=, 676($3)
-	i32.store	292($3), $pop141
-	i32.load	$push142=, 672($3)
-	i32.store	288($3), $pop142
-	i32.const	$push335=, 272
-	i32.add 	$push336=, $3, $pop335
-	i32.const	$push480=, 8
-	i32.add 	$push143=, $pop336, $pop480
-	i64.load	$push144=, 664($3)
-	i64.store	0($pop143), $pop144
-	i64.load	$push145=, 656($3)
-	i64.store	272($3), $pop145
-	i32.const	$push337=, 256
-	i32.add 	$push338=, $3, $pop337
-	i32.const	$push479=, 8
-	i32.add 	$push146=, $pop338, $pop479
-	i64.load	$push147=, 680($3)
-	i64.store	0($pop146), $pop147
-	i64.load	$push148=, 672($3)
-	i64.store	256($3), $pop148
-	i32.const	$push339=, 256
-	i32.add 	$push340=, $3, $pop339
-	i32.store	248($3), $pop340
-	i32.const	$push341=, 272
-	i32.add 	$push342=, $3, $pop341
-	i32.store	244($3), $pop342
-	i32.const	$push343=, 288
-	i32.add 	$push344=, $3, $pop343
-	i32.store	240($3), $pop344
-	i32.const	$push149=, 2
-	i32.const	$push345=, 240
-	i32.add 	$push346=, $3, $pop345
-	call    	f6@FUNCTION, $pop149, $pop346
-	i32.const	$push478=, 0
-	i32.load	$push150=, s2+8($pop478)
-	i32.const	$push477=, 257
-	i32.ne  	$push151=, $pop150, $pop477
-	br_if   	0, $pop151      # 0: down to label16
+	i32.const	$push114=, 138
+	i32.store	680($4), $pop114
+	i32.const	$push288=, 288
+	i32.add 	$push289=, $4, $pop288
+	i32.const	$push115=, 8
+	i32.add 	$push116=, $pop289, $pop115
+	i64.load	$push446=, 680($4)
+	tee_local	$push445=, $1=, $pop446
+	i64.store	0($pop116), $pop445
+	i32.const	$push117=, 257
+	i32.store	664($4), $pop117
+	i32.const	$push290=, 272
+	i32.add 	$push291=, $4, $pop290
+	i32.const	$push444=, 8
+	i32.add 	$push118=, $pop291, $pop444
+	i64.load	$push119=, 664($4)
+	i64.store	0($pop118), $pop119
+	i32.const	$push292=, 256
+	i32.add 	$push293=, $4, $pop292
+	i32.const	$push443=, 8
+	i32.add 	$push120=, $pop293, $pop443
+	i64.store	0($pop120), $1
+	i64.const	$push121=, 4625196817309499392
+	i64.store	672($4), $pop121
+	i64.const	$push122=, 4640396466051874816
+	i64.store	656($4), $pop122
+	i64.const	$push442=, 4625196817309499392
+	i64.store	288($4), $pop442
+	i64.const	$push441=, 4640396466051874816
+	i64.store	272($4), $pop441
+	i64.const	$push440=, 4625196817309499392
+	i64.store	256($4), $pop440
+	i32.const	$push294=, 256
+	i32.add 	$push295=, $4, $pop294
+	i32.store	248($4), $pop295
+	i32.const	$push296=, 272
+	i32.add 	$push297=, $4, $pop296
+	i32.store	244($4), $pop297
+	i32.const	$push298=, 288
+	i32.add 	$push299=, $4, $pop298
+	i32.store	240($4), $pop299
+	i32.const	$push123=, 2
+	i32.const	$push300=, 240
+	i32.add 	$push301=, $4, $pop300
+	call    	f6@FUNCTION, $pop123, $pop301
+	i32.const	$push439=, 0
+	i32.load	$push124=, s2+8($pop439)
+	i32.const	$push438=, 257
+	i32.ne  	$push125=, $pop124, $pop438
+	br_if   	0, $pop125      # 0: down to label16
 # BB#15:                                # %if.end32
-	i32.const	$push482=, 0
-	f64.load	$push129=, s2($pop482)
-	f64.const	$push152=, 0x1.6p7
-	f64.ne  	$push153=, $pop129, $pop152
-	br_if   	0, $pop153      # 0: down to label16
+	i32.const	$push447=, 0
+	f64.load	$push113=, s2($pop447)
+	f64.const	$push126=, 0x1.6p7
+	f64.ne  	$push127=, $pop113, $pop126
+	br_if   	0, $pop127      # 0: down to label16
 # BB#16:                                # %if.end41
-	i32.const	$push347=, 224
-	i32.add 	$push348=, $3, $pop347
-	i32.const	$push155=, 8
-	i32.add 	$push156=, $pop348, $pop155
-	i32.const	$push349=, 672
-	i32.add 	$push350=, $3, $pop349
-	i32.const	$push489=, 8
-	i32.add 	$push488=, $pop350, $pop489
-	tee_local	$push487=, $0=, $pop488
-	i64.load	$push157=, 0($pop487)
-	i64.store	0($pop156), $pop157
-	i32.const	$push351=, 208
-	i32.add 	$push352=, $3, $pop351
-	i32.const	$push486=, 8
-	i32.add 	$push158=, $pop352, $pop486
-	i32.const	$push353=, 656
-	i32.add 	$push354=, $3, $pop353
-	i32.const	$push485=, 8
-	i32.add 	$push159=, $pop354, $pop485
-	i64.load	$push160=, 0($pop159)
-	i64.store	0($pop158), $pop160
-	i64.load	$push161=, 672($3)
-	i64.store	224($3), $pop161
-	i64.load	$push162=, 656($3)
-	i64.store	208($3), $pop162
-	i32.const	$push355=, 192
-	i32.add 	$push356=, $3, $pop355
-	i32.const	$push484=, 8
-	i32.add 	$push163=, $pop356, $pop484
-	i64.load	$push164=, 0($0)
-	i64.store	0($pop163), $pop164
-	i64.load	$push165=, 672($3)
-	i64.store	192($3), $pop165
-	i32.const	$push357=, 192
-	i32.add 	$push358=, $3, $pop357
-	i32.store	184($3), $pop358
-	i32.const	$push359=, 208
-	i32.add 	$push360=, $3, $pop359
-	i32.store	180($3), $pop360
-	i32.const	$push361=, 224
-	i32.add 	$push362=, $3, $pop361
-	i32.store	176($3), $pop362
-	i32.const	$push166=, 3
-	i32.const	$push363=, 176
-	i32.add 	$push364=, $3, $pop363
-	call    	f6@FUNCTION, $pop166, $pop364
-	i32.const	$push483=, 0
-	i32.load	$push167=, s2+8($pop483)
-	i32.const	$push168=, 138
-	i32.ne  	$push169=, $pop167, $pop168
-	br_if   	0, $pop169      # 0: down to label16
+	i32.const	$push302=, 224
+	i32.add 	$push303=, $4, $pop302
+	i32.const	$push129=, 8
+	i32.add 	$push130=, $pop303, $pop129
+	i32.const	$push304=, 672
+	i32.add 	$push305=, $4, $pop304
+	i32.const	$push456=, 8
+	i32.add 	$push131=, $pop305, $pop456
+	i64.load	$push455=, 0($pop131)
+	tee_local	$push454=, $1=, $pop455
+	i64.store	0($pop130), $pop454
+	i32.const	$push306=, 208
+	i32.add 	$push307=, $4, $pop306
+	i32.const	$push453=, 8
+	i32.add 	$push132=, $pop307, $pop453
+	i32.const	$push308=, 656
+	i32.add 	$push309=, $4, $pop308
+	i32.const	$push452=, 8
+	i32.add 	$push133=, $pop309, $pop452
+	i64.load	$push134=, 0($pop133)
+	i64.store	0($pop132), $pop134
+	i32.const	$push310=, 192
+	i32.add 	$push311=, $4, $pop310
+	i32.const	$push451=, 8
+	i32.add 	$push135=, $pop311, $pop451
+	i64.store	0($pop135), $1
+	i64.load	$push450=, 672($4)
+	tee_local	$push449=, $1=, $pop450
+	i64.store	224($4), $pop449
+	i64.load	$push136=, 656($4)
+	i64.store	208($4), $pop136
+	i64.store	192($4), $1
+	i32.const	$push312=, 192
+	i32.add 	$push313=, $4, $pop312
+	i32.store	184($4), $pop313
+	i32.const	$push314=, 208
+	i32.add 	$push315=, $4, $pop314
+	i32.store	180($4), $pop315
+	i32.const	$push316=, 224
+	i32.add 	$push317=, $4, $pop316
+	i32.store	176($4), $pop317
+	i32.const	$push137=, 3
+	i32.const	$push318=, 176
+	i32.add 	$push319=, $4, $pop318
+	call    	f6@FUNCTION, $pop137, $pop319
+	i32.const	$push448=, 0
+	i32.load	$push138=, s2+8($pop448)
+	i32.const	$push139=, 138
+	i32.ne  	$push140=, $pop138, $pop139
+	br_if   	0, $pop140      # 0: down to label16
 # BB#17:                                # %if.end41
-	i32.const	$push490=, 0
-	f64.load	$push154=, s2($pop490)
-	f64.const	$push170=, 0x1p4
-	f64.ne  	$push171=, $pop154, $pop170
-	br_if   	0, $pop171      # 0: down to label16
+	i32.const	$push457=, 0
+	f64.load	$push128=, s2($pop457)
+	f64.const	$push141=, 0x1p4
+	f64.ne  	$push142=, $pop128, $pop141
+	br_if   	0, $pop142      # 0: down to label16
 # BB#18:                                # %if.end46
-	i32.const	$push365=, 144
-	i32.add 	$push366=, $3, $pop365
-	i32.const	$push175=, 24
-	i32.add 	$push176=, $pop366, $pop175
-	i32.const	$push367=, 688
-	i32.add 	$push368=, $3, $pop367
-	i32.const	$push509=, 24
-	i32.add 	$push177=, $pop368, $pop509
-	i64.load	$push178=, 0($pop177)
-	i64.store	0($pop176), $pop178
-	i32.const	$push369=, 144
-	i32.add 	$push370=, $3, $pop369
-	i32.const	$push179=, 16
-	i32.add 	$push180=, $pop370, $pop179
-	i32.const	$push371=, 688
-	i32.add 	$push372=, $3, $pop371
-	i32.const	$push508=, 16
-	i32.add 	$push181=, $pop372, $pop508
-	i64.load	$push182=, 0($pop181)
-	i64.store	0($pop180), $pop182
-	i32.const	$push373=, 144
-	i32.add 	$push374=, $3, $pop373
-	i32.const	$push183=, 8
-	i32.add 	$push184=, $pop374, $pop183
-	i32.const	$push375=, 688
-	i32.add 	$push376=, $3, $pop375
-	i32.const	$push507=, 8
-	i32.add 	$push185=, $pop376, $pop507
-	i64.load	$push186=, 0($pop185)
-	i64.store	0($pop184), $pop186
-	i64.load	$push187=, 688($3)
-	i64.store	144($3), $pop187
-	i32.const	$push377=, 112
-	i32.add 	$push378=, $3, $pop377
-	i32.const	$push506=, 24
-	i32.add 	$push188=, $pop378, $pop506
-	i32.const	$push379=, 720
-	i32.add 	$push380=, $3, $pop379
-	i32.const	$push505=, 24
-	i32.add 	$push504=, $pop380, $pop505
-	tee_local	$push503=, $0=, $pop504
-	i64.load	$push189=, 0($pop503)
-	i64.store	0($pop188), $pop189
-	i32.const	$push381=, 112
-	i32.add 	$push382=, $3, $pop381
-	i32.const	$push502=, 16
-	i32.add 	$push190=, $pop382, $pop502
-	i32.const	$push383=, 720
-	i32.add 	$push384=, $3, $pop383
-	i32.const	$push501=, 16
-	i32.add 	$push500=, $pop384, $pop501
-	tee_local	$push499=, $1=, $pop500
-	i64.load	$push191=, 0($pop499)
-	i64.store	0($pop190), $pop191
-	i32.const	$push385=, 112
-	i32.add 	$push386=, $3, $pop385
-	i32.const	$push498=, 8
-	i32.add 	$push192=, $pop386, $pop498
-	i32.const	$push387=, 720
-	i32.add 	$push388=, $3, $pop387
-	i32.const	$push497=, 8
-	i32.add 	$push496=, $pop388, $pop497
-	tee_local	$push495=, $2=, $pop496
-	i64.load	$push193=, 0($pop495)
-	i64.store	0($pop192), $pop193
-	i64.load	$push194=, 720($3)
-	i64.store	112($3), $pop194
-	i32.const	$push389=, 80
-	i32.add 	$push390=, $3, $pop389
-	i32.const	$push494=, 24
-	i32.add 	$push195=, $pop390, $pop494
-	i64.load	$push196=, 0($0)
-	i64.store	0($pop195), $pop196
-	i32.const	$push391=, 80
-	i32.add 	$push392=, $3, $pop391
-	i32.const	$push493=, 16
-	i32.add 	$push197=, $pop392, $pop493
-	i64.load	$push198=, 0($1)
-	i64.store	0($pop197), $pop198
-	i32.const	$push393=, 80
-	i32.add 	$push394=, $3, $pop393
-	i32.const	$push492=, 8
-	i32.add 	$push199=, $pop394, $pop492
-	i64.load	$push200=, 0($2)
-	i64.store	0($pop199), $pop200
-	i64.load	$push201=, 720($3)
-	i64.store	80($3), $pop201
-	i32.const	$push395=, 80
-	i32.add 	$push396=, $3, $pop395
-	i32.store	72($3), $pop396
-	i32.const	$push397=, 112
-	i32.add 	$push398=, $3, $pop397
-	i32.store	68($3), $pop398
-	i32.const	$push399=, 144
-	i32.add 	$push400=, $3, $pop399
-	i32.store	64($3), $pop400
-	i32.const	$push202=, 2
-	i32.const	$push401=, 64
-	i32.add 	$push402=, $3, $pop401
-	call    	f7@FUNCTION, $pop202, $pop402
-	i32.const	$push491=, 0
-	i32.load	$push203=, s1($pop491)
-	i32.const	$push204=, 131
-	i32.ne  	$push205=, $pop203, $pop204
-	br_if   	0, $pop205      # 0: down to label16
+	i32.const	$push320=, 144
+	i32.add 	$push321=, $4, $pop320
+	i32.const	$push146=, 24
+	i32.add 	$push147=, $pop321, $pop146
+	i32.const	$push322=, 688
+	i32.add 	$push323=, $4, $pop322
+	i32.const	$push478=, 24
+	i32.add 	$push148=, $pop323, $pop478
+	i64.load	$push149=, 0($pop148)
+	i64.store	0($pop147), $pop149
+	i32.const	$push324=, 144
+	i32.add 	$push325=, $4, $pop324
+	i32.const	$push150=, 16
+	i32.add 	$push151=, $pop325, $pop150
+	i32.const	$push326=, 688
+	i32.add 	$push327=, $4, $pop326
+	i32.const	$push477=, 16
+	i32.add 	$push152=, $pop327, $pop477
+	i64.load	$push153=, 0($pop152)
+	i64.store	0($pop151), $pop153
+	i32.const	$push328=, 144
+	i32.add 	$push329=, $4, $pop328
+	i32.const	$push154=, 8
+	i32.add 	$push155=, $pop329, $pop154
+	i32.const	$push330=, 688
+	i32.add 	$push331=, $4, $pop330
+	i32.const	$push476=, 8
+	i32.add 	$push156=, $pop331, $pop476
+	i64.load	$push157=, 0($pop156)
+	i64.store	0($pop155), $pop157
+	i32.const	$push332=, 112
+	i32.add 	$push333=, $4, $pop332
+	i32.const	$push475=, 8
+	i32.add 	$push158=, $pop333, $pop475
+	i32.const	$push334=, 720
+	i32.add 	$push335=, $4, $pop334
+	i32.const	$push474=, 8
+	i32.add 	$push159=, $pop335, $pop474
+	i64.load	$push473=, 0($pop159)
+	tee_local	$push472=, $1=, $pop473
+	i64.store	0($pop158), $pop472
+	i32.const	$push336=, 112
+	i32.add 	$push337=, $4, $pop336
+	i32.const	$push471=, 16
+	i32.add 	$push160=, $pop337, $pop471
+	i32.const	$push338=, 720
+	i32.add 	$push339=, $4, $pop338
+	i32.const	$push470=, 16
+	i32.add 	$push161=, $pop339, $pop470
+	i64.load	$push469=, 0($pop161)
+	tee_local	$push468=, $2=, $pop469
+	i64.store	0($pop160), $pop468
+	i32.const	$push340=, 112
+	i32.add 	$push341=, $4, $pop340
+	i32.const	$push467=, 24
+	i32.add 	$push162=, $pop341, $pop467
+	i32.const	$push342=, 720
+	i32.add 	$push343=, $4, $pop342
+	i32.const	$push466=, 24
+	i32.add 	$push163=, $pop343, $pop466
+	i64.load	$push465=, 0($pop163)
+	tee_local	$push464=, $3=, $pop465
+	i64.store	0($pop162), $pop464
+	i32.const	$push344=, 80
+	i32.add 	$push345=, $4, $pop344
+	i32.const	$push463=, 8
+	i32.add 	$push164=, $pop345, $pop463
+	i64.store	0($pop164), $1
+	i32.const	$push346=, 80
+	i32.add 	$push347=, $4, $pop346
+	i32.const	$push462=, 16
+	i32.add 	$push165=, $pop347, $pop462
+	i64.store	0($pop165), $2
+	i32.const	$push348=, 80
+	i32.add 	$push349=, $4, $pop348
+	i32.const	$push461=, 24
+	i32.add 	$push166=, $pop349, $pop461
+	i64.store	0($pop166), $3
+	i64.load	$push167=, 688($4)
+	i64.store	144($4), $pop167
+	i64.load	$push460=, 720($4)
+	tee_local	$push459=, $1=, $pop460
+	i64.store	112($4), $pop459
+	i64.store	80($4), $1
+	i32.const	$push350=, 80
+	i32.add 	$push351=, $4, $pop350
+	i32.store	72($4), $pop351
+	i32.const	$push352=, 112
+	i32.add 	$push353=, $4, $pop352
+	i32.store	68($4), $pop353
+	i32.const	$push354=, 144
+	i32.add 	$push355=, $4, $pop354
+	i32.store	64($4), $pop355
+	i32.const	$push168=, 2
+	i32.const	$push356=, 64
+	i32.add 	$push357=, $4, $pop356
+	call    	f7@FUNCTION, $pop168, $pop357
+	i32.const	$push458=, 0
+	i32.load	$push169=, s1($pop458)
+	i32.const	$push170=, 131
+	i32.ne  	$push171=, $pop169, $pop170
+	br_if   	0, $pop171      # 0: down to label16
 # BB#19:                                # %if.end46
-	i32.const	$push510=, 0
-	i32.load	$push172=, s1+16($pop510)
-	i32.const	$push206=, 254
-	i32.ne  	$push207=, $pop172, $pop206
-	br_if   	0, $pop207      # 0: down to label16
+	i32.const	$push479=, 0
+	i32.load	$push143=, s1+16($pop479)
+	i32.const	$push172=, 254
+	i32.ne  	$push173=, $pop143, $pop172
+	br_if   	0, $pop173      # 0: down to label16
 # BB#20:                                # %if.end46
-	i32.const	$push511=, 0
-	f64.load	$push173=, s1+8($pop511)
-	f64.const	$push208=, 0x1.ep3
-	f64.ne  	$push209=, $pop173, $pop208
-	br_if   	0, $pop209      # 0: down to label16
+	i32.const	$push480=, 0
+	f64.load	$push144=, s1+8($pop480)
+	f64.const	$push174=, 0x1.ep3
+	f64.ne  	$push175=, $pop144, $pop174
+	br_if   	0, $pop175      # 0: down to label16
 # BB#21:                                # %if.end46
-	i32.const	$push512=, 0
-	f64.load	$push174=, s1+24($pop512)
-	f64.const	$push210=, 0x1.64p7
-	f64.ne  	$push211=, $pop174, $pop210
-	br_if   	0, $pop211      # 0: down to label16
+	i32.const	$push481=, 0
+	f64.load	$push145=, s1+24($pop481)
+	f64.const	$push176=, 0x1.64p7
+	f64.ne  	$push177=, $pop145, $pop176
+	br_if   	0, $pop177      # 0: down to label16
 # BB#22:                                # %if.end55
-	i32.const	$push513=, 0
-	i32.load	$push212=, bar_arg($pop513)
-	i32.const	$push213=, 131
-	i32.ne  	$push214=, $pop212, $pop213
-	br_if   	0, $pop214      # 0: down to label16
+	i32.const	$push482=, 0
+	i32.load	$push178=, bar_arg($pop482)
+	i32.const	$push179=, 131
+	i32.ne  	$push180=, $pop178, $pop179
+	br_if   	0, $pop180      # 0: down to label16
 # BB#23:                                # %if.end58
-	i32.const	$push403=, 48
-	i32.add 	$push404=, $3, $pop403
-	i32.const	$push216=, 8
-	i32.add 	$push217=, $pop404, $pop216
-	i32.const	$push405=, 656
-	i32.add 	$push406=, $3, $pop405
-	i32.const	$push520=, 8
-	i32.add 	$push218=, $pop406, $pop520
-	i64.load	$push219=, 0($pop218)
-	i64.store	0($pop217), $pop219
-	i32.const	$push407=, 32
-	i32.add 	$push408=, $3, $pop407
-	i32.const	$push519=, 8
-	i32.add 	$push220=, $pop408, $pop519
-	i32.const	$push409=, 672
-	i32.add 	$push410=, $3, $pop409
-	i32.const	$push518=, 8
-	i32.add 	$push517=, $pop410, $pop518
-	tee_local	$push516=, $0=, $pop517
-	i64.load	$push221=, 0($pop516)
-	i64.store	0($pop220), $pop221
-	i64.load	$push222=, 656($3)
-	i64.store	48($3), $pop222
-	i64.load	$push223=, 672($3)
-	i64.store	32($3), $pop223
-	i32.const	$push411=, 16
-	i32.add 	$push412=, $3, $pop411
-	i32.const	$push515=, 8
-	i32.add 	$push224=, $pop412, $pop515
-	i64.load	$push225=, 0($0)
-	i64.store	0($pop224), $pop225
-	i64.load	$push226=, 672($3)
-	i64.store	16($3), $pop226
-	i32.const	$push413=, 16
-	i32.add 	$push414=, $3, $pop413
-	i32.store	8($3), $pop414
-	i32.const	$push415=, 32
-	i32.add 	$push416=, $3, $pop415
-	i32.store	4($3), $pop416
-	i32.const	$push417=, 48
-	i32.add 	$push418=, $3, $pop417
-	i32.store	0($3), $pop418
-	i32.const	$push227=, 3
-	call    	f8@FUNCTION, $pop227, $3
-	i32.const	$push514=, 0
-	i32.load	$push228=, s2+8($pop514)
-	i32.const	$push229=, 257
-	i32.ne  	$push230=, $pop228, $pop229
-	br_if   	0, $pop230      # 0: down to label16
+	i32.const	$push358=, 48
+	i32.add 	$push359=, $4, $pop358
+	i32.const	$push182=, 8
+	i32.add 	$push183=, $pop359, $pop182
+	i32.const	$push360=, 656
+	i32.add 	$push361=, $4, $pop360
+	i32.const	$push491=, 8
+	i32.add 	$push184=, $pop361, $pop491
+	i64.load	$push185=, 0($pop184)
+	i64.store	0($pop183), $pop185
+	i32.const	$push362=, 32
+	i32.add 	$push363=, $4, $pop362
+	i32.const	$push490=, 8
+	i32.add 	$push186=, $pop363, $pop490
+	i32.const	$push364=, 672
+	i32.add 	$push365=, $4, $pop364
+	i32.const	$push489=, 8
+	i32.add 	$push187=, $pop365, $pop489
+	i64.load	$push488=, 0($pop187)
+	tee_local	$push487=, $1=, $pop488
+	i64.store	0($pop186), $pop487
+	i32.const	$push366=, 16
+	i32.add 	$push367=, $4, $pop366
+	i32.const	$push486=, 8
+	i32.add 	$push188=, $pop367, $pop486
+	i64.store	0($pop188), $1
+	i64.load	$push189=, 656($4)
+	i64.store	48($4), $pop189
+	i64.load	$push485=, 672($4)
+	tee_local	$push484=, $1=, $pop485
+	i64.store	32($4), $pop484
+	i64.store	16($4), $1
+	i32.const	$push368=, 16
+	i32.add 	$push369=, $4, $pop368
+	i32.store	8($4), $pop369
+	i32.const	$push370=, 32
+	i32.add 	$push371=, $4, $pop370
+	i32.store	4($4), $pop371
+	i32.const	$push372=, 48
+	i32.add 	$push373=, $4, $pop372
+	i32.store	0($4), $pop373
+	i32.const	$push190=, 3
+	call    	f8@FUNCTION, $pop190, $4
+	i32.const	$push483=, 0
+	i32.load	$push191=, s2+8($pop483)
+	i32.const	$push192=, 257
+	i32.ne  	$push193=, $pop191, $pop192
+	br_if   	0, $pop193      # 0: down to label16
 # BB#24:                                # %if.end58
-	i32.const	$push521=, 0
-	f64.load	$push215=, s2($pop521)
-	f64.const	$push231=, 0x1.6p7
-	f64.ne  	$push232=, $pop215, $pop231
-	br_if   	0, $pop232      # 0: down to label16
+	i32.const	$push492=, 0
+	f64.load	$push181=, s2($pop492)
+	f64.const	$push194=, 0x1.6p7
+	f64.ne  	$push195=, $pop181, $pop194
+	br_if   	0, $pop195      # 0: down to label16
 # BB#25:                                # %if.end63
-	i32.const	$push240=, 0
-	i32.const	$push238=, 752
-	i32.add 	$push239=, $3, $pop238
-	i32.store	__stack_pointer($pop240), $pop239
-	i32.const	$push233=, 0
-	return  	$pop233
-.LBB9_26:                               # %if.then62
+	i32.const	$push203=, 0
+	i32.const	$push201=, 752
+	i32.add 	$push202=, $4, $pop201
+	i32.store	__stack_pointer($pop203), $pop202
+	i32.const	$push196=, 0
+	return  	$pop196
+.LBB9_26:                               # %if.then
 	end_block                       # label16:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end9:
 	.size	main, .Lfunc_end9-main
-
+                                        # -- End function
 	.hidden	bar_arg                 # @bar_arg
 	.type	bar_arg,@object
 	.section	.bss.bar_arg,"aw",@nobits
@@ -1265,5 +1203,5 @@ gap:
 	.size	gap, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-4.c.s b/test/torture-s/stdarg-4.c.s
index 78975523a..f3e80636f 100644
--- a/test/torture-s/stdarg-4.c.s
+++ b/test/torture-s/stdarg-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/stdarg-4.c"
+	.file	"stdarg-4.c"
 	.section	.text.f1i,"ax",@progbits
-	.hidden	f1i
+	.hidden	f1i                     # -- Begin function f1i
 	.globl	f1i
 	.type	f1i,@function
 f1i:                                    # @f1i
@@ -13,35 +13,35 @@ f1i:                                    # @f1i
 	i32.const	$push2=, -8
 	i32.and 	$push17=, $pop1, $pop2
 	tee_local	$push16=, $0=, $pop17
-	i32.load	$push3=, 8($pop16)
-	f64.load	$push4=, 0($0)
-	i32.trunc_s/f64	$push5=, $pop4
-	i32.add 	$push6=, $pop3, $pop5
-	f64.convert_s/i32	$push7=, $pop6
 	i32.const	$push8=, 19
-	i32.add 	$push9=, $0, $pop8
+	i32.add 	$push9=, $pop16, $pop8
 	i32.const	$push15=, -8
 	i32.and 	$push10=, $pop9, $pop15
 	f64.load	$push11=, 0($pop10)
-	f64.add 	$push12=, $pop7, $pop11
+	i32.load	$push3=, 8($0)
+	f64.load	$push4=, 0($0)
+	i32.trunc_s/f64	$push5=, $pop4
+	i32.add 	$push6=, $pop3, $pop5
+	f64.convert_s/i32	$push7=, $pop6
+	f64.add 	$push12=, $pop11, $pop7
 	i32.trunc_s/f64	$push13=, $pop12
 	i32.store	x($pop14), $pop13
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f1i, .Lfunc_end0-f1i
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push15=, 0
-	i32.load	$push16=, __stack_pointer($pop15)
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push18=, $pop16, $pop17
+	i32.sub 	$push18=, $pop15, $pop17
 	i32.store	12($pop18), $1
 	i32.const	$push14=, 0
 	i32.const	$push0=, 7
@@ -66,36 +66,37 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end1:
 	.size	f1, .Lfunc_end1-f1
-
+                                        # -- End function
 	.section	.text.f2i,"ax",@progbits
-	.hidden	f2i
+	.hidden	f2i                     # -- Begin function f2i
 	.globl	f2i
 	.type	f2i,@function
 f2i:                                    # @f2i
 	.param  	i32
+	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.load	$push5=, 4($0)
-	i32.load	$push4=, 0($0)
-	i32.add 	$push6=, $pop5, $pop4
-	f64.convert_s/i32	$push7=, $pop6
-	i32.const	$push0=, 15
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, -8
-	i32.and 	$push25=, $pop1, $pop2
-	tee_local	$push24=, $0=, $pop25
-	f64.load	$push3=, 0($pop24)
+	i32.const	$push4=, 15
+	i32.add 	$push5=, $0, $pop4
+	i32.const	$push6=, -8
+	i32.and 	$push25=, $pop5, $pop6
+	tee_local	$push24=, $1=, $pop25
+	f64.load	$push7=, 0($pop24)
+	i32.load	$push1=, 4($0)
+	i32.load	$push0=, 0($0)
+	i32.add 	$push2=, $pop1, $pop0
+	f64.convert_s/i32	$push3=, $pop2
 	f64.add 	$push8=, $pop7, $pop3
 	i32.trunc_s/f64	$push9=, $pop8
 	i32.store	y($pop10), $pop9
 	i32.const	$push23=, 0
 	i32.const	$push16=, 27
-	i32.add 	$push17=, $0, $pop16
+	i32.add 	$push17=, $1, $pop16
 	i32.const	$push22=, -8
 	i32.and 	$push18=, $pop17, $pop22
 	f64.load	$push19=, 0($pop18)
-	i32.load	$push11=, 16($0)
-	f64.load	$push12=, 8($0)
+	i32.load	$push11=, 16($1)
+	f64.load	$push12=, 8($1)
 	i32.trunc_s/f64	$push13=, $pop12
 	i32.add 	$push14=, $pop11, $pop13
 	f64.convert_s/i32	$push15=, $pop14
@@ -106,19 +107,19 @@ f2i:                                    # @f2i
 	.endfunc
 .Lfunc_end2:
 	.size	f2i, .Lfunc_end2-f2i
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
-	i32.load	$push23=, __stack_pointer($pop22)
+	i32.const	$push23=, 0
+	i32.load	$push22=, __stack_pointer($pop23)
 	i32.const	$push24=, 16
-	i32.sub 	$push25=, $pop23, $pop24
+	i32.sub 	$push25=, $pop22, $pop24
 	i32.store	12($pop25), $1
 	i32.const	$push10=, 0
 	i32.const	$push4=, 15
@@ -152,9 +153,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.f3h,"ax",@progbits
-	.hidden	f3h
+	.hidden	f3h                     # -- Begin function f3h
 	.globl	f3h
 	.type	f3h,@function
 f3h:                                    # @f3h
@@ -169,9 +170,9 @@ f3h:                                    # @f3h
 	.endfunc
 .Lfunc_end4:
 	.size	f3h, .Lfunc_end4-f3h
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -180,10 +181,10 @@ f3:                                     # @f3
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push35=, 0
-	i32.const	$push32=, 0
-	i32.load	$push33=, __stack_pointer($pop32)
+	i32.const	$push33=, 0
+	i32.load	$push32=, __stack_pointer($pop33)
 	i32.const	$push34=, 16
-	i32.sub 	$push40=, $pop33, $pop34
+	i32.sub 	$push40=, $pop32, $pop34
 	tee_local	$push39=, $2=, $pop40
 	i32.store	__stack_pointer($pop35), $pop39
 	i32.store	12($2), $1
@@ -198,11 +199,11 @@ f3:                                     # @f3
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 4, 0, 1, 3, 2, 4 # 4: down to label1
+	br_table 	$0, 4, 0, 2, 3, 1, 4 # 4: down to label1
                                         # 0: down to label5
-                                        # 1: down to label4
-                                        # 3: down to label2
                                         # 2: down to label3
+                                        # 3: down to label2
+                                        # 1: down to label4
 .LBB5_2:                                # %sw.bb2
 	end_block                       # label5:
 	i32.load	$push42=, 12($2)
@@ -214,28 +215,12 @@ f3:                                     # @f3
 	i32.const	$push31=, 1
 	i32.add 	$1=, $pop30, $pop31
 	br      	3               # 3: down to label1
-.LBB5_3:                                # %sw.bb4
+.LBB5_3:                                # %sw.bb18
 	end_block                       # label4:
-	i32.load	$push44=, 12($2)
-	tee_local	$push43=, $0=, $pop44
-	i32.const	$push21=, 4
-	i32.add 	$push22=, $pop43, $pop21
-	i32.store	12($2), $pop22
-	i32.load	$1=, 0($0)
-	i32.const	$push23=, 8
-	i32.add 	$push24=, $0, $pop23
-	i32.store	12($2), $pop24
-	i32.load	$push25=, 4($0)
-	i32.add 	$push26=, $1, $pop25
-	i32.const	$push27=, 2
-	i32.add 	$1=, $pop26, $pop27
-	br      	2               # 2: down to label1
-.LBB5_4:                                # %sw.bb18
-	end_block                       # label3:
-	i32.load	$push47=, 12($2)
-	tee_local	$push46=, $0=, $pop47
+	i32.load	$push45=, 12($2)
+	tee_local	$push44=, $0=, $pop45
 	i32.const	$push2=, 4
-	i32.add 	$push3=, $pop46, $pop2
+	i32.add 	$push3=, $pop44, $pop2
 	i32.store	12($2), $pop3
 	i32.load	$1=, 0($0)
 	i32.const	$push4=, 16
@@ -247,8 +232,24 @@ f3:                                     # @f3
 	i32.add 	$push9=, $pop7, $pop8
 	i32.load	$push10=, 12($0)
 	i32.add 	$push11=, $pop9, $pop10
-	i32.const	$push45=, 4
-	i32.add 	$1=, $pop11, $pop45
+	i32.const	$push43=, 4
+	i32.add 	$1=, $pop11, $pop43
+	br      	2               # 2: down to label1
+.LBB5_4:                                # %sw.bb4
+	end_block                       # label3:
+	i32.load	$push47=, 12($2)
+	tee_local	$push46=, $0=, $pop47
+	i32.const	$push21=, 4
+	i32.add 	$push22=, $pop46, $pop21
+	i32.store	12($2), $pop22
+	i32.load	$1=, 0($0)
+	i32.const	$push23=, 8
+	i32.add 	$push24=, $0, $pop23
+	i32.store	12($2), $pop24
+	i32.load	$push25=, 4($0)
+	i32.add 	$push26=, $1, $pop25
+	i32.const	$push27=, 2
+	i32.add 	$1=, $pop26, $pop27
 	br      	1               # 1: down to label1
 .LBB5_5:                                # %sw.bb10
 	end_block                       # label2:
@@ -281,9 +282,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end5:
 	.size	f3, .Lfunc_end5-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -291,10 +292,10 @@ f4:                                     # @f4
 	.local  	i32, f64, i32
 # BB#0:                                 # %entry
 	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
+	i32.const	$push35=, 0
+	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 16
-	i32.sub 	$push42=, $pop35, $pop36
+	i32.sub 	$push42=, $pop34, $pop36
 	tee_local	$push41=, $4=, $pop42
 	i32.store	__stack_pointer($pop37), $pop41
 	i32.store	12($4), $1
@@ -338,9 +339,9 @@ f4:                                     # @f4
 	i32.add 	$push48=, $1, $pop10
 	tee_local	$push47=, $0=, $pop48
 	i32.store	12($4), $pop47
-	f64.convert_s/i32	$push12=, $2
 	f64.load	$push11=, 8($1)
-	f64.add 	$3=, $pop12, $pop11
+	f64.convert_s/i32	$push12=, $2
+	f64.add 	$3=, $pop11, $pop12
 .LBB6_4:                                # %sw.epilog
 	end_block                       # label7:
 	i32.const	$push19=, 0
@@ -377,9 +378,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end6:
 	.size	f4, .Lfunc_end6-f4
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -387,10 +388,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push79=, 0
-	i32.const	$push76=, 0
-	i32.load	$push77=, __stack_pointer($pop76)
+	i32.const	$push77=, 0
+	i32.load	$push76=, __stack_pointer($pop77)
 	i32.const	$push78=, 224
-	i32.sub 	$push106=, $pop77, $pop78
+	i32.sub 	$push106=, $pop76, $pop78
 	tee_local	$push105=, $0=, $pop106
 	i32.store	__stack_pointer($pop79), $pop105
 	i32.const	$push83=, 192
@@ -561,14 +562,14 @@ main:                                   # @main
 	i32.store	__stack_pointer($pop82), $pop81
 	i32.const	$push75=, 0
 	return  	$pop75
-.LBB7_13:                               # %if.then32
+.LBB7_13:                               # %if.then
 	end_block                       # label9:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end7:
 	.size	main, .Lfunc_end7-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.bss.x,"aw",@nobits
@@ -588,5 +589,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/strcmp-1.c.s b/test/torture-s/strcmp-1.c.s
index 1938574ee..1f7036bbc 100644
--- a/test/torture-s/strcmp-1.c.s
+++ b/test/torture-s/strcmp-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strcmp-1.c"
+	.file	"strcmp-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -36,16 +36,16 @@ test:                                   # @test
 .LBB0_6:                                # %if.end12
 	end_block                       # label3:
 	return
-.LBB0_7:                                # %if.then10
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,94 +54,91 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
 	i32.const	$1=, u1
-.LBB1_1:                                # %for.cond1.preheader
+.LBB1_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
                                         #       Child Loop BB1_3 Depth 3
 	block   	
-	block   	
-	loop    	                # label6:
+	loop    	                # label5:
 	i32.const	$2=, 0
 	i32.const	$3=, u2
-.LBB1_2:                                # %for.cond4.preheader
+.LBB1_2:                                # %for.body3
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB1_3 Depth 3
-	loop    	                # label7:
+	loop    	                # label6:
 	i32.const	$4=, 0
-.LBB1_3:                                # %for.cond7.preheader
+.LBB1_3:                                # %for.body6
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label8:
+	loop    	                # label7:
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push83=, $0
-	br_if   	0, $pop83       # 0: down to label11
-# BB#4:                                 # %for.body9.preheader
-                                        #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push28=, u1
-	i32.const	$push27=, 0
-	i32.call	$drop=, memset@FUNCTION, $pop28, $pop27, $0
-	copy_local	$push26=, $1
-	tee_local	$push25=, $5=, $pop26
-	copy_local	$6=, $pop25
-	br_if   	1, $4           # 1: down to label10
-	br      	2               # 2: down to label9
-.LBB1_5:                                #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label11:
+	br_if   	0, $0           # 0: down to label10
+# BB#4:                                 #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$5=, u1
-	i32.const	$push29=, u1
-	copy_local	$6=, $pop29
-	i32.eqz 	$push84=, $4
-	br_if   	1, $pop84       # 1: down to label9
-.LBB1_6:                                # %for.body12.preheader
+	i32.const	$push25=, u1
+	copy_local	$6=, $pop25
+	br_if   	1, $4           # 1: down to label9
+	br      	2               # 2: down to label8
+.LBB1_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label10:
-	i32.const	$push30=, 97
-	i32.call	$push0=, memset@FUNCTION, $5, $pop30, $4
-	i32.add 	$6=, $pop0, $4
-.LBB1_7:                                # %for.cond17.preheader
+	i32.const	$push30=, u1
+	i32.const	$push29=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop30, $pop29, $0
+	copy_local	$push28=, $1
+	tee_local	$push27=, $5=, $pop28
+	copy_local	$6=, $pop27
+	i32.eqz 	$push83=, $4
+	br_if   	1, $pop83       # 1: down to label8
+.LBB1_6:                                # %for.body12.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label9:
-	i64.const	$push33=, 8680820740569200760
-	i64.store	0($6):p2align=0, $pop33
-	i32.const	$push32=, 8
-	i32.add 	$push2=, $6, $pop32
-	i32.const	$push31=, 30840
-	i32.store16	0($pop2):p2align=0, $pop31
+	i32.const	$push31=, 97
+	i32.call	$push0=, memset@FUNCTION, $5, $pop31, $4
+	i32.add 	$6=, $pop0, $4
+.LBB1_7:                                # %for.end16
+                                        #   in Loop: Header=BB1_3 Depth=3
+	end_block                       # label8:
+	i64.const	$push34=, 8680820740569200760
+	i64.store	0($6):p2align=0, $pop34
+	i32.const	$push33=, 8
+	i32.add 	$push2=, $6, $pop33
+	i32.const	$push32=, 30840
+	i32.store16	0($pop2):p2align=0, $pop32
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push85=, $2
-	br_if   	0, $pop85       # 0: down to label14
-# BB#8:                                 # %for.body26.preheader
-                                        #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push37=, u2
-	i32.const	$push36=, 0
-	i32.call	$drop=, memset@FUNCTION, $pop37, $pop36, $2
-	copy_local	$push35=, $3
-	tee_local	$push34=, $7=, $pop35
-	copy_local	$8=, $pop34
-	br_if   	1, $4           # 1: down to label13
-	br      	2               # 2: down to label12
-.LBB1_9:                                #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label14:
+	br_if   	0, $2           # 0: down to label13
+# BB#8:                                 #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$7=, u2
-	i32.const	$push38=, u2
-	copy_local	$8=, $pop38
-	i32.eqz 	$push86=, $4
-	br_if   	1, $pop86       # 1: down to label12
-.LBB1_10:                               # %for.body33.preheader
+	i32.const	$push26=, u2
+	copy_local	$8=, $pop26
+	br_if   	1, $4           # 1: down to label12
+	br      	2               # 2: down to label11
+.LBB1_9:                                # %for.body26.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label13:
+	i32.const	$push38=, u2
+	i32.const	$push37=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop38, $pop37, $2
+	copy_local	$push36=, $3
+	tee_local	$push35=, $7=, $pop36
+	copy_local	$8=, $pop35
+	i32.eqz 	$push84=, $4
+	br_if   	1, $pop84       # 1: down to label11
+.LBB1_10:                               # %for.body33.lr.ph
+                                        #   in Loop: Header=BB1_3 Depth=3
+	end_block                       # label12:
 	i32.const	$push39=, 97
 	i32.call	$push1=, memset@FUNCTION, $7, $pop39, $4
 	i32.add 	$8=, $pop1, $4
-.LBB1_11:                               # %for.cond38.preheader
+.LBB1_11:                               # %for.end37
                                         #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label12:
+	end_block                       # label11:
 	i64.const	$push44=, 8680820740569200760
 	i64.store	1($8):p2align=0, $pop44
 	i32.const	$push43=, 9
@@ -153,7 +150,7 @@ main:                                   # @main
 	i32.const	$push40=, 0
 	i32.store8	0($8), $pop40
 	i32.call	$push4=, strcmp@FUNCTION, $5, $7
-	br_if   	3, $pop4        # 3: down to label5
+	br_if   	3, $pop4        # 3: down to label4
 # BB#12:                                # %test.exit
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push47=, 97
@@ -163,7 +160,7 @@ main:                                   # @main
 	i32.call	$push5=, strcmp@FUNCTION, $5, $7
 	i32.const	$push45=, 0
 	i32.le_s	$push6=, $pop5, $pop45
-	br_if   	3, $pop6        # 3: down to label5
+	br_if   	3, $pop6        # 3: down to label4
 # BB#13:                                # %test.exit157
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push50=, 0
@@ -173,7 +170,7 @@ main:                                   # @main
 	i32.call	$push7=, strcmp@FUNCTION, $5, $7
 	i32.const	$push48=, 0
 	i32.ge_s	$push8=, $pop7, $pop48
-	br_if   	3, $pop8        # 3: down to label5
+	br_if   	3, $pop8        # 3: down to label4
 # BB#14:                                # %test.exit162
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push53=, 98
@@ -183,7 +180,7 @@ main:                                   # @main
 	i32.call	$push9=, strcmp@FUNCTION, $5, $7
 	i32.const	$push51=, 0
 	i32.ge_s	$push10=, $pop9, $pop51
-	br_if   	3, $pop10       # 3: down to label5
+	br_if   	3, $pop10       # 3: down to label4
 # BB#15:                                # %test.exit168
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push56=, 99
@@ -193,7 +190,7 @@ main:                                   # @main
 	i32.call	$push11=, strcmp@FUNCTION, $5, $7
 	i32.const	$push54=, 0
 	i32.le_s	$push12=, $pop11, $pop54
-	br_if   	3, $pop12       # 3: down to label5
+	br_if   	3, $pop12       # 3: down to label4
 # BB#16:                                # %test.exit174
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push59=, 98
@@ -203,7 +200,7 @@ main:                                   # @main
 	i32.call	$push13=, strcmp@FUNCTION, $5, $7
 	i32.const	$push57=, 0
 	i32.ge_s	$push14=, $pop13, $pop57
-	br_if   	3, $pop14       # 3: down to label5
+	br_if   	3, $pop14       # 3: down to label4
 # BB#17:                                # %test.exit180
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push62=, 169
@@ -213,7 +210,7 @@ main:                                   # @main
 	i32.call	$push15=, strcmp@FUNCTION, $5, $7
 	i32.const	$push60=, 0
 	i32.le_s	$push16=, $pop15, $pop60
-	br_if   	3, $pop16       # 3: down to label5
+	br_if   	3, $pop16       # 3: down to label4
 # BB#18:                                # %test.exit186
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push65=, 169
@@ -223,7 +220,7 @@ main:                                   # @main
 	i32.call	$push17=, strcmp@FUNCTION, $5, $7
 	i32.const	$push63=, 0
 	i32.ge_s	$push18=, $pop17, $pop63
-	br_if   	3, $pop18       # 3: down to label5
+	br_if   	3, $pop18       # 3: down to label4
 # BB#19:                                # %test.exit192
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push68=, 170
@@ -233,7 +230,7 @@ main:                                   # @main
 	i32.call	$push19=, strcmp@FUNCTION, $5, $7
 	i32.const	$push66=, 0
 	i32.le_s	$push20=, $pop19, $pop66
-	br_if   	4, $pop20       # 4: down to label4
+	br_if   	3, $pop20       # 3: down to label4
 # BB#20:                                # %for.cond4
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push72=, 1
@@ -241,7 +238,7 @@ main:                                   # @main
 	tee_local	$push70=, $4=, $pop71
 	i32.const	$push69=, 63
 	i32.le_u	$push21=, $pop70, $pop69
-	br_if   	0, $pop21       # 0: up to label8
+	br_if   	0, $pop21       # 0: up to label7
 # BB#21:                                # %for.inc79
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
@@ -252,7 +249,7 @@ main:                                   # @main
 	tee_local	$push74=, $2=, $pop75
 	i32.const	$push73=, 8
 	i32.lt_u	$push22=, $pop74, $pop73
-	br_if   	0, $pop22       # 0: up to label7
+	br_if   	0, $pop22       # 0: up to label6
 # BB#22:                                # %for.inc82
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
@@ -263,24 +260,20 @@ main:                                   # @main
 	tee_local	$push79=, $0=, $pop80
 	i32.const	$push78=, 8
 	i32.lt_u	$push23=, $pop79, $pop78
-	br_if   	0, $pop23       # 0: up to label6
+	br_if   	0, $pop23       # 0: up to label5
 # BB#23:                                # %for.end84
 	end_loop
 	i32.const	$push24=, 0
 	call    	exit@FUNCTION, $pop24
 	unreachable
-.LBB1_24:                               # %if.then.i189
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_25:                               # %if.then10.i197
+.LBB1_24:                               # %if.then5.i
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	u1,@object              # @u1
 	.section	.bss.u1,"aw",@nobits
 	.p2align	4
@@ -296,7 +289,7 @@ u2:
 	.size	u2, 96
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcmp, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/strcpy-1.c.s b/test/torture-s/strcpy-1.c.s
index 952d5b98d..41a0f9397 100644
--- a/test/torture-s/strcpy-1.c.s
+++ b/test/torture-s/strcpy-1.c.s
@@ -1,15 +1,15 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strcpy-1.c"
+	.file	"strcpy-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
-.LBB0_1:                                # %for.cond1.preheader
+.LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
                                         #       Child Loop BB0_3 Depth 3
@@ -17,269 +17,252 @@ main:                                   # @main
                                         #         Child Loop BB0_8 Depth 4
                                         #         Child Loop BB0_13 Depth 4
 	block   	
-	block   	
-	block   	
-	loop    	                # label3:
-	i32.const	$push52=, u1
-	i32.add 	$1=, $0, $pop52
+	loop    	                # label1:
+	i32.const	$push49=, u1
+	i32.add 	$1=, $0, $pop49
 	i32.const	$2=, 0
-.LBB0_2:                                # %for.cond4.preheader
+.LBB0_2:                                # %for.body3
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB0_3 Depth 3
                                         #         Child Loop BB0_4 Depth 4
                                         #         Child Loop BB0_8 Depth 4
                                         #         Child Loop BB0_13 Depth 4
-	loop    	                # label4:
-	i32.const	$push54=, 65
-	i32.add 	$4=, $2, $pop54
-	i32.const	$push53=, u2
-	i32.add 	$3=, $2, $pop53
+	loop    	                # label2:
+	i32.const	$push51=, 65
+	i32.add 	$4=, $2, $pop51
+	i32.const	$push50=, u2
+	i32.add 	$3=, $2, $pop50
 	i32.const	$5=, 1
-.LBB0_3:                                # %for.cond7.preheader
+.LBB0_3:                                # %for.body6
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Loop Header: Depth=3
                                         #         Child Loop BB0_4 Depth 4
                                         #         Child Loop BB0_8 Depth 4
                                         #         Child Loop BB0_13 Depth 4
-	loop    	                # label5:
-	i32.const	$push57=, u1
-	i32.const	$push56=, 97
-	i32.const	$push55=, 97
-	i32.call	$10=, memset@FUNCTION, $pop57, $pop56, $pop55
-	i32.const	$9=, 65
-	i32.const	$7=, -97
+	loop    	                # label3:
+	i32.const	$push54=, u1
+	i32.const	$push53=, 97
+	i32.const	$push52=, 97
+	i32.call	$7=, memset@FUNCTION, $pop54, $pop53, $pop52
+	i32.const	$8=, 65
+	i32.const	$6=, -97
 .LBB0_4:                                # %for.body9
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
-	loop    	                # label6:
-	i32.const	$push68=, u2+97
-	i32.add 	$push3=, $7, $pop68
-	i32.const	$push67=, 65
-	i32.const	$push66=, 24
-	i32.shl 	$push0=, $9, $pop66
-	i32.const	$push65=, 24
-	i32.shr_s	$push1=, $pop0, $pop65
-	i32.const	$push64=, 95
-	i32.gt_s	$push2=, $pop1, $pop64
-	i32.select	$push63=, $pop67, $9, $pop2
-	tee_local	$push62=, $9=, $pop63
-	i32.store8	0($pop3), $pop62
-	i32.const	$push61=, 1
-	i32.add 	$9=, $9, $pop61
-	i32.const	$push60=, 1
-	i32.add 	$push59=, $7, $pop60
-	tee_local	$push58=, $7=, $pop59
-	br_if   	0, $pop58       # 0: up to label6
+	loop    	                # label4:
+	i32.const	$push65=, u2+97
+	i32.add 	$push3=, $6, $pop65
+	i32.const	$push64=, 65
+	i32.const	$push63=, 24
+	i32.shl 	$push0=, $8, $pop63
+	i32.const	$push62=, 24
+	i32.shr_s	$push1=, $pop0, $pop62
+	i32.const	$push61=, 95
+	i32.gt_s	$push2=, $pop1, $pop61
+	i32.select	$push60=, $pop64, $8, $pop2
+	tee_local	$push59=, $8=, $pop60
+	i32.store8	0($pop3), $pop59
+	i32.const	$push58=, 1
+	i32.add 	$8=, $8, $pop58
+	i32.const	$push57=, 1
+	i32.add 	$push56=, $6, $pop57
+	tee_local	$push55=, $6=, $pop56
+	br_if   	0, $pop55       # 0: up to label4
 # BB#5:                                 # %for.end
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
 	i32.add 	$push4=, $5, $2
-	i32.const	$push70=, u2
-	i32.add 	$push5=, $pop4, $pop70
-	i32.const	$push69=, 0
-	i32.store8	0($pop5), $pop69
+	i32.const	$push67=, u2
+	i32.add 	$push5=, $pop4, $pop67
+	i32.const	$push66=, 0
+	i32.store8	0($pop5), $pop66
 	i32.call	$push6=, strcpy@FUNCTION, $1, $3
 	i32.ne  	$push7=, $pop6, $1
-	br_if   	5, $pop7        # 5: down to label0
-# BB#6:                                 # %for.cond21.preheader
+	br_if   	3, $pop7        # 3: down to label0
+# BB#6:                                 # %if.end20
                                         #   in Loop: Header=BB0_3 Depth=3
 	block   	
 	block   	
-	i32.const	$push71=, 1
-	i32.lt_s	$push8=, $0, $pop71
-	br_if   	0, $pop8        # 0: down to label8
+	i32.eqz 	$push113=, $0
+	br_if   	0, $pop113      # 0: down to label6
 # BB#7:                                 # %for.body24.preheader
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$9=, 0
+	i32.const	$8=, 0
 .LBB0_8:                                # %for.body24
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
-	loop    	                # label9:
-	i32.add 	$push9=, $9, $10
-	i32.load8_u	$push10=, 0($pop9)
-	i32.const	$push72=, 97
-	i32.ne  	$push11=, $pop10, $pop72
-	br_if   	6, $pop11       # 6: down to label2
+	loop    	                # label7:
+	i32.add 	$push8=, $8, $7
+	i32.load8_u	$push9=, 0($pop8)
+	i32.const	$push68=, 97
+	i32.ne  	$push10=, $pop9, $pop68
+	br_if   	6, $pop10       # 6: down to label0
 # BB#9:                                 # %for.inc30
                                         #   in Loop: Header=BB0_8 Depth=4
-	i32.const	$push75=, 1
-	i32.add 	$push74=, $9, $pop75
-	tee_local	$push73=, $9=, $pop74
-	i32.lt_s	$push12=, $pop73, $0
-	br_if   	0, $pop12       # 0: up to label9
+	i32.const	$push71=, 1
+	i32.add 	$push70=, $8, $pop71
+	tee_local	$push69=, $8=, $pop70
+	i32.lt_u	$push11=, $pop69, $0
+	br_if   	0, $pop11       # 0: up to label7
 # BB#10:                                # %for.body38.preheader.loopexit
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
-	i32.add 	$8=, $9, $10
-	br      	1               # 1: down to label7
+	i32.add 	$7=, $8, $7
+	br      	1               # 1: down to label5
 .LBB0_11:                               #   in Loop: Header=BB0_3 Depth=3
-	end_block                       # label8:
-	i32.const	$8=, u1
+	end_block                       # label6:
+	i32.const	$7=, u1
 .LBB0_12:                               # %for.body38.preheader
                                         #   in Loop: Header=BB0_3 Depth=3
-	end_block                       # label7:
-	i32.load8_u	$9=, 0($8)
-	i32.const	$10=, 0
-	copy_local	$7=, $4
+	end_block                       # label5:
+	i32.const	$8=, 0
+	copy_local	$6=, $4
 .LBB0_13:                               # %for.body38
                                         #   Parent Loop BB0_1 Depth=1
                                         #     Parent Loop BB0_2 Depth=2
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
-	loop    	                # label10:
-	i32.const	$push81=, 255
-	i32.and 	$push13=, $9, $pop81
-	i32.const	$push80=, 65
-	i32.const	$push79=, 24
-	i32.shl 	$push14=, $7, $pop79
-	i32.const	$push78=, 24
-	i32.shr_s	$push15=, $pop14, $pop78
-	i32.const	$push77=, 95
-	i32.gt_s	$push16=, $pop15, $pop77
-	i32.select	$push17=, $pop80, $7, $pop16
-	i32.const	$push76=, 255
-	i32.and 	$push18=, $pop17, $pop76
-	i32.ne  	$push19=, $pop13, $pop18
-	br_if   	4, $pop19       # 4: down to label2
+	loop    	                # label8:
+	i32.add 	$push16=, $7, $8
+	i32.load8_u	$push17=, 0($pop16)
+	i32.const	$push78=, 65
+	i32.const	$push77=, 24
+	i32.shl 	$push12=, $6, $pop77
+	i32.const	$push76=, 24
+	i32.shr_s	$push13=, $pop12, $pop76
+	i32.const	$push75=, 95
+	i32.gt_s	$push14=, $pop13, $pop75
+	i32.select	$push74=, $pop78, $6, $pop14
+	tee_local	$push73=, $6=, $pop74
+	i32.const	$push72=, 255
+	i32.and 	$push15=, $pop73, $pop72
+	i32.ne  	$push18=, $pop17, $pop15
+	br_if   	4, $pop18       # 4: down to label0
 # BB#14:                                # %for.inc50
                                         #   in Loop: Header=BB0_13 Depth=4
-	i32.const	$push86=, 1
-	i32.add 	$7=, $9, $pop86
-	i32.add 	$push21=, $8, $10
-	i32.const	$push85=, 1
-	i32.add 	$push22=, $pop21, $pop85
-	i32.load8_u	$9=, 0($pop22)
-	i32.const	$push84=, 1
-	i32.add 	$push83=, $10, $pop84
-	tee_local	$push82=, $6=, $pop83
-	copy_local	$10=, $pop82
-	i32.lt_s	$push20=, $6, $5
-	br_if   	0, $pop20       # 0: up to label10
+	i32.const	$push82=, 1
+	i32.add 	$6=, $6, $pop82
+	i32.const	$push81=, 1
+	i32.add 	$push80=, $8, $pop81
+	tee_local	$push79=, $8=, $pop80
+	i32.lt_u	$push19=, $pop79, $5
+	br_if   	0, $pop19       # 0: up to label8
 # BB#15:                                # %for.end54
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
-	i32.const	$push87=, 255
-	i32.and 	$push23=, $9, $pop87
-	br_if   	3, $pop23       # 3: down to label2
-# BB#16:                                # %for.cond61.preheader
+	i32.add 	$push84=, $7, $8
+	tee_local	$push83=, $8=, $pop84
+	i32.load8_u	$push20=, 0($pop83)
+	br_if   	3, $pop20       # 3: down to label0
+# BB#16:                                # %if.end60
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.add 	$push91=, $8, $6
-	tee_local	$push90=, $9=, $pop91
-	i32.const	$push89=, 1
-	i32.add 	$push24=, $pop90, $pop89
-	i32.load8_u	$push25=, 0($pop24)
-	i32.const	$push88=, 97
-	i32.ne  	$push26=, $pop25, $pop88
-	br_if   	4, $pop26       # 4: down to label1
+	i32.const	$push86=, 1
+	i32.add 	$push21=, $8, $pop86
+	i32.load8_u	$push22=, 0($pop21)
+	i32.const	$push85=, 97
+	i32.ne  	$push23=, $pop22, $pop85
+	br_if   	3, $pop23       # 3: down to label0
 # BB#17:                                # %for.cond61
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push93=, 2
-	i32.add 	$push27=, $9, $pop93
-	i32.load8_u	$push28=, 0($pop27)
-	i32.const	$push92=, 97
-	i32.ne  	$push29=, $pop28, $pop92
-	br_if   	4, $pop29       # 4: down to label1
+	i32.const	$push88=, 2
+	i32.add 	$push24=, $8, $pop88
+	i32.load8_u	$push25=, 0($pop24)
+	i32.const	$push87=, 97
+	i32.ne  	$push26=, $pop25, $pop87
+	br_if   	3, $pop26       # 3: down to label0
 # BB#18:                                # %for.cond61.1
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push95=, 3
-	i32.add 	$push30=, $9, $pop95
-	i32.load8_u	$push31=, 0($pop30)
-	i32.const	$push94=, 97
-	i32.ne  	$push32=, $pop31, $pop94
-	br_if   	4, $pop32       # 4: down to label1
+	i32.const	$push90=, 3
+	i32.add 	$push27=, $8, $pop90
+	i32.load8_u	$push28=, 0($pop27)
+	i32.const	$push89=, 97
+	i32.ne  	$push29=, $pop28, $pop89
+	br_if   	3, $pop29       # 3: down to label0
 # BB#19:                                # %for.cond61.2
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push97=, 4
-	i32.add 	$push33=, $9, $pop97
-	i32.load8_u	$push34=, 0($pop33)
-	i32.const	$push96=, 97
-	i32.ne  	$push35=, $pop34, $pop96
-	br_if   	4, $pop35       # 4: down to label1
+	i32.const	$push92=, 4
+	i32.add 	$push30=, $8, $pop92
+	i32.load8_u	$push31=, 0($pop30)
+	i32.const	$push91=, 97
+	i32.ne  	$push32=, $pop31, $pop91
+	br_if   	3, $pop32       # 3: down to label0
 # BB#20:                                # %for.cond61.3
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push99=, 5
-	i32.add 	$push36=, $9, $pop99
-	i32.load8_u	$push37=, 0($pop36)
-	i32.const	$push98=, 97
-	i32.ne  	$push38=, $pop37, $pop98
-	br_if   	4, $pop38       # 4: down to label1
+	i32.const	$push94=, 5
+	i32.add 	$push33=, $8, $pop94
+	i32.load8_u	$push34=, 0($pop33)
+	i32.const	$push93=, 97
+	i32.ne  	$push35=, $pop34, $pop93
+	br_if   	3, $pop35       # 3: down to label0
 # BB#21:                                # %for.cond61.4
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push101=, 6
-	i32.add 	$push39=, $9, $pop101
-	i32.load8_u	$push40=, 0($pop39)
-	i32.const	$push100=, 97
-	i32.ne  	$push41=, $pop40, $pop100
-	br_if   	4, $pop41       # 4: down to label1
+	i32.const	$push96=, 6
+	i32.add 	$push36=, $8, $pop96
+	i32.load8_u	$push37=, 0($pop36)
+	i32.const	$push95=, 97
+	i32.ne  	$push38=, $pop37, $pop95
+	br_if   	3, $pop38       # 3: down to label0
 # BB#22:                                # %for.cond61.5
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push103=, 7
-	i32.add 	$push42=, $9, $pop103
-	i32.load8_u	$push43=, 0($pop42)
-	i32.const	$push102=, 97
-	i32.ne  	$push44=, $pop43, $pop102
-	br_if   	4, $pop44       # 4: down to label1
+	i32.const	$push98=, 7
+	i32.add 	$push39=, $8, $pop98
+	i32.load8_u	$push40=, 0($pop39)
+	i32.const	$push97=, 97
+	i32.ne  	$push41=, $pop40, $pop97
+	br_if   	3, $pop41       # 3: down to label0
 # BB#23:                                # %for.cond61.6
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push105=, 8
-	i32.add 	$push45=, $9, $pop105
-	i32.load8_u	$push46=, 0($pop45)
-	i32.const	$push104=, 97
-	i32.ne  	$push47=, $pop46, $pop104
-	br_if   	4, $pop47       # 4: down to label1
+	i32.const	$push100=, 8
+	i32.add 	$push42=, $8, $pop100
+	i32.load8_u	$push43=, 0($pop42)
+	i32.const	$push99=, 97
+	i32.ne  	$push44=, $pop43, $pop99
+	br_if   	3, $pop44       # 3: down to label0
 # BB#24:                                # %for.cond61.7
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push109=, 1
-	i32.add 	$push108=, $5, $pop109
-	tee_local	$push107=, $5=, $pop108
-	i32.const	$push106=, 80
-	i32.lt_u	$push48=, $pop107, $pop106
-	br_if   	0, $pop48       # 0: up to label5
+	i32.const	$push104=, 1
+	i32.add 	$push103=, $5, $pop104
+	tee_local	$push102=, $5=, $pop103
+	i32.const	$push101=, 80
+	i32.lt_u	$push45=, $pop102, $pop101
+	br_if   	0, $pop45       # 0: up to label3
 # BB#25:                                # %for.inc77
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push113=, 1
-	i32.add 	$push112=, $2, $pop113
-	tee_local	$push111=, $2=, $pop112
-	i32.const	$push110=, 8
-	i32.lt_u	$push49=, $pop111, $pop110
-	br_if   	0, $pop49       # 0: up to label4
+	i32.const	$push108=, 1
+	i32.add 	$push107=, $2, $pop108
+	tee_local	$push106=, $2=, $pop107
+	i32.const	$push105=, 8
+	i32.lt_u	$push46=, $pop106, $pop105
+	br_if   	0, $pop46       # 0: up to label2
 # BB#26:                                # %for.inc80
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push117=, 1
-	i32.add 	$push116=, $0, $pop117
-	tee_local	$push115=, $0=, $pop116
-	i32.const	$push114=, 8
-	i32.lt_u	$push50=, $pop115, $pop114
-	br_if   	0, $pop50       # 0: up to label3
+	i32.const	$push112=, 1
+	i32.add 	$push111=, $0, $pop112
+	tee_local	$push110=, $0=, $pop111
+	i32.const	$push109=, 8
+	i32.lt_u	$push47=, $pop110, $pop109
+	br_if   	0, $pop47       # 0: up to label1
 # BB#27:                                # %for.end82
 	end_loop
-	i32.const	$push51=, 0
-	call    	exit@FUNCTION, $pop51
-	unreachable
-.LBB0_28:                               # %if.then59
-	end_block                       # label2:
-	call    	abort@FUNCTION
+	i32.const	$push48=, 0
+	call    	exit@FUNCTION, $pop48
 	unreachable
-.LBB0_29:                               # %if.then68
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_30:                               # %if.then19
+.LBB0_28:                               # %if.then19
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	u1,@object              # @u1
 	.section	.bss.u1,"aw",@nobits
 	.p2align	4
@@ -295,7 +278,7 @@ u2:
 	.size	u2, 112
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcpy, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-pack-1.c.s b/test/torture-s/strct-pack-1.c.s
index 1ae267802..efc34d803 100644
--- a/test/torture-s/strct-pack-1.c.s
+++ b/test/torture-s/strct-pack-1.c.s
@@ -1,37 +1,38 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-pack-1.c"
+	.file	"strct-pack-1.c"
 	.section	.text.check,"ax",@progbits
-	.hidden	check
+	.hidden	check                   # -- Begin function check
 	.globl	check
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$1=, 1
+	block   	
 	block   	
 	i32.load16_u	$push0=, 0($0)
-	i32.const	$push5=, 1
-	i32.ne  	$push1=, $pop0, $pop5
-	br_if   	0, $pop1        # 0: down to label0
+	i32.const	$push6=, 1
+	i32.ne  	$push1=, $pop0, $pop6
+	br_if   	0, $pop1        # 0: down to label1
 # BB#1:                                 # %lor.lhs.false
 	f64.load	$push2=, 2($0):p2align=1
 	f64.const	$push3=, 0x1p4
-	f64.ne  	$push4=, $pop2, $pop3
-	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %if.end
-	i32.const	$1=, 0
-.LBB0_3:                                # %return
+	f64.eq  	$push4=, $pop2, $pop3
+	br_if   	1, $pop4        # 1: down to label0
+.LBB0_2:                                # %return
+	end_block                       # label1:
+	i32.const	$push7=, 1
+	return  	$pop7
+.LBB0_3:                                # %if.end
 	end_block                       # label0:
-	copy_local	$push6=, $1
-                                        # fallthrough-return: $pop6
+	i32.const	$push5=, 0
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	check, .Lfunc_end0-check
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-pack-2.c.s b/test/torture-s/strct-pack-2.c.s
index e50646047..d9409e3dc 100644
--- a/test/torture-s/strct-pack-2.c.s
+++ b/test/torture-s/strct-pack-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-pack-2.c"
+	.file	"strct-pack-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-pack-3.c.s b/test/torture-s/strct-pack-3.c.s
index 03cf7002b..3954ac497 100644
--- a/test/torture-s/strct-pack-3.c.s
+++ b/test/torture-s/strct-pack-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-pack-3.c"
+	.file	"strct-pack-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -28,9 +28,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -42,7 +42,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-pack-4.c.s b/test/torture-s/strct-pack-4.c.s
index 3845eb995..0842cfd21 100644
--- a/test/torture-s/strct-pack-4.c.s
+++ b/test/torture-s/strct-pack-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-pack-4.c"
+	.file	"strct-pack-4.c"
 	.section	.text.my_set_a,"ax",@progbits
-	.hidden	my_set_a
+	.hidden	my_set_a                # -- Begin function my_set_a
 	.globl	my_set_a
 	.type	my_set_a,@function
 my_set_a:                               # @my_set_a
@@ -12,9 +12,9 @@ my_set_a:                               # @my_set_a
 	.endfunc
 .Lfunc_end0:
 	.size	my_set_a, .Lfunc_end0-my_set_a
-
+                                        # -- End function
 	.section	.text.my_set_b,"ax",@progbits
-	.hidden	my_set_b
+	.hidden	my_set_b                # -- Begin function my_set_b
 	.globl	my_set_b
 	.type	my_set_b,@function
 my_set_b:                               # @my_set_b
@@ -25,9 +25,9 @@ my_set_b:                               # @my_set_b
 	.endfunc
 .Lfunc_end1:
 	.size	my_set_b, .Lfunc_end1-my_set_b
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-stdarg-1.c.s b/test/torture-s/strct-stdarg-1.c.s
index 5b2959a91..2c553de4a 100644
--- a/test/torture-s/strct-stdarg-1.c.s
+++ b/test/torture-s/strct-stdarg-1.c.s
@@ -1,225 +1,192 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-stdarg-1.c"
+	.file	"strct-stdarg-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push31=, 0
-	i32.const	$push28=, 0
-	i32.load	$push29=, __stack_pointer($pop28)
-	i32.const	$push30=, 16
-	i32.sub 	$push37=, $pop29, $pop30
-	tee_local	$push36=, $3=, $pop37
-	i32.store	__stack_pointer($pop31), $pop36
-	i32.store	12($3), $1
+	i32.const	$push29=, 0
+	i32.const	$push27=, 0
+	i32.load	$push26=, __stack_pointer($pop27)
+	i32.const	$push28=, 16
+	i32.sub 	$push35=, $pop26, $pop28
+	tee_local	$push34=, $4=, $pop35
+	i32.store	__stack_pointer($pop29), $pop34
+	i32.store	12($4), $1
 	block   	
 	block   	
 	block   	
-	i32.const	$push35=, 1
-	i32.lt_s	$push3=, $0, $pop35
+	i32.const	$push33=, 1
+	i32.lt_s	$push3=, $0, $pop33
 	br_if   	0, $pop3        # 0: down to label2
 # BB#1:                                 # %for.body.preheader
-	i32.const	$push38=, 8
-	i32.add 	$1=, $1, $pop38
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.store	12($3), $1
-	i32.const	$push40=, 10
-	i32.add 	$push4=, $2, $pop40
-	i32.const	$push39=, -8
-	i32.add 	$push5=, $1, $pop39
-	i32.load8_s	$push6=, 0($pop5)
-	i32.ne  	$push7=, $pop4, $pop6
-	br_if   	2, $pop7        # 2: down to label1
+	i32.const	$push39=, 8
+	i32.add 	$push38=, $1, $pop39
+	tee_local	$push37=, $3=, $pop38
+	i32.store	12($4), $pop37
+	i32.const	$push36=, 10
+	i32.add 	$push4=, $2, $pop36
+	i32.load8_s	$push5=, 0($1)
+	i32.ne  	$push6=, $pop4, $pop5
+	br_if   	3, $pop6        # 3: down to label0
 # BB#3:                                 # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push42=, 20
-	i32.add 	$push11=, $2, $pop42
-	i32.const	$push41=, -7
-	i32.add 	$push12=, $1, $pop41
-	i32.load8_s	$push13=, 0($pop12)
-	i32.ne  	$push14=, $pop11, $pop13
-	br_if   	2, $pop14       # 2: down to label1
+	i32.const	$push41=, 20
+	i32.add 	$push10=, $2, $pop41
+	i32.const	$push40=, 1
+	i32.add 	$push11=, $1, $pop40
+	i32.load8_s	$push12=, 0($pop11)
+	i32.ne  	$push13=, $pop10, $pop12
+	br_if   	3, $pop13       # 3: down to label0
 # BB#4:                                 # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push44=, 30
-	i32.add 	$push15=, $2, $pop44
-	i32.const	$push43=, -6
-	i32.add 	$push10=, $1, $pop43
-	i32.load8_s	$push0=, 0($pop10)
-	i32.ne  	$push16=, $pop15, $pop0
-	br_if   	2, $pop16       # 2: down to label1
+	i32.const	$push43=, 30
+	i32.add 	$push14=, $2, $pop43
+	i32.const	$push42=, 2
+	i32.add 	$push9=, $1, $pop42
+	i32.load8_s	$push0=, 0($pop9)
+	i32.ne  	$push15=, $pop14, $pop0
+	br_if   	3, $pop15       # 3: down to label0
 # BB#5:                                 # %if.end15
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push46=, 40
-	i32.add 	$push17=, $2, $pop46
-	i32.const	$push45=, -5
-	i32.add 	$push9=, $1, $pop45
-	i32.load8_s	$push1=, 0($pop9)
-	i32.ne  	$push18=, $pop17, $pop1
-	br_if   	2, $pop18       # 2: down to label1
+	i32.const	$push45=, 40
+	i32.add 	$push16=, $2, $pop45
+	i32.const	$push44=, 3
+	i32.add 	$push8=, $1, $pop44
+	i32.load8_s	$push1=, 0($pop8)
+	i32.ne  	$push17=, $pop16, $pop1
+	br_if   	3, $pop17       # 3: down to label0
 # BB#6:                                 # %if.end21
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push48=, 50
-	i32.add 	$push19=, $2, $pop48
-	i32.const	$push47=, -4
-	i32.add 	$push8=, $1, $pop47
-	i32.load8_s	$push2=, 0($pop8)
-	i32.ne  	$push20=, $pop19, $pop2
-	br_if   	3, $pop20       # 3: down to label0
+	i32.const	$push47=, 50
+	i32.add 	$push18=, $2, $pop47
+	i32.const	$push46=, 4
+	i32.add 	$push7=, $1, $pop46
+	i32.load8_s	$push2=, 0($pop7)
+	i32.ne  	$push19=, $pop18, $pop2
+	br_if   	3, $pop19       # 3: down to label0
 # BB#7:                                 # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push52=, 8
-	i32.add 	$1=, $1, $pop52
-	i32.const	$push51=, 1
-	i32.add 	$push50=, $2, $pop51
-	tee_local	$push49=, $2=, $pop50
-	i32.lt_s	$push21=, $pop49, $0
-	br_if   	0, $pop21       # 0: up to label3
-# BB#8:                                 # %for.end.loopexit
+	copy_local	$1=, $3
+	i32.const	$push50=, 1
+	i32.add 	$push49=, $2, $pop50
+	tee_local	$push48=, $2=, $pop49
+	i32.lt_s	$push20=, $pop48, $0
+	br_if   	0, $pop20       # 0: up to label3
+	br      	2               # 2: down to label1
+.LBB0_8:
 	end_loop
-	i32.const	$push22=, -8
-	i32.add 	$1=, $1, $pop22
-.LBB0_9:                                # %for.end
 	end_block                       # label2:
-	i32.const	$push23=, 4
-	i32.add 	$push24=, $1, $pop23
-	i32.store	12($3), $pop24
-	i32.load	$push25=, 0($1)
-	i32.const	$push26=, 123
-	i32.ne  	$push27=, $pop25, $pop26
-	br_if   	0, $pop27       # 0: down to label1
+	copy_local	$3=, $1
+.LBB0_9:                                # %for.end
+	end_block                       # label1:
+	i32.const	$push21=, 4
+	i32.add 	$push22=, $3, $pop21
+	i32.store	12($4), $pop22
+	i32.load	$push23=, 0($3)
+	i32.const	$push24=, 123
+	i32.ne  	$push25=, $pop23, $pop24
+	br_if   	0, $pop25       # 0: down to label0
 # BB#10:                                # %if.end34
-	i32.const	$push34=, 0
-	i32.const	$push32=, 16
-	i32.add 	$push33=, $3, $pop32
-	i32.store	__stack_pointer($pop34), $pop33
+	i32.const	$push32=, 0
+	i32.const	$push30=, 16
+	i32.add 	$push31=, $4, $pop30
+	i32.store	__stack_pointer($pop32), $pop31
 	return  	$1
-.LBB0_11:                               # %if.then33
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_12:                               # %if.then26
+.LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push38=, 0
-	i32.const	$push35=, 0
-	i32.load	$push36=, __stack_pointer($pop35)
-	i32.const	$push37=, 64
-	i32.sub 	$push64=, $pop36, $pop37
-	tee_local	$push63=, $2=, $pop64
-	i32.store	__stack_pointer($pop38), $pop63
-	i32.const	$push0=, 11
-	i32.store8	53($2), $pop0
-	i32.const	$push39=, 48
-	i32.add 	$push40=, $2, $pop39
-	i32.const	$push62=, 11
-	i32.add 	$push1=, $pop40, $pop62
-	i32.const	$push2=, 22
-	i32.store8	0($pop1), $pop2
-	i32.const	$push3=, 5130
-	i32.store16	48($2), $pop3
-	i32.const	$push4=, 21
-	i32.store8	54($2), $pop4
-	i32.const	$push5=, 30
-	i32.store8	50($2), $pop5
-	i32.const	$push6=, 12
-	i32.store8	58($2), $pop6
-	i32.const	$push7=, 31
-	i32.store8	55($2), $pop7
-	i32.const	$push41=, 48
-	i32.add 	$push42=, $2, $pop41
-	i32.const	$push61=, 12
-	i32.add 	$push8=, $pop42, $pop61
-	i32.const	$push9=, 32
-	i32.store8	0($pop8), $pop9
-	i32.const	$push10=, 40
-	i32.store8	51($2), $pop10
-	i32.const	$push11=, 56
-	i32.add 	$push12=, $2, $pop11
-	i32.const	$push13=, 41
-	i32.store8	0($pop12), $pop13
-	i32.const	$push14=, 61
-	i32.add 	$push15=, $2, $pop14
-	i32.const	$push16=, 42
-	i32.store8	0($pop15), $pop16
-	i32.const	$push17=, 50
-	i32.store8	52($2), $pop17
-	i32.const	$push18=, 57
-	i32.add 	$push60=, $2, $pop18
-	tee_local	$push59=, $0=, $pop60
-	i32.const	$push19=, 51
-	i32.store8	0($pop59), $pop19
-	i32.const	$push43=, 40
-	i32.add 	$push44=, $2, $pop43
-	i32.const	$push20=, 4
-	i32.add 	$push21=, $pop44, $pop20
-	i32.load8_u	$push22=, 52($2)
-	i32.store8	0($pop21), $pop22
-	i32.const	$push23=, 62
-	i32.add 	$push58=, $2, $pop23
-	tee_local	$push57=, $1=, $pop58
-	i32.const	$push24=, 52
-	i32.store8	0($pop57), $pop24
-	i32.const	$push45=, 32
-	i32.add 	$push46=, $2, $pop45
-	i32.const	$push56=, 4
-	i32.add 	$push25=, $pop46, $pop56
-	i32.load8_u	$push26=, 0($0)
-	i32.store8	0($pop25), $pop26
-	i32.load	$push27=, 48($2)
-	i32.store	40($2), $pop27
-	i32.load	$push28=, 53($2):p2align=0
-	i32.store	32($2), $pop28
-	i32.const	$push47=, 24
-	i32.add 	$push48=, $2, $pop47
-	i32.const	$push55=, 4
-	i32.add 	$push29=, $pop48, $pop55
-	i32.load8_u	$push30=, 0($1)
-	i32.store8	0($pop29), $pop30
-	i32.load	$push31=, 58($2):p2align=1
-	i32.store	24($2), $pop31
-	i32.const	$push32=, 123
-	i32.store	12($2), $pop32
-	i32.const	$push49=, 24
-	i32.add 	$push50=, $2, $pop49
-	i32.store	8($2), $pop50
-	i32.const	$push51=, 32
-	i32.add 	$push52=, $2, $pop51
-	i32.store	4($2), $pop52
-	i32.const	$push53=, 40
-	i32.add 	$push54=, $2, $pop53
-	i32.store	0($2), $pop54
-	i32.const	$push33=, 3
-	i32.call	$drop=, f@FUNCTION, $pop33, $2
-	i32.const	$push34=, 0
-	call    	exit@FUNCTION, $pop34
+	i32.const	$push30=, 0
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
+	i32.const	$push29=, 64
+	i32.sub 	$push46=, $pop27, $pop29
+	tee_local	$push45=, $0=, $pop46
+	i32.store	__stack_pointer($pop30), $pop45
+	i32.const	$push0=, 56
+	i32.add 	$push1=, $0, $pop0
+	i32.const	$push2=, 369898281
+	i32.store	0($pop1), $pop2
+	i32.const	$push3=, 61
+	i32.add 	$push4=, $0, $pop3
+	i32.const	$push5=, 13354
+	i32.store16	0($pop4):p2align=0, $pop5
+	i32.const	$push6=, 60
+	i32.add 	$push7=, $0, $pop6
+	i32.const	$push8=, 32
+	i32.store8	0($pop7), $pop8
+	i64.const	$push9=, 2239708699736019978
+	i64.store	48($0), $pop9
+	i32.const	$push31=, 40
+	i32.add 	$push32=, $0, $pop31
+	i32.const	$push10=, 4
+	i32.add 	$push11=, $pop32, $pop10
+	i32.load8_u	$push12=, 52($0)
+	i32.store8	0($pop11), $pop12
+	i32.const	$push33=, 32
+	i32.add 	$push34=, $0, $pop33
+	i32.const	$push44=, 4
+	i32.add 	$push13=, $pop34, $pop44
+	i32.const	$push14=, 57
+	i32.add 	$push15=, $0, $pop14
+	i32.load8_u	$push16=, 0($pop15)
+	i32.store8	0($pop13), $pop16
+	i32.const	$push35=, 24
+	i32.add 	$push36=, $0, $pop35
+	i32.const	$push43=, 4
+	i32.add 	$push17=, $pop36, $pop43
+	i32.const	$push18=, 62
+	i32.add 	$push19=, $0, $pop18
+	i32.load8_u	$push20=, 0($pop19)
+	i32.store8	0($pop17), $pop20
+	i32.load	$push21=, 48($0)
+	i32.store	40($0), $pop21
+	i32.load	$push22=, 53($0):p2align=0
+	i32.store	32($0), $pop22
+	i32.load	$push23=, 58($0):p2align=1
+	i32.store	24($0), $pop23
+	i32.const	$push24=, 123
+	i32.store	12($0), $pop24
+	i32.const	$push37=, 24
+	i32.add 	$push38=, $0, $pop37
+	i32.store	8($0), $pop38
+	i32.const	$push39=, 32
+	i32.add 	$push40=, $0, $pop39
+	i32.store	4($0), $pop40
+	i32.const	$push41=, 40
+	i32.add 	$push42=, $0, $pop41
+	i32.store	0($0), $pop42
+	i32.const	$push25=, 3
+	i32.call	$drop=, f@FUNCTION, $pop25, $0
+	i32.const	$push26=, 0
+	call    	exit@FUNCTION, $pop26
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/strct-varg-1.c.s b/test/torture-s/strct-varg-1.c.s
index e43c4038e..b3d0fad75 100644
--- a/test/torture-s/strct-varg-1.c.s
+++ b/test/torture-s/strct-varg-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strct-varg-1.c"
+	.file	"strct-varg-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,10 +10,10 @@ f:                                      # @f
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 16
-	i32.sub 	$push32=, $pop25, $pop26
+	i32.sub 	$push32=, $pop24, $pop26
 	tee_local	$push31=, $2=, $pop32
 	i32.store	__stack_pointer($pop27), $pop31
 	i32.store	12($2), $1
@@ -66,59 +66,55 @@ f:                                      # @f
 	i32.add 	$push29=, $2, $pop28
 	i32.store	__stack_pointer($pop30), $pop29
 	return  	$2
-.LBB0_7:                                # %if.then18
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push13=, 0
-	i32.const	$push10=, 0
-	i32.load	$push11=, __stack_pointer($pop10)
-	i32.const	$push12=, 48
-	i32.sub 	$push19=, $pop11, $pop12
-	tee_local	$push18=, $0=, $pop19
-	i32.store	__stack_pointer($pop13), $pop18
-	i64.const	$push0=, 93823560624810
-	i64.store	40($0), $pop0
-	i64.const	$push1=, 18764712181759
-	i64.store	32($0), $pop1
-	i64.load	$push2=, 40($0)
-	i64.store	24($0):p2align=2, $pop2
-	i32.const	$push3=, 20
-	i32.add 	$push4=, $0, $pop3
-	i32.load	$push5=, 36($0)
-	i32.store	0($pop4), $pop5
-	i32.load	$push6=, 32($0)
-	i32.store	16($0), $pop6
-	i32.const	$push7=, 3
-	i32.store	4($0), $pop7
-	i32.const	$push14=, 24
-	i32.add 	$push15=, $0, $pop14
-	i32.store	0($0), $pop15
-	i32.const	$push16=, 16
-	i32.add 	$push17=, $0, $pop16
-	i32.store	8($0), $pop17
-	i32.const	$push8=, 2
-	i32.call	$drop=, f@FUNCTION, $pop8, $0
-	i32.const	$push9=, 0
-	call    	exit@FUNCTION, $pop9
+	i32.const	$push8=, 0
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
+	i32.const	$push7=, 48
+	i32.sub 	$push16=, $pop5, $pop7
+	tee_local	$push15=, $0=, $pop16
+	i32.store	__stack_pointer($pop8), $pop15
+	i64.const	$push0=, 18764712181759
+	i64.store	32($0), $pop0
+	i64.const	$push1=, 93823560624810
+	i64.store	24($0), $pop1
+	i64.const	$push14=, 93823560624810
+	i64.store	40($0), $pop14
+	i64.const	$push13=, 18764712181759
+	i64.store	16($0), $pop13
+	i32.const	$push2=, 3
+	i32.store	4($0), $pop2
+	i32.const	$push9=, 16
+	i32.add 	$push10=, $0, $pop9
+	i32.store	8($0), $pop10
+	i32.const	$push11=, 24
+	i32.add 	$push12=, $0, $pop11
+	i32.store	0($0), $pop12
+	i32.const	$push3=, 2
+	i32.call	$drop=, f@FUNCTION, $pop3, $0
+	i32.const	$push4=, 0
+	call    	exit@FUNCTION, $pop4
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/string-opt-17.c.s b/test/torture-s/string-opt-17.c.s
index 07928a17a..358f42ea2 100644
--- a/test/torture-s/string-opt-17.c.s
+++ b/test/torture-s/string-opt-17.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/string-opt-17.c"
+	.file	"string-opt-17.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -17,9 +17,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.check2,"ax",@progbits
-	.hidden	check2
+	.hidden	check2                  # -- Begin function check2
 	.globl	check2
 	.type	check2,@function
 check2:                                 # @check2
@@ -44,9 +44,9 @@ check2:                                 # @check2
 	.endfunc
 .Lfunc_end1:
 	.size	check2, .Lfunc_end1-check2
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -72,62 +72,56 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end2:
 	.size	test2, .Lfunc_end2-test2
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %lor.lhs.false
-	i32.const	$push14=, 0
+	i32.const	$push13=, 0
 	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
-	i32.const	$push13=, 16
-	i32.sub 	$push20=, $pop12, $pop13
-	tee_local	$push19=, $0=, $pop20
-	i32.store	__stack_pointer($pop14), $pop19
-	i32.const	$push18=, 0
-	i32.load8_u	$push0=, .L.str+9($pop18)
-	i32.store8	6($0), $pop0
+	i32.load	$push10=, __stack_pointer($pop11)
+	i32.const	$push12=, 16
+	i32.sub 	$push19=, $pop10, $pop12
+	tee_local	$push18=, $0=, $pop19
+	i32.store	__stack_pointer($pop13), $pop18
 	i32.const	$push17=, 0
-	i32.load16_u	$push1=, .L.str+7($pop17):p2align=0
+	i32.load8_u	$push0=, .L.str+9($pop17)
+	i32.store8	6($0), $pop0
+	i32.const	$push16=, 0
+	i32.load16_u	$push1=, .L.str+7($pop16):p2align=0
 	i32.store16	4($0), $pop1
 	block   	
-	i32.const	$push15=, 4
-	i32.add 	$push16=, $0, $pop15
+	i32.const	$push14=, 4
+	i32.add 	$push15=, $0, $pop14
 	i32.const	$push3=, .L.str.1
 	i32.const	$push2=, 3
-	i32.call	$push4=, memcmp@FUNCTION, $pop16, $pop3, $pop2
+	i32.call	$push4=, memcmp@FUNCTION, $pop15, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label2
 # BB#1:                                 # %if.end
-	i32.const	$push21=, 0
-	i32.load	$push5=, check2.r($pop21)
+	i32.const	$push20=, 0
+	i32.load	$push5=, check2.r($pop20)
 	i32.const	$push6=, 5
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label2
 # BB#2:                                 # %test2.exit
-	i32.const	$push22=, 0
+	i32.const	$push9=, 0
 	i32.const	$push8=, 6
-	i32.store	check2.r($pop22), $pop8
-	i32.const	$push9=, 8020322
-	i32.store	4($0), $pop9
-	i32.const	$push10=, 1
-	i32.eqz 	$push24=, $pop10
-	br_if   	0, $pop24       # 0: down to label2
-# BB#3:                                 # %if.end8
-	i32.const	$push23=, 0
-	call    	exit@FUNCTION, $pop23
+	i32.store	check2.r($pop9), $pop8
+	i32.const	$push21=, 0
+	call    	exit@FUNCTION, $pop21
 	unreachable
-.LBB3_4:                                # %if.then7
+.LBB3_3:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -147,13 +141,8 @@ check2.r:
 	.asciz	"az"
 	.size	.L.str.1, 3
 
-	.type	.L.str.2,@object        # @.str.2
-.L.str.2:
-	.asciz	"baz"
-	.size	.L.str.2, 4
-
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strcpy, i32, i32, i32
 	.functype	abort, void
 	.functype	memcmp, i32, i32, i32, i32
diff --git a/test/torture-s/string-opt-18.c.s b/test/torture-s/string-opt-18.c.s
index 671ca00b1..f81cce63c 100644
--- a/test/torture-s/string-opt-18.c.s
+++ b/test/torture-s/string-opt-18.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/string-opt-18.c"
+	.file	"string-opt-18.c"
 	.section	.text.test1,"ax",@progbits
-	.hidden	test1
+	.hidden	test1                   # -- Begin function test1
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
@@ -11,9 +11,9 @@ test1:                                  # @test1
 	.endfunc
 .Lfunc_end0:
 	.size	test1, .Lfunc_end0-test1
-
+                                        # -- End function
 	.section	.text.test2,"ax",@progbits
-	.hidden	test2
+	.hidden	test2                   # -- Begin function test2
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
@@ -34,9 +34,9 @@ test2:                                  # @test2
 	.endfunc
 .Lfunc_end1:
 	.size	test2, .Lfunc_end1-test2
-
+                                        # -- End function
 	.section	.text.test3,"ax",@progbits
-	.hidden	test3
+	.hidden	test3                   # -- Begin function test3
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
@@ -46,9 +46,9 @@ test3:                                  # @test3
 	.endfunc
 .Lfunc_end2:
 	.size	test3, .Lfunc_end2-test3
-
+                                        # -- End function
 	.section	.text.test4,"ax",@progbits
-	.hidden	test4
+	.hidden	test4                   # -- Begin function test4
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
@@ -58,9 +58,9 @@ test4:                                  # @test4
 	.endfunc
 .Lfunc_end3:
 	.size	test4, .Lfunc_end3-test4
-
+                                        # -- End function
 	.section	.text.test5,"ax",@progbits
-	.hidden	test5
+	.hidden	test5                   # -- Begin function test5
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
@@ -70,9 +70,9 @@ test5:                                  # @test5
 	.endfunc
 .Lfunc_end4:
 	.size	test5, .Lfunc_end4-test5
-
+                                        # -- End function
 	.section	.text.test6,"ax",@progbits
-	.hidden	test6
+	.hidden	test6                   # -- Begin function test6
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
@@ -82,9 +82,9 @@ test6:                                  # @test6
 	.endfunc
 .Lfunc_end5:
 	.size	test6, .Lfunc_end5-test6
-
+                                        # -- End function
 	.section	.text.test7,"ax",@progbits
-	.hidden	test7
+	.hidden	test7                   # -- Begin function test7
 	.globl	test7
 	.type	test7,@function
 test7:                                  # @test7
@@ -94,9 +94,9 @@ test7:                                  # @test7
 	.endfunc
 .Lfunc_end6:
 	.size	test7, .Lfunc_end6-test7
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -104,14 +104,14 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop4, $pop5
+	i32.sub 	$push11=, $pop3, $pop5
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop6), $pop10
-	i64.load	$push0=, 4($0):p2align=2
-	i64.store	4($0):p2align=2, $pop0
+	i64.load	$push0=, 0($0)
+	i64.store	0($0), $pop0
 	block   	
 	i32.const	$push1=, 1
 	i32.eqz 	$push12=, $pop1
@@ -130,8 +130,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end7:
 	.size	main, .Lfunc_end7-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	mempcpy, i32, i32, i32, i32
diff --git a/test/torture-s/string-opt-5.c.s b/test/torture-s/string-opt-5.c.s
index 8e7464ae2..2b99dd7af 100644
--- a/test/torture-s/string-opt-5.c.s
+++ b/test/torture-s/string-opt-5.c.s
@@ -1,37 +1,37 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/string-opt-5.c"
+	.file	"string-opt-5.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push114=, 0
-	i32.const	$push111=, 0
-	i32.load	$push112=, __stack_pointer($pop111)
-	i32.const	$push113=, 64
-	i32.sub 	$push122=, $pop112, $pop113
-	tee_local	$push121=, $4=, $pop122
-	i32.store	__stack_pointer($pop114), $pop121
+	i32.const	$push136=, 0
+	i32.const	$push134=, 0
+	i32.load	$push133=, __stack_pointer($pop134)
+	i32.const	$push135=, 64
+	i32.sub 	$push144=, $pop133, $pop135
+	tee_local	$push143=, $4=, $pop144
+	i32.store	__stack_pointer($pop136), $pop143
 	block   	
-	i32.const	$push120=, 0
-	i32.load	$push119=, bar($pop120)
-	tee_local	$push118=, $0=, $pop119
-	i32.call	$push0=, strlen@FUNCTION, $pop118
+	i32.const	$push142=, 0
+	i32.load	$push141=, bar($pop142)
+	tee_local	$push140=, $0=, $pop141
+	i32.call	$push0=, strlen@FUNCTION, $pop140
 	i32.const	$push1=, 8
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push128=, 0
-	i32.const	$push127=, 0
-	i32.load	$push126=, x($pop127)
-	tee_local	$push125=, $1=, $pop126
+	i32.const	$push150=, 0
+	i32.const	$push149=, 0
+	i32.load	$push148=, x($pop149)
+	tee_local	$push147=, $1=, $pop148
 	i32.const	$push3=, 1
-	i32.add 	$push124=, $pop125, $pop3
-	tee_local	$push123=, $2=, $pop124
-	i32.store	x($pop128), $pop123
+	i32.add 	$push146=, $pop147, $pop3
+	tee_local	$push145=, $2=, $pop146
+	i32.store	x($pop150), $pop145
 	i32.const	$push4=, 2
 	i32.and 	$push5=, $2, $pop4
 	i32.add 	$push6=, $0, $pop5
@@ -43,43 +43,43 @@ main:                                   # @main
 	i32.const	$push10=, 7
 	i32.ne  	$push11=, $2, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end26
-	i32.const	$push131=, 0
+# BB#3:                                 # %if.end25
+	i32.const	$push153=, 0
 	i32.const	$push12=, -3
-	i32.add 	$push130=, $1, $pop12
-	tee_local	$push129=, $2=, $pop130
-	i32.store	x($pop131), $pop129
+	i32.add 	$push152=, $1, $pop12
+	tee_local	$push151=, $2=, $pop152
+	i32.store	x($pop153), $pop151
 	i32.const	$push13=, .L.str.1-3
 	i32.add 	$push14=, $1, $pop13
 	i32.const	$push15=, .L.str.2
 	i32.call	$push16=, strcmp@FUNCTION, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#4:                                 # %if.end33
-	i32.const	$push133=, .L.str.1
-	i32.call	$push17=, strcmp@FUNCTION, $pop133, $0
-	i32.const	$push132=, 0
-	i32.ge_s	$push18=, $pop17, $pop132
+# BB#4:                                 # %if.end32
+	i32.const	$push155=, .L.str.1
+	i32.call	$push17=, strcmp@FUNCTION, $pop155, $0
+	i32.const	$push154=, 0
+	i32.ge_s	$push18=, $pop17, $pop154
 	br_if   	0, $pop18       # 0: down to label0
-# BB#5:                                 # %if.end37
-	i32.const	$push138=, 0
+# BB#5:                                 # %if.end36
+	i32.const	$push160=, 0
 	i32.const	$push19=, -2
-	i32.add 	$push137=, $1, $pop19
-	tee_local	$push136=, $3=, $pop137
-	i32.store	x($pop138), $pop136
-	i32.const	$push135=, .L.str.1
+	i32.add 	$push159=, $1, $pop19
+	tee_local	$push158=, $3=, $pop159
+	i32.store	x($pop160), $pop158
+	i32.const	$push157=, .L.str.1
 	i32.const	$push20=, 1
 	i32.and 	$push21=, $2, $pop20
 	i32.add 	$push22=, $0, $pop21
-	i32.call	$push23=, strcmp@FUNCTION, $pop135, $pop22
-	i32.const	$push134=, 0
-	i32.ge_s	$push24=, $pop23, $pop134
+	i32.call	$push23=, strcmp@FUNCTION, $pop157, $pop22
+	i32.const	$push156=, 0
+	i32.ge_s	$push24=, $pop23, $pop156
 	br_if   	0, $pop24       # 0: down to label0
-# BB#6:                                 # %if.end47
-	i32.const	$push141=, 0
+# BB#6:                                 # %if.end46
+	i32.const	$push163=, 0
 	i32.const	$push25=, -1
-	i32.add 	$push140=, $1, $pop25
-	tee_local	$push139=, $2=, $pop140
-	i32.store	x($pop141), $pop139
+	i32.add 	$push162=, $1, $pop25
+	tee_local	$push161=, $2=, $pop162
+	i32.store	x($pop163), $pop161
 	i32.const	$push26=, 7
 	i32.and 	$push27=, $3, $pop26
 	i32.const	$push28=, .L.str.1
@@ -89,196 +89,269 @@ main:                                   # @main
 	i32.const	$push32=, .L.str.1+9
 	i32.ne  	$push33=, $pop31, $pop32
 	br_if   	0, $pop33       # 0: down to label0
-# BB#7:                                 # %if.end58
+# BB#7:                                 # %if.end56
 	i32.const	$push36=, 111
-	i32.call	$push143=, strchr@FUNCTION, $0, $pop36
-	tee_local	$push142=, $3=, $pop143
+	i32.call	$push165=, strchr@FUNCTION, $0, $pop36
+	tee_local	$push164=, $3=, $pop165
 	i32.const	$push34=, 4
 	i32.add 	$push35=, $0, $pop34
-	i32.ne  	$push37=, $pop142, $pop35
+	i32.ne  	$push37=, $pop164, $pop35
 	br_if   	0, $pop37       # 0: down to label0
-# BB#8:                                 # %if.end63
+# BB#8:                                 # %if.end61
 	i32.call	$push38=, strlen@FUNCTION, $0
 	i32.const	$push39=, 8
 	i32.ne  	$push40=, $pop38, $pop39
 	br_if   	0, $pop40       # 0: down to label0
-# BB#9:                                 # %if.end68
+# BB#9:                                 # %if.end66
 	i32.const	$push41=, 120
 	i32.call	$push42=, strrchr@FUNCTION, $0, $pop41
 	br_if   	0, $pop42       # 0: down to label0
-# BB#10:                                # %if.end72
+# BB#10:                                # %if.end70
 	i32.const	$push43=, 111
 	i32.call	$push44=, strrchr@FUNCTION, $0, $pop43
 	i32.ne  	$push45=, $pop44, $3
 	br_if   	0, $pop45       # 0: down to label0
-# BB#11:                                # %if.end77
+# BB#11:                                # %if.end75
 	i32.const	$push46=, 0
 	i32.store	x($pop46), $1
-	i32.const	$push148=, 0
-	i32.const	$push147=, 0
-	i32.load	$push47=, y($pop147)
+	i32.const	$push170=, 0
+	i32.const	$push169=, 0
+	i32.load	$push47=, y($pop169)
 	i32.const	$push48=, -1
-	i32.add 	$push146=, $pop47, $pop48
-	tee_local	$push145=, $0=, $pop146
-	i32.store	y($pop148), $pop145
+	i32.add 	$push168=, $pop47, $pop48
+	tee_local	$push167=, $0=, $pop168
+	i32.store	y($pop170), $pop167
 	i32.const	$push49=, 1
 	i32.and 	$push50=, $2, $pop49
 	i32.const	$push51=, .L.str.1
 	i32.add 	$push52=, $pop50, $pop51
-	i32.const	$push144=, 1
-	i32.and 	$push53=, $0, $pop144
+	i32.const	$push166=, 1
+	i32.and 	$push53=, $0, $pop166
 	i32.const	$push54=, .L.str.3
 	i32.add 	$push55=, $pop53, $pop54
 	i32.call	$push56=, strcmp@FUNCTION, $pop52, $pop55
 	br_if   	0, $pop56       # 0: down to label0
-# BB#12:                                # %if.end86
+# BB#12:                                # %if.end84
 	br_if   	0, $0           # 0: down to label0
-# BB#13:                                # %if.end90
-	i32.const	$push154=, 0
+# BB#13:                                # %if.end88
+	i32.const	$push176=, 0
 	i32.const	$push57=, 1
-	i32.store	y($pop154), $pop57
-	i32.const	$push153=, 0
+	i32.store	y($pop176), $pop57
+	i32.const	$push175=, 0
 	i32.const	$push58=, 6
-	i32.store	x($pop153), $pop58
-	i32.const	$push152=, 32
-	i32.store16	5($4):p2align=0, $pop152
+	i32.store	x($pop175), $pop58
+	i32.const	$push174=, 32
+	i32.store16	5($4):p2align=0, $pop174
 	i32.const	$push59=, 1869376613
 	i32.store	1($4):p2align=0, $pop59
-	i32.const	$push151=, 1
-	i32.or  	$push150=, $4, $pop151
-	tee_local	$push149=, $0=, $pop150
+	i32.const	$push173=, 1
+	i32.or  	$push172=, $4, $pop173
+	tee_local	$push171=, $0=, $pop172
 	i32.const	$push60=, .L.str.4
-	i32.call	$push61=, strcmp@FUNCTION, $pop149, $pop60
+	i32.call	$push61=, strcmp@FUNCTION, $pop171, $pop60
 	br_if   	0, $pop61       # 0: down to label0
-# BB#14:                                # %if.end108
-	i32.const	$push158=, 32
-	i32.const	$push64=, 64
-	i32.call	$1=, memset@FUNCTION, $4, $pop158, $pop64
-	i32.const	$push157=, 0
-	i32.const	$push65=, 2
-	i32.store	y($pop157), $pop65
-	i32.const	$push156=, 0
-	i32.const	$push155=, 7
-	i32.store	x($pop156), $pop155
-	i32.const	$push67=, .L.str.5+1
-	i32.const	$push66=, 10
-	i32.call	$push68=, strncpy@FUNCTION, $0, $pop67, $pop66
-	i32.ne  	$push69=, $pop68, $0
-	br_if   	0, $pop69       # 0: down to label0
-# BB#15:                                # %if.end108
-	i32.const	$push160=, 0
-	i32.load	$push62=, x($pop160)
-	i32.const	$push159=, 7
-	i32.ne  	$push70=, $pop62, $pop159
-	br_if   	0, $pop70       # 0: down to label0
-# BB#16:                                # %if.end108
-	i32.const	$push161=, 0
-	i32.load	$push63=, y($pop161)
-	i32.const	$push71=, 2
-	i32.ne  	$push72=, $pop63, $pop71
-	br_if   	0, $pop72       # 0: down to label0
-# BB#17:                                # %lor.lhs.false125
-	i32.const	$push74=, .L.str.6
-	i32.const	$push73=, 12
-	i32.call	$push75=, memcmp@FUNCTION, $1, $pop74, $pop73
-	br_if   	0, $pop75       # 0: down to label0
-# BB#18:                                # %if.end130
-	i32.const	$push77=, 32
-	i32.const	$push76=, 64
-	i32.call	$push163=, memset@FUNCTION, $1, $pop77, $pop76
-	tee_local	$push162=, $0=, $pop163
-	i32.const	$push79=, .L.str.7
-	i32.const	$push78=, 8
-	i32.call	$push80=, strncpy@FUNCTION, $0, $pop79, $pop78
-	i32.ne  	$push81=, $pop162, $pop80
+# BB#14:                                # %if.end106
+	i32.const	$push187=, 0
+	i32.const	$push186=, 7
+	i32.store	x($pop187), $pop186
+	i32.const	$push185=, 0
+	i32.const	$push64=, 2
+	i32.store	y($pop185), $pop64
+	i32.const	$push65=, 56
+	i32.add 	$push66=, $4, $pop65
+	i64.const	$push67=, 2314885530818453536
+	i64.store	0($pop66), $pop67
+	i32.const	$push68=, 48
+	i32.add 	$push69=, $4, $pop68
+	i64.const	$push184=, 2314885530818453536
+	i64.store	0($pop69), $pop184
+	i32.const	$push70=, 40
+	i32.add 	$push71=, $4, $pop70
+	i64.const	$push183=, 2314885530818453536
+	i64.store	0($pop71), $pop183
+	i32.const	$push182=, 32
+	i32.add 	$push72=, $4, $pop182
+	i64.const	$push181=, 2314885530818453536
+	i64.store	0($pop72), $pop181
+	i32.const	$push73=, 24
+	i32.add 	$push74=, $4, $pop73
+	i64.const	$push180=, 2314885530818453536
+	i64.store	0($pop74), $pop180
+	i32.const	$push75=, 16
+	i32.add 	$push76=, $4, $pop75
+	i64.const	$push179=, 2314885530818453536
+	i64.store	0($pop76), $pop179
+	i64.const	$push178=, 2314885530818453536
+	i64.store	8($4), $pop178
+	i64.const	$push177=, 2314885530818453536
+	i64.store	0($4), $pop177
+	i32.const	$push78=, .L.str.5+1
+	i32.const	$push77=, 10
+	i32.call	$push79=, strncpy@FUNCTION, $0, $pop78, $pop77
+	i32.ne  	$push80=, $pop79, $0
+	br_if   	0, $pop80       # 0: down to label0
+# BB#15:                                # %if.end106
+	i32.const	$push189=, 0
+	i32.load	$push62=, x($pop189)
+	i32.const	$push188=, 7
+	i32.ne  	$push81=, $pop62, $pop188
 	br_if   	0, $pop81       # 0: down to label0
-# BB#19:                                # %lor.lhs.false136
-	i32.const	$push83=, .L.str.8
-	i32.const	$push82=, 9
-	i32.call	$push84=, memcmp@FUNCTION, $0, $pop83, $pop82
-	br_if   	0, $pop84       # 0: down to label0
-# BB#20:                                # %if.end141
-	i32.const	$push87=, buf
-	i32.const	$push86=, 32
-	i32.const	$push85=, 64
-	i32.call	$4=, memset@FUNCTION, $pop87, $pop86, $pop85
-	i32.const	$push89=, 0
-	i32.const	$push88=, 34
-	i32.store	x($pop89), $pop88
-	i32.const	$push168=, 0
-	i32.const	$push167=, 0
-	i32.load	$push90=, y($pop167)
-	i32.const	$push91=, 1
-	i32.add 	$push166=, $pop90, $pop91
-	tee_local	$push165=, $1=, $pop166
-	i32.store	y($pop168), $pop165
-	i32.const	$push92=, 33
-	i32.call	$drop=, memset@FUNCTION, $4, $pop92, $1
-	i32.const	$push164=, 3
-	i32.ne  	$push93=, $1, $pop164
-	br_if   	0, $pop93       # 0: down to label0
-# BB#21:                                # %lor.lhs.false148
-	i32.const	$push94=, .L.str.9
-	i32.const	$push169=, 3
-	i32.call	$push95=, memcmp@FUNCTION, $4, $pop94, $pop169
-	br_if   	0, $pop95       # 0: down to label0
-# BB#22:                                # %lor.lhs.false158
-	i32.const	$push172=, 0
-	i64.const	$push96=, 3255307777713450285
-	i64.store	buf+3($pop172):p2align=0, $pop96
-	i32.const	$push171=, 0
-	i32.const	$push97=, 4
-	i32.store	y($pop171), $pop97
-	i32.const	$push99=, buf
-	i32.const	$push98=, .L.str.10
-	i32.const	$push170=, 11
-	i32.call	$push100=, memcmp@FUNCTION, $pop99, $pop98, $pop170
-	br_if   	0, $pop100      # 0: down to label0
-# BB#23:                                # %lor.lhs.false171
-	i32.const	$push177=, 0
-	i32.const	$push101=, 5
-	i32.store	y($pop177), $pop101
-	i32.const	$push176=, 0
-	i32.const	$push175=, 11
-	i32.store	x($pop176), $pop175
-	i32.const	$push174=, 0
-	i32.const	$push173=, 0
-	i32.store	buf+11($pop174):p2align=0, $pop173
-	i32.const	$push104=, buf+8
-	i32.const	$push103=, .L.str.11
-	i32.const	$push102=, 7
-	i32.call	$push105=, memcmp@FUNCTION, $pop104, $pop103, $pop102
-	br_if   	0, $pop105      # 0: down to label0
-# BB#24:                                # %lor.lhs.false180
-	i32.const	$push182=, 0
-	i32.const	$push106=, 15
-	i32.store	x($pop182), $pop106
-	i32.const	$push181=, 0
-	i32.const	$push180=, 0
-	i32.store16	buf+19($pop181):p2align=0, $pop180
-	i32.const	$push179=, 0
-	i32.const	$push178=, 0
-	i32.store	buf+15($pop179):p2align=0, $pop178
-	i32.const	$push109=, buf+10
-	i32.const	$push108=, .L.str.12
-	i32.const	$push107=, 11
-	i32.call	$push110=, memcmp@FUNCTION, $pop109, $pop108, $pop107
-	br_if   	0, $pop110      # 0: down to label0
-# BB#25:                                # %if.end184
-	i32.const	$push117=, 0
-	i32.const	$push115=, 64
-	i32.add 	$push116=, $0, $pop115
-	i32.store	__stack_pointer($pop117), $pop116
-	i32.const	$push183=, 0
-	return  	$pop183
-.LBB0_26:                               # %if.then183
+# BB#16:                                # %if.end106
+	i32.const	$push190=, 0
+	i32.load	$push63=, y($pop190)
+	i32.const	$push82=, 2
+	i32.ne  	$push83=, $pop63, $pop82
+	br_if   	0, $pop83       # 0: down to label0
+# BB#17:                                # %lor.lhs.false123
+	i32.const	$push85=, .L.str.6
+	i32.const	$push84=, 12
+	i32.call	$push86=, memcmp@FUNCTION, $4, $pop85, $pop84
+	br_if   	0, $pop86       # 0: down to label0
+# BB#18:                                # %if.end128
+	i32.const	$push87=, 56
+	i32.add 	$push88=, $4, $pop87
+	i64.const	$push89=, 2314885530818453536
+	i64.store	0($pop88), $pop89
+	i32.const	$push90=, 48
+	i32.add 	$push91=, $4, $pop90
+	i64.const	$push197=, 2314885530818453536
+	i64.store	0($pop91), $pop197
+	i32.const	$push92=, 40
+	i32.add 	$push93=, $4, $pop92
+	i64.const	$push196=, 2314885530818453536
+	i64.store	0($pop93), $pop196
+	i32.const	$push94=, 32
+	i32.add 	$push95=, $4, $pop94
+	i64.const	$push195=, 2314885530818453536
+	i64.store	0($pop95), $pop195
+	i32.const	$push96=, 24
+	i32.add 	$push97=, $4, $pop96
+	i64.const	$push194=, 2314885530818453536
+	i64.store	0($pop97), $pop194
+	i32.const	$push98=, 16
+	i32.add 	$push99=, $4, $pop98
+	i64.const	$push193=, 2314885530818453536
+	i64.store	0($pop99), $pop193
+	i64.const	$push192=, 2314885530818453536
+	i64.store	8($4), $pop192
+	i64.const	$push191=, 2314885530818453536
+	i64.store	0($4), $pop191
+	i32.const	$push101=, .L.str.7
+	i32.const	$push100=, 8
+	i32.call	$push102=, strncpy@FUNCTION, $4, $pop101, $pop100
+	i32.ne  	$push103=, $pop102, $4
+	br_if   	0, $pop103      # 0: down to label0
+# BB#19:                                # %lor.lhs.false134
+	i32.const	$push105=, .L.str.8
+	i32.const	$push104=, 9
+	i32.call	$push106=, memcmp@FUNCTION, $4, $pop105, $pop104
+	br_if   	0, $pop106      # 0: down to label0
+# BB#20:                                # %if.end139
+	i32.const	$push108=, 0
+	i64.const	$push107=, 2314885530818453536
+	i64.store	buf+56($pop108), $pop107
+	i32.const	$push219=, 0
+	i64.const	$push218=, 2314885530818453536
+	i64.store	buf+48($pop219), $pop218
+	i32.const	$push217=, 0
+	i64.const	$push216=, 2314885530818453536
+	i64.store	buf+40($pop217), $pop216
+	i32.const	$push215=, 0
+	i64.const	$push214=, 2314885530818453536
+	i64.store	buf+32($pop215), $pop214
+	i32.const	$push213=, 0
+	i64.const	$push212=, 2314885530818453536
+	i64.store	buf+24($pop213), $pop212
+	i32.const	$push211=, 0
+	i64.const	$push210=, 2314885530818453536
+	i64.store	buf+16($pop211), $pop210
+	i32.const	$push209=, 0
+	i64.const	$push208=, 2314885530818453536
+	i64.store	buf+8($pop209), $pop208
+	i32.const	$push207=, 0
+	i64.const	$push206=, 2314885530818453536
+	i64.store	buf($pop207), $pop206
+	i32.const	$push205=, 0
+	i32.const	$push109=, 34
+	i32.store	x($pop205), $pop109
+	i32.const	$push204=, 0
+	i32.const	$push203=, 0
+	i32.load	$push202=, y($pop203)
+	tee_local	$push201=, $0=, $pop202
+	i32.const	$push110=, 1
+	i32.add 	$push200=, $pop201, $pop110
+	tee_local	$push199=, $1=, $pop200
+	i32.store	y($pop204), $pop199
+	i32.const	$push112=, buf
+	i32.const	$push111=, 33
+	i32.call	$2=, memset@FUNCTION, $pop112, $pop111, $1
+	i32.const	$push198=, 3
+	i32.ne  	$push113=, $1, $pop198
+	br_if   	0, $pop113      # 0: down to label0
+# BB#21:                                # %lor.lhs.false146
+	i32.const	$push114=, .L.str.9
+	i32.const	$push220=, 3
+	i32.call	$push115=, memcmp@FUNCTION, $2, $pop114, $pop220
+	br_if   	0, $pop115      # 0: down to label0
+# BB#22:                                # %lor.lhs.false156
+	i32.const	$push223=, 0
+	i64.const	$push116=, 3255307777713450285
+	i64.store	buf+3($pop223):p2align=0, $pop116
+	i32.const	$push222=, 0
+	i32.const	$push117=, 2
+	i32.add 	$push118=, $0, $pop117
+	i32.store	y($pop222), $pop118
+	i32.const	$push120=, buf
+	i32.const	$push119=, .L.str.10
+	i32.const	$push221=, 11
+	i32.call	$push121=, memcmp@FUNCTION, $pop120, $pop119, $pop221
+	br_if   	0, $pop121      # 0: down to label0
+# BB#23:                                # %lor.lhs.false169
+	i32.const	$push228=, 0
+	i32.const	$push227=, 11
+	i32.store	x($pop228), $pop227
+	i32.const	$push226=, 0
+	i32.const	$push122=, 3
+	i32.add 	$push123=, $0, $pop122
+	i32.store	y($pop226), $pop123
+	i32.const	$push225=, 0
+	i32.const	$push224=, 0
+	i32.store	buf+11($pop225):p2align=0, $pop224
+	i32.const	$push126=, buf+8
+	i32.const	$push125=, .L.str.11
+	i32.const	$push124=, 7
+	i32.call	$push127=, memcmp@FUNCTION, $pop126, $pop125, $pop124
+	br_if   	0, $pop127      # 0: down to label0
+# BB#24:                                # %lor.lhs.false178
+	i32.const	$push233=, 0
+	i32.const	$push128=, 15
+	i32.store	x($pop233), $pop128
+	i32.const	$push232=, 0
+	i32.const	$push231=, 0
+	i32.store16	buf+19($pop232):p2align=0, $pop231
+	i32.const	$push230=, 0
+	i32.const	$push229=, 0
+	i32.store	buf+15($pop230):p2align=0, $pop229
+	i32.const	$push131=, buf+10
+	i32.const	$push130=, .L.str.12
+	i32.const	$push129=, 11
+	i32.call	$push132=, memcmp@FUNCTION, $pop131, $pop130, $pop129
+	br_if   	0, $pop132      # 0: down to label0
+# BB#25:                                # %if.end182
+	i32.const	$push139=, 0
+	i32.const	$push137=, 64
+	i32.add 	$push138=, $4, $pop137
+	i32.store	__stack_pointer($pop139), $pop138
+	i32.const	$push234=, 0
+	return  	$pop234
+.LBB0_26:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -389,7 +462,7 @@ buf:
 	.size	.L.str.12, 11
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strlen, i32, i32
 	.functype	abort, void
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/strlen-1.c.s b/test/torture-s/strlen-1.c.s
index 070d68a1c..96afb6c34 100644
--- a/test/torture-s/strlen-1.c.s
+++ b/test/torture-s/strlen-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strlen-1.c"
+	.file	"strlen-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -10,7 +10,7 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$1=, 0
 	i32.const	$2=, u
-.LBB0_1:                                # %for.cond1.preheader
+.LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
 	block   	
@@ -18,29 +18,28 @@ main:                                   # @main
 	i32.const	$push7=, u
 	i32.add 	$0=, $1, $pop7
 	i32.const	$3=, 0
-.LBB0_2:                                # %for.cond4.preheader
+.LBB0_2:                                # %for.body3
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label2:
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push23=, $1
-	br_if   	0, $pop23       # 0: down to label5
-# BB#3:                                 # %for.body6.preheader
+	br_if   	0, $1           # 0: down to label5
+# BB#3:                                 #   in Loop: Header=BB0_2 Depth=2
+	i32.const	$4=, u
+	br_if   	1, $3           # 1: down to label4
+	br      	2               # 2: down to label3
+.LBB0_4:                                # %for.body6.lr.ph
                                         #   in Loop: Header=BB0_2 Depth=2
+	end_block                       # label5:
 	i32.const	$push9=, u
 	i32.const	$push8=, 0
 	i32.call	$drop=, memset@FUNCTION, $pop9, $pop8, $1
 	copy_local	$4=, $2
-	br_if   	1, $3           # 1: down to label4
-	br      	2               # 2: down to label3
-.LBB0_4:                                #   in Loop: Header=BB0_2 Depth=2
-	end_block                       # label5:
-	i32.const	$4=, u
-	i32.eqz 	$push24=, $3
-	br_if   	1, $pop24       # 1: down to label3
-.LBB0_5:                                # %for.body9.preheader
+	i32.eqz 	$push23=, $3
+	br_if   	1, $pop23       # 1: down to label3
+.LBB0_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label4:
 	i32.const	$push10=, 97
@@ -89,7 +88,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.type	u,@object               # @u
 	.section	.bss.u,"aw",@nobits
 	.p2align	4
@@ -98,7 +97,7 @@ u:
 	.size	u, 96
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strlen, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/strncmp-1.c.s b/test/torture-s/strncmp-1.c.s
index 05276ddbb..a9ee84a00 100644
--- a/test/torture-s/strncmp-1.c.s
+++ b/test/torture-s/strncmp-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/strncmp-1.c"
+	.file	"strncmp-1.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -36,16 +36,16 @@ test:                                   # @test
 .LBB0_6:                                # %if.end12
 	end_block                       # label3:
 	return
-.LBB0_7:                                # %if.then10
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -54,90 +54,87 @@ main:                                   # @main
 # BB#0:                                 # %entry
 	i32.const	$0=, 0
 	i32.const	$1=, u1
-.LBB1_1:                                # %for.cond1.preheader
+.LBB1_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
                                         #       Child Loop BB1_3 Depth 3
 	block   	
-	block   	
-	loop    	                # label6:
+	loop    	                # label5:
 	i32.const	$2=, 0
 	i32.const	$3=, u2
-.LBB1_2:                                # %for.cond4.preheader
+.LBB1_2:                                # %for.body3
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Loop Header: Depth=2
                                         #       Child Loop BB1_3 Depth 3
-	loop    	                # label7:
+	loop    	                # label6:
 	i32.const	$4=, 0
-.LBB1_3:                                # %for.cond7.preheader
+.LBB1_3:                                # %for.body6
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label8:
+	loop    	                # label7:
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push95=, $0
-	br_if   	0, $pop95       # 0: down to label11
-# BB#4:                                 # %for.body9.preheader
-                                        #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push35=, u1
-	i32.const	$push34=, 0
-	i32.call	$drop=, memset@FUNCTION, $pop35, $pop34, $0
-	copy_local	$push33=, $1
-	tee_local	$push32=, $5=, $pop33
-	copy_local	$6=, $pop32
-	br_if   	1, $4           # 1: down to label10
-	br      	2               # 2: down to label9
-.LBB1_5:                                #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label11:
+	br_if   	0, $0           # 0: down to label10
+# BB#4:                                 #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$5=, u1
-	i32.const	$push36=, u1
-	copy_local	$6=, $pop36
-	i32.eqz 	$push96=, $4
-	br_if   	1, $pop96       # 1: down to label9
-.LBB1_6:                                # %for.body12.preheader
+	i32.const	$push32=, u1
+	copy_local	$6=, $pop32
+	br_if   	1, $4           # 1: down to label9
+	br      	2               # 2: down to label8
+.LBB1_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label10:
-	i32.const	$push37=, 97
-	i32.call	$push0=, memset@FUNCTION, $5, $pop37, $4
-	i32.add 	$6=, $pop0, $4
-.LBB1_7:                                # %for.cond17.preheader
+	i32.const	$push37=, u1
+	i32.const	$push36=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop37, $pop36, $0
+	copy_local	$push35=, $1
+	tee_local	$push34=, $5=, $pop35
+	copy_local	$6=, $pop34
+	i32.eqz 	$push95=, $4
+	br_if   	1, $pop95       # 1: down to label8
+.LBB1_6:                                # %for.body12.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label9:
-	i64.const	$push38=, 8680820740569200760
-	i64.store	0($6):p2align=0, $pop38
+	i32.const	$push38=, 97
+	i32.call	$push0=, memset@FUNCTION, $5, $pop38, $4
+	i32.add 	$6=, $pop0, $4
+.LBB1_7:                                # %for.end16
+                                        #   in Loop: Header=BB1_3 Depth=3
+	end_block                       # label8:
+	i64.const	$push39=, 8680820740569200760
+	i64.store	0($6):p2align=0, $pop39
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push97=, $2
-	br_if   	0, $pop97       # 0: down to label14
-# BB#8:                                 # %for.body26.preheader
-                                        #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push42=, u2
-	i32.const	$push41=, 0
-	i32.call	$drop=, memset@FUNCTION, $pop42, $pop41, $2
-	copy_local	$push40=, $3
-	tee_local	$push39=, $7=, $pop40
-	copy_local	$8=, $pop39
-	br_if   	1, $4           # 1: down to label13
-	br      	2               # 2: down to label12
-.LBB1_9:                                #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label14:
+	br_if   	0, $2           # 0: down to label13
+# BB#8:                                 #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$7=, u2
-	i32.const	$push43=, u2
-	copy_local	$8=, $pop43
-	i32.eqz 	$push98=, $4
-	br_if   	1, $pop98       # 1: down to label12
-.LBB1_10:                               # %for.body33.preheader
+	i32.const	$push33=, u2
+	copy_local	$8=, $pop33
+	br_if   	1, $4           # 1: down to label12
+	br      	2               # 2: down to label11
+.LBB1_9:                                # %for.body26.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label13:
+	i32.const	$push43=, u2
+	i32.const	$push42=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop43, $pop42, $2
+	copy_local	$push41=, $3
+	tee_local	$push40=, $7=, $pop41
+	copy_local	$8=, $pop40
+	i32.eqz 	$push96=, $4
+	br_if   	1, $pop96       # 1: down to label11
+.LBB1_10:                               # %for.body33.lr.ph
+                                        #   in Loop: Header=BB1_3 Depth=3
+	end_block                       # label12:
 	i32.const	$push44=, 97
 	i32.call	$push1=, memset@FUNCTION, $7, $pop44, $4
 	i32.add 	$8=, $pop1, $4
-.LBB1_11:                               # %for.cond38.preheader
+.LBB1_11:                               # %for.end37
                                         #   in Loop: Header=BB1_3 Depth=3
-	end_block                       # label12:
+	end_block                       # label11:
 	i64.const	$push48=, 8680820740569200760
 	i64.store	0($8):p2align=0, $pop48
 	i32.const	$push47=, 0
@@ -146,11 +143,11 @@ main:                                   # @main
 	i32.store8	0($8), $pop46
 	i32.const	$push45=, 80
 	i32.call	$push2=, strncmp@FUNCTION, $5, $7, $pop45
-	br_if   	3, $pop2        # 3: down to label5
+	br_if   	3, $pop2        # 3: down to label4
 # BB#12:                                # %test.exit
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push3=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop3        # 3: down to label5
+	br_if   	3, $pop3        # 3: down to label4
 # BB#13:                                # %test.exit185
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push52=, 97
@@ -161,11 +158,11 @@ main:                                   # @main
 	i32.call	$push4=, strncmp@FUNCTION, $5, $7, $pop50
 	i32.const	$push49=, 0
 	i32.le_s	$push5=, $pop4, $pop49
-	br_if   	3, $pop5        # 3: down to label5
+	br_if   	3, $pop5        # 3: down to label4
 # BB#14:                                # %test.exit190
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push6=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop6        # 3: down to label5
+	br_if   	3, $pop6        # 3: down to label4
 # BB#15:                                # %test.exit196
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push56=, 0
@@ -176,11 +173,11 @@ main:                                   # @main
 	i32.call	$push7=, strncmp@FUNCTION, $5, $7, $pop54
 	i32.const	$push53=, 0
 	i32.ge_s	$push8=, $pop7, $pop53
-	br_if   	3, $pop8        # 3: down to label5
+	br_if   	3, $pop8        # 3: down to label4
 # BB#16:                                # %test.exit201
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push9=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop9        # 3: down to label5
+	br_if   	3, $pop9        # 3: down to label4
 # BB#17:                                # %test.exit207
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push60=, 98
@@ -191,11 +188,11 @@ main:                                   # @main
 	i32.call	$push10=, strncmp@FUNCTION, $5, $7, $pop58
 	i32.const	$push57=, 0
 	i32.ge_s	$push11=, $pop10, $pop57
-	br_if   	3, $pop11       # 3: down to label5
+	br_if   	3, $pop11       # 3: down to label4
 # BB#18:                                # %test.exit213
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push12=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop12       # 3: down to label5
+	br_if   	3, $pop12       # 3: down to label4
 # BB#19:                                # %test.exit219
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push64=, 99
@@ -206,11 +203,11 @@ main:                                   # @main
 	i32.call	$push13=, strncmp@FUNCTION, $5, $7, $pop62
 	i32.const	$push61=, 0
 	i32.le_s	$push14=, $pop13, $pop61
-	br_if   	3, $pop14       # 3: down to label5
+	br_if   	3, $pop14       # 3: down to label4
 # BB#20:                                # %test.exit225
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push15=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop15       # 3: down to label5
+	br_if   	3, $pop15       # 3: down to label4
 # BB#21:                                # %test.exit231
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push68=, 98
@@ -221,11 +218,11 @@ main:                                   # @main
 	i32.call	$push16=, strncmp@FUNCTION, $5, $7, $pop66
 	i32.const	$push65=, 0
 	i32.ge_s	$push17=, $pop16, $pop65
-	br_if   	3, $pop17       # 3: down to label5
+	br_if   	3, $pop17       # 3: down to label4
 # BB#22:                                # %test.exit237
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push18=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop18       # 3: down to label5
+	br_if   	3, $pop18       # 3: down to label4
 # BB#23:                                # %test.exit243
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push72=, 169
@@ -236,11 +233,11 @@ main:                                   # @main
 	i32.call	$push19=, strncmp@FUNCTION, $5, $7, $pop70
 	i32.const	$push69=, 0
 	i32.le_s	$push20=, $pop19, $pop69
-	br_if   	3, $pop20       # 3: down to label5
+	br_if   	3, $pop20       # 3: down to label4
 # BB#24:                                # %test.exit249
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push21=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop21       # 3: down to label5
+	br_if   	3, $pop21       # 3: down to label4
 # BB#25:                                # %test.exit255
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push76=, 169
@@ -251,11 +248,11 @@ main:                                   # @main
 	i32.call	$push22=, strncmp@FUNCTION, $5, $7, $pop74
 	i32.const	$push73=, 0
 	i32.ge_s	$push23=, $pop22, $pop73
-	br_if   	3, $pop23       # 3: down to label5
+	br_if   	3, $pop23       # 3: down to label4
 # BB#26:                                # %test.exit261
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push24=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	3, $pop24       # 3: down to label5
+	br_if   	3, $pop24       # 3: down to label4
 # BB#27:                                # %test.exit267
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push80=, 170
@@ -266,11 +263,11 @@ main:                                   # @main
 	i32.call	$push25=, strncmp@FUNCTION, $5, $7, $pop78
 	i32.const	$push77=, 0
 	i32.le_s	$push26=, $pop25, $pop77
-	br_if   	3, $pop26       # 3: down to label5
+	br_if   	3, $pop26       # 3: down to label4
 # BB#28:                                # %test.exit273
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push27=, strncmp@FUNCTION, $5, $7, $4
-	br_if   	4, $pop27       # 4: down to label4
+	br_if   	3, $pop27       # 3: down to label4
 # BB#29:                                # %for.cond4
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$push84=, 1
@@ -278,7 +275,7 @@ main:                                   # @main
 	tee_local	$push82=, $4=, $pop83
 	i32.const	$push81=, 63
 	i32.le_u	$push28=, $pop82, $pop81
-	br_if   	0, $pop28       # 0: up to label8
+	br_if   	0, $pop28       # 0: up to label7
 # BB#30:                                # %for.inc79
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
@@ -289,7 +286,7 @@ main:                                   # @main
 	tee_local	$push86=, $2=, $pop87
 	i32.const	$push85=, 8
 	i32.lt_u	$push29=, $pop86, $pop85
-	br_if   	0, $pop29       # 0: up to label7
+	br_if   	0, $pop29       # 0: up to label6
 # BB#31:                                # %for.inc82
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
@@ -300,24 +297,20 @@ main:                                   # @main
 	tee_local	$push91=, $0=, $pop92
 	i32.const	$push90=, 8
 	i32.lt_u	$push30=, $pop91, $pop90
-	br_if   	0, $pop30       # 0: up to label6
+	br_if   	0, $pop30       # 0: up to label5
 # BB#32:                                # %for.end84
 	end_loop
 	i32.const	$push31=, 0
 	call    	exit@FUNCTION, $pop31
 	unreachable
-.LBB1_33:                               # %if.then10.i272
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_34:                               # %if.then5.i277
+.LBB1_33:                               # %if.then5.i
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	u1,@object              # @u1
 	.section	.bss.u1,"aw",@nobits
 	.p2align	4
@@ -333,7 +326,7 @@ u2:
 	.size	u2, 80
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	strncmp, i32, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/struct-aliasing-1.c.s b/test/torture-s/struct-aliasing-1.c.s
index 3a958c86c..4a9c6448b 100644
--- a/test/torture-s/struct-aliasing-1.c.s
+++ b/test/torture-s/struct-aliasing-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c"
+	.file	"struct-aliasing-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,9 +18,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,10 +28,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push17=, $pop5, $pop6
+	i32.sub 	$push17=, $pop4, $pop6
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop7), $pop16
 	i32.const	$push0=, 1
@@ -59,7 +59,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/struct-cpy-1.c.s b/test/torture-s/struct-cpy-1.c.s
index 797dd3881..8f42be60d 100644
--- a/test/torture-s/struct-cpy-1.c.s
+++ b/test/torture-s/struct-cpy-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-cpy-1.c"
+	.file	"struct-cpy-1.c"
 	.section	.text.ini,"ax",@progbits
-	.hidden	ini
+	.hidden	ini                     # -- Begin function ini
 	.globl	ini
 	.type	ini,@function
 ini:                                    # @ini
@@ -9,63 +9,57 @@ ini:                                    # @ini
 	i32.const	$push1=, 0
 	i64.const	$push0=, 0
 	i64.store	pty+72($pop1), $pop0
-	i32.const	$push13=, 0
-	i64.const	$push12=, 0
-	i64.store	pty+64($pop13), $pop12
 	i32.const	$push11=, 0
 	i64.const	$push10=, 0
-	i64.store	pty+56($pop11), $pop10
+	i64.store	pty+64($pop11), $pop10
 	i32.const	$push9=, 0
-	i64.const	$push2=, 8589934593
-	i64.store	pty+40($pop9), $pop2
-	i32.const	$push8=, 0
-	i32.const	$push3=, 3
-	i32.store	pty+48($pop8), $pop3
+	i64.const	$push8=, 0
+	i64.store	pty+56($pop9), $pop8
 	i32.const	$push7=, 0
+	i64.const	$push2=, 8589934593
+	i64.store	pty+40($pop7), $pop2
 	i32.const	$push6=, 0
-	i32.store	pty+80($pop7), $pop6
+	i64.const	$push3=, 17179869187
+	i64.store	pty+48($pop6), $pop3
 	i32.const	$push5=, 0
-	i32.const	$push4=, 4
-	i32.store	pty+52($pop5), $pop4
+	i32.const	$push4=, 0
+	i32.store	pty+80($pop5), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	ini, .Lfunc_end0-ini
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 0
 	i64.store	pty+72($pop1), $pop0
-	i32.const	$push14=, 0
-	i64.const	$push13=, 0
-	i64.store	pty+64($pop14), $pop13
 	i32.const	$push12=, 0
 	i64.const	$push11=, 0
-	i64.store	pty+56($pop12), $pop11
+	i64.store	pty+64($pop12), $pop11
 	i32.const	$push10=, 0
-	i64.const	$push2=, 8589934593
-	i64.store	pty+40($pop10), $pop2
-	i32.const	$push9=, 0
-	i32.const	$push3=, 3
-	i32.store	pty+48($pop9), $pop3
+	i64.const	$push9=, 0
+	i64.store	pty+56($pop10), $pop9
 	i32.const	$push8=, 0
+	i64.const	$push2=, 8589934593
+	i64.store	pty+40($pop8), $pop2
 	i32.const	$push7=, 0
-	i32.store	pty+80($pop8), $pop7
+	i64.const	$push3=, 17179869187
+	i64.store	pty+48($pop7), $pop3
 	i32.const	$push6=, 0
-	i32.const	$push4=, 4
-	i32.store	pty+52($pop6), $pop4
 	i32.const	$push5=, 0
-                                        # fallthrough-return: $pop5
+	i32.store	pty+80($pop6), $pop5
+	i32.const	$push4=, 0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	pty,@object             # @pty
 	.section	.bss.pty,"aw",@nobits
 	.p2align	3
@@ -74,4 +68,4 @@ pty:
 	.size	pty, 88
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/struct-ini-1.c.s b/test/torture-s/struct-ini-1.c.s
index 9c3c1cd2c..e789bebf9 100644
--- a/test/torture-s/struct-ini-1.c.s
+++ b/test/torture-s/struct-ini-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ini-1.c"
+	.file	"struct-ini-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -36,7 +36,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	object                  # @object
 	.type	object,@object
 	.section	.data.object,"aw",@progbits
@@ -50,6 +50,6 @@ object:
 	.size	object, 12
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/struct-ini-2.c.s b/test/torture-s/struct-ini-2.c.s
index ff3b844ee..ab84e6e0e 100644
--- a/test/torture-s/struct-ini-2.c.s
+++ b/test/torture-s/struct-ini-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ini-2.c"
+	.file	"struct-ini-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -33,14 +33,14 @@ main:                                   # @main
 	i32.const	$push13=, 0
 	call    	exit@FUNCTION, $pop13
 	unreachable
-.LBB0_4:                                # %if.then12
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -53,6 +53,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/struct-ini-3.c.s b/test/torture-s/struct-ini-3.c.s
index 29cab3511..f6f2db600 100644
--- a/test/torture-s/struct-ini-3.c.s
+++ b/test/torture-s/struct-ini-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ini-3.c"
+	.file	"struct-ini-3.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	result                  # @result
 	.type	result,@object
 	.section	.data.result,"aw",@progbits
@@ -26,5 +26,5 @@ result:
 	.size	result, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/struct-ini-4.c.s b/test/torture-s/struct-ini-4.c.s
index d6baf6b39..55b27cbf9 100644
--- a/test/torture-s/struct-ini-4.c.s
+++ b/test/torture-s/struct-ini-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ini-4.c"
+	.file	"struct-ini-4.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -24,7 +24,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	s                       # @s
 	.type	s,@object
 	.section	.data.s,"aw",@progbits
@@ -38,6 +38,6 @@ s:
 	.size	s, 24
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/struct-ret-1.c.s b/test/torture-s/struct-ret-1.c.s
index 06ffc21ad..07076e3bd 100644
--- a/test/torture-s/struct-ret-1.c.s
+++ b/test/torture-s/struct-ret-1.c.s
@@ -1,210 +1,192 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ret-1.c"
+	.file	"struct-ret-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32, f64, i32
-	.local  	i32, i32, i32, f64, f64, i32, i32
+	.local  	i64, i32, f64, f64, i32
 # BB#0:                                 # %entry
-	i32.const	$push28=, 0
-	i32.const	$push25=, 0
-	i32.load	$push26=, __stack_pointer($pop25)
-	i32.const	$push27=, 64
-	i32.sub 	$push36=, $pop26, $pop27
-	tee_local	$push35=, $11=, $pop36
-	i32.store	__stack_pointer($pop28), $pop35
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $1, $pop1
-	i32.load	$5=, 0($pop2)
-	i32.const	$push3=, 16
-	i32.add 	$push4=, $1, $pop3
-	i32.load	$6=, 0($pop4)
-	i32.const	$push34=, 12
-	i32.add 	$push5=, $4, $pop34
-	i32.load	$7=, 0($pop5)
-	f64.load	$8=, 0($1)
-	i32.load	$1=, 8($1)
-	f64.load	$9=, 0($4)
-	i32.load	$10=, 8($4)
-	i32.const	$push8=, 48
-	i32.add 	$push9=, $11, $pop8
-	i32.const	$push33=, 16
-	i32.add 	$push6=, $4, $pop33
-	i32.load	$push7=, 0($pop6)
-	i32.store	0($pop9), $pop7
-	i32.const	$push10=, 44
-	i32.add 	$push11=, $11, $pop10
-	i32.store	0($pop11), $7
-	i32.const	$push12=, 40
-	i32.add 	$push13=, $11, $pop12
-	i32.store	0($pop13), $10
-	i32.const	$push14=, 32
-	i32.add 	$push15=, $11, $pop14
-	f64.store	0($pop15), $9
-	i32.const	$push16=, 24
-	i32.add 	$push17=, $11, $pop16
-	f64.store	0($pop17), $3
-	i32.const	$push18=, 20
-	i32.add 	$push19=, $11, $pop18
-	i32.store	0($pop19), $2
-	i32.const	$push32=, 16
-	i32.add 	$push20=, $11, $pop32
-	i32.store	0($pop20), $6
-	i32.store	12($11), $5
-	i32.store	8($11), $1
-	f64.store	0($11), $8
-	i32.const	$push22=, out
-	i32.const	$push21=, .L.str
-	i32.call	$drop=, sprintf@FUNCTION, $pop22, $pop21, $11
-	i32.const	$push24=, f.xr
-	i32.const	$push23=, 33
-	i32.call	$push0=, memcpy@FUNCTION, $0, $pop24, $pop23
-	i32.store8	33($pop0), $2
 	i32.const	$push31=, 0
-	i32.const	$push29=, 64
-	i32.add 	$push30=, $11, $pop29
-	i32.store	__stack_pointer($pop31), $pop30
+	i32.const	$push29=, 0
+	i32.load	$push28=, __stack_pointer($pop29)
+	i32.const	$push30=, 64
+	i32.sub 	$push43=, $pop28, $pop30
+	tee_local	$push42=, $9=, $pop43
+	i32.store	__stack_pointer($pop31), $pop42
+	i32.const	$push0=, 12
+	i32.add 	$push1=, $1, $pop0
+	i64.load	$5=, 0($pop1):p2align=2
+	i32.const	$push2=, 16
+	i32.add 	$push3=, $4, $pop2
+	i32.load	$6=, 0($pop3)
+	f64.load	$7=, 0($1)
+	i32.load	$1=, 8($1)
+	f64.load	$8=, 0($4)
+	i32.const	$push5=, 40
+	i32.add 	$push6=, $9, $pop5
+	i64.load	$push4=, 8($4)
+	i64.store	0($pop6), $pop4
+	i32.const	$push7=, 32
+	i32.add 	$push8=, $9, $pop7
+	f64.store	0($pop8), $8
+	i32.const	$push9=, 24
+	i32.add 	$push10=, $9, $pop9
+	f64.store	0($pop10), $3
+	i32.const	$push11=, 20
+	i32.add 	$push12=, $9, $pop11
+	i32.store	0($pop12), $2
+	i32.const	$push13=, 48
+	i32.add 	$push14=, $9, $pop13
+	i32.store	0($pop14), $6
+	i64.store	12($9):p2align=2, $5
+	i32.store	8($9), $1
+	f64.store	0($9), $7
+	i32.const	$push16=, out
+	i32.const	$push15=, .L.str
+	i32.call	$drop=, sprintf@FUNCTION, $pop16, $pop15, $9
+	i32.store8	33($0), $2
+	i32.const	$push41=, 32
+	i32.add 	$push17=, $0, $pop41
+	i32.const	$push18=, 0
+	i32.load8_u	$push19=, f.xr+32($pop18)
+	i32.store8	0($pop17), $pop19
+	i32.const	$push40=, 24
+	i32.add 	$push20=, $0, $pop40
+	i32.const	$push39=, 0
+	i64.load	$push21=, f.xr+24($pop39):p2align=0
+	i64.store	0($pop20):p2align=0, $pop21
+	i32.const	$push38=, 16
+	i32.add 	$push22=, $0, $pop38
+	i32.const	$push37=, 0
+	i64.load	$push23=, f.xr+16($pop37):p2align=0
+	i64.store	0($pop22):p2align=0, $pop23
+	i32.const	$push24=, 8
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push36=, 0
+	i64.load	$push26=, f.xr+8($pop36):p2align=0
+	i64.store	0($pop25):p2align=0, $pop26
+	i32.const	$push35=, 0
+	i64.load	$push27=, f.xr($pop35):p2align=0
+	i64.store	0($0):p2align=0, $pop27
+	i32.const	$push34=, 0
+	i32.const	$push32=, 64
+	i32.add 	$push33=, $9, $pop32
+	i32.store	__stack_pointer($pop34), $pop33
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f64, i64, i32, i32, f64, f64, i32, i32, i32
+	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push38=, 0
-	i32.const	$push35=, 0
-	i32.load	$push36=, __stack_pointer($pop35)
-	i32.const	$push37=, 256
-	i32.sub 	$push87=, $pop36, $pop37
-	tee_local	$push86=, $8=, $pop87
-	i32.store	__stack_pointer($pop38), $pop86
-	i32.const	$push85=, 0
-	f64.load	$0=, B1($pop85)
-	i32.const	$push84=, 0
-	i64.load	$1=, B1+8($pop84)
-	i32.const	$push83=, 0
-	i32.load	$2=, B1+16($pop83)
-	i32.const	$push82=, 0
-	i32.load8_s	$3=, c2($pop82)
-	i32.const	$push81=, 0
-	f64.load	$4=, d3($pop81)
-	i32.const	$push80=, 0
-	f64.load	$5=, B2($pop80)
-	i32.const	$push79=, 0
-	i32.load	$6=, B2+8($pop79)
-	i32.const	$push78=, 0
-	i32.load	$7=, B2+12($pop78)
-	i32.const	$push1=, 96
-	i32.add 	$push2=, $8, $pop1
-	i32.const	$push77=, 0
-	i32.load	$push0=, B2+16($pop77)
-	i32.store	0($pop2), $pop0
-	i32.const	$push3=, 92
-	i32.add 	$push4=, $8, $pop3
-	i32.store	0($pop4), $7
-	i32.const	$push5=, 88
-	i32.add 	$push6=, $8, $pop5
-	i32.store	0($pop6), $6
-	i32.const	$push7=, 80
-	i32.add 	$push8=, $8, $pop7
-	f64.store	0($pop8), $5
-	i32.const	$push9=, 72
-	i32.add 	$push10=, $8, $pop9
-	f64.store	0($pop10), $4
-	i32.const	$push39=, 48
-	i32.add 	$push40=, $8, $pop39
-	i32.const	$push11=, 20
-	i32.add 	$push12=, $pop40, $pop11
-	i32.store	0($pop12), $3
-	i32.const	$push41=, 48
-	i32.add 	$push42=, $8, $pop41
-	i32.const	$push13=, 16
-	i32.add 	$push14=, $pop42, $pop13
-	i32.store	0($pop14), $2
-	i64.store	56($8), $1
-	f64.store	48($8), $0
-	i32.const	$push16=, out
-	i32.const	$push15=, .L.str
-	i32.const	$push43=, 48
-	i32.add 	$push44=, $8, $pop43
-	i32.call	$drop=, sprintf@FUNCTION, $pop16, $pop15, $pop44
-	i32.const	$push45=, 144
-	i32.add 	$push46=, $8, $pop45
-	i32.const	$push76=, out
-	i32.call	$drop=, strcpy@FUNCTION, $pop46, $pop76
-	i32.const	$push47=, 24
-	i32.add 	$push48=, $8, $pop47
-	i32.const	$push75=, 20
-	i32.add 	$push17=, $pop48, $pop75
+	i32.const	$push39=, 0
+	i32.const	$push37=, 0
+	i32.load	$push36=, __stack_pointer($pop37)
+	i32.const	$push38=, 256
+	i32.sub 	$push76=, $pop36, $pop38
+	tee_local	$push75=, $0=, $pop76
+	i32.store	__stack_pointer($pop39), $pop75
+	i32.const	$push1=, 92
+	i32.add 	$push2=, $0, $pop1
 	i32.const	$push74=, 0
-	i32.load	$push18=, B1+20($pop74)
-	i32.store	0($pop17), $pop18
-	i32.const	$push49=, 24
-	i32.add 	$push50=, $8, $pop49
-	i32.const	$push73=, 16
-	i32.add 	$push19=, $pop50, $pop73
+	i64.load	$push0=, B2+12($pop74):p2align=2
+	i64.store	0($pop2):p2align=2, $pop0
+	i32.const	$push4=, 88
+	i32.add 	$push5=, $0, $pop4
+	i32.const	$push73=, 0
+	i32.load	$push3=, B2+8($pop73)
+	i32.store	0($pop5), $pop3
+	i32.const	$push7=, 80
+	i32.add 	$push8=, $0, $pop7
 	i32.const	$push72=, 0
-	i32.load	$push20=, B1+16($pop72)
-	i32.store	0($pop19), $pop20
-	i32.const	$push21=, 36
-	i32.add 	$push22=, $8, $pop21
+	f64.load	$push6=, B2($pop72)
+	f64.store	0($pop8), $pop6
+	i32.const	$push10=, 72
+	i32.add 	$push11=, $0, $pop10
 	i32.const	$push71=, 0
-	i32.load	$push23=, B1+12($pop71)
-	i32.store	0($pop22), $pop23
-	i32.const	$push51=, 24
-	i32.add 	$push52=, $8, $pop51
-	i32.const	$push24=, 8
-	i32.add 	$push25=, $pop52, $pop24
+	f64.load	$push9=, d3($pop71)
+	f64.store	0($pop11), $pop9
+	i32.const	$push13=, 68
+	i32.add 	$push14=, $0, $pop13
 	i32.const	$push70=, 0
-	i32.load	$push26=, B1+8($pop70)
-	i32.store	0($pop25), $pop26
+	i32.load8_s	$push12=, c2($pop70)
+	i32.store	0($pop14), $pop12
 	i32.const	$push69=, 0
-	i32.load	$push27=, B1+4($pop69)
-	i32.store	28($8), $pop27
+	i64.load	$push15=, B1+12($pop69):p2align=2
+	i64.store	60($0):p2align=2, $pop15
 	i32.const	$push68=, 0
-	i32.load	$push28=, B1($pop68)
-	i32.store	24($8), $pop28
+	i32.load	$push16=, B1+8($pop68)
+	i32.store	56($0), $pop16
 	i32.const	$push67=, 0
-	f64.load	$0=, d3($pop67)
-	i32.const	$push66=, 0
-	i32.load8_s	$2=, c2($pop66)
+	f64.load	$push17=, B1($pop67)
+	f64.store	48($0), $pop17
+	i32.const	$push19=, out
+	i32.const	$push18=, .L.str
+	i32.const	$push40=, 48
+	i32.add 	$push41=, $0, $pop40
+	i32.call	$drop=, sprintf@FUNCTION, $pop19, $pop18, $pop41
+	i32.const	$push42=, 144
+	i32.add 	$push43=, $0, $pop42
+	i32.const	$push66=, out
+	i32.call	$drop=, strcpy@FUNCTION, $pop43, $pop66
+	i32.const	$push44=, 24
+	i32.add 	$push45=, $0, $pop44
+	i32.const	$push20=, 8
+	i32.add 	$push21=, $pop45, $pop20
 	i32.const	$push65=, 0
-	i32.load	$3=, fp($pop65)
-	i32.const	$push64=, 16
-	i32.add 	$push29=, $8, $pop64
-	i32.const	$push63=, 0
-	i64.load	$push30=, B2+16($pop63)
-	i64.store	0($pop29), $pop30
-	i32.const	$push62=, 8
-	i32.add 	$push31=, $8, $pop62
-	i32.const	$push61=, 0
-	i64.load	$push32=, B2+8($pop61)
-	i64.store	0($pop31), $pop32
+	i64.load	$push22=, B1+8($pop65)
+	i64.store	0($pop21), $pop22
+	i32.const	$push46=, 24
+	i32.add 	$push47=, $0, $pop46
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $pop47, $pop23
+	i32.const	$push64=, 0
+	i64.load	$push25=, B1+16($pop64)
+	i64.store	0($pop24), $pop25
+	i32.const	$push63=, 8
+	i32.add 	$push26=, $0, $pop63
+	i32.const	$push62=, 0
+	i64.load	$push27=, B2+8($pop62)
+	i64.store	0($pop26), $pop27
+	i32.const	$push61=, 16
+	i32.add 	$push28=, $0, $pop61
 	i32.const	$push60=, 0
-	i64.load	$push33=, B2($pop60)
-	i64.store	0($8), $pop33
-	i32.const	$push53=, 104
-	i32.add 	$push54=, $8, $pop53
-	i32.const	$push55=, 24
-	i32.add 	$push56=, $8, $pop55
-	call_indirect	$pop54, $pop56, $2, $0, $8, $3
+	i64.load	$push29=, B2+16($pop60)
+	i64.store	0($pop28), $pop29
+	i32.const	$push59=, 0
+	i64.load	$push30=, B1($pop59)
+	i64.store	24($0), $pop30
+	i32.const	$push58=, 0
+	i64.load	$push31=, B2($pop58)
+	i64.store	0($0), $pop31
+	i32.const	$push48=, 104
+	i32.add 	$push49=, $0, $pop48
+	i32.const	$push50=, 24
+	i32.add 	$push51=, $0, $pop50
+	i32.const	$push57=, 0
+	i32.load8_s	$push33=, c2($pop57)
+	i32.const	$push56=, 0
+	f64.load	$push32=, d3($pop56)
+	i32.const	$push55=, 0
+	i32.load	$push34=, fp($pop55)
+	call_indirect	$pop49, $pop51, $pop33, $pop32, $0, $pop34
 	block   	
-	i32.const	$push57=, 144
-	i32.add 	$push58=, $8, $pop57
-	i32.const	$push59=, out
-	i32.call	$push34=, strcmp@FUNCTION, $pop58, $pop59
-	br_if   	0, $pop34       # 0: down to label0
+	i32.const	$push52=, 144
+	i32.add 	$push53=, $0, $pop52
+	i32.const	$push54=, out
+	i32.call	$push35=, strcmp@FUNCTION, $pop53, $pop54
+	br_if   	0, $pop35       # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push88=, 0
-	call    	exit@FUNCTION, $pop88
+	i32.const	$push77=, 0
+	call    	exit@FUNCTION, $pop77
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -213,7 +195,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	c1                      # @c1
 	.type	c1,@object
 	.section	.data.c1,"aw",@progbits
@@ -420,7 +402,7 @@ fp:
 	.size	fp, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	sprintf, i32, i32, i32
 	.functype	strcpy, i32, i32, i32
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/struct-ret-2.c.s b/test/torture-s/struct-ret-2.c.s
index 2b0cc303d..487db26f1 100644
--- a/test/torture-s/struct-ret-2.c.s
+++ b/test/torture-s/struct-ret-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/struct-ret-2.c"
+	.file	"struct-ret-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -12,9 +12,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.g,"ax",@progbits
-	.hidden	g
+	.hidden	g                       # -- Begin function g
 	.globl	g
 	.type	g,@function
 g:                                      # @g
@@ -25,9 +25,9 @@ g:                                      # @g
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -39,7 +39,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/switch-1.c.s b/test/torture-s/switch-1.c.s
index 503c2318c..b86f693fe 100644
--- a/test/torture-s/switch-1.c.s
+++ b/test/torture-s/switch-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/switch-1.c"
+	.file	"switch-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -18,7 +18,7 @@ foo:                                    # @foo
 # BB#1:                                 # %switch.lookup
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $0, $pop4
-	i32.const	$push6=, .Lswitch.table
+	i32.const	$push6=, .Lswitch.table.main
 	i32.add 	$push7=, $pop5, $pop6
 	i32.load	$push8=, 0($pop7)
 	return  	$pop8
@@ -29,140 +29,119 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32, i32
+	.local  	i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$1=, -1
+	i32.const	$2=, -5
+	i32.const	$1=, .Lswitch.table.main-20
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
+	loop    	                # label2:
+	i32.const	$push12=, 4
+	i32.add 	$3=, $2, $pop12
+	i32.const	$4=, 31
 	block   	
-	block   	
-	block   	
-	block   	
-	loop    	                # label6:
-	i32.const	$3=, 31
-	block   	
-	i32.const	$push15=, -4
-	i32.add 	$push14=, $1, $pop15
-	tee_local	$push13=, $2=, $pop14
-	i32.const	$push12=, 7
-	i32.gt_u	$push11=, $pop13, $pop12
-	tee_local	$push10=, $4=, $pop11
-	br_if   	0, $pop10       # 0: down to label7
-# BB#2:                                 # %switch.lookup.i
+	i32.const	$push11=, 7
+	i32.gt_u	$push0=, $2, $pop11
+	br_if   	0, $pop0        # 0: down to label3
+# BB#2:                                 # %switch.lookup
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push17=, 2
-	i32.shl 	$push0=, $2, $pop17
-	i32.const	$push16=, .Lswitch.table
-	i32.add 	$push1=, $pop0, $pop16
-	i32.load	$3=, 0($pop1)
+	i32.load	$4=, 0($1)
 .LBB1_3:                                # %foo.exit
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label7:
+	end_block                       # label3:
 	block   	
 	block   	
 	block   	
+	i32.const	$push16=, -4
+	i32.add 	$push15=, $3, $pop16
+	tee_local	$push14=, $5=, $pop15
+	i32.const	$push13=, 7
+	i32.gt_u	$push1=, $pop14, $pop13
+	br_if   	0, $pop1        # 0: down to label6
+# BB#4:                                 # %foo.exit
+                                        #   in Loop: Header=BB1_1 Depth=1
 	block   	
 	block   	
 	block   	
-	br_if   	0, $4           # 0: down to label13
-# BB#4:                                 # %foo.exit
-                                        #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	br_table 	$2, 0, 1, 2, 1, 1, 3, 1, 4, 0 # 0: down to label14
-                                        # 1: down to label13
-                                        # 2: down to label12
-                                        # 3: down to label11
-                                        # 4: down to label10
+	br_table 	$5, 0, 4, 2, 4, 4, 1, 4, 3, 0 # 0: down to label10
+                                        # 4: down to label6
+                                        # 2: down to label8
+                                        # 1: down to label9
+                                        # 3: down to label7
 .LBB1_5:                                # %if.then
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label14:
-	i32.const	$push18=, 30
-	i32.eq  	$push5=, $3, $pop18
-	br_if   	4, $pop5        # 4: down to label9
-	br      	8               # 8: down to label4
-.LBB1_6:                                # %if.else21
+	end_block                       # label10:
+	i32.const	$push17=, 30
+	i32.eq  	$push5=, $4, $pop17
+	br_if   	4, $pop5        # 4: down to label5
+	br      	7               # 7: down to label1
+.LBB1_6:                                # %if.then11
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label13:
-	i32.const	$push19=, 31
-	i32.ne  	$push6=, $3, $pop19
-	br_if   	8, $pop6        # 8: down to label3
-# BB#7:                                 # %for.inc
+	end_block                       # label9:
+	i32.const	$push18=, 30
+	i32.eq  	$push3=, $4, $pop18
+	br_if   	3, $pop3        # 3: down to label5
+	br      	6               # 6: down to label1
+.LBB1_7:                                # %if.then5
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $1, $pop23
-	tee_local	$push21=, $1=, $pop22
-	i32.const	$push20=, 66
-	i32.lt_s	$push7=, $pop21, $pop20
-	br_if   	5, $pop7        # 5: up to label6
-	br      	6               # 6: down to label5
-.LBB1_8:                                # %if.then5
+	end_block                       # label8:
+	i32.const	$push19=, 30
+	i32.eq  	$push4=, $4, $pop19
+	br_if   	2, $pop4        # 2: down to label5
+	br      	5               # 5: down to label1
+.LBB1_8:                                # %if.then17
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label12:
-	i32.const	$push24=, 30
-	i32.eq  	$push4=, $3, $pop24
-	br_if   	2, $pop4        # 2: down to label9
-	br      	8               # 8: down to label2
-.LBB1_9:                                # %if.then11
+	end_block                       # label7:
+	i32.const	$push20=, 30
+	i32.eq  	$push2=, $4, $pop20
+	br_if   	1, $pop2        # 1: down to label5
+	br      	4               # 4: down to label1
+.LBB1_9:                                # %if.else21
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label11:
-	i32.const	$push25=, 30
-	i32.eq  	$push3=, $3, $pop25
-	br_if   	1, $pop3        # 1: down to label9
-	br      	8               # 8: down to label1
-.LBB1_10:                               # %if.then17
+	end_block                       # label6:
+	i32.const	$push21=, 31
+	i32.ne  	$push6=, $4, $pop21
+	br_if   	3, $pop6        # 3: down to label1
+# BB#10:                                # %for.inc
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label10:
-	i32.const	$push26=, 30
-	i32.ne  	$push2=, $3, $pop26
-	br_if   	1, $pop2        # 1: down to label8
-.LBB1_11:                               # %for.inc.thread
+	i32.const	$push22=, 64
+	i32.gt_s	$push7=, $3, $pop22
+	br_if   	1, $pop7        # 1: down to label4
+.LBB1_11:                               # %for.body.backedge
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label9:
+	end_block                       # label5:
+	i32.const	$push10=, 4
+	i32.add 	$1=, $1, $pop10
 	i32.const	$push9=, 1
-	i32.add 	$1=, $1, $pop9
-	br      	1               # 1: up to label6
-.LBB1_12:                               # %if.then19
-	end_block                       # label8:
+	i32.add 	$2=, $2, $pop9
+	br      	1               # 1: up to label2
+.LBB1_12:                               # %for.end
+	end_block                       # label4:
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_13:                               # %for.end
-	end_block                       # label5:
 	i32.const	$push8=, 0
 	return  	$pop8
-.LBB1_14:                               # %if.then3
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_15:                               # %if.then23
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_16:                               # %if.then7
-	end_block                       # label2:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_17:                               # %if.then13
+.LBB1_13:                               # %if.then3
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
-	.type	.Lswitch.table,@object  # @switch.table
+                                        # -- End function
+	.type	.Lswitch.table.main,@object # @switch.table.main
 	.section	.rodata.cst32,"aM",@progbits,32
 	.p2align	4
-.Lswitch.table:
+.Lswitch.table.main:
 	.int32	30                      # 0x1e
 	.int32	31                      # 0x1f
 	.int32	30                      # 0x1e
@@ -171,8 +150,8 @@ main:                                   # @main
 	.int32	30                      # 0x1e
 	.int32	31                      # 0x1f
 	.int32	30                      # 0x1e
-	.size	.Lswitch.table, 32
+	.size	.Lswitch.table.main, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/tstdi-1.c.s b/test/torture-s/tstdi-1.c.s
index b4b78b3c2..b44fb0b47 100644
--- a/test/torture-s/tstdi-1.c.s
+++ b/test/torture-s/tstdi-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/tstdi-1.c"
+	.file	"tstdi-1.c"
 	.section	.text.feq,"ax",@progbits
-	.hidden	feq
+	.hidden	feq                     # -- Begin function feq
 	.globl	feq
 	.type	feq,@function
 feq:                                    # @feq
@@ -16,9 +16,9 @@ feq:                                    # @feq
 	.endfunc
 .Lfunc_end0:
 	.size	feq, .Lfunc_end0-feq
-
+                                        # -- End function
 	.section	.text.fne,"ax",@progbits
-	.hidden	fne
+	.hidden	fne                     # -- Begin function fne
 	.globl	fne
 	.type	fne,@function
 fne:                                    # @fne
@@ -33,9 +33,9 @@ fne:                                    # @fne
 	.endfunc
 .Lfunc_end1:
 	.size	fne, .Lfunc_end1-fne
-
+                                        # -- End function
 	.section	.text.flt,"ax",@progbits
-	.hidden	flt
+	.hidden	flt                     # -- Begin function flt
 	.globl	flt
 	.type	flt,@function
 flt:                                    # @flt
@@ -51,9 +51,9 @@ flt:                                    # @flt
 	.endfunc
 .Lfunc_end2:
 	.size	flt, .Lfunc_end2-flt
-
+                                        # -- End function
 	.section	.text.fge,"ax",@progbits
-	.hidden	fge
+	.hidden	fge                     # -- Begin function fge
 	.globl	fge
 	.type	fge,@function
 fge:                                    # @fge
@@ -69,9 +69,9 @@ fge:                                    # @fge
 	.endfunc
 .Lfunc_end3:
 	.size	fge, .Lfunc_end3-fge
-
+                                        # -- End function
 	.section	.text.fgt,"ax",@progbits
-	.hidden	fgt
+	.hidden	fgt                     # -- Begin function fgt
 	.globl	fgt
 	.type	fgt,@function
 fgt:                                    # @fgt
@@ -87,9 +87,9 @@ fgt:                                    # @fgt
 	.endfunc
 .Lfunc_end4:
 	.size	fgt, .Lfunc_end4-fgt
-
+                                        # -- End function
 	.section	.text.fle,"ax",@progbits
-	.hidden	fle
+	.hidden	fle                     # -- Begin function fle
 	.globl	fle
 	.type	fle,@function
 fle:                                    # @fle
@@ -105,9 +105,9 @@ fle:                                    # @fle
 	.endfunc
 .Lfunc_end5:
 	.size	fle, .Lfunc_end5-fle
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -119,7 +119,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end6:
 	.size	main, .Lfunc_end6-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/unroll-1.c.s b/test/torture-s/unroll-1.c.s
index 8bd332c4c..dcee48fb9 100644
--- a/test/torture-s/unroll-1.c.s
+++ b/test/torture-s/unroll-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/unroll-1.c"
+	.file	"unroll-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -28,7 +28,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/usmul.c.s b/test/torture-s/usmul.c.s
index e8d32f21a..baf8174ab 100644
--- a/test/torture-s/usmul.c.s
+++ b/test/torture-s/usmul.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/usmul.c"
+	.file	"usmul.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -27,9 +27,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -95,15 +95,15 @@ main:                                   # @main
 	i32.const	$push32=, 0
 	call    	exit@FUNCTION, $pop32
 	unreachable
-.LBB2_9:                                # %if.then27
+.LBB2_9:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-1.c.s b/test/torture-s/va-arg-1.c.s
index e258d18ab..2e0cb658a 100644
--- a/test/torture-s/va-arg-1.c.s
+++ b/test/torture-s/va-arg-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-1.c"
+	.file	"va-arg-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,13 +10,12 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push14=, 0
-	i32.const	$push11=, 0
-	i32.load	$push12=, __stack_pointer($pop11)
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push21=, $pop12, $pop13
+	i32.sub 	$push21=, $pop11, $pop13
 	tee_local	$push20=, $12=, $pop21
 	i32.store	__stack_pointer($pop14), $pop20
-	i32.store	12($12), $9
 	i32.const	$push0=, 4
 	i32.add 	$push19=, $9, $pop0
 	tee_local	$push18=, $10=, $pop19
@@ -47,16 +46,16 @@ f:                                      # @f
 	i32.add 	$push16=, $12, $pop15
 	i32.store	__stack_pointer($pop17), $pop16
 	return  	$9
-.LBB0_4:                                # %if.then10
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -64,10 +63,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push8=, $pop3, $pop4
+	i32.sub 	$push8=, $pop2, $pop4
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop5), $pop7
 	i32.const	$push0=, 0
@@ -81,8 +80,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-10.c.s b/test/torture-s/va-arg-10.c.s
index 13e2f6296..f9731cfd0 100644
--- a/test/torture-s/va-arg-10.c.s
+++ b/test/torture-s/va-arg-10.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-10.c"
+	.file	"va-arg-10.c"
 	.section	.text.to_hex,"ax",@progbits
-	.hidden	to_hex
+	.hidden	to_hex                  # -- Begin function to_hex
 	.globl	to_hex
 	.type	to_hex,@function
 to_hex:                                 # @to_hex
@@ -24,118 +24,126 @@ to_hex:                                 # @to_hex
 	.endfunc
 .Lfunc_end0:
 	.size	to_hex, .Lfunc_end0-to_hex
-
+                                        # -- End function
 	.section	.text.fap,"ax",@progbits
-	.hidden	fap
+	.hidden	fap                     # -- Begin function fap
 	.globl	fap
 	.type	fap,@function
 fap:                                    # @fap
 	.param  	i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 16
-	i32.sub 	$push23=, $pop15, $pop16
-	tee_local	$push22=, $4=, $pop23
-	i32.store	__stack_pointer($pop17), $pop22
-	i32.store	12($4), $2
-	i32.load	$push0=, 12($4)
-	i32.store	8($4), $pop0
+	i32.const	$push20=, 0
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
+	i32.const	$push19=, 16
+	i32.sub 	$push25=, $pop17, $pop19
+	tee_local	$push24=, $6=, $pop25
+	i32.store	__stack_pointer($pop20), $pop24
+	i32.store	12($6), $2
+	i32.load	$push2=, 12($6)
+	i32.store	8($6), $pop2
 	block   	
-	i32.call	$push2=, strlen@FUNCTION, $1
-	i32.const	$push21=, 16
-	i32.sub 	$push1=, $pop21, $0
-	i32.ne  	$push3=, $pop2, $pop1
-	br_if   	0, $pop3        # 0: down to label1
-# BB#1:
-	copy_local	$0=, $1
-.LBB1_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push5=, strlen@FUNCTION, $1
+	i32.const	$push3=, 16
+	i32.sub 	$push4=, $pop3, $0
+	i32.ne  	$push6=, $pop5, $pop4
+	br_if   	0, $pop6        # 0: down to label1
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push27=, 0($1)
+	tee_local	$push26=, $5=, $pop27
+	i32.eqz 	$push48=, $pop26
+	br_if   	0, $pop48       # 0: down to label2
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push28=, 1
+	i32.add 	$0=, $1, $pop28
+	i32.load	$2=, 12($6)
+	copy_local	$4=, $5
+.LBB1_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.load8_u	$push25=, 0($0)
-	tee_local	$push24=, $2=, $pop25
-	i32.eqz 	$push44=, $pop24
-	br_if   	1, $pop44       # 1: down to label2
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.load	$push31=, 12($4)
-	tee_local	$push30=, $3=, $pop31
-	i32.const	$push29=, 4
-	i32.add 	$push4=, $pop30, $pop29
-	i32.store	12($4), $pop4
-	i32.load	$push28=, 0($3)
-	tee_local	$push27=, $3=, $pop28
-	i32.const	$push26=, 16
-	i32.ge_u	$push5=, $pop27, $pop26
-	br_if   	2, $pop5        # 2: down to label1
+	i32.const	$push34=, 4
+	i32.add 	$push33=, $2, $pop34
+	tee_local	$push32=, $3=, $pop33
+	i32.store	12($6), $pop32
+	i32.load	$push31=, 0($2)
+	tee_local	$push30=, $2=, $pop31
+	i32.const	$push29=, 16
+	i32.ge_u	$push7=, $pop30, $pop29
+	br_if   	2, $pop7        # 2: down to label1
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push33=, 1
-	i32.add 	$0=, $0, $pop33
-	i32.const	$push32=, .L.str
-	i32.add 	$push6=, $3, $pop32
-	i32.load8_u	$push7=, 0($pop6)
-	i32.eq  	$push8=, $2, $pop7
-	br_if   	0, $pop8        # 0: up to label3
-# BB#5:                                 # %if.then4
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$push36=, .L.str
+	i32.add 	$push9=, $2, $pop36
+	i32.load8_u	$push10=, 0($pop9)
+	i32.const	$push35=, 255
+	i32.and 	$push8=, $4, $pop35
+	i32.ne  	$push11=, $pop10, $pop8
+	br_if   	2, $pop11       # 2: down to label1
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push37=, 1
+	i32.add 	$push0=, $0, $pop37
+	copy_local	$0=, $pop0
+	copy_local	$2=, $3
+	br_if   	0, $4           # 0: up to label3
+# BB#6:                                 # %while.end
 	end_loop
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_6:
-	end_block                       # label2:
-.LBB1_7:                                # %while.cond6
+	i32.eqz 	$push49=, $5
+	br_if   	0, $pop49       # 0: down to label2
+# BB#7:                                 # %while.body8.lr.ph
+	i32.const	$push38=, 1
+	i32.add 	$0=, $1, $pop38
+	i32.load	$2=, 8($6)
+.LBB1_8:                                # %while.body8
                                         # =>This Inner Loop Header: Depth=1
-	block   	
-	loop    	                # label5:
-	i32.load8_u	$push35=, 0($1)
-	tee_local	$push34=, $0=, $pop35
-	i32.eqz 	$push45=, $pop34
-	br_if   	1, $pop45       # 1: down to label4
-# BB#8:                                 # %while.body8
-                                        #   in Loop: Header=BB1_7 Depth=1
-	i32.load	$push41=, 8($4)
+	loop    	                # label4:
+	i32.const	$push44=, 4
+	i32.add 	$push43=, $2, $pop44
+	tee_local	$push42=, $4=, $pop43
+	i32.store	8($6), $pop42
+	i32.load	$push41=, 0($2)
 	tee_local	$push40=, $2=, $pop41
-	i32.const	$push39=, 4
-	i32.add 	$push9=, $pop40, $pop39
-	i32.store	8($4), $pop9
-	i32.load	$push38=, 0($2)
-	tee_local	$push37=, $2=, $pop38
-	i32.const	$push36=, 16
-	i32.ge_u	$push10=, $pop37, $pop36
-	br_if   	2, $pop10       # 2: down to label1
+	i32.const	$push39=, 16
+	i32.ge_u	$push12=, $pop40, $pop39
+	br_if   	2, $pop12       # 2: down to label1
 # BB#9:                                 # %to_hex.exit28
-                                        #   in Loop: Header=BB1_7 Depth=1
-	i32.const	$push43=, 1
-	i32.add 	$1=, $1, $pop43
-	i32.const	$push42=, .L.str
-	i32.add 	$push11=, $2, $pop42
-	i32.load8_u	$push12=, 0($pop11)
-	i32.eq  	$push13=, $0, $pop12
-	br_if   	0, $pop13       # 0: up to label5
-# BB#10:                                # %if.then16
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB1_8 Depth=1
+	i32.const	$push46=, .L.str
+	i32.add 	$push14=, $2, $pop46
+	i32.load8_u	$push15=, 0($pop14)
+	i32.const	$push45=, 255
+	i32.and 	$push13=, $5, $pop45
+	i32.ne  	$push16=, $pop15, $pop13
+	br_if   	2, $pop16       # 2: down to label1
+# BB#10:                                # %while.cond6
+                                        #   in Loop: Header=BB1_8 Depth=1
+	i32.load8_u	$5=, 0($0)
+	i32.const	$push47=, 1
+	i32.add 	$push1=, $0, $pop47
+	copy_local	$0=, $pop1
+	copy_local	$2=, $4
+	br_if   	0, $5           # 0: up to label4
 .LBB1_11:                               # %while.end18
-	end_block                       # label4:
-	i32.const	$push20=, 0
-	i32.const	$push18=, 16
-	i32.add 	$push19=, $4, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
+	end_loop
+	end_block                       # label2:
+	i32.const	$push23=, 0
+	i32.const	$push21=, 16
+	i32.add 	$push22=, $6, $pop21
+	i32.store	__stack_pointer($pop23), $pop22
 	return
-.LBB1_12:                               # %if.then.i25
+.LBB1_12:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	fap, .Lfunc_end1-fap
-
+                                        # -- End function
 	.section	.text.f0,"ax",@progbits
-	.hidden	f0
+	.hidden	f0                      # -- Begin function f0
 	.globl	f0
 	.type	f0,@function
 f0:                                     # @f0
@@ -143,10 +151,10 @@ f0:                                     # @f0
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $2=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($2), $1
@@ -160,9 +168,9 @@ f0:                                     # @f0
 	.endfunc
 .Lfunc_end2:
 	.size	f0, .Lfunc_end2-f0
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
@@ -170,10 +178,10 @@ f1:                                     # @f1
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $3=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($3), $2
@@ -187,9 +195,9 @@ f1:                                     # @f1
 	.endfunc
 .Lfunc_end3:
 	.size	f1, .Lfunc_end3-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
@@ -197,10 +205,10 @@ f2:                                     # @f2
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $4=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($4), $3
@@ -214,9 +222,9 @@ f2:                                     # @f2
 	.endfunc
 .Lfunc_end4:
 	.size	f2, .Lfunc_end4-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
@@ -224,10 +232,10 @@ f3:                                     # @f3
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $5=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($5), $4
@@ -241,9 +249,9 @@ f3:                                     # @f3
 	.endfunc
 .Lfunc_end5:
 	.size	f3, .Lfunc_end5-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
@@ -251,10 +259,10 @@ f4:                                     # @f4
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $6=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($6), $5
@@ -268,9 +276,9 @@ f4:                                     # @f4
 	.endfunc
 .Lfunc_end6:
 	.size	f4, .Lfunc_end6-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
@@ -278,10 +286,10 @@ f5:                                     # @f5
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $7=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($7), $6
@@ -295,9 +303,9 @@ f5:                                     # @f5
 	.endfunc
 .Lfunc_end7:
 	.size	f5, .Lfunc_end7-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
@@ -305,10 +313,10 @@ f6:                                     # @f6
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $8=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($8), $7
@@ -322,9 +330,9 @@ f6:                                     # @f6
 	.endfunc
 .Lfunc_end8:
 	.size	f6, .Lfunc_end8-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
@@ -332,10 +340,10 @@ f7:                                     # @f7
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $9=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($9), $8
@@ -349,9 +357,9 @@ f7:                                     # @f7
 	.endfunc
 .Lfunc_end9:
 	.size	f7, .Lfunc_end9-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
@@ -359,10 +367,10 @@ f8:                                     # @f8
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $10=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($10), $9
@@ -376,9 +384,9 @@ f8:                                     # @f8
 	.endfunc
 .Lfunc_end10:
 	.size	f8, .Lfunc_end10-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
@@ -386,10 +394,10 @@ f9:                                     # @f9
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $11=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($11), $10
@@ -403,9 +411,9 @@ f9:                                     # @f9
 	.endfunc
 .Lfunc_end11:
 	.size	f9, .Lfunc_end11-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
@@ -413,10 +421,10 @@ f10:                                    # @f10
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $12=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($12), $11
@@ -430,9 +438,9 @@ f10:                                    # @f10
 	.endfunc
 .Lfunc_end12:
 	.size	f10, .Lfunc_end12-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
@@ -440,10 +448,10 @@ f11:                                    # @f11
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $13=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($13), $12
@@ -457,9 +465,9 @@ f11:                                    # @f11
 	.endfunc
 .Lfunc_end13:
 	.size	f11, .Lfunc_end13-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
@@ -467,10 +475,10 @@ f12:                                    # @f12
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $14=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($14), $13
@@ -484,9 +492,9 @@ f12:                                    # @f12
 	.endfunc
 .Lfunc_end14:
 	.size	f12, .Lfunc_end14-f12
-
+                                        # -- End function
 	.section	.text.f13,"ax",@progbits
-	.hidden	f13
+	.hidden	f13                     # -- Begin function f13
 	.globl	f13
 	.type	f13,@function
 f13:                                    # @f13
@@ -494,10 +502,10 @@ f13:                                    # @f13
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $15=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($15), $14
@@ -511,9 +519,9 @@ f13:                                    # @f13
 	.endfunc
 .Lfunc_end15:
 	.size	f13, .Lfunc_end15-f13
-
+                                        # -- End function
 	.section	.text.f14,"ax",@progbits
-	.hidden	f14
+	.hidden	f14                     # -- Begin function f14
 	.globl	f14
 	.type	f14,@function
 f14:                                    # @f14
@@ -521,10 +529,10 @@ f14:                                    # @f14
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $16=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($16), $15
@@ -538,9 +546,9 @@ f14:                                    # @f14
 	.endfunc
 .Lfunc_end16:
 	.size	f14, .Lfunc_end16-f14
-
+                                        # -- End function
 	.section	.text.f15,"ax",@progbits
-	.hidden	f15
+	.hidden	f15                     # -- Begin function f15
 	.globl	f15
 	.type	f15,@function
 f15:                                    # @f15
@@ -548,10 +556,10 @@ f15:                                    # @f15
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop2, $pop3
+	i32.sub 	$push9=, $pop1, $pop3
 	tee_local	$push8=, $17=, $pop9
 	i32.store	__stack_pointer($pop4), $pop8
 	i32.store	12($17), $16
@@ -565,9 +573,9 @@ f15:                                    # @f15
 	.endfunc
 .Lfunc_end17:
 	.size	f15, .Lfunc_end17-f15
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -575,10 +583,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push84=, 0
-	i32.const	$push81=, 0
-	i32.load	$push82=, __stack_pointer($pop81)
+	i32.const	$push82=, 0
+	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop82, $pop83
+	i32.sub 	$push292=, $pop81, $pop83
 	tee_local	$push291=, $0=, $pop292
 	i32.store	__stack_pointer($pop84), $pop291
 	i32.const	$push85=, 576
@@ -961,7 +969,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end18:
 	.size	main, .Lfunc_end18-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.16,"aMS",@progbits,1
 	.p2align	4
@@ -970,7 +978,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	strlen, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-11.c.s b/test/torture-s/va-arg-11.c.s
index 9efd303f3..70d01b052 100644
--- a/test/torture-s/va-arg-11.c.s
+++ b/test/torture-s/va-arg-11.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-11.c"
+	.file	"va-arg-11.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 32
-	i32.sub 	$push11=, $pop6, $pop7
+	i32.sub 	$push11=, $pop5, $pop7
 	tee_local	$push10=, $0=, $pop11
 	i32.store	__stack_pointer($pop8), $pop10
 	i32.const	$push0=, 16
@@ -37,23 +37,20 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.type	foo,@function
+	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push9=, $pop6, $pop7
-	tee_local	$push8=, $2=, $pop9
-	i32.store	12($pop8), $1
+	i32.sub 	$push8=, $pop5, $pop7
 	i32.const	$push0=, 20
 	i32.add 	$push1=, $1, $pop0
-	i32.store	12($2), $pop1
+	i32.store	12($pop8), $pop1
 	i32.const	$push2=, 16
 	i32.add 	$push3=, $1, $pop2
 	i32.load	$push4=, 0($pop3)
@@ -61,8 +58,8 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-12.c.s b/test/torture-s/va-arg-12.c.s
index da9a4a423..b2c528e0e 100644
--- a/test/torture-s/va-arg-12.c.s
+++ b/test/torture-s/va-arg-12.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-12.c"
+	.file	"va-arg-12.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,13 +9,12 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 16
-	i32.sub 	$push28=, $pop17, $pop18
+	i32.sub 	$push28=, $pop16, $pop18
 	tee_local	$push27=, $12=, $pop28
 	i32.store	__stack_pointer($pop19), $pop27
-	i32.store	12($12), $9
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $9, $pop0
 	i32.const	$push2=, -8
@@ -53,16 +52,16 @@ f:                                      # @f
 	i32.add 	$push21=, $12, $pop20
 	i32.store	__stack_pointer($pop22), $pop21
 	return
-.LBB0_4:                                # %if.then10
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -70,10 +69,10 @@ main:                                   # @main
 	.local  	f64, i32
 # BB#0:                                 # %entry
 	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push11=, $pop7, $pop8
+	i32.sub 	$push11=, $pop6, $pop8
 	tee_local	$push10=, $1=, $pop11
 	i32.store	__stack_pointer($pop9), $pop10
 	i32.const	$push0=, 16
@@ -91,8 +90,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-13.c.s b/test/torture-s/va-arg-13.c.s
index e32c0c3d8..449fe48c4 100644
--- a/test/torture-s/va-arg-13.c.s
+++ b/test/torture-s/va-arg-13.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-13.c"
+	.file	"va-arg-13.c"
 	.section	.text.dummy,"ax",@progbits
-	.hidden	dummy
+	.hidden	dummy                   # -- Begin function dummy
 	.globl	dummy
 	.type	dummy,@function
 dummy:                                  # @dummy
@@ -21,9 +21,9 @@ dummy:                                  # @dummy
 	.endfunc
 .Lfunc_end0:
 	.size	dummy, .Lfunc_end0-dummy
-
+                                        # -- End function
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -31,10 +31,10 @@ test:                                   # @test
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
+	i32.sub 	$push16=, $pop7, $pop9
 	tee_local	$push15=, $2=, $pop16
 	i32.store	__stack_pointer($pop10), $pop15
 	i32.store	4($2), $1
@@ -58,16 +58,16 @@ test:                                   # @test
 	i32.add 	$push12=, $2, $pop11
 	i32.store	__stack_pointer($pop13), $pop12
 	return
-.LBB1_3:                                # %if.then.i14
+.LBB1_3:                                # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	test, .Lfunc_end1-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -75,10 +75,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop3, $pop4
+	i32.sub 	$push7=, $pop2, $pop4
 	tee_local	$push6=, $0=, $pop7
 	i32.store	__stack_pointer($pop5), $pop6
 	i32.const	$push0=, 1234
@@ -90,8 +90,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-14.c.s b/test/torture-s/va-arg-14.c.s
index 035ea1cb1..c292b6de9 100644
--- a/test/torture-s/va-arg-14.c.s
+++ b/test/torture-s/va-arg-14.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-14.c"
+	.file	"va-arg-14.c"
 	.section	.text.vat,"ax",@progbits
-	.hidden	vat
+	.hidden	vat                     # -- Begin function vat
 	.globl	vat
 	.type	vat,@function
 vat:                                    # @vat
@@ -9,90 +9,85 @@ vat:                                    # @vat
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 16
-	i32.sub 	$push37=, $pop25, $pop26
-	tee_local	$push36=, $2=, $pop37
-	i32.store	__stack_pointer($pop27), $pop36
+	i32.sub 	$push35=, $pop24, $pop26
+	tee_local	$push34=, $2=, $pop35
+	i32.store	__stack_pointer($pop27), $pop34
 	i32.store	12($2), $0
-	i32.const	$push35=, 0
-	i32.store	global($pop35), $1
-	i32.store	8($2), $1
+	i32.const	$push33=, 0
+	i32.store	global($pop33), $1
 	i32.store	12($2), $1
-	i32.load	$push34=, 8($2)
-	tee_local	$push33=, $0=, $pop34
 	i32.const	$push32=, 4
-	i32.add 	$push0=, $pop33, $pop32
+	i32.add 	$push0=, $1, $pop32
 	i32.store	8($2), $pop0
 	block   	
-	i32.load	$push1=, 0($0)
+	i32.load	$push1=, 0($1)
 	i32.const	$push31=, 1
 	i32.ne  	$push2=, $pop1, $pop31
 	br_if   	0, $pop2        # 0: down to label0
 # BB#1:                                 # %if.end
-	i32.const	$push43=, 0
-	i32.const	$push42=, 0
-	i32.load	$push41=, global($pop42)
-	tee_local	$push40=, $0=, $pop41
-	i32.const	$push39=, 4
-	i32.add 	$push3=, $pop40, $pop39
-	i32.store	global($pop43), $pop3
+	i32.const	$push41=, 0
+	i32.const	$push40=, 0
+	i32.load	$push39=, global($pop40)
+	tee_local	$push38=, $0=, $pop39
+	i32.const	$push37=, 4
+	i32.add 	$push3=, $pop38, $pop37
+	i32.store	global($pop41), $pop3
 	i32.load	$push4=, 0($0)
-	i32.const	$push38=, 1
-	i32.ne  	$push5=, $pop4, $pop38
+	i32.const	$push36=, 1
+	i32.ne  	$push5=, $pop4, $pop36
 	br_if   	0, $pop5        # 0: down to label0
 # BB#2:                                 # %if.end7
-	i32.load	$push47=, 12($2)
-	tee_local	$push46=, $0=, $pop47
-	i32.const	$push45=, 4
-	i32.add 	$push6=, $pop46, $pop45
+	i32.load	$push45=, 12($2)
+	tee_local	$push44=, $0=, $pop45
+	i32.const	$push43=, 4
+	i32.add 	$push6=, $pop44, $pop43
 	i32.store	12($2), $pop6
 	i32.load	$push7=, 0($0)
-	i32.const	$push44=, 1
-	i32.ne  	$push8=, $pop7, $pop44
+	i32.const	$push42=, 1
+	i32.ne  	$push8=, $pop7, $pop42
 	br_if   	0, $pop8        # 0: down to label0
 # BB#3:                                 # %if.end12
-	i32.const	$push50=, 0
-	i32.store	global($pop50), $1
+	i32.const	$push48=, 0
+	i32.store	global($pop48), $1
 	i32.store	12($2), $1
-	i32.store	8($2), $1
-	i32.const	$push49=, 4
-	i32.add 	$push9=, $1, $pop49
+	i32.const	$push47=, 4
+	i32.add 	$push9=, $1, $pop47
 	i32.store	8($2), $pop9
 	i32.load	$push10=, 0($1)
-	i32.const	$push48=, 1
-	i32.ne  	$push11=, $pop10, $pop48
+	i32.const	$push46=, 1
+	i32.ne  	$push11=, $pop10, $pop46
 	br_if   	0, $pop11       # 0: down to label0
 # BB#4:                                 # %if.end19
-	i32.const	$push55=, 0
-	i32.load	$push54=, global($pop55)
-	tee_local	$push53=, $1=, $pop54
-	i32.store	8($2), $pop53
-	i32.const	$push52=, 4
-	i32.add 	$push12=, $1, $pop52
+	i32.const	$push53=, 0
+	i32.load	$push52=, global($pop53)
+	tee_local	$push51=, $1=, $pop52
+	i32.const	$push50=, 4
+	i32.add 	$push12=, $pop51, $pop50
 	i32.store	8($2), $pop12
 	i32.load	$push13=, 0($1)
-	i32.const	$push51=, 1
-	i32.ne  	$push14=, $pop13, $pop51
+	i32.const	$push49=, 1
+	i32.ne  	$push14=, $pop13, $pop49
 	br_if   	0, $pop14       # 0: down to label0
 # BB#5:                                 # %if.end25
 	i32.const	$push15=, 0
-	i32.const	$push60=, 0
-	i32.load	$push59=, global($pop60)
-	tee_local	$push58=, $1=, $pop59
-	i32.const	$push57=, 4
-	i32.add 	$push16=, $pop58, $pop57
+	i32.const	$push58=, 0
+	i32.load	$push57=, global($pop58)
+	tee_local	$push56=, $1=, $pop57
+	i32.const	$push55=, 4
+	i32.add 	$push16=, $pop56, $pop55
 	i32.store	global($pop15), $pop16
 	i32.load	$push17=, 0($1)
-	i32.const	$push56=, 1
-	i32.ne  	$push18=, $pop17, $pop56
+	i32.const	$push54=, 1
+	i32.ne  	$push18=, $pop17, $pop54
 	br_if   	0, $pop18       # 0: down to label0
 # BB#6:                                 # %if.end31
-	i32.load	$push62=, 12($2)
-	tee_local	$push61=, $1=, $pop62
+	i32.load	$push60=, 12($2)
+	tee_local	$push59=, $1=, $pop60
 	i32.const	$push19=, 4
-	i32.add 	$push20=, $pop61, $pop19
+	i32.add 	$push20=, $pop59, $pop19
 	i32.store	12($2), $pop20
 	i32.load	$push21=, 0($1)
 	i32.const	$push22=, 1
@@ -104,16 +99,16 @@ vat:                                    # @vat
 	i32.add 	$push29=, $2, $pop28
 	i32.store	__stack_pointer($pop30), $pop29
 	return
-.LBB0_8:                                # %if.then35
+.LBB0_8:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	vat, .Lfunc_end0-vat
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -121,10 +116,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop3, $pop4
+	i32.sub 	$push7=, $pop2, $pop4
 	tee_local	$push6=, $0=, $pop7
 	i32.store	__stack_pointer($pop5), $pop6
 	i32.const	$push0=, 1
@@ -136,7 +131,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	global                  # @global
 	.type	global,@object
 	.section	.bss.global,"aw",@nobits
@@ -147,6 +142,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-15.c.s b/test/torture-s/va-arg-15.c.s
index 588be0980..b023d3bf6 100644
--- a/test/torture-s/va-arg-15.c.s
+++ b/test/torture-s/va-arg-15.c.s
@@ -1,91 +1,84 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-15.c"
+	.file	"va-arg-15.c"
 	.section	.text.vafunction,"ax",@progbits
-	.hidden	vafunction
+	.hidden	vafunction              # -- Begin function vafunction
 	.globl	vafunction
 	.type	vafunction,@function
 vafunction:                             # @vafunction
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
+	i32.const	$push10=, 0
 	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $5=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
+	i32.load	$push7=, __stack_pointer($pop8)
+	i32.const	$push9=, 16
+	i32.sub 	$push15=, $pop7, $pop9
+	tee_local	$push14=, $5=, $pop15
+	i32.store	__stack_pointer($pop10), $pop14
 	i32.store	12($5), $1
-	i32.const	$2=, 1
+	i32.const	$4=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	block   	
-	loop    	                # label2:
+	loop    	                # label1:
+	i32.const	$push17=, 1
+	i32.add 	$2=, $4, $pop17
 	block   	
 	block   	
-	i32.const	$push18=, -1
-	i32.add 	$push0=, $2, $pop18
-	i32.const	$push17=, 1
-	i32.and 	$push1=, $pop0, $pop17
-	br_if   	0, $pop1        # 0: down to label4
+	i32.const	$push16=, 1
+	i32.and 	$push0=, $4, $pop16
+	br_if   	0, $pop0        # 0: down to label3
 # BB#2:                                 # %if.else
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push21=, 4
-	i32.add 	$push20=, $1, $pop21
-	tee_local	$push19=, $3=, $pop20
-	i32.store	12($5), $pop19
-	i32.load	$4=, 0($1)
-	copy_local	$1=, $3
-	i32.eq  	$push6=, $2, $4
-	br_if   	1, $pop6        # 1: down to label3
-	br      	3               # 3: down to label1
+	i32.const	$push20=, 4
+	i32.add 	$push19=, $1, $pop20
+	tee_local	$push18=, $4=, $pop19
+	i32.store	12($5), $pop18
+	i32.load	$3=, 0($1)
+	copy_local	$1=, $4
+	i32.eq  	$push5=, $2, $3
+	br_if   	1, $pop5        # 1: down to label2
+	br      	3               # 3: down to label0
 .LBB0_3:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label4:
-	i32.const	$push28=, 7
-	i32.add 	$push2=, $1, $pop28
-	i32.const	$push27=, -8
-	i32.and 	$push26=, $pop2, $pop27
-	tee_local	$push25=, $3=, $pop26
-	i32.const	$push24=, 8
-	i32.add 	$push23=, $pop25, $pop24
-	tee_local	$push22=, $1=, $pop23
-	i32.store	12($5), $pop22
-	f64.load	$push3=, 0($3)
-	f64.convert_s/i32	$push4=, $2
-	f64.ne  	$push5=, $pop3, $pop4
-	br_if   	3, $pop5        # 3: down to label0
+	end_block                       # label3:
+	i32.const	$push27=, 7
+	i32.add 	$push1=, $1, $pop27
+	i32.const	$push26=, -8
+	i32.and 	$push25=, $pop1, $pop26
+	tee_local	$push24=, $4=, $pop25
+	i32.const	$push23=, 8
+	i32.add 	$push22=, $pop24, $pop23
+	tee_local	$push21=, $1=, $pop22
+	i32.store	12($5), $pop21
+	f64.load	$push2=, 0($4)
+	f64.convert_s/i32	$push3=, $2
+	f64.ne  	$push4=, $pop2, $pop3
+	br_if   	2, $pop4        # 2: down to label0
 .LBB0_4:                                # %for.inc
                                         #   in Loop: Header=BB0_1 Depth=1
-	end_block                       # label3:
-	i32.const	$push32=, 1
-	i32.add 	$push31=, $2, $pop32
-	tee_local	$push30=, $2=, $pop31
-	i32.const	$push29=, 19
-	i32.lt_s	$push7=, $pop30, $pop29
-	br_if   	0, $pop7        # 0: up to label2
+	end_block                       # label2:
+	copy_local	$4=, $2
+	i32.const	$push28=, 18
+	i32.lt_u	$push6=, $2, $pop28
+	br_if   	0, $pop6        # 0: up to label1
 # BB#5:                                 # %for.end
 	end_loop
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $5, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push13=, 0
+	i32.const	$push11=, 16
+	i32.add 	$push12=, $5, $pop11
+	i32.store	__stack_pointer($pop13), $pop12
 	return
-.LBB0_6:                                # %if.then9
-	end_block                       # label1:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_7:                                # %if.then4
+.LBB0_6:                                # %if.then4
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	vafunction, .Lfunc_end0-vafunction
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -93,10 +86,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push54=, 0
-	i32.const	$push51=, 0
-	i32.load	$push52=, __stack_pointer($pop51)
+	i32.const	$push52=, 0
+	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 144
-	i32.sub 	$push56=, $pop52, $pop53
+	i32.sub 	$push56=, $pop51, $pop53
 	tee_local	$push55=, $0=, $pop56
 	i32.store	__stack_pointer($pop54), $pop55
 	i32.const	$push0=, 136
@@ -174,8 +167,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-16.c.s b/test/torture-s/va-arg-16.c.s
index 0260b8887..d6551b066 100644
--- a/test/torture-s/va-arg-16.c.s
+++ b/test/torture-s/va-arg-16.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-16.c"
+	.file	"va-arg-16.c"
 	.section	.text.vafunction,"ax",@progbits
-	.hidden	vafunction
+	.hidden	vafunction              # -- Begin function vafunction
 	.globl	vafunction
 	.type	vafunction,@function
 vafunction:                             # @vafunction
@@ -9,10 +9,10 @@ vafunction:                             # @vafunction
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push48=, 0
-	i32.const	$push45=, 0
-	i32.load	$push46=, __stack_pointer($pop45)
+	i32.const	$push46=, 0
+	i32.load	$push45=, __stack_pointer($pop46)
 	i32.const	$push47=, 16
-	i32.sub 	$push53=, $pop46, $pop47
+	i32.sub 	$push53=, $pop45, $pop47
 	tee_local	$push52=, $5=, $pop53
 	i32.store	__stack_pointer($pop48), $pop52
 	i32.store	12($5), $2
@@ -116,16 +116,16 @@ vafunction:                             # @vafunction
 	i32.add 	$push50=, $5, $pop49
 	i32.store	__stack_pointer($pop51), $pop50
 	return
-.LBB0_12:                               # %if.then46
+.LBB0_12:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	vafunction, .Lfunc_end0-vafunction
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -133,10 +133,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push29=, 0
-	i32.const	$push26=, 0
-	i32.load	$push27=, __stack_pointer($pop26)
+	i32.const	$push27=, 0
+	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 80
-	i32.sub 	$push31=, $pop27, $pop28
+	i32.sub 	$push31=, $pop26, $pop28
 	tee_local	$push30=, $0=, $pop31
 	i32.store	__stack_pointer($pop29), $pop30
 	i32.const	$push0=, 64
@@ -180,8 +180,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-17.c.s b/test/torture-s/va-arg-17.c.s
index 2eb5d3f29..3effdb44e 100644
--- a/test/torture-s/va-arg-17.c.s
+++ b/test/torture-s/va-arg-17.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-17.c"
+	.file	"va-arg-17.c"
 	.section	.text.vafunction,"ax",@progbits
-	.hidden	vafunction
+	.hidden	vafunction              # -- Begin function vafunction
 	.globl	vafunction
 	.type	vafunction,@function
 vafunction:                             # @vafunction
@@ -9,13 +9,12 @@ vafunction:                             # @vafunction
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push43=, 0
-	i32.const	$push40=, 0
-	i32.load	$push41=, __stack_pointer($pop40)
+	i32.const	$push41=, 0
+	i32.load	$push40=, __stack_pointer($pop41)
 	i32.const	$push42=, 16
-	i32.sub 	$push52=, $pop41, $pop42
+	i32.sub 	$push52=, $pop40, $pop42
 	tee_local	$push51=, $4=, $pop52
 	i32.store	__stack_pointer($pop43), $pop51
-	i32.store	12($4), $1
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
@@ -107,16 +106,16 @@ vafunction:                             # @vafunction
 	i32.add 	$push45=, $4, $pop44
 	i32.store	__stack_pointer($pop46), $pop45
 	return
-.LBB0_10:                               # %if.then40
+.LBB0_10:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	vafunction, .Lfunc_end0-vafunction
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -124,10 +123,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push27=, 0
-	i32.const	$push24=, 0
-	i32.load	$push25=, __stack_pointer($pop24)
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 80
-	i32.sub 	$push29=, $pop25, $pop26
+	i32.sub 	$push29=, $pop24, $pop26
 	tee_local	$push28=, $0=, $pop29
 	i32.store	__stack_pointer($pop27), $pop28
 	i32.const	$push0=, 64
@@ -169,8 +168,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-18.c.s b/test/torture-s/va-arg-18.c.s
index 9340ff094..e46059983 100644
--- a/test/torture-s/va-arg-18.c.s
+++ b/test/torture-s/va-arg-18.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-18.c"
+	.file	"va-arg-18.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,13 +9,12 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop13, $pop14
+	i32.sub 	$push22=, $pop12, $pop14
 	tee_local	$push21=, $12=, $pop22
 	i32.store	__stack_pointer($pop15), $pop21
-	i32.store	12($12), $9
 	i32.const	$push0=, 4
 	i32.add 	$push20=, $9, $pop0
 	tee_local	$push19=, $10=, $pop20
@@ -48,16 +47,16 @@ f:                                      # @f
 	i32.add 	$push17=, $12, $pop16
 	i32.store	__stack_pointer($pop18), $pop17
 	return
-.LBB0_4:                                # %if.then10
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -65,10 +64,10 @@ main:                                   # @main
 	.local  	f64, i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $1=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i32.const	$push0=, 12
@@ -82,8 +81,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-19.c.s b/test/torture-s/va-arg-19.c.s
index d83e6bc62..e872908c5 100644
--- a/test/torture-s/va-arg-19.c.s
+++ b/test/torture-s/va-arg-19.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-19.c"
+	.file	"va-arg-19.c"
 	.section	.text.vafunction,"ax",@progbits
-	.hidden	vafunction
+	.hidden	vafunction              # -- Begin function vafunction
 	.globl	vafunction
 	.type	vafunction,@function
 vafunction:                             # @vafunction
@@ -9,13 +9,12 @@ vafunction:                             # @vafunction
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push40=, 0
-	i32.const	$push37=, 0
-	i32.load	$push38=, __stack_pointer($pop37)
+	i32.const	$push38=, 0
+	i32.load	$push37=, __stack_pointer($pop38)
 	i32.const	$push39=, 16
-	i32.sub 	$push47=, $pop38, $pop39
+	i32.sub 	$push47=, $pop37, $pop39
 	tee_local	$push46=, $4=, $pop47
 	i32.store	__stack_pointer($pop40), $pop46
-	i32.store	12($4), $1
 	i32.const	$push0=, 4
 	i32.add 	$push45=, $1, $pop0
 	tee_local	$push44=, $2=, $pop45
@@ -102,16 +101,16 @@ vafunction:                             # @vafunction
 	i32.add 	$push42=, $4, $pop41
 	i32.store	__stack_pointer($pop43), $pop42
 	return
-.LBB0_10:                               # %if.then40
+.LBB0_10:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	vafunction, .Lfunc_end0-vafunction
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -119,10 +118,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 48
-	i32.sub 	$push17=, $pop13, $pop14
+	i32.sub 	$push17=, $pop12, $pop14
 	tee_local	$push16=, $0=, $pop17
 	i32.store	__stack_pointer($pop15), $pop16
 	i32.const	$push0=, 32
@@ -148,8 +147,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-2.c.s b/test/torture-s/va-arg-2.c.s
index a632ec77a..00a38b022 100644
--- a/test/torture-s/va-arg-2.c.s
+++ b/test/torture-s/va-arg-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-2.c"
+	.file	"va-arg-2.c"
 	.section	.text.to_hex,"ax",@progbits
-	.hidden	to_hex
+	.hidden	to_hex                  # -- Begin function to_hex
 	.globl	to_hex
 	.type	to_hex,@function
 to_hex:                                 # @to_hex
@@ -24,1129 +24,1225 @@ to_hex:                                 # @to_hex
 	.endfunc
 .Lfunc_end0:
 	.size	to_hex, .Lfunc_end0-to_hex
-
+                                        # -- End function
 	.section	.text.f0,"ax",@progbits
-	.hidden	f0
+	.hidden	f0                      # -- Begin function f0
 	.globl	f0
 	.type	f0,@function
 f0:                                     # @f0
 	.param  	i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
-	tee_local	$push15=, $3=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
-	i32.store	12($3), $1
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $4=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($4), $1
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $0
-	i32.const	$push14=, 16
-	i32.ne  	$push1=, $pop0, $pop14
-	br_if   	0, $pop1        # 0: down to label1
-# BB#1:
-.LBB1_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $0
+	i32.const	$push2=, 16
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label1
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($0)
+	tee_local	$push18=, $1=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label2
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$0=, $0, $pop20
+	i32.load	$3=, 12($4)
+.LBB1_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.load8_u	$push18=, 0($0)
-	tee_local	$push17=, $1=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label2
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.load	$push24=, 12($3)
-	tee_local	$push23=, $2=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push2=, $pop23, $pop22
-	i32.store	12($3), $pop2
-	i32.load	$push21=, 0($2)
-	tee_local	$push20=, $2=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push3=, $pop20, $pop19
-	br_if   	2, $pop3        # 2: down to label1
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $3, $pop26
+	tee_local	$push24=, $2=, $pop25
+	i32.store	12($4), $pop24
+	i32.load	$push23=, 0($3)
+	tee_local	$push22=, $3=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label1
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$0=, $0, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push4=, $2, $pop25
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $1, $pop5
-	br_if   	0, $pop6        # 0: up to label3
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $3, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $1, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label1
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.load8_u	$1=, 0($0)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $0, $pop29
+	copy_local	$0=, $pop0
+	copy_local	$3=, $2
+	br_if   	0, $1           # 0: up to label3
 .LBB1_6:                                # %while.end
+	end_loop
 	end_block                       # label2:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $3, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $4, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB1_7:                                # %if.then.i
+.LBB1_7:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	f0, .Lfunc_end1-f0
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $4=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($4), $2
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $5=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($5), $2
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $1
-	i32.const	$push1=, 15
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label4
-# BB#1:
-.LBB2_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $1
+	i32.const	$push2=, 15
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label4
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($1)
+	tee_local	$push18=, $2=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label5
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$1=, $1, $pop20
+	i32.load	$4=, 12($5)
+.LBB2_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.load8_u	$push18=, 0($1)
-	tee_local	$push17=, $2=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label5
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB2_2 Depth=1
-	i32.load	$push24=, 12($4)
-	tee_local	$push23=, $3=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($4), $pop3
-	i32.load	$push21=, 0($3)
-	tee_local	$push20=, $3=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $4, $pop26
+	tee_local	$push24=, $3=, $pop25
+	i32.store	12($5), $pop24
+	i32.load	$push23=, 0($4)
+	tee_local	$push22=, $4=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label4
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB2_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$1=, $1, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $3, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $2, $pop6
-	br_if   	0, $pop7        # 0: up to label6
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB2_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $4, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $2, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label4
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB2_3 Depth=1
+	i32.load8_u	$2=, 0($1)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $1, $pop29
+	copy_local	$1=, $pop0
+	copy_local	$4=, $3
+	br_if   	0, $2           # 0: up to label6
 .LBB2_6:                                # %while.end
+	end_loop
 	end_block                       # label5:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $4, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $5, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB2_7:                                # %if.then.i
+.LBB2_7:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	f1, .Lfunc_end2-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $5=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($5), $3
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $6=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($6), $3
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $2
-	i32.const	$push1=, 14
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label7
-# BB#1:
-.LBB3_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $2
+	i32.const	$push2=, 14
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label7
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($2)
+	tee_local	$push18=, $3=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label8
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$2=, $2, $pop20
+	i32.load	$5=, 12($6)
+.LBB3_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.load8_u	$push18=, 0($2)
-	tee_local	$push17=, $3=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label8
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB3_2 Depth=1
-	i32.load	$push24=, 12($5)
-	tee_local	$push23=, $4=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($5), $pop3
-	i32.load	$push21=, 0($4)
-	tee_local	$push20=, $4=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $5, $pop26
+	tee_local	$push24=, $4=, $pop25
+	i32.store	12($6), $pop24
+	i32.load	$push23=, 0($5)
+	tee_local	$push22=, $5=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label7
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB3_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$2=, $2, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $4, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $3, $pop6
-	br_if   	0, $pop7        # 0: up to label9
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB3_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $5, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $3, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label7
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB3_3 Depth=1
+	i32.load8_u	$3=, 0($2)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $2, $pop29
+	copy_local	$2=, $pop0
+	copy_local	$5=, $4
+	br_if   	0, $3           # 0: up to label9
 .LBB3_6:                                # %while.end
+	end_loop
 	end_block                       # label8:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $5, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $6, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB3_7:                                # %if.then.i
+.LBB3_7:                                # %if.then
 	end_block                       # label7:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	f2, .Lfunc_end3-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $6=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($6), $4
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $7=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($7), $4
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $3
-	i32.const	$push1=, 13
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label10
-# BB#1:
-.LBB4_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $3
+	i32.const	$push2=, 13
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label10
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($3)
+	tee_local	$push18=, $4=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label11
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$3=, $3, $pop20
+	i32.load	$6=, 12($7)
+.LBB4_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	i32.load8_u	$push18=, 0($3)
-	tee_local	$push17=, $4=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label11
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB4_2 Depth=1
-	i32.load	$push24=, 12($6)
-	tee_local	$push23=, $5=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($6), $pop3
-	i32.load	$push21=, 0($5)
-	tee_local	$push20=, $5=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $6, $pop26
+	tee_local	$push24=, $5=, $pop25
+	i32.store	12($7), $pop24
+	i32.load	$push23=, 0($6)
+	tee_local	$push22=, $6=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label10
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB4_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$3=, $3, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $5, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $4, $pop6
-	br_if   	0, $pop7        # 0: up to label12
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB4_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $6, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $4, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label10
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB4_3 Depth=1
+	i32.load8_u	$4=, 0($3)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $3, $pop29
+	copy_local	$3=, $pop0
+	copy_local	$6=, $5
+	br_if   	0, $4           # 0: up to label12
 .LBB4_6:                                # %while.end
+	end_loop
 	end_block                       # label11:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $6, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $7, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB4_7:                                # %if.then.i
+.LBB4_7:                                # %if.then
 	end_block                       # label10:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	f3, .Lfunc_end4-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $7=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($7), $5
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $8=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($8), $5
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $4
-	i32.const	$push1=, 12
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label13
-# BB#1:
-.LBB5_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $4
+	i32.const	$push2=, 12
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label13
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($4)
+	tee_local	$push18=, $5=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label14
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$4=, $4, $pop20
+	i32.load	$7=, 12($8)
+.LBB5_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.load8_u	$push18=, 0($4)
-	tee_local	$push17=, $5=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label14
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB5_2 Depth=1
-	i32.load	$push24=, 12($7)
-	tee_local	$push23=, $6=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($7), $pop3
-	i32.load	$push21=, 0($6)
-	tee_local	$push20=, $6=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $7, $pop26
+	tee_local	$push24=, $6=, $pop25
+	i32.store	12($8), $pop24
+	i32.load	$push23=, 0($7)
+	tee_local	$push22=, $7=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label13
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB5_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$4=, $4, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $6, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $5, $pop6
-	br_if   	0, $pop7        # 0: up to label15
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB5_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $7, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $5, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label13
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB5_3 Depth=1
+	i32.load8_u	$5=, 0($4)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $4, $pop29
+	copy_local	$4=, $pop0
+	copy_local	$7=, $6
+	br_if   	0, $5           # 0: up to label15
 .LBB5_6:                                # %while.end
+	end_loop
 	end_block                       # label14:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $7, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $8, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB5_7:                                # %if.then.i
+.LBB5_7:                                # %if.then
 	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end5:
 	.size	f4, .Lfunc_end5-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $8=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($8), $6
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $9=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($9), $6
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $5
-	i32.const	$push1=, 11
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label16
-# BB#1:
-.LBB6_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $5
+	i32.const	$push2=, 11
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label16
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($5)
+	tee_local	$push18=, $6=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label17
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$5=, $5, $pop20
+	i32.load	$8=, 12($9)
+.LBB6_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.load8_u	$push18=, 0($5)
-	tee_local	$push17=, $6=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label17
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB6_2 Depth=1
-	i32.load	$push24=, 12($8)
-	tee_local	$push23=, $7=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($8), $pop3
-	i32.load	$push21=, 0($7)
-	tee_local	$push20=, $7=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $8, $pop26
+	tee_local	$push24=, $7=, $pop25
+	i32.store	12($9), $pop24
+	i32.load	$push23=, 0($8)
+	tee_local	$push22=, $8=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label16
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB6_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$5=, $5, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $7, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $6, $pop6
-	br_if   	0, $pop7        # 0: up to label18
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB6_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $8, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $6, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label16
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB6_3 Depth=1
+	i32.load8_u	$6=, 0($5)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $5, $pop29
+	copy_local	$5=, $pop0
+	copy_local	$8=, $7
+	br_if   	0, $6           # 0: up to label18
 .LBB6_6:                                # %while.end
+	end_loop
 	end_block                       # label17:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $8, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $9, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB6_7:                                # %if.then.i
+.LBB6_7:                                # %if.then
 	end_block                       # label16:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	f5, .Lfunc_end6-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $9=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($9), $7
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $10=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($10), $7
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $6
-	i32.const	$push1=, 10
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label19
-# BB#1:
-.LBB7_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $6
+	i32.const	$push2=, 10
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label19
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($6)
+	tee_local	$push18=, $7=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label20
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$6=, $6, $pop20
+	i32.load	$9=, 12($10)
+.LBB7_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label21:
-	i32.load8_u	$push18=, 0($6)
-	tee_local	$push17=, $7=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label20
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB7_2 Depth=1
-	i32.load	$push24=, 12($9)
-	tee_local	$push23=, $8=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($9), $pop3
-	i32.load	$push21=, 0($8)
-	tee_local	$push20=, $8=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $9, $pop26
+	tee_local	$push24=, $8=, $pop25
+	i32.store	12($10), $pop24
+	i32.load	$push23=, 0($9)
+	tee_local	$push22=, $9=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label19
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB7_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$6=, $6, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $8, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $7, $pop6
-	br_if   	0, $pop7        # 0: up to label21
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB7_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $9, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $7, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label19
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB7_3 Depth=1
+	i32.load8_u	$7=, 0($6)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $6, $pop29
+	copy_local	$6=, $pop0
+	copy_local	$9=, $8
+	br_if   	0, $7           # 0: up to label21
 .LBB7_6:                                # %while.end
+	end_loop
 	end_block                       # label20:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $9, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $10, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB7_7:                                # %if.then.i
+.LBB7_7:                                # %if.then
 	end_block                       # label19:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end7:
 	.size	f6, .Lfunc_end7-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $10=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($10), $8
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $11=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($11), $8
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $7
-	i32.const	$push1=, 9
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label22
-# BB#1:
-.LBB8_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $7
+	i32.const	$push2=, 9
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label22
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($7)
+	tee_local	$push18=, $8=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label23
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$7=, $7, $pop20
+	i32.load	$10=, 12($11)
+.LBB8_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label24:
-	i32.load8_u	$push18=, 0($7)
-	tee_local	$push17=, $8=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label23
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB8_2 Depth=1
-	i32.load	$push24=, 12($10)
-	tee_local	$push23=, $9=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($10), $pop3
-	i32.load	$push21=, 0($9)
-	tee_local	$push20=, $9=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $10, $pop26
+	tee_local	$push24=, $9=, $pop25
+	i32.store	12($11), $pop24
+	i32.load	$push23=, 0($10)
+	tee_local	$push22=, $10=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label22
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB8_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$7=, $7, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $9, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $8, $pop6
-	br_if   	0, $pop7        # 0: up to label24
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB8_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $10, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $8, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label22
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB8_3 Depth=1
+	i32.load8_u	$8=, 0($7)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $7, $pop29
+	copy_local	$7=, $pop0
+	copy_local	$10=, $9
+	br_if   	0, $8           # 0: up to label24
 .LBB8_6:                                # %while.end
+	end_loop
 	end_block                       # label23:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $10, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $11, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB8_7:                                # %if.then.i
+.LBB8_7:                                # %if.then
 	end_block                       # label22:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end8:
 	.size	f7, .Lfunc_end8-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $11=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($11), $9
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $12=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($12), $9
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $8
-	i32.const	$push1=, 8
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label25
-# BB#1:
-.LBB9_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $8
+	i32.const	$push2=, 8
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label25
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($8)
+	tee_local	$push18=, $9=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label26
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$8=, $8, $pop20
+	i32.load	$11=, 12($12)
+.LBB9_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label27:
-	i32.load8_u	$push18=, 0($8)
-	tee_local	$push17=, $9=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label26
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB9_2 Depth=1
-	i32.load	$push24=, 12($11)
-	tee_local	$push23=, $10=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($11), $pop3
-	i32.load	$push21=, 0($10)
-	tee_local	$push20=, $10=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $11, $pop26
+	tee_local	$push24=, $10=, $pop25
+	i32.store	12($12), $pop24
+	i32.load	$push23=, 0($11)
+	tee_local	$push22=, $11=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label25
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB9_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$8=, $8, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $10, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $9, $pop6
-	br_if   	0, $pop7        # 0: up to label27
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB9_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $11, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $9, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label25
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB9_3 Depth=1
+	i32.load8_u	$9=, 0($8)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $8, $pop29
+	copy_local	$8=, $pop0
+	copy_local	$11=, $10
+	br_if   	0, $9           # 0: up to label27
 .LBB9_6:                                # %while.end
+	end_loop
 	end_block                       # label26:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $11, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $12, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB9_7:                                # %if.then.i
+.LBB9_7:                                # %if.then
 	end_block                       # label25:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end9:
 	.size	f8, .Lfunc_end9-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $12=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($12), $10
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $13=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($13), $10
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $9
-	i32.const	$push1=, 7
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label28
-# BB#1:
-.LBB10_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $9
+	i32.const	$push2=, 7
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label28
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($9)
+	tee_local	$push18=, $10=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label29
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$9=, $9, $pop20
+	i32.load	$12=, 12($13)
+.LBB10_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label30:
-	i32.load8_u	$push18=, 0($9)
-	tee_local	$push17=, $10=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label29
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB10_2 Depth=1
-	i32.load	$push24=, 12($12)
-	tee_local	$push23=, $11=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($12), $pop3
-	i32.load	$push21=, 0($11)
-	tee_local	$push20=, $11=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $12, $pop26
+	tee_local	$push24=, $11=, $pop25
+	i32.store	12($13), $pop24
+	i32.load	$push23=, 0($12)
+	tee_local	$push22=, $12=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label28
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB10_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$9=, $9, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $11, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $10, $pop6
-	br_if   	0, $pop7        # 0: up to label30
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB10_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $12, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $10, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label28
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB10_3 Depth=1
+	i32.load8_u	$10=, 0($9)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $9, $pop29
+	copy_local	$9=, $pop0
+	copy_local	$12=, $11
+	br_if   	0, $10          # 0: up to label30
 .LBB10_6:                               # %while.end
+	end_loop
 	end_block                       # label29:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $12, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $13, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB10_7:                               # %if.then.i
+.LBB10_7:                               # %if.then
 	end_block                       # label28:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	f9, .Lfunc_end10-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $13=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($13), $11
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $14=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($14), $11
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $10
-	i32.const	$push1=, 6
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label31
-# BB#1:
-.LBB11_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $10
+	i32.const	$push2=, 6
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label31
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($10)
+	tee_local	$push18=, $11=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label32
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$10=, $10, $pop20
+	i32.load	$13=, 12($14)
+.LBB11_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label33:
-	i32.load8_u	$push18=, 0($10)
-	tee_local	$push17=, $11=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label32
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB11_2 Depth=1
-	i32.load	$push24=, 12($13)
-	tee_local	$push23=, $12=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($13), $pop3
-	i32.load	$push21=, 0($12)
-	tee_local	$push20=, $12=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $13, $pop26
+	tee_local	$push24=, $12=, $pop25
+	i32.store	12($14), $pop24
+	i32.load	$push23=, 0($13)
+	tee_local	$push22=, $13=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label31
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB11_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$10=, $10, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $12, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $11, $pop6
-	br_if   	0, $pop7        # 0: up to label33
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB11_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $13, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $11, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label31
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB11_3 Depth=1
+	i32.load8_u	$11=, 0($10)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $10, $pop29
+	copy_local	$10=, $pop0
+	copy_local	$13=, $12
+	br_if   	0, $11          # 0: up to label33
 .LBB11_6:                               # %while.end
+	end_loop
 	end_block                       # label32:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $13, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $14, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB11_7:                               # %if.then.i
+.LBB11_7:                               # %if.then
 	end_block                       # label31:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end11:
 	.size	f10, .Lfunc_end11-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $14=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($14), $12
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $15=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($15), $12
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $11
-	i32.const	$push1=, 5
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label34
-# BB#1:
-.LBB12_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $11
+	i32.const	$push2=, 5
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label34
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($11)
+	tee_local	$push18=, $12=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label35
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$11=, $11, $pop20
+	i32.load	$14=, 12($15)
+.LBB12_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label36:
-	i32.load8_u	$push18=, 0($11)
-	tee_local	$push17=, $12=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label35
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB12_2 Depth=1
-	i32.load	$push24=, 12($14)
-	tee_local	$push23=, $13=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($14), $pop3
-	i32.load	$push21=, 0($13)
-	tee_local	$push20=, $13=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $14, $pop26
+	tee_local	$push24=, $13=, $pop25
+	i32.store	12($15), $pop24
+	i32.load	$push23=, 0($14)
+	tee_local	$push22=, $14=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label34
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB12_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$11=, $11, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $13, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $12, $pop6
-	br_if   	0, $pop7        # 0: up to label36
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB12_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $14, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $12, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label34
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB12_3 Depth=1
+	i32.load8_u	$12=, 0($11)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $11, $pop29
+	copy_local	$11=, $pop0
+	copy_local	$14=, $13
+	br_if   	0, $12          # 0: up to label36
 .LBB12_6:                               # %while.end
+	end_loop
 	end_block                       # label35:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $14, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $15, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB12_7:                               # %if.then.i
+.LBB12_7:                               # %if.then
 	end_block                       # label34:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	f11, .Lfunc_end12-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
-	tee_local	$push15=, $15=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
-	i32.store	12($15), $13
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $16=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($16), $13
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $12
-	i32.const	$push14=, 4
-	i32.ne  	$push1=, $pop0, $pop14
-	br_if   	0, $pop1        # 0: down to label37
-# BB#1:
-.LBB13_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $12
+	i32.const	$push2=, 4
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label37
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($12)
+	tee_local	$push18=, $13=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label38
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$12=, $12, $pop20
+	i32.load	$15=, 12($16)
+.LBB13_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label39:
-	i32.load8_u	$push18=, 0($12)
-	tee_local	$push17=, $13=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label38
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB13_2 Depth=1
-	i32.load	$push24=, 12($15)
-	tee_local	$push23=, $14=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push2=, $pop23, $pop22
-	i32.store	12($15), $pop2
-	i32.load	$push21=, 0($14)
-	tee_local	$push20=, $14=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push3=, $pop20, $pop19
-	br_if   	2, $pop3        # 2: down to label37
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $15, $pop26
+	tee_local	$push24=, $14=, $pop25
+	i32.store	12($16), $pop24
+	i32.load	$push23=, 0($15)
+	tee_local	$push22=, $15=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label37
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB13_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$12=, $12, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push4=, $14, $pop25
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $13, $pop5
-	br_if   	0, $pop6        # 0: up to label39
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB13_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $15, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $13, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label37
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB13_3 Depth=1
+	i32.load8_u	$13=, 0($12)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $12, $pop29
+	copy_local	$12=, $pop0
+	copy_local	$15=, $14
+	br_if   	0, $13          # 0: up to label39
 .LBB13_6:                               # %while.end
+	end_loop
 	end_block                       # label38:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $15, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $16, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB13_7:                               # %if.then.i
+.LBB13_7:                               # %if.then
 	end_block                       # label37:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end13:
 	.size	f12, .Lfunc_end13-f12
-
+                                        # -- End function
 	.section	.text.f13,"ax",@progbits
-	.hidden	f13
+	.hidden	f13                     # -- Begin function f13
 	.globl	f13
 	.type	f13,@function
 f13:                                    # @f13
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $16=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($16), $14
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $17=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($17), $14
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $13
-	i32.const	$push1=, 3
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label40
-# BB#1:
-.LBB14_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $13
+	i32.const	$push2=, 3
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label40
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($13)
+	tee_local	$push18=, $14=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label41
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$13=, $13, $pop20
+	i32.load	$16=, 12($17)
+.LBB14_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label42:
-	i32.load8_u	$push18=, 0($13)
-	tee_local	$push17=, $14=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label41
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB14_2 Depth=1
-	i32.load	$push24=, 12($16)
-	tee_local	$push23=, $15=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($16), $pop3
-	i32.load	$push21=, 0($15)
-	tee_local	$push20=, $15=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $16, $pop26
+	tee_local	$push24=, $15=, $pop25
+	i32.store	12($17), $pop24
+	i32.load	$push23=, 0($16)
+	tee_local	$push22=, $16=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label40
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB14_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$13=, $13, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $15, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $14, $pop6
-	br_if   	0, $pop7        # 0: up to label42
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB14_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $16, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $14, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label40
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB14_3 Depth=1
+	i32.load8_u	$14=, 0($13)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $13, $pop29
+	copy_local	$13=, $pop0
+	copy_local	$16=, $15
+	br_if   	0, $14          # 0: up to label42
 .LBB14_6:                               # %while.end
+	end_loop
 	end_block                       # label41:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $16, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $17, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB14_7:                               # %if.then.i
+.LBB14_7:                               # %if.then
 	end_block                       # label40:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end14:
 	.size	f13, .Lfunc_end14-f13
-
+                                        # -- End function
 	.section	.text.f14,"ax",@progbits
-	.hidden	f14
+	.hidden	f14                     # -- Begin function f14
 	.globl	f14
 	.type	f14,@function
 f14:                                    # @f14
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push8=, 0
-	i32.load	$push9=, __stack_pointer($pop8)
-	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop9, $pop10
-	tee_local	$push15=, $17=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
-	i32.store	12($17), $15
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $18=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($18), $15
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $14
-	i32.const	$push1=, 2
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label43
-# BB#1:
-.LBB15_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $14
+	i32.const	$push2=, 2
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label43
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($14)
+	tee_local	$push18=, $15=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label44
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$14=, $14, $pop20
+	i32.load	$17=, 12($18)
+.LBB15_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label45:
-	i32.load8_u	$push18=, 0($14)
-	tee_local	$push17=, $15=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label44
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB15_2 Depth=1
-	i32.load	$push24=, 12($17)
-	tee_local	$push23=, $16=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push3=, $pop23, $pop22
-	i32.store	12($17), $pop3
-	i32.load	$push21=, 0($16)
-	tee_local	$push20=, $16=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push4=, $pop20, $pop19
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $17, $pop26
+	tee_local	$push24=, $16=, $pop25
+	i32.store	12($18), $pop24
+	i32.load	$push23=, 0($17)
+	tee_local	$push22=, $17=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
 	br_if   	2, $pop4        # 2: down to label43
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB15_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$14=, $14, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push5=, $16, $pop25
-	i32.load8_u	$push6=, 0($pop5)
-	i32.eq  	$push7=, $15, $pop6
-	br_if   	0, $pop7        # 0: up to label45
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB15_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $17, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $15, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label43
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB15_3 Depth=1
+	i32.load8_u	$15=, 0($14)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $14, $pop29
+	copy_local	$14=, $pop0
+	copy_local	$17=, $16
+	br_if   	0, $15          # 0: up to label45
 .LBB15_6:                               # %while.end
+	end_loop
 	end_block                       # label44:
-	i32.const	$push14=, 0
-	i32.const	$push12=, 16
-	i32.add 	$push13=, $17, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $18, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB15_7:                               # %if.then.i
+.LBB15_7:                               # %if.then
 	end_block                       # label43:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end15:
 	.size	f14, .Lfunc_end15-f14
-
+                                        # -- End function
 	.section	.text.f15,"ax",@progbits
-	.hidden	f15
+	.hidden	f15                     # -- Begin function f15
 	.globl	f15
 	.type	f15,@function
 f15:                                    # @f15
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-	.local  	i32, i32
+	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop8, $pop9
-	tee_local	$push15=, $18=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
-	i32.store	12($18), $16
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $19=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
+	i32.store	12($19), $16
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $15
-	i32.const	$push14=, 1
-	i32.ne  	$push1=, $pop0, $pop14
-	br_if   	0, $pop1        # 0: down to label46
-# BB#1:
-.LBB16_2:                               # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $15
+	i32.const	$push2=, 1
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label46
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push19=, 0($15)
+	tee_local	$push18=, $16=, $pop19
+	i32.eqz 	$push30=, $pop18
+	br_if   	0, $pop30       # 0: down to label47
+# BB#2:                                 # %while.body.lr.ph
+	i32.const	$push20=, 1
+	i32.add 	$15=, $15, $pop20
+	i32.load	$18=, 12($19)
+.LBB16_3:                               # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label48:
-	i32.load8_u	$push18=, 0($15)
-	tee_local	$push17=, $16=, $pop18
-	i32.eqz 	$push27=, $pop17
-	br_if   	1, $pop27       # 1: down to label47
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB16_2 Depth=1
-	i32.load	$push24=, 12($18)
-	tee_local	$push23=, $17=, $pop24
-	i32.const	$push22=, 4
-	i32.add 	$push2=, $pop23, $pop22
-	i32.store	12($18), $pop2
-	i32.load	$push21=, 0($17)
-	tee_local	$push20=, $17=, $pop21
-	i32.const	$push19=, 16
-	i32.ge_u	$push3=, $pop20, $pop19
-	br_if   	2, $pop3        # 2: down to label46
+	i32.const	$push26=, 4
+	i32.add 	$push25=, $18, $pop26
+	tee_local	$push24=, $17=, $pop25
+	i32.store	12($19), $pop24
+	i32.load	$push23=, 0($18)
+	tee_local	$push22=, $18=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label46
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB16_2 Depth=1
-	i32.const	$push26=, 1
-	i32.add 	$15=, $15, $pop26
-	i32.const	$push25=, .L.str
-	i32.add 	$push4=, $17, $pop25
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $16, $pop5
-	br_if   	0, $pop6        # 0: up to label48
-# BB#5:                                 # %if.then5
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB16_3 Depth=1
+	i32.const	$push28=, .L.str
+	i32.add 	$push6=, $18, $pop28
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push27=, 255
+	i32.and 	$push5=, $16, $pop27
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label46
+# BB#5:                                 # %while.cond
+                                        #   in Loop: Header=BB16_3 Depth=1
+	i32.load8_u	$16=, 0($15)
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $15, $pop29
+	copy_local	$15=, $pop0
+	copy_local	$18=, $17
+	br_if   	0, $16          # 0: up to label48
 .LBB16_6:                               # %while.end
+	end_loop
 	end_block                       # label47:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $18, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $19, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB16_7:                               # %if.then.i
+.LBB16_7:                               # %if.then
 	end_block                       # label46:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end16:
 	.size	f15, .Lfunc_end16-f15
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1154,10 +1250,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push84=, 0
-	i32.const	$push81=, 0
-	i32.load	$push82=, __stack_pointer($pop81)
+	i32.const	$push82=, 0
+	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop82, $pop83
+	i32.sub 	$push292=, $pop81, $pop83
 	tee_local	$push291=, $0=, $pop292
 	i32.store	__stack_pointer($pop84), $pop291
 	i32.const	$push85=, 576
@@ -1540,7 +1636,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end17:
 	.size	main, .Lfunc_end17-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.16,"aMS",@progbits,1
 	.p2align	4
@@ -1549,7 +1645,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	strlen, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-20.c.s b/test/torture-s/va-arg-20.c.s
index 7977e57fa..bdd52f12b 100644
--- a/test/torture-s/va-arg-20.c.s
+++ b/test/torture-s/va-arg-20.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-20.c"
+	.file	"va-arg-20.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -25,9 +25,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -35,10 +35,10 @@ bar:                                    # @bar
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
+	i32.sub 	$push15=, $pop7, $pop9
 	tee_local	$push14=, $3=, $pop15
 	i32.store	__stack_pointer($pop10), $pop14
 	i32.store	12($3), $2
@@ -64,9 +64,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -74,10 +74,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push9=, $pop3, $pop4
+	i32.sub 	$push9=, $pop2, $pop4
 	tee_local	$push8=, $0=, $pop9
 	i32.store	__stack_pointer($pop5), $pop8
 	i64.const	$push0=, 16
@@ -91,8 +91,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-21.c.s b/test/torture-s/va-arg-21.c.s
index 8eec1d68f..e2f41785d 100644
--- a/test/torture-s/va-arg-21.c.s
+++ b/test/torture-s/va-arg-21.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-21.c"
+	.file	"va-arg-21.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push5=, 0
-	i32.const	$push2=, 0
-	i32.load	$push3=, __stack_pointer($pop2)
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop3, $pop4
+	i32.sub 	$push7=, $pop2, $pop4
 	tee_local	$push6=, $0=, $pop7
 	i32.store	__stack_pointer($pop5), $pop6
 	i32.const	$push0=, .L.str.1
@@ -24,9 +24,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.doit,"ax",@progbits
-	.type	doit,@function
+	.type	doit,@function          # -- Begin function doit
 doit:                                   # @doit
 	.param  	i32, i32
 	.local  	i32, i32
@@ -53,7 +53,7 @@ doit:                                   # @doit
 	.endfunc
 .Lfunc_end1:
 	.size	doit, .Lfunc_end1-doit
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -66,7 +66,7 @@ doit:                                   # @doit
 	.size	.L.str.1, 13
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
 	.functype	malloc, i32, i32
 	.functype	vprintf, i32, i32, i32
diff --git a/test/torture-s/va-arg-22.c.s b/test/torture-s/va-arg-22.c.s
index 4bbb1b14c..7a2592349 100644
--- a/test/torture-s/va-arg-22.c.s
+++ b/test/torture-s/va-arg-22.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-22.c"
+	.file	"va-arg-22.c"
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -44,2397 +44,2084 @@ bar:                                    # @bar
 	i32.add 	$push11=, $3, $pop10
 	i32.store	bar.lastc($pop12), $pop11
 	return
-.LBB0_5:                                # %if.then7
+.LBB0_5:                                # %if.then2
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
-
+                                        # -- End function
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32
+	.local  	i64, i32, i32, i32, i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push504=, 0
-	i32.const	$push501=, 0
-	i32.load	$push502=, __stack_pointer($pop501)
-	i32.const	$push503=, 352
-	i32.sub 	$push575=, $pop502, $pop503
-	tee_local	$push574=, $9=, $pop575
-	i32.store	__stack_pointer($pop504), $pop574
-	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	block   	
-	block   	
+	i32.const	$push471=, 0
+	i32.const	$push469=, 0
+	i32.load	$push468=, __stack_pointer($pop469)
+	i32.const	$push470=, 352
+	i32.sub 	$push532=, $pop468, $pop470
+	tee_local	$push531=, $9=, $pop532
+	i32.store	__stack_pointer($pop471), $pop531
 	block   	
-	block   	
-	i32.const	$push0=, 21
-	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label10
+	i32.const	$push14=, 21
+	i32.ne  	$push15=, $0, $pop14
+	br_if   	0, $pop15       # 0: down to label2
 # BB#1:                                 # %if.end
-	i32.store	4($9), $1
-	i32.const	$push2=, 4
-	i32.add 	$push3=, $1, $pop2
-	i32.store	4($9), $pop3
-	i32.const	$push4=, 0
-	i32.load	$0=, bar.lastc($pop4)
+	i32.store	12($9), $1
+	i32.const	$push16=, 4
+	i32.add 	$push17=, $1, $pop16
+	i32.store	12($9), $pop17
+	i32.const	$push18=, 0
+	i32.load	$0=, bar.lastc($pop18)
 	i32.load8_s	$8=, 0($1)
 	block   	
-	i32.const	$push578=, 0
-	i32.load	$push577=, bar.lastn($pop578)
-	tee_local	$push576=, $2=, $pop577
-	i32.const	$push5=, 1
-	i32.eq  	$push6=, $pop576, $pop5
-	br_if   	0, $pop6        # 0: down to label11
+	i32.const	$push535=, 0
+	i32.load	$push534=, bar.lastn($pop535)
+	tee_local	$push533=, $3=, $pop534
+	i32.const	$push19=, 1
+	i32.eq  	$push20=, $pop533, $pop19
+	br_if   	0, $pop20       # 0: down to label3
 # BB#2:                                 # %if.then.i
-	i32.ne  	$push7=, $0, $2
-	br_if   	1, $pop7        # 1: down to label10
+	i32.ne  	$push21=, $0, $3
+	br_if   	1, $pop21       # 1: down to label2
 # BB#3:                                 # %if.end.i
 	i32.const	$0=, 0
-	i32.const	$push581=, 0
-	i32.const	$push8=, 1
-	i32.store	bar.lastn($pop581), $pop8
-	i32.const	$push580=, 0
-	i32.const	$push579=, 0
-	i32.store	bar.lastc($pop580), $pop579
+	i32.const	$push538=, 0
+	i32.const	$push22=, 1
+	i32.store	bar.lastn($pop538), $pop22
+	i32.const	$push537=, 0
+	i32.const	$push536=, 0
+	i32.store	bar.lastc($pop537), $pop536
 .LBB1_4:                                # %if.end3.i
-	end_block                       # label11:
-	i32.const	$push9=, 24
-	i32.shl 	$push10=, $0, $pop9
-	i32.const	$push583=, 24
-	i32.shr_s	$push11=, $pop10, $pop583
-	i32.const	$push582=, 8
-	i32.xor 	$push12=, $pop11, $pop582
-	i32.ne  	$push13=, $pop12, $8
-	br_if   	0, $pop13       # 0: down to label10
+	end_block                       # label3:
+	i32.const	$push23=, 24
+	i32.shl 	$push24=, $0, $pop23
+	i32.const	$push540=, 24
+	i32.shr_s	$push25=, $pop24, $pop540
+	i32.const	$push539=, 8
+	i32.xor 	$push26=, $pop25, $pop539
+	i32.ne  	$push27=, $pop26, $8
+	br_if   	0, $pop27       # 0: down to label2
 # BB#5:                                 # %if.then.i312
-	i32.const	$push587=, 0
-	i32.const	$push14=, 1
-	i32.add 	$push15=, $0, $pop14
-	i32.store	bar.lastc($pop587), $pop15
-	i32.const	$push586=, 8
-	i32.add 	$push585=, $1, $pop586
-	tee_local	$push584=, $8=, $pop585
-	i32.store	4($9), $pop584
-	br_if   	0, $0           # 0: down to label10
+	i32.const	$push544=, 0
+	i32.const	$push28=, 1
+	i32.add 	$push29=, $0, $pop28
+	i32.store	bar.lastc($pop544), $pop29
+	i32.const	$push543=, 8
+	i32.add 	$push542=, $1, $pop543
+	tee_local	$push541=, $8=, $pop542
+	i32.store	12($9), $pop541
+	br_if   	0, $0           # 0: down to label2
 # BB#6:                                 # %if.end3.i319
-	i32.const	$push16=, 4
-	i32.add 	$push17=, $1, $pop16
-	i32.load16_u	$0=, 0($pop17):p2align=0
-	i32.const	$push590=, 0
-	i32.const	$push18=, 2
-	i32.store	bar.lastn($pop590), $pop18
-	i32.const	$push589=, 0
-	i32.const	$push588=, 0
-	i32.store	bar.lastc($pop589), $pop588
-	i32.const	$push19=, 255
-	i32.and 	$push20=, $0, $pop19
-	i32.const	$push21=, 16
-	i32.ne  	$push22=, $pop20, $pop21
-	br_if   	0, $pop22       # 0: down to label10
+	i32.const	$push30=, 4
+	i32.add 	$push31=, $1, $pop30
+	i32.load16_u	$0=, 0($pop31):p2align=0
+	i32.const	$push547=, 0
+	i32.const	$push32=, 2
+	i32.store	bar.lastn($pop547), $pop32
+	i32.const	$push546=, 0
+	i32.const	$push545=, 0
+	i32.store	bar.lastc($pop546), $pop545
+	i32.const	$push33=, 255
+	i32.and 	$push34=, $0, $pop33
+	i32.const	$push35=, 16
+	i32.ne  	$push36=, $pop34, $pop35
+	br_if   	0, $pop36       # 0: down to label2
 # BB#7:                                 # %if.end3.i319.1
-	i32.const	$push591=, 0
-	i32.const	$push23=, 1
-	i32.store	bar.lastc($pop591), $pop23
-	i32.const	$push24=, 65280
-	i32.and 	$push25=, $0, $pop24
-	i32.const	$push26=, 4352
-	i32.ne  	$push27=, $pop25, $pop26
-	br_if   	0, $pop27       # 0: down to label10
+	i32.const	$push548=, 0
+	i32.const	$push37=, 1
+	i32.store	bar.lastc($pop548), $pop37
+	i32.const	$push38=, 65280
+	i32.and 	$push39=, $0, $pop38
+	i32.const	$push40=, 4352
+	i32.ne  	$push41=, $pop39, $pop40
+	br_if   	0, $pop41       # 0: down to label2
 # BB#8:                                 # %if.end3.i333
-	i32.const	$push28=, 12
-	i32.add 	$push29=, $1, $pop28
-	i32.store	4($9), $pop29
-	i32.load16_u	$push30=, 0($8):p2align=0
-	i32.store16	344($9), $pop30
-	i32.const	$push31=, 2
-	i32.add 	$push32=, $8, $pop31
-	i32.load8_u	$push33=, 0($pop32)
-	i32.store8	346($9), $pop33
-	i32.load8_u	$0=, 344($9)
-	i32.const	$push594=, 0
-	i32.const	$push593=, 0
-	i32.store	bar.lastc($pop594), $pop593
-	i32.const	$push592=, 0
-	i32.const	$push34=, 3
-	i32.store	bar.lastn($pop592), $pop34
-	i32.const	$push35=, 24
-	i32.ne  	$push36=, $0, $pop35
-	br_if   	8, $pop36       # 8: down to label2
+	i32.const	$push551=, 0
+	i32.const	$push42=, 3
+	i32.store	bar.lastn($pop551), $pop42
+	i32.load16_u	$push43=, 0($8):p2align=0
+	i32.store16	344($9), $pop43
+	i32.const	$push550=, 0
+	i32.const	$push549=, 0
+	i32.store	bar.lastc($pop550), $pop549
+	i32.const	$push44=, 12
+	i32.add 	$push45=, $1, $pop44
+	i32.store	12($9), $pop45
+	i32.const	$push46=, 2
+	i32.add 	$push47=, $8, $pop46
+	i32.load8_u	$push48=, 0($pop47)
+	i32.store8	346($9), $pop48
+	i32.load8_u	$push50=, 344($9)
+	i32.const	$push49=, 24
+	i32.ne  	$push51=, $pop50, $pop49
+	br_if   	0, $pop51       # 0: down to label2
 # BB#9:                                 # %if.end3.i333.1
-	i32.const	$push595=, 0
-	i32.const	$push37=, 1
-	i32.store	bar.lastc($pop595), $pop37
-	i32.load8_u	$push39=, 345($9)
-	i32.const	$push38=, 25
-	i32.ne  	$push40=, $pop39, $pop38
-	br_if   	8, $pop40       # 8: down to label2
+	i32.const	$push552=, 0
+	i32.const	$push52=, 1
+	i32.store	bar.lastc($pop552), $pop52
+	i32.load8_u	$push54=, 345($9)
+	i32.const	$push53=, 25
+	i32.ne  	$push55=, $pop54, $pop53
+	br_if   	0, $pop55       # 0: down to label2
 # BB#10:                                # %if.end3.i333.2
-	i32.const	$push596=, 0
-	i32.const	$push41=, 2
-	i32.store	bar.lastc($pop596), $pop41
-	i32.load8_u	$push43=, 346($9)
-	i32.const	$push42=, 26
-	i32.ne  	$push44=, $pop43, $pop42
-	br_if   	8, $pop44       # 8: down to label2
+	i32.const	$push553=, 0
+	i32.const	$push56=, 2
+	i32.store	bar.lastc($pop553), $pop56
+	i32.load8_u	$push58=, 346($9)
+	i32.const	$push57=, 26
+	i32.ne  	$push59=, $pop58, $pop57
+	br_if   	0, $pop59       # 0: down to label2
 # BB#11:                                # %if.end3.i347
-	i32.const	$push45=, 16
-	i32.add 	$push601=, $1, $pop45
-	tee_local	$push600=, $8=, $pop601
-	i32.store	4($9), $pop600
-	i32.const	$push46=, 12
-	i32.add 	$push47=, $1, $pop46
-	i32.load	$0=, 0($pop47):p2align=0
-	i32.const	$push599=, 0
-	i32.const	$push48=, 4
-	i32.store	bar.lastn($pop599), $pop48
-	i32.const	$push598=, 0
-	i32.const	$push597=, 0
-	i32.store	bar.lastc($pop598), $pop597
-	i32.const	$push49=, 255
-	i32.and 	$push50=, $0, $pop49
-	i32.const	$push51=, 32
-	i32.ne  	$push52=, $pop50, $pop51
-	br_if   	7, $pop52       # 7: down to label3
+	i32.const	$push60=, 16
+	i32.add 	$push558=, $1, $pop60
+	tee_local	$push557=, $8=, $pop558
+	i32.store	12($9), $pop557
+	i32.const	$push61=, 12
+	i32.add 	$push62=, $1, $pop61
+	i32.load	$0=, 0($pop62):p2align=0
+	i32.const	$push556=, 0
+	i32.const	$push63=, 4
+	i32.store	bar.lastn($pop556), $pop63
+	i32.const	$push555=, 0
+	i32.const	$push554=, 0
+	i32.store	bar.lastc($pop555), $pop554
+	i32.const	$push64=, 255
+	i32.and 	$push65=, $0, $pop64
+	i32.const	$push66=, 32
+	i32.ne  	$push67=, $pop65, $pop66
+	br_if   	0, $pop67       # 0: down to label2
 # BB#12:                                # %if.end3.i347.1
-	i32.const	$push602=, 0
-	i32.const	$push53=, 1
-	i32.store	bar.lastc($pop602), $pop53
-	i32.const	$push54=, 65280
-	i32.and 	$push55=, $0, $pop54
-	i32.const	$push56=, 8448
-	i32.ne  	$push57=, $pop55, $pop56
-	br_if   	7, $pop57       # 7: down to label3
+	i32.const	$push559=, 0
+	i32.const	$push68=, 1
+	i32.store	bar.lastc($pop559), $pop68
+	i32.const	$push69=, 65280
+	i32.and 	$push70=, $0, $pop69
+	i32.const	$push71=, 8448
+	i32.ne  	$push72=, $pop70, $pop71
+	br_if   	0, $pop72       # 0: down to label2
 # BB#13:                                # %if.end3.i347.2
-	i32.const	$push603=, 0
-	i32.const	$push58=, 2
-	i32.store	bar.lastc($pop603), $pop58
-	i32.const	$push59=, 16711680
-	i32.and 	$push60=, $0, $pop59
-	i32.const	$push61=, 2228224
-	i32.ne  	$push62=, $pop60, $pop61
-	br_if   	7, $pop62       # 7: down to label3
+	i32.const	$push560=, 0
+	i32.const	$push73=, 2
+	i32.store	bar.lastc($pop560), $pop73
+	i32.const	$push74=, 16711680
+	i32.and 	$push75=, $0, $pop74
+	i32.const	$push76=, 2228224
+	i32.ne  	$push77=, $pop75, $pop76
+	br_if   	0, $pop77       # 0: down to label2
 # BB#14:                                # %if.end3.i347.3
-	i32.const	$push604=, 0
-	i32.const	$push63=, 3
-	i32.store	bar.lastc($pop604), $pop63
-	i32.const	$push64=, -16777216
-	i32.and 	$push65=, $0, $pop64
-	i32.const	$push66=, 587202560
-	i32.ne  	$push67=, $pop65, $pop66
-	br_if   	7, $pop67       # 7: down to label3
+	i32.const	$push561=, 0
+	i32.const	$push78=, 3
+	i32.store	bar.lastc($pop561), $pop78
+	i32.const	$push79=, -16777216
+	i32.and 	$push80=, $0, $pop79
+	i32.const	$push81=, 587202560
+	i32.ne  	$push82=, $pop80, $pop81
+	br_if   	0, $pop82       # 0: down to label2
 # BB#15:                                # %if.end3.i361
-	i32.const	$push68=, 24
-	i32.add 	$push609=, $1, $pop68
-	tee_local	$push608=, $2=, $pop609
-	i32.store	4($9), $pop608
-	i32.load	$push69=, 0($8):p2align=0
-	i32.store	336($9), $pop69
-	i32.const	$push70=, 4
-	i32.add 	$push71=, $8, $pop70
-	i32.load8_u	$push72=, 0($pop71)
-	i32.store8	340($9), $pop72
-	i32.load8_u	$0=, 336($9)
-	i32.const	$push607=, 0
-	i32.const	$push606=, 0
-	i32.store	bar.lastc($pop607), $pop606
-	i32.const	$push605=, 0
-	i32.const	$push73=, 5
-	i32.store	bar.lastn($pop605), $pop73
-	i32.const	$push74=, 40
-	i32.ne  	$push75=, $0, $pop74
-	br_if   	6, $pop75       # 6: down to label4
+	i32.const	$push566=, 0
+	i32.const	$push83=, 5
+	i32.store	bar.lastn($pop566), $pop83
+	i32.load	$push84=, 0($8):p2align=0
+	i32.store	336($9), $pop84
+	i32.const	$push565=, 0
+	i32.const	$push564=, 0
+	i32.store	bar.lastc($pop565), $pop564
+	i32.const	$push85=, 24
+	i32.add 	$push563=, $1, $pop85
+	tee_local	$push562=, $3=, $pop563
+	i32.store	12($9), $pop562
+	i32.const	$push86=, 4
+	i32.add 	$push87=, $8, $pop86
+	i32.load8_u	$push88=, 0($pop87)
+	i32.store8	340($9), $pop88
+	i32.load8_u	$push90=, 336($9)
+	i32.const	$push89=, 40
+	i32.ne  	$push91=, $pop90, $pop89
+	br_if   	0, $pop91       # 0: down to label2
 # BB#16:                                # %if.end3.i361.1
-	i32.const	$push610=, 0
-	i32.const	$push76=, 1
-	i32.store	bar.lastc($pop610), $pop76
-	i32.load8_u	$push78=, 337($9)
-	i32.const	$push77=, 41
-	i32.ne  	$push79=, $pop78, $pop77
-	br_if   	6, $pop79       # 6: down to label4
+	i32.const	$push567=, 0
+	i32.const	$push92=, 1
+	i32.store	bar.lastc($pop567), $pop92
+	i32.load8_u	$push94=, 337($9)
+	i32.const	$push93=, 41
+	i32.ne  	$push95=, $pop94, $pop93
+	br_if   	0, $pop95       # 0: down to label2
 # BB#17:                                # %if.end3.i361.2
-	i32.const	$push611=, 0
-	i32.const	$push80=, 2
-	i32.store	bar.lastc($pop611), $pop80
-	i32.load8_u	$push82=, 338($9)
-	i32.const	$push81=, 42
-	i32.ne  	$push83=, $pop82, $pop81
-	br_if   	6, $pop83       # 6: down to label4
+	i32.const	$push568=, 0
+	i32.const	$push96=, 2
+	i32.store	bar.lastc($pop568), $pop96
+	i32.load8_u	$push98=, 338($9)
+	i32.const	$push97=, 42
+	i32.ne  	$push99=, $pop98, $pop97
+	br_if   	0, $pop99       # 0: down to label2
 # BB#18:                                # %if.end3.i361.3
-	i32.const	$push612=, 0
-	i32.const	$push84=, 3
-	i32.store	bar.lastc($pop612), $pop84
-	i32.load8_u	$push86=, 339($9)
-	i32.const	$push85=, 43
-	i32.ne  	$push87=, $pop86, $pop85
-	br_if   	6, $pop87       # 6: down to label4
+	i32.const	$push569=, 0
+	i32.const	$push100=, 3
+	i32.store	bar.lastc($pop569), $pop100
+	i32.load8_u	$push102=, 339($9)
+	i32.const	$push101=, 43
+	i32.ne  	$push103=, $pop102, $pop101
+	br_if   	0, $pop103      # 0: down to label2
 # BB#19:                                # %if.end3.i361.4
-	i32.const	$push614=, 0
-	i32.const	$push613=, 4
-	i32.store	bar.lastc($pop614), $pop613
-	i32.load8_u	$push89=, 340($9)
-	i32.const	$push88=, 44
-	i32.ne  	$push90=, $pop89, $pop88
-	br_if   	6, $pop90       # 6: down to label4
+	i32.const	$push571=, 0
+	i32.const	$push570=, 4
+	i32.store	bar.lastc($pop571), $pop570
+	i32.load8_u	$push105=, 340($9)
+	i32.const	$push104=, 44
+	i32.ne  	$push106=, $pop105, $pop104
+	br_if   	0, $pop106      # 0: down to label2
 # BB#20:                                # %if.end3.i375
-	i32.const	$push91=, 32
-	i32.add 	$push620=, $1, $pop91
-	tee_local	$push619=, $0=, $pop620
-	i32.store	4($9), $pop619
-	i32.load	$push92=, 0($2):p2align=0
-	i32.store	328($9), $pop92
-	i32.const	$push618=, 4
-	i32.add 	$push93=, $2, $pop618
-	i32.load16_u	$push94=, 0($pop93):p2align=0
-	i32.store16	332($9), $pop94
-	i32.load8_u	$8=, 328($9)
-	i32.const	$push617=, 0
-	i32.const	$push616=, 0
-	i32.store	bar.lastc($pop617), $pop616
-	i32.const	$push615=, 0
-	i32.const	$push95=, 6
-	i32.store	bar.lastn($pop615), $pop95
-	i32.const	$push96=, 48
-	i32.ne  	$push97=, $8, $pop96
-	br_if   	5, $pop97       # 5: down to label5
+	i32.const	$push577=, 0
+	i32.const	$push107=, 6
+	i32.store	bar.lastn($pop577), $pop107
+	i32.load	$push108=, 0($3):p2align=0
+	i32.store	328($9), $pop108
+	i32.const	$push576=, 0
+	i32.const	$push575=, 0
+	i32.store	bar.lastc($pop576), $pop575
+	i32.const	$push109=, 32
+	i32.add 	$push574=, $1, $pop109
+	tee_local	$push573=, $0=, $pop574
+	i32.store	12($9), $pop573
+	i32.const	$push572=, 4
+	i32.add 	$push110=, $3, $pop572
+	i32.load16_u	$push111=, 0($pop110):p2align=0
+	i32.store16	332($9), $pop111
+	i32.load8_u	$push113=, 328($9)
+	i32.const	$push112=, 48
+	i32.ne  	$push114=, $pop113, $pop112
+	br_if   	0, $pop114      # 0: down to label2
 # BB#21:                                # %if.end3.i375.1
-	i32.const	$push621=, 0
-	i32.const	$push98=, 1
-	i32.store	bar.lastc($pop621), $pop98
-	i32.load8_u	$push100=, 329($9)
-	i32.const	$push99=, 49
-	i32.ne  	$push101=, $pop100, $pop99
-	br_if   	5, $pop101      # 5: down to label5
+	i32.const	$push578=, 0
+	i32.const	$push115=, 1
+	i32.store	bar.lastc($pop578), $pop115
+	i32.load8_u	$push117=, 329($9)
+	i32.const	$push116=, 49
+	i32.ne  	$push118=, $pop117, $pop116
+	br_if   	0, $pop118      # 0: down to label2
 # BB#22:                                # %if.end3.i375.2
-	i32.const	$push622=, 0
-	i32.const	$push102=, 2
-	i32.store	bar.lastc($pop622), $pop102
-	i32.load8_u	$push104=, 330($9)
-	i32.const	$push103=, 50
-	i32.ne  	$push105=, $pop104, $pop103
-	br_if   	5, $pop105      # 5: down to label5
+	i32.const	$push579=, 0
+	i32.const	$push119=, 2
+	i32.store	bar.lastc($pop579), $pop119
+	i32.load8_u	$push121=, 330($9)
+	i32.const	$push120=, 50
+	i32.ne  	$push122=, $pop121, $pop120
+	br_if   	0, $pop122      # 0: down to label2
 # BB#23:                                # %if.end3.i375.3
-	i32.const	$push623=, 0
-	i32.const	$push106=, 3
-	i32.store	bar.lastc($pop623), $pop106
-	i32.load8_u	$push108=, 331($9)
-	i32.const	$push107=, 51
-	i32.ne  	$push109=, $pop108, $pop107
-	br_if   	5, $pop109      # 5: down to label5
+	i32.const	$push580=, 0
+	i32.const	$push123=, 3
+	i32.store	bar.lastc($pop580), $pop123
+	i32.load8_u	$push125=, 331($9)
+	i32.const	$push124=, 51
+	i32.ne  	$push126=, $pop125, $pop124
+	br_if   	0, $pop126      # 0: down to label2
 # BB#24:                                # %if.end3.i375.4
-	i32.const	$push624=, 0
-	i32.const	$push110=, 4
-	i32.store	bar.lastc($pop624), $pop110
-	i32.load8_u	$push112=, 332($9)
-	i32.const	$push111=, 52
-	i32.ne  	$push113=, $pop112, $pop111
-	br_if   	5, $pop113      # 5: down to label5
+	i32.const	$push581=, 0
+	i32.const	$push127=, 4
+	i32.store	bar.lastc($pop581), $pop127
+	i32.load8_u	$push129=, 332($9)
+	i32.const	$push128=, 52
+	i32.ne  	$push130=, $pop129, $pop128
+	br_if   	0, $pop130      # 0: down to label2
 # BB#25:                                # %if.end3.i375.5
-	i32.const	$push625=, 0
-	i32.const	$push114=, 5
-	i32.store	bar.lastc($pop625), $pop114
-	i32.load8_u	$push116=, 333($9)
-	i32.const	$push115=, 53
-	i32.ne  	$push117=, $pop116, $pop115
-	br_if   	5, $pop117      # 5: down to label5
+	i32.const	$push582=, 0
+	i32.const	$push131=, 5
+	i32.store	bar.lastc($pop582), $pop131
+	i32.load8_u	$push133=, 333($9)
+	i32.const	$push132=, 53
+	i32.ne  	$push134=, $pop133, $pop132
+	br_if   	0, $pop134      # 0: down to label2
 # BB#26:                                # %if.end3.i389
-	i32.const	$push118=, 40
-	i32.add 	$push119=, $1, $pop118
-	i32.store	4($9), $pop119
-	i32.load	$push120=, 0($0):p2align=0
-	i32.store	320($9), $pop120
-	i32.const	$push121=, 6
-	i32.add 	$push122=, $0, $pop121
-	i32.load8_u	$push123=, 0($pop122)
-	i32.store8	326($9), $pop123
-	i32.const	$push124=, 4
-	i32.add 	$push125=, $0, $pop124
-	i32.load16_u	$push126=, 0($pop125):p2align=0
-	i32.store16	324($9), $pop126
-	i32.load8_u	$0=, 320($9)
-	i32.const	$push628=, 0
-	i32.const	$push627=, 0
-	i32.store	bar.lastc($pop628), $pop627
-	i32.const	$push626=, 0
-	i32.const	$push127=, 7
-	i32.store	bar.lastn($pop626), $pop127
-	i32.const	$push128=, 56
-	i32.ne  	$push129=, $0, $pop128
-	br_if   	4, $pop129      # 4: down to label6
+	i32.const	$push585=, 0
+	i32.const	$push135=, 7
+	i32.store	bar.lastn($pop585), $pop135
+	i32.load	$push136=, 0($0):p2align=0
+	i32.store	320($9), $pop136
+	i32.const	$push584=, 0
+	i32.const	$push583=, 0
+	i32.store	bar.lastc($pop584), $pop583
+	i32.const	$push137=, 40
+	i32.add 	$push138=, $1, $pop137
+	i32.store	12($9), $pop138
+	i32.const	$push139=, 4
+	i32.add 	$push140=, $0, $pop139
+	i32.load16_u	$push141=, 0($pop140):p2align=0
+	i32.store16	324($9), $pop141
+	i32.const	$push142=, 6
+	i32.add 	$push143=, $0, $pop142
+	i32.load8_u	$push144=, 0($pop143)
+	i32.store8	326($9), $pop144
+	i32.load8_u	$push146=, 320($9)
+	i32.const	$push145=, 56
+	i32.ne  	$push147=, $pop146, $pop145
+	br_if   	0, $pop147      # 0: down to label2
 # BB#27:                                # %if.end3.i389.1
-	i32.const	$push629=, 0
-	i32.const	$push130=, 1
-	i32.store	bar.lastc($pop629), $pop130
-	i32.load8_u	$push132=, 321($9)
-	i32.const	$push131=, 57
-	i32.ne  	$push133=, $pop132, $pop131
-	br_if   	4, $pop133      # 4: down to label6
+	i32.const	$push586=, 0
+	i32.const	$push148=, 1
+	i32.store	bar.lastc($pop586), $pop148
+	i32.load8_u	$push150=, 321($9)
+	i32.const	$push149=, 57
+	i32.ne  	$push151=, $pop150, $pop149
+	br_if   	0, $pop151      # 0: down to label2
 # BB#28:                                # %if.end3.i389.2
-	i32.const	$push630=, 0
-	i32.const	$push134=, 2
-	i32.store	bar.lastc($pop630), $pop134
-	i32.load8_u	$push136=, 322($9)
-	i32.const	$push135=, 58
-	i32.ne  	$push137=, $pop136, $pop135
-	br_if   	4, $pop137      # 4: down to label6
+	i32.const	$push587=, 0
+	i32.const	$push152=, 2
+	i32.store	bar.lastc($pop587), $pop152
+	i32.load8_u	$push154=, 322($9)
+	i32.const	$push153=, 58
+	i32.ne  	$push155=, $pop154, $pop153
+	br_if   	0, $pop155      # 0: down to label2
 # BB#29:                                # %if.end3.i389.3
-	i32.const	$push631=, 0
-	i32.const	$push138=, 3
-	i32.store	bar.lastc($pop631), $pop138
-	i32.load8_u	$push140=, 323($9)
-	i32.const	$push139=, 59
-	i32.ne  	$push141=, $pop140, $pop139
-	br_if   	4, $pop141      # 4: down to label6
+	i32.const	$push588=, 0
+	i32.const	$push156=, 3
+	i32.store	bar.lastc($pop588), $pop156
+	i32.load8_u	$push158=, 323($9)
+	i32.const	$push157=, 59
+	i32.ne  	$push159=, $pop158, $pop157
+	br_if   	0, $pop159      # 0: down to label2
 # BB#30:                                # %if.end3.i389.4
-	i32.const	$push632=, 0
-	i32.const	$push142=, 4
-	i32.store	bar.lastc($pop632), $pop142
-	i32.load8_u	$push144=, 324($9)
-	i32.const	$push143=, 60
-	i32.ne  	$push145=, $pop144, $pop143
-	br_if   	4, $pop145      # 4: down to label6
+	i32.const	$push589=, 0
+	i32.const	$push160=, 4
+	i32.store	bar.lastc($pop589), $pop160
+	i32.load8_u	$push162=, 324($9)
+	i32.const	$push161=, 60
+	i32.ne  	$push163=, $pop162, $pop161
+	br_if   	0, $pop163      # 0: down to label2
 # BB#31:                                # %if.end3.i389.5
-	i32.const	$push633=, 0
-	i32.const	$push146=, 5
-	i32.store	bar.lastc($pop633), $pop146
-	i32.load8_u	$push148=, 325($9)
-	i32.const	$push147=, 61
-	i32.ne  	$push149=, $pop148, $pop147
-	br_if   	4, $pop149      # 4: down to label6
+	i32.const	$push590=, 0
+	i32.const	$push164=, 5
+	i32.store	bar.lastc($pop590), $pop164
+	i32.load8_u	$push166=, 325($9)
+	i32.const	$push165=, 61
+	i32.ne  	$push167=, $pop166, $pop165
+	br_if   	0, $pop167      # 0: down to label2
 # BB#32:                                # %if.end3.i389.6
-	i32.const	$push634=, 0
-	i32.const	$push150=, 6
-	i32.store	bar.lastc($pop634), $pop150
-	i32.load8_u	$push152=, 326($9)
-	i32.const	$push151=, 62
-	i32.ne  	$push153=, $pop152, $pop151
-	br_if   	4, $pop153      # 4: down to label6
+	i32.const	$push591=, 0
+	i32.const	$push168=, 6
+	i32.store	bar.lastc($pop591), $pop168
+	i32.load8_u	$push170=, 326($9)
+	i32.const	$push169=, 62
+	i32.ne  	$push171=, $pop170, $pop169
+	br_if   	0, $pop171      # 0: down to label2
 # BB#33:                                # %if.end3.i403
-	i32.const	$push640=, 0
-	i32.const	$push154=, 7
-	i32.store	bar.lastc($pop640), $pop154
-	i32.const	$push639=, 0
-	i32.const	$push155=, 8
-	i32.store	bar.lastn($pop639), $pop155
-	i32.const	$push156=, 48
-	i32.add 	$push638=, $1, $pop156
-	tee_local	$push637=, $0=, $pop638
-	i32.store	4($9), $pop637
-	i32.const	$push157=, 40
-	i32.add 	$push158=, $1, $pop157
-	i64.load	$push159=, 0($pop158):p2align=0
-	i64.store	312($9), $pop159
-	i32.const	$push636=, 0
-	i32.const	$push635=, 0
-	i32.store	bar.lastc($pop636), $pop635
-	i32.load8_s	$push161=, 312($9)
-	i32.const	$push160=, 64
-	i32.ne  	$push162=, $pop161, $pop160
-	br_if   	3, $pop162      # 3: down to label7
+	i32.const	$push598=, 0
+	i32.const	$push172=, 8
+	i32.store	bar.lastn($pop598), $pop172
+	i32.const	$push597=, 0
+	i32.const	$push596=, 0
+	i32.store	bar.lastc($pop597), $pop596
+	i32.const	$push173=, 48
+	i32.add 	$push595=, $1, $pop173
+	tee_local	$push594=, $0=, $pop595
+	i32.store	12($9), $pop594
+	i32.const	$push174=, 40
+	i32.add 	$push175=, $1, $pop174
+	i64.load	$push593=, 0($pop175):p2align=0
+	tee_local	$push592=, $2=, $pop593
+	i64.const	$push180=, 255
+	i64.and 	$push181=, $pop592, $pop180
+	i64.const	$push182=, 64
+	i64.ne  	$push183=, $pop181, $pop182
+	br_if   	0, $pop183      # 0: down to label2
 # BB#34:                                # %if.end3.i403.1
-	i32.const	$push642=, 0
-	i32.const	$push641=, 1
-	i32.store	bar.lastc($pop642), $pop641
-	i32.load8_s	$push164=, 313($9)
-	i32.const	$push163=, 65
-	i32.ne  	$push165=, $pop164, $pop163
-	br_if   	3, $pop165      # 3: down to label7
+	i32.const	$push599=, 0
+	i32.const	$push184=, 1
+	i32.store	bar.lastc($pop599), $pop184
+	i32.wrap/i64	$push185=, $2
+	i32.const	$push186=, 16
+	i32.shl 	$push187=, $pop185, $pop186
+	i32.const	$push188=, -16777216
+	i32.and 	$push189=, $pop187, $pop188
+	i32.const	$push190=, 1090519040
+	i32.ne  	$push191=, $pop189, $pop190
+	br_if   	0, $pop191      # 0: down to label2
 # BB#35:                                # %if.end3.i403.2
-	i32.const	$push648=, 0
-	i32.const	$push647=, 1
-	i32.const	$push646=, 1
-	i32.add 	$push645=, $pop647, $pop646
-	tee_local	$push644=, $8=, $pop645
-	i32.store	bar.lastc($pop648), $pop644
-	i32.const	$push643=, 64
-	i32.or  	$push166=, $8, $pop643
-	i32.load8_s	$push167=, 314($9)
-	i32.ne  	$push168=, $pop166, $pop167
-	br_if   	3, $pop168      # 3: down to label7
+	i32.const	$push600=, 0
+	i32.const	$push192=, 2
+	i32.store	bar.lastc($pop600), $pop192
+	i64.const	$push179=, 16
+	i64.shr_u	$push0=, $2, $pop179
+	i32.wrap/i64	$push193=, $pop0
+	i32.const	$push194=, 24
+	i32.shl 	$push195=, $pop193, $pop194
+	i32.const	$push196=, 1107296256
+	i32.ne  	$push197=, $pop195, $pop196
+	br_if   	0, $pop197      # 0: down to label2
 # BB#36:                                # %if.end3.i403.3
-	i32.const	$push655=, 0
-	i32.const	$push654=, 1
-	i32.add 	$push653=, $8, $pop654
-	tee_local	$push652=, $8=, $pop653
-	i32.store	bar.lastc($pop655), $pop652
-	i32.const	$push651=, 24
-	i32.shl 	$push169=, $8, $pop651
-	i32.const	$push650=, 24
-	i32.shr_s	$push170=, $pop169, $pop650
-	i32.const	$push649=, 64
-	i32.xor 	$push171=, $pop170, $pop649
-	i32.load8_s	$push172=, 315($9)
-	i32.ne  	$push173=, $pop171, $pop172
-	br_if   	3, $pop173      # 3: down to label7
+	i32.const	$push601=, 0
+	i32.const	$push198=, 3
+	i32.store	bar.lastc($pop601), $pop198
+	i64.const	$push199=, 4278190080
+	i64.and 	$push200=, $2, $pop199
+	i64.const	$push201=, 1124073472
+	i64.ne  	$push202=, $pop200, $pop201
+	br_if   	0, $pop202      # 0: down to label2
 # BB#37:                                # %if.end3.i403.4
-	i32.const	$push662=, 0
-	i32.const	$push661=, 1
-	i32.add 	$push660=, $8, $pop661
-	tee_local	$push659=, $8=, $pop660
-	i32.store	bar.lastc($pop662), $pop659
-	i32.const	$push658=, 24
-	i32.shl 	$push174=, $8, $pop658
-	i32.const	$push657=, 24
-	i32.shr_s	$push175=, $pop174, $pop657
-	i32.const	$push656=, 64
-	i32.xor 	$push176=, $pop175, $pop656
-	i32.load8_s	$push177=, 316($9)
-	i32.ne  	$push178=, $pop176, $pop177
-	br_if   	3, $pop178      # 3: down to label7
+	i32.const	$push603=, 0
+	i32.const	$push203=, 4
+	i32.store	bar.lastc($pop603), $pop203
+	i64.const	$push178=, 32
+	i64.shr_u	$push1=, $2, $pop178
+	i32.wrap/i64	$push204=, $pop1
+	i32.const	$push602=, 24
+	i32.shl 	$push205=, $pop204, $pop602
+	i32.const	$push206=, 1140850688
+	i32.ne  	$push207=, $pop205, $pop206
+	br_if   	0, $pop207      # 0: down to label2
 # BB#38:                                # %if.end3.i403.5
-	i32.const	$push669=, 0
-	i32.const	$push668=, 1
-	i32.add 	$push667=, $8, $pop668
-	tee_local	$push666=, $8=, $pop667
-	i32.store	bar.lastc($pop669), $pop666
-	i32.const	$push665=, 24
-	i32.shl 	$push179=, $8, $pop665
-	i32.const	$push664=, 24
-	i32.shr_s	$push180=, $pop179, $pop664
-	i32.const	$push663=, 64
-	i32.xor 	$push181=, $pop180, $pop663
-	i32.load8_s	$push182=, 317($9)
-	i32.ne  	$push183=, $pop181, $pop182
-	br_if   	3, $pop183      # 3: down to label7
+	i32.const	$push605=, 0
+	i32.const	$push208=, 5
+	i32.store	bar.lastc($pop605), $pop208
+	i64.const	$push177=, 40
+	i64.shr_u	$push2=, $2, $pop177
+	i32.wrap/i64	$push209=, $pop2
+	i32.const	$push604=, 24
+	i32.shl 	$push210=, $pop209, $pop604
+	i32.const	$push211=, 1157627904
+	i32.ne  	$push212=, $pop210, $pop211
+	br_if   	0, $pop212      # 0: down to label2
 # BB#39:                                # %if.end3.i403.6
-	i32.const	$push676=, 0
-	i32.const	$push675=, 1
-	i32.add 	$push674=, $8, $pop675
-	tee_local	$push673=, $8=, $pop674
-	i32.store	bar.lastc($pop676), $pop673
-	i32.const	$push672=, 24
-	i32.shl 	$push184=, $8, $pop672
-	i32.const	$push671=, 24
-	i32.shr_s	$push185=, $pop184, $pop671
-	i32.const	$push670=, 64
-	i32.xor 	$push186=, $pop185, $pop670
-	i32.load8_s	$push187=, 318($9)
-	i32.ne  	$push188=, $pop186, $pop187
-	br_if   	3, $pop188      # 3: down to label7
+	i32.const	$push606=, 0
+	i32.const	$push213=, 6
+	i32.store	bar.lastc($pop606), $pop213
+	i64.const	$push176=, 48
+	i64.shr_u	$push3=, $2, $pop176
+	i32.wrap/i64	$push214=, $pop3
+	i32.const	$push215=, 24
+	i32.shl 	$push216=, $pop214, $pop215
+	i32.const	$push217=, 1174405120
+	i32.ne  	$push218=, $pop216, $pop217
+	br_if   	0, $pop218      # 0: down to label2
 # BB#40:                                # %if.end3.i403.7
-	i32.const	$push682=, 0
-	i32.const	$push681=, 1
-	i32.add 	$push680=, $8, $pop681
-	tee_local	$push679=, $8=, $pop680
-	i32.store	bar.lastc($pop682), $pop679
-	i32.const	$push189=, 24
-	i32.shl 	$push190=, $8, $pop189
-	i32.const	$push678=, 24
-	i32.shr_s	$push191=, $pop190, $pop678
-	i32.const	$push677=, 64
-	i32.xor 	$push192=, $pop191, $pop677
-	i32.load8_s	$push193=, 319($9)
-	i32.ne  	$push194=, $pop192, $pop193
-	br_if   	3, $pop194      # 3: down to label7
-# BB#41:                                # %for.body104
-	i32.const	$push195=, 0
-	i32.const	$push690=, 1
-	i32.add 	$push689=, $8, $pop690
-	tee_local	$push688=, $2=, $pop689
-	i32.store	bar.lastc($pop195), $pop688
-	i32.const	$8=, 8
-	i32.const	$push508=, 296
-	i32.add 	$push509=, $9, $pop508
-	i32.const	$push687=, 8
-	i32.add 	$push198=, $pop509, $pop687
-	i32.const	$push686=, 8
-	i32.add 	$push196=, $0, $pop686
-	i32.load8_u	$push197=, 0($pop196)
-	i32.store8	0($pop198), $pop197
-	i32.const	$push199=, 60
-	i32.add 	$push685=, $1, $pop199
-	tee_local	$push684=, $7=, $pop685
-	i32.store	4($9), $pop684
-	i32.load	$push200=, 0($0):p2align=0
-	i32.store	296($9), $pop200
-	i32.const	$push201=, 4
-	i32.add 	$push202=, $0, $pop201
-	i32.load	$push203=, 0($pop202):p2align=0
-	i32.store	300($9), $pop203
-	i32.load8_s	$0=, 296($9)
-	block   	
-	i32.const	$push683=, 0
-	br_if   	0, $pop683      # 0: down to label12
-# BB#42:                                # %if.then.i410
-	i32.const	$push204=, 8
-	i32.ne  	$push205=, $2, $pop204
-	br_if   	1, $pop205      # 1: down to label10
-# BB#43:                                # %if.end.i412
-	i32.const	$8=, 9
-	i32.const	$2=, 0
-	i32.const	$push694=, 0
-	i32.const	$push693=, 9
-	i32.store	bar.lastn($pop694), $pop693
-	i32.const	$push692=, 0
-	i32.const	$push691=, 0
-	i32.store	bar.lastc($pop692), $pop691
-.LBB1_44:                               # %if.end3.i417
-	end_block                       # label12:
-	i32.const	$push697=, 24
-	i32.shl 	$push206=, $2, $pop697
-	i32.const	$push696=, 24
-	i32.shr_s	$push207=, $pop206, $pop696
-	i32.const	$push695=, 72
-	i32.xor 	$push208=, $pop207, $pop695
-	i32.ne  	$push209=, $pop208, $0
-	br_if   	2, $pop209      # 2: down to label8
-# BB#45:                                # %if.end3.i417.1
-	i32.const	$push704=, 0
-	i32.const	$push703=, 1
-	i32.add 	$push702=, $2, $pop703
-	tee_local	$push701=, $0=, $pop702
-	i32.store	bar.lastc($pop704), $pop701
-	i32.const	$push700=, 24
-	i32.shl 	$push210=, $0, $pop700
-	i32.const	$push699=, 24
-	i32.shr_s	$push211=, $pop210, $pop699
-	i32.const	$push698=, 72
-	i32.xor 	$push212=, $pop211, $pop698
-	i32.load8_s	$push213=, 297($9)
-	i32.ne  	$push214=, $pop212, $pop213
-	br_if   	2, $pop214      # 2: down to label8
-# BB#46:                                # %if.end3.i417.2
-	i32.const	$push711=, 0
-	i32.const	$push710=, 1
-	i32.add 	$push709=, $0, $pop710
-	tee_local	$push708=, $0=, $pop709
-	i32.store	bar.lastc($pop711), $pop708
-	i32.const	$push707=, 24
-	i32.shl 	$push215=, $0, $pop707
-	i32.const	$push706=, 24
-	i32.shr_s	$push216=, $pop215, $pop706
-	i32.const	$push705=, 72
-	i32.xor 	$push217=, $pop216, $pop705
-	i32.load8_s	$push218=, 298($9)
-	i32.ne  	$push219=, $pop217, $pop218
-	br_if   	2, $pop219      # 2: down to label8
-# BB#47:                                # %if.end3.i417.3
-	i32.const	$push718=, 0
-	i32.const	$push717=, 1
-	i32.add 	$push716=, $0, $pop717
-	tee_local	$push715=, $0=, $pop716
-	i32.store	bar.lastc($pop718), $pop715
-	i32.const	$push714=, 24
-	i32.shl 	$push220=, $0, $pop714
-	i32.const	$push713=, 24
-	i32.shr_s	$push221=, $pop220, $pop713
-	i32.const	$push712=, 72
-	i32.xor 	$push222=, $pop221, $pop712
-	i32.load8_s	$push223=, 299($9)
-	i32.ne  	$push224=, $pop222, $pop223
-	br_if   	2, $pop224      # 2: down to label8
-# BB#48:                                # %if.end3.i417.4
-	i32.const	$push725=, 0
-	i32.const	$push724=, 1
-	i32.add 	$push723=, $0, $pop724
-	tee_local	$push722=, $0=, $pop723
-	i32.store	bar.lastc($pop725), $pop722
-	i32.const	$push721=, 24
-	i32.shl 	$push225=, $0, $pop721
-	i32.const	$push720=, 24
-	i32.shr_s	$push226=, $pop225, $pop720
-	i32.const	$push719=, 72
-	i32.xor 	$push227=, $pop226, $pop719
-	i32.load8_s	$push228=, 300($9)
-	i32.ne  	$push229=, $pop227, $pop228
-	br_if   	2, $pop229      # 2: down to label8
-# BB#49:                                # %if.end3.i417.5
-	i32.const	$push732=, 0
-	i32.const	$push731=, 1
-	i32.add 	$push730=, $0, $pop731
-	tee_local	$push729=, $0=, $pop730
-	i32.store	bar.lastc($pop732), $pop729
-	i32.const	$push728=, 24
-	i32.shl 	$push230=, $0, $pop728
-	i32.const	$push727=, 24
-	i32.shr_s	$push231=, $pop230, $pop727
-	i32.const	$push726=, 72
-	i32.xor 	$push232=, $pop231, $pop726
-	i32.load8_s	$push233=, 301($9)
-	i32.ne  	$push234=, $pop232, $pop233
-	br_if   	2, $pop234      # 2: down to label8
-# BB#50:                                # %if.end3.i417.6
-	i32.const	$push739=, 0
-	i32.const	$push738=, 1
-	i32.add 	$push737=, $0, $pop738
-	tee_local	$push736=, $0=, $pop737
-	i32.store	bar.lastc($pop739), $pop736
-	i32.const	$push735=, 24
-	i32.shl 	$push235=, $0, $pop735
-	i32.const	$push734=, 24
-	i32.shr_s	$push236=, $pop235, $pop734
-	i32.const	$push733=, 72
-	i32.xor 	$push237=, $pop236, $pop733
-	i32.load8_s	$push238=, 302($9)
-	i32.ne  	$push239=, $pop237, $pop238
-	br_if   	2, $pop239      # 2: down to label8
-# BB#51:                                # %if.end3.i417.7
-	i32.const	$push746=, 0
-	i32.const	$push745=, 1
-	i32.add 	$push744=, $0, $pop745
-	tee_local	$push743=, $0=, $pop744
-	i32.store	bar.lastc($pop746), $pop743
-	i32.const	$push742=, 24
-	i32.shl 	$push240=, $0, $pop742
-	i32.const	$push741=, 24
-	i32.shr_s	$push241=, $pop240, $pop741
-	i32.const	$push740=, 72
-	i32.xor 	$push242=, $pop241, $pop740
-	i32.load8_s	$push243=, 303($9)
-	i32.ne  	$push244=, $pop242, $pop243
-	br_if   	2, $pop244      # 2: down to label8
-# BB#52:                                # %if.end3.i417.8
-	i32.const	$push752=, 0
-	i32.const	$push751=, 1
-	i32.add 	$push750=, $0, $pop751
-	tee_local	$push749=, $0=, $pop750
-	i32.store	bar.lastc($pop752), $pop749
-	i32.const	$push245=, 24
-	i32.shl 	$push246=, $0, $pop245
-	i32.const	$push748=, 24
-	i32.shr_s	$push247=, $pop246, $pop748
-	i32.const	$push747=, 72
-	i32.xor 	$push248=, $pop247, $pop747
-	i32.load8_s	$push249=, 304($9)
-	i32.ne  	$push250=, $pop248, $pop249
-	br_if   	2, $pop250      # 2: down to label8
-# BB#53:                                # %for.body116
-	i32.const	$push252=, 0
-	i32.const	$push251=, 1
-	i32.add 	$push758=, $0, $pop251
-	tee_local	$push757=, $0=, $pop758
-	i32.store	bar.lastc($pop252), $pop757
-	i32.const	$push510=, 280
-	i32.add 	$push511=, $9, $pop510
-	i32.const	$push253=, 8
-	i32.add 	$push256=, $pop511, $pop253
-	i32.const	$push756=, 8
-	i32.add 	$push254=, $7, $pop756
-	i32.load16_u	$push255=, 0($pop254):p2align=0
-	i32.store16	0($pop256), $pop255
-	i32.const	$push755=, 72
-	i32.add 	$push754=, $1, $pop755
-	tee_local	$push753=, $2=, $pop754
-	i32.store	4($9), $pop753
-	i32.load	$push257=, 0($7):p2align=0
-	i32.store	280($9), $pop257
-	i32.const	$push258=, 4
-	i32.add 	$push259=, $7, $pop258
-	i32.load	$push260=, 0($pop259):p2align=0
-	i32.store	284($9), $pop260
-	i32.load8_s	$7=, 280($9)
-	block   	
-	i32.const	$push261=, 10
-	i32.eq  	$push262=, $8, $pop261
-	br_if   	0, $pop262      # 0: down to label13
-# BB#54:                                # %if.then.i424
-	i32.ne  	$push263=, $0, $8
-	br_if   	1, $pop263      # 1: down to label10
-# BB#55:                                # %if.end.i426
+	i32.const	$push607=, 0
+	i32.const	$push219=, 7
+	i32.store	bar.lastc($pop607), $pop219
+	i64.const	$push220=, -72057594037927936
+	i64.and 	$push221=, $2, $pop220
+	i64.const	$push222=, 5116089176692883456
+	i64.ne  	$push223=, $pop221, $pop222
+	br_if   	0, $pop223      # 0: down to label2
+# BB#41:                                # %if.end3.i417
+	i32.const	$push613=, 0
+	i32.const	$push224=, 9
+	i32.store	bar.lastn($pop613), $pop224
+	i32.const	$push475=, 304
+	i32.add 	$push476=, $9, $pop475
+	i32.const	$push225=, 8
+	i32.add 	$push228=, $pop476, $pop225
+	i32.const	$push612=, 8
+	i32.add 	$push226=, $0, $pop612
+	i32.load8_u	$push227=, 0($pop226)
+	i32.store8	0($pop228), $pop227
+	i64.load	$push229=, 0($0):p2align=0
+	i64.store	304($9), $pop229
+	i32.const	$push611=, 0
+	i32.const	$push610=, 0
+	i32.store	bar.lastc($pop611), $pop610
+	i32.const	$push230=, 60
+	i32.add 	$push609=, $1, $pop230
+	tee_local	$push608=, $0=, $pop609
+	i32.store	12($9), $pop608
+	i32.load8_u	$push232=, 304($9)
+	i32.const	$push231=, 72
+	i32.ne  	$push233=, $pop232, $pop231
+	br_if   	0, $pop233      # 0: down to label2
+# BB#42:                                # %if.end3.i417.1
+	i32.const	$push614=, 0
+	i32.const	$push234=, 1
+	i32.store	bar.lastc($pop614), $pop234
+	i32.load8_u	$push236=, 305($9)
+	i32.const	$push235=, 73
+	i32.ne  	$push237=, $pop236, $pop235
+	br_if   	0, $pop237      # 0: down to label2
+# BB#43:                                # %if.end3.i417.2
+	i32.const	$push615=, 0
+	i32.const	$push238=, 2
+	i32.store	bar.lastc($pop615), $pop238
+	i32.load8_u	$push240=, 306($9)
+	i32.const	$push239=, 74
+	i32.ne  	$push241=, $pop240, $pop239
+	br_if   	0, $pop241      # 0: down to label2
+# BB#44:                                # %if.end3.i417.3
+	i32.const	$push616=, 0
+	i32.const	$push242=, 3
+	i32.store	bar.lastc($pop616), $pop242
+	i32.load8_u	$push244=, 307($9)
+	i32.const	$push243=, 75
+	i32.ne  	$push245=, $pop244, $pop243
+	br_if   	0, $pop245      # 0: down to label2
+# BB#45:                                # %if.end3.i417.4
+	i32.const	$push617=, 0
+	i32.const	$push246=, 4
+	i32.store	bar.lastc($pop617), $pop246
+	i32.load8_u	$push248=, 308($9)
+	i32.const	$push247=, 76
+	i32.ne  	$push249=, $pop248, $pop247
+	br_if   	0, $pop249      # 0: down to label2
+# BB#46:                                # %if.end3.i417.5
+	i32.const	$push618=, 0
+	i32.const	$push250=, 5
+	i32.store	bar.lastc($pop618), $pop250
+	i32.load8_u	$push252=, 309($9)
+	i32.const	$push251=, 77
+	i32.ne  	$push253=, $pop252, $pop251
+	br_if   	0, $pop253      # 0: down to label2
+# BB#47:                                # %if.end3.i417.6
+	i32.const	$push619=, 0
+	i32.const	$push254=, 6
+	i32.store	bar.lastc($pop619), $pop254
+	i32.load8_u	$push256=, 310($9)
+	i32.const	$push255=, 78
+	i32.ne  	$push257=, $pop256, $pop255
+	br_if   	0, $pop257      # 0: down to label2
+# BB#48:                                # %if.end3.i417.7
+	i32.const	$push620=, 0
+	i32.const	$push258=, 7
+	i32.store	bar.lastc($pop620), $pop258
+	i32.load8_u	$push260=, 311($9)
+	i32.const	$push259=, 79
+	i32.ne  	$push261=, $pop260, $pop259
+	br_if   	0, $pop261      # 0: down to label2
+# BB#49:                                # %if.end3.i417.8
+	i32.const	$push622=, 0
+	i32.const	$push621=, 8
+	i32.store	bar.lastc($pop622), $pop621
+	i32.load8_u	$push263=, 312($9)
+	i32.const	$push262=, 64
+	i32.ne  	$push264=, $pop263, $pop262
+	br_if   	0, $pop264      # 0: down to label2
+# BB#50:                                # %bar.exit420.8
+	i32.const	$push629=, 0
+	i32.const	$push265=, 10
+	i32.store	bar.lastn($pop629), $pop265
+	i32.const	$push477=, 288
+	i32.add 	$push478=, $9, $pop477
+	i32.const	$push628=, 8
+	i32.add 	$push268=, $pop478, $pop628
+	i32.const	$push627=, 8
+	i32.add 	$push266=, $0, $pop627
+	i32.load16_u	$push267=, 0($pop266):p2align=0
+	i32.store16	0($pop268), $pop267
+	i64.load	$push269=, 0($0):p2align=0
+	i64.store	288($9), $pop269
+	i32.const	$push626=, 0
+	i32.const	$push625=, 0
+	i32.store	bar.lastc($pop626), $pop625
+	i32.const	$push270=, 72
+	i32.add 	$push624=, $1, $pop270
+	tee_local	$push623=, $8=, $pop624
+	i32.store	12($9), $pop623
+	i32.load8_s	$push272=, 288($9)
+	i32.const	$push271=, 80
+	i32.ne  	$push273=, $pop272, $pop271
+	br_if   	0, $pop273      # 0: down to label2
+# BB#51:                                # %bar.exit434
+	i32.const	$push631=, 0
+	i32.const	$push630=, 1
+	i32.store	bar.lastc($pop631), $pop630
+	i32.load8_s	$push275=, 289($9)
+	i32.const	$push274=, 81
+	i32.ne  	$push276=, $pop275, $pop274
+	br_if   	0, $pop276      # 0: down to label2
+# BB#52:                                # %bar.exit434.1
+	i32.const	$push637=, 0
+	i32.const	$push636=, 1
+	i32.const	$push635=, 1
+	i32.add 	$push634=, $pop636, $pop635
+	tee_local	$push633=, $0=, $pop634
+	i32.store	bar.lastc($pop637), $pop633
+	i32.const	$push632=, 80
+	i32.or  	$push277=, $0, $pop632
+	i32.load8_s	$push278=, 290($9)
+	i32.ne  	$push279=, $pop277, $pop278
+	br_if   	0, $pop279      # 0: down to label2
+# BB#53:                                # %bar.exit434.2
+	i32.const	$push644=, 0
+	i32.const	$push643=, 1
+	i32.add 	$push642=, $0, $pop643
+	tee_local	$push641=, $0=, $pop642
+	i32.store	bar.lastc($pop644), $pop641
+	i32.const	$push640=, 24
+	i32.shl 	$push280=, $0, $pop640
+	i32.const	$push639=, 24
+	i32.shr_s	$push281=, $pop280, $pop639
+	i32.const	$push638=, 80
+	i32.xor 	$push282=, $pop281, $pop638
+	i32.load8_s	$push283=, 291($9)
+	i32.ne  	$push284=, $pop282, $pop283
+	br_if   	0, $pop284      # 0: down to label2
+# BB#54:                                # %bar.exit434.3
+	i32.const	$push651=, 0
+	i32.const	$push650=, 1
+	i32.add 	$push649=, $0, $pop650
+	tee_local	$push648=, $0=, $pop649
+	i32.store	bar.lastc($pop651), $pop648
+	i32.const	$push647=, 24
+	i32.shl 	$push285=, $0, $pop647
+	i32.const	$push646=, 24
+	i32.shr_s	$push286=, $pop285, $pop646
+	i32.const	$push645=, 80
+	i32.xor 	$push287=, $pop286, $pop645
+	i32.load8_s	$push288=, 292($9)
+	i32.ne  	$push289=, $pop287, $pop288
+	br_if   	0, $pop289      # 0: down to label2
+# BB#55:                                # %bar.exit434.4
+	i32.const	$push658=, 0
+	i32.const	$push657=, 1
+	i32.add 	$push656=, $0, $pop657
+	tee_local	$push655=, $0=, $pop656
+	i32.store	bar.lastc($pop658), $pop655
+	i32.const	$push654=, 24
+	i32.shl 	$push290=, $0, $pop654
+	i32.const	$push653=, 24
+	i32.shr_s	$push291=, $pop290, $pop653
+	i32.const	$push652=, 80
+	i32.xor 	$push292=, $pop291, $pop652
+	i32.load8_s	$push293=, 293($9)
+	i32.ne  	$push294=, $pop292, $pop293
+	br_if   	0, $pop294      # 0: down to label2
+# BB#56:                                # %bar.exit434.5
+	i32.const	$push665=, 0
+	i32.const	$push664=, 1
+	i32.add 	$push663=, $0, $pop664
+	tee_local	$push662=, $0=, $pop663
+	i32.store	bar.lastc($pop665), $pop662
+	i32.const	$push661=, 24
+	i32.shl 	$push295=, $0, $pop661
+	i32.const	$push660=, 24
+	i32.shr_s	$push296=, $pop295, $pop660
+	i32.const	$push659=, 80
+	i32.xor 	$push297=, $pop296, $pop659
+	i32.load8_s	$push298=, 294($9)
+	i32.ne  	$push299=, $pop297, $pop298
+	br_if   	0, $pop299      # 0: down to label2
+# BB#57:                                # %bar.exit434.6
+	i32.const	$push672=, 0
+	i32.const	$push671=, 1
+	i32.add 	$push670=, $0, $pop671
+	tee_local	$push669=, $0=, $pop670
+	i32.store	bar.lastc($pop672), $pop669
+	i32.const	$push668=, 24
+	i32.shl 	$push300=, $0, $pop668
+	i32.const	$push667=, 24
+	i32.shr_s	$push301=, $pop300, $pop667
+	i32.const	$push666=, 80
+	i32.xor 	$push302=, $pop301, $pop666
+	i32.load8_s	$push303=, 295($9)
+	i32.ne  	$push304=, $pop302, $pop303
+	br_if   	0, $pop304      # 0: down to label2
+# BB#58:                                # %bar.exit434.7
+	i32.const	$push679=, 0
+	i32.const	$push678=, 1
+	i32.add 	$push677=, $0, $pop678
+	tee_local	$push676=, $0=, $pop677
+	i32.store	bar.lastc($pop679), $pop676
+	i32.const	$push675=, 24
+	i32.shl 	$push305=, $0, $pop675
+	i32.const	$push674=, 24
+	i32.shr_s	$push306=, $pop305, $pop674
+	i32.const	$push673=, 80
+	i32.xor 	$push307=, $pop306, $pop673
+	i32.load8_s	$push308=, 296($9)
+	i32.ne  	$push309=, $pop307, $pop308
+	br_if   	0, $pop309      # 0: down to label2
+# BB#59:                                # %bar.exit434.8
+	i32.const	$push686=, 0
+	i32.const	$push685=, 1
+	i32.add 	$push684=, $0, $pop685
+	tee_local	$push683=, $0=, $pop684
+	i32.store	bar.lastc($pop686), $pop683
+	i32.const	$push682=, 24
+	i32.shl 	$push310=, $0, $pop682
+	i32.const	$push681=, 24
+	i32.shr_s	$push311=, $pop310, $pop681
+	i32.const	$push680=, 80
+	i32.xor 	$push312=, $pop311, $pop680
+	i32.load8_s	$push313=, 297($9)
+	i32.ne  	$push314=, $pop312, $pop313
+	br_if   	0, $pop314      # 0: down to label2
+# BB#60:                                # %bar.exit434.9
+	i32.const	$push695=, 0
+	i32.const	$push694=, 1
+	i32.add 	$push693=, $0, $pop694
+	tee_local	$push692=, $0=, $pop693
+	i32.store	bar.lastc($pop695), $pop692
+	i32.const	$push479=, 272
+	i32.add 	$push480=, $9, $pop479
+	i32.const	$push315=, 8
+	i32.add 	$push318=, $pop480, $pop315
+	i32.const	$push691=, 8
+	i32.add 	$push316=, $8, $pop691
+	i32.load16_u	$push317=, 0($pop316):p2align=0
+	i32.store16	0($pop318), $pop317
+	i32.const	$push481=, 272
+	i32.add 	$push482=, $9, $pop481
+	i32.const	$push690=, 10
+	i32.add 	$push321=, $pop482, $pop690
+	i32.const	$push689=, 10
+	i32.add 	$push319=, $8, $pop689
+	i32.load8_u	$push320=, 0($pop319)
+	i32.store8	0($pop321), $pop320
+	i32.const	$push322=, 84
+	i32.add 	$push688=, $1, $pop322
+	tee_local	$push687=, $6=, $pop688
+	i32.store	12($9), $pop687
+	i64.load	$push323=, 0($8):p2align=0
+	i64.store	272($9), $pop323
 	i32.const	$8=, 10
+	i32.const	$7=, 10
+	i32.const	$3=, 0
+.LBB1_61:                               # %for.body128
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label4:
+	i32.const	$push483=, 272
+	i32.add 	$push484=, $9, $pop483
+	i32.add 	$push325=, $pop484, $3
+	i32.load8_s	$4=, 0($pop325)
+	block   	
+	i32.const	$push696=, 11
+	i32.eq  	$push324=, $7, $pop696
+	br_if   	0, $pop324      # 0: down to label5
+# BB#62:                                # %if.then.i438
+                                        #   in Loop: Header=BB1_61 Depth=1
+	i32.ne  	$push326=, $0, $7
+	br_if   	2, $pop326      # 2: down to label2
+# BB#63:                                # %if.end.i440
+                                        #   in Loop: Header=BB1_61 Depth=1
+	i32.const	$8=, 11
 	i32.const	$0=, 0
-	i32.const	$push762=, 0
-	i32.const	$push761=, 10
-	i32.store	bar.lastn($pop762), $pop761
-	i32.const	$push760=, 0
-	i32.const	$push759=, 0
-	i32.store	bar.lastc($pop760), $pop759
-.LBB1_56:                               # %if.end3.i431
-	end_block                       # label13:
-	i32.const	$push765=, 24
-	i32.shl 	$push264=, $0, $pop765
-	i32.const	$push764=, 24
-	i32.shr_s	$push265=, $pop264, $pop764
-	i32.const	$push763=, 80
-	i32.xor 	$push266=, $pop265, $pop763
-	i32.ne  	$push267=, $pop266, $7
-	br_if   	1, $pop267      # 1: down to label9
-# BB#57:                                # %if.end3.i431.1
-	i32.const	$push772=, 0
-	i32.const	$push771=, 1
-	i32.add 	$push770=, $0, $pop771
-	tee_local	$push769=, $0=, $pop770
-	i32.store	bar.lastc($pop772), $pop769
-	i32.const	$push768=, 24
-	i32.shl 	$push268=, $0, $pop768
-	i32.const	$push767=, 24
-	i32.shr_s	$push269=, $pop268, $pop767
-	i32.const	$push766=, 80
-	i32.xor 	$push270=, $pop269, $pop766
-	i32.load8_s	$push271=, 281($9)
-	i32.ne  	$push272=, $pop270, $pop271
-	br_if   	1, $pop272      # 1: down to label9
-# BB#58:                                # %if.end3.i431.2
-	i32.const	$push779=, 0
-	i32.const	$push778=, 1
-	i32.add 	$push777=, $0, $pop778
-	tee_local	$push776=, $0=, $pop777
-	i32.store	bar.lastc($pop779), $pop776
-	i32.const	$push775=, 24
-	i32.shl 	$push273=, $0, $pop775
-	i32.const	$push774=, 24
-	i32.shr_s	$push274=, $pop273, $pop774
-	i32.const	$push773=, 80
-	i32.xor 	$push275=, $pop274, $pop773
-	i32.load8_s	$push276=, 282($9)
-	i32.ne  	$push277=, $pop275, $pop276
-	br_if   	1, $pop277      # 1: down to label9
-# BB#59:                                # %if.end3.i431.3
-	i32.const	$push786=, 0
-	i32.const	$push785=, 1
-	i32.add 	$push784=, $0, $pop785
-	tee_local	$push783=, $0=, $pop784
-	i32.store	bar.lastc($pop786), $pop783
-	i32.const	$push782=, 24
-	i32.shl 	$push278=, $0, $pop782
-	i32.const	$push781=, 24
-	i32.shr_s	$push279=, $pop278, $pop781
-	i32.const	$push780=, 80
-	i32.xor 	$push280=, $pop279, $pop780
-	i32.load8_s	$push281=, 283($9)
-	i32.ne  	$push282=, $pop280, $pop281
-	br_if   	1, $pop282      # 1: down to label9
-# BB#60:                                # %if.end3.i431.4
-	i32.const	$push793=, 0
-	i32.const	$push792=, 1
-	i32.add 	$push791=, $0, $pop792
-	tee_local	$push790=, $0=, $pop791
-	i32.store	bar.lastc($pop793), $pop790
-	i32.const	$push789=, 24
-	i32.shl 	$push283=, $0, $pop789
-	i32.const	$push788=, 24
-	i32.shr_s	$push284=, $pop283, $pop788
-	i32.const	$push787=, 80
-	i32.xor 	$push285=, $pop284, $pop787
-	i32.load8_s	$push286=, 284($9)
-	i32.ne  	$push287=, $pop285, $pop286
-	br_if   	1, $pop287      # 1: down to label9
-# BB#61:                                # %if.end3.i431.5
-	i32.const	$push800=, 0
-	i32.const	$push799=, 1
-	i32.add 	$push798=, $0, $pop799
-	tee_local	$push797=, $0=, $pop798
-	i32.store	bar.lastc($pop800), $pop797
-	i32.const	$push796=, 24
-	i32.shl 	$push288=, $0, $pop796
-	i32.const	$push795=, 24
-	i32.shr_s	$push289=, $pop288, $pop795
-	i32.const	$push794=, 80
-	i32.xor 	$push290=, $pop289, $pop794
-	i32.load8_s	$push291=, 285($9)
-	i32.ne  	$push292=, $pop290, $pop291
-	br_if   	1, $pop292      # 1: down to label9
-# BB#62:                                # %if.end3.i431.6
-	i32.const	$push807=, 0
-	i32.const	$push806=, 1
-	i32.add 	$push805=, $0, $pop806
-	tee_local	$push804=, $0=, $pop805
-	i32.store	bar.lastc($pop807), $pop804
-	i32.const	$push803=, 24
-	i32.shl 	$push293=, $0, $pop803
-	i32.const	$push802=, 24
-	i32.shr_s	$push294=, $pop293, $pop802
-	i32.const	$push801=, 80
-	i32.xor 	$push295=, $pop294, $pop801
-	i32.load8_s	$push296=, 286($9)
-	i32.ne  	$push297=, $pop295, $pop296
-	br_if   	1, $pop297      # 1: down to label9
-# BB#63:                                # %if.end3.i431.7
-	i32.const	$push814=, 0
-	i32.const	$push813=, 1
-	i32.add 	$push812=, $0, $pop813
-	tee_local	$push811=, $0=, $pop812
-	i32.store	bar.lastc($pop814), $pop811
-	i32.const	$push810=, 24
-	i32.shl 	$push298=, $0, $pop810
-	i32.const	$push809=, 24
-	i32.shr_s	$push299=, $pop298, $pop809
-	i32.const	$push808=, 80
-	i32.xor 	$push300=, $pop299, $pop808
-	i32.load8_s	$push301=, 287($9)
-	i32.ne  	$push302=, $pop300, $pop301
-	br_if   	1, $pop302      # 1: down to label9
-# BB#64:                                # %if.end3.i431.8
-	i32.const	$push821=, 0
-	i32.const	$push820=, 1
-	i32.add 	$push819=, $0, $pop820
-	tee_local	$push818=, $0=, $pop819
-	i32.store	bar.lastc($pop821), $pop818
-	i32.const	$push817=, 24
-	i32.shl 	$push303=, $0, $pop817
-	i32.const	$push816=, 24
-	i32.shr_s	$push304=, $pop303, $pop816
-	i32.const	$push815=, 80
-	i32.xor 	$push305=, $pop304, $pop815
-	i32.load8_s	$push306=, 288($9)
-	i32.ne  	$push307=, $pop305, $pop306
-	br_if   	1, $pop307      # 1: down to label9
-# BB#65:                                # %if.end3.i431.9
-	i32.const	$push828=, 0
-	i32.const	$push827=, 1
-	i32.add 	$push826=, $0, $pop827
-	tee_local	$push825=, $0=, $pop826
-	i32.store	bar.lastc($pop828), $pop825
-	i32.const	$push824=, 24
-	i32.shl 	$push308=, $0, $pop824
-	i32.const	$push823=, 24
-	i32.shr_s	$push309=, $pop308, $pop823
-	i32.const	$push822=, 80
-	i32.xor 	$push310=, $pop309, $pop822
-	i32.load8_s	$push311=, 289($9)
-	i32.ne  	$push312=, $pop310, $pop311
-	br_if   	1, $pop312      # 1: down to label9
-# BB#66:                                # %bar.exit434.9
-	i32.const	$push836=, 0
-	i32.const	$push835=, 1
-	i32.add 	$push834=, $0, $pop835
-	tee_local	$push833=, $0=, $pop834
-	i32.store	bar.lastc($pop836), $pop833
-	i32.const	$push512=, 264
-	i32.add 	$push513=, $9, $pop512
-	i32.const	$push313=, 10
-	i32.add 	$push316=, $pop513, $pop313
-	i32.const	$push832=, 10
-	i32.add 	$push314=, $2, $pop832
-	i32.load8_u	$push315=, 0($pop314)
-	i32.store8	0($pop316), $pop315
-	i32.const	$push514=, 264
-	i32.add 	$push515=, $9, $pop514
-	i32.const	$push317=, 8
-	i32.add 	$push320=, $pop515, $pop317
-	i32.const	$push831=, 8
-	i32.add 	$push318=, $2, $pop831
-	i32.load16_u	$push319=, 0($pop318):p2align=0
-	i32.store16	0($pop320), $pop319
-	i32.const	$push321=, 84
-	i32.add 	$push830=, $1, $pop321
-	tee_local	$push829=, $4=, $pop830
-	i32.store	4($9), $pop829
-	i32.const	$push322=, 4
-	i32.add 	$push323=, $2, $pop322
-	i32.load	$push324=, 0($pop323):p2align=0
-	i32.store	268($9), $pop324
-	i32.load	$push325=, 0($2):p2align=0
-	i32.store	264($9), $pop325
+	i32.const	$push700=, 0
+	i32.const	$push699=, 11
+	i32.store	bar.lastn($pop700), $pop699
+	i32.const	$push698=, 0
+	i32.const	$push697=, 0
+	i32.store	bar.lastc($pop698), $pop697
+.LBB1_64:                               # %if.end3.i445
+                                        #   in Loop: Header=BB1_61 Depth=1
+	end_block                       # label5:
+	i32.const	$push703=, 24
+	i32.shl 	$push327=, $0, $pop703
+	i32.const	$push702=, 24
+	i32.shr_s	$push328=, $pop327, $pop702
+	i32.const	$push701=, 88
+	i32.xor 	$push329=, $pop328, $pop701
+	i32.ne  	$push330=, $pop329, $4
+	br_if   	1, $pop330      # 1: down to label2
+# BB#65:                                # %bar.exit448
+                                        #   in Loop: Header=BB1_61 Depth=1
+	i32.const	$push709=, 0
+	i32.const	$push708=, 1
+	i32.add 	$push707=, $0, $pop708
+	tee_local	$push706=, $0=, $pop707
+	i32.store	bar.lastc($pop709), $pop706
+	i32.const	$push705=, 10
+	i32.lt_u	$4=, $3, $pop705
+	i32.const	$7=, 11
+	i32.const	$push704=, 1
+	i32.add 	$push4=, $3, $pop704
+	copy_local	$3=, $pop4
+	br_if   	0, $4           # 0: up to label4
+# BB#66:                                # %for.end134
+	end_loop
+	i32.const	$push485=, 256
+	i32.add 	$push486=, $9, $pop485
+	i32.const	$push331=, 8
+	i32.add 	$push334=, $pop486, $pop331
+	i32.const	$push713=, 8
+	i32.add 	$push332=, $6, $pop713
+	i32.load	$push333=, 0($pop332):p2align=0
+	i32.store	0($pop334), $pop333
+	i64.load	$push335=, 0($6):p2align=0
+	i64.store	256($9), $pop335
+	i32.const	$push712=, 96
+	i32.add 	$push711=, $1, $pop712
+	tee_local	$push710=, $6=, $pop711
+	i32.store	12($9), $pop710
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_67:                               # %for.body128
+	i32.const	$3=, 0
+.LBB1_67:                               # %for.body140
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label14:
-	i32.const	$push516=, 264
-	i32.add 	$push517=, $9, $pop516
-	i32.add 	$push327=, $pop517, $2
-	i32.load8_s	$3=, 0($pop327)
+	loop    	                # label6:
+	i32.const	$push487=, 256
+	i32.add 	$push488=, $9, $pop487
+	i32.add 	$push337=, $pop488, $3
+	i32.load8_s	$4=, 0($pop337)
 	block   	
-	i32.const	$push837=, 11
-	i32.eq  	$push326=, $7, $pop837
-	br_if   	0, $pop326      # 0: down to label15
-# BB#68:                                # %if.then.i438
+	i32.const	$push714=, 12
+	i32.eq  	$push336=, $7, $pop714
+	br_if   	0, $pop336      # 0: down to label7
+# BB#68:                                # %if.then.i452
                                         #   in Loop: Header=BB1_67 Depth=1
-	i32.ne  	$push328=, $0, $7
-	br_if   	2, $pop328      # 2: down to label10
-# BB#69:                                # %if.end.i440
+	i32.ne  	$push338=, $0, $7
+	br_if   	2, $pop338      # 2: down to label2
+# BB#69:                                # %if.end.i454
                                         #   in Loop: Header=BB1_67 Depth=1
-	i32.const	$8=, 11
+	i32.const	$8=, 12
 	i32.const	$0=, 0
-	i32.const	$push841=, 0
-	i32.const	$push840=, 11
-	i32.store	bar.lastn($pop841), $pop840
-	i32.const	$push839=, 0
-	i32.const	$push838=, 0
-	i32.store	bar.lastc($pop839), $pop838
-.LBB1_70:                               # %if.end3.i445
+	i32.const	$push718=, 0
+	i32.const	$push717=, 12
+	i32.store	bar.lastn($pop718), $pop717
+	i32.const	$push716=, 0
+	i32.const	$push715=, 0
+	i32.store	bar.lastc($pop716), $pop715
+.LBB1_70:                               # %if.end3.i459
                                         #   in Loop: Header=BB1_67 Depth=1
-	end_block                       # label15:
-	i32.const	$push844=, 24
-	i32.shl 	$push329=, $0, $pop844
-	i32.const	$push843=, 24
-	i32.shr_s	$push330=, $pop329, $pop843
-	i32.const	$push842=, 88
-	i32.xor 	$push331=, $pop330, $pop842
-	i32.ne  	$push332=, $pop331, $3
-	br_if   	1, $pop332      # 1: down to label10
-# BB#71:                                # %bar.exit448
+	end_block                       # label7:
+	i32.const	$push721=, 24
+	i32.shl 	$push339=, $0, $pop721
+	i32.const	$push720=, 24
+	i32.shr_s	$push340=, $pop339, $pop720
+	i32.const	$push719=, 96
+	i32.xor 	$push341=, $pop340, $pop719
+	i32.ne  	$push342=, $pop341, $4
+	br_if   	1, $pop342      # 1: down to label2
+# BB#71:                                # %bar.exit462
                                         #   in Loop: Header=BB1_67 Depth=1
-	i32.const	$push852=, 0
-	i32.const	$push851=, 1
-	i32.add 	$push850=, $0, $pop851
-	tee_local	$push849=, $0=, $pop850
-	i32.store	bar.lastc($pop852), $pop849
-	i32.const	$7=, 11
-	i32.const	$push848=, 1
-	i32.add 	$push847=, $2, $pop848
-	tee_local	$push846=, $2=, $pop847
-	i32.const	$push845=, 11
-	i32.lt_s	$push333=, $pop846, $pop845
-	br_if   	0, $pop333      # 0: up to label14
-# BB#72:                                # %for.end134
+	i32.const	$push727=, 0
+	i32.const	$push726=, 1
+	i32.add 	$push725=, $0, $pop726
+	tee_local	$push724=, $0=, $pop725
+	i32.store	bar.lastc($pop727), $pop724
+	i32.const	$push723=, 11
+	i32.lt_u	$4=, $3, $pop723
+	i32.const	$7=, 12
+	i32.const	$push722=, 1
+	i32.add 	$push5=, $3, $pop722
+	copy_local	$3=, $pop5
+	br_if   	0, $4           # 0: up to label6
+# BB#72:                                # %for.end146
 	end_loop
-	i32.const	$push518=, 248
-	i32.add 	$push519=, $9, $pop518
-	i32.const	$push334=, 8
-	i32.add 	$push337=, $pop519, $pop334
-	i32.const	$push856=, 8
-	i32.add 	$push335=, $4, $pop856
-	i32.load	$push336=, 0($pop335):p2align=0
-	i32.store	0($pop337), $pop336
-	i32.const	$push855=, 96
-	i32.add 	$push854=, $1, $pop855
-	tee_local	$push853=, $6=, $pop854
-	i32.store	4($9), $pop853
-	i32.const	$push338=, 4
-	i32.add 	$push339=, $4, $pop338
-	i32.load	$push340=, 0($pop339):p2align=0
-	i32.store	252($9), $pop340
-	i32.load	$push341=, 0($4):p2align=0
-	i32.store	248($9), $pop341
+	i64.load	$push343=, 0($6):p2align=0
+	i64.store	240($9), $pop343
+	i32.const	$push344=, 112
+	i32.add 	$push729=, $1, $pop344
+	tee_local	$push728=, $5=, $pop729
+	i32.store	12($9), $pop728
+	i32.const	$push345=, 5
+	i32.add 	$push346=, $6, $pop345
+	i64.load	$push347=, 0($pop346):p2align=0
+	i64.store	245($9):p2align=0, $pop347
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_73:                               # %for.body140
+	i32.const	$3=, 0
+.LBB1_73:                               # %for.body152
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label16:
-	i32.const	$push520=, 248
-	i32.add 	$push521=, $9, $pop520
-	i32.add 	$push343=, $pop521, $2
-	i32.load8_s	$3=, 0($pop343)
+	loop    	                # label8:
+	i32.const	$push489=, 240
+	i32.add 	$push490=, $9, $pop489
+	i32.add 	$push349=, $pop490, $3
+	i32.load8_s	$4=, 0($pop349)
 	block   	
-	i32.const	$push857=, 12
-	i32.eq  	$push342=, $7, $pop857
-	br_if   	0, $pop342      # 0: down to label17
-# BB#74:                                # %if.then.i452
+	i32.const	$push730=, 13
+	i32.eq  	$push348=, $7, $pop730
+	br_if   	0, $pop348      # 0: down to label9
+# BB#74:                                # %if.then.i466
                                         #   in Loop: Header=BB1_73 Depth=1
-	i32.ne  	$push344=, $0, $7
-	br_if   	2, $pop344      # 2: down to label10
-# BB#75:                                # %if.end.i454
+	i32.ne  	$push350=, $0, $7
+	br_if   	2, $pop350      # 2: down to label2
+# BB#75:                                # %if.end.i468
                                         #   in Loop: Header=BB1_73 Depth=1
-	i32.const	$8=, 12
+	i32.const	$8=, 13
 	i32.const	$0=, 0
-	i32.const	$push861=, 0
-	i32.const	$push860=, 12
-	i32.store	bar.lastn($pop861), $pop860
-	i32.const	$push859=, 0
-	i32.const	$push858=, 0
-	i32.store	bar.lastc($pop859), $pop858
-.LBB1_76:                               # %if.end3.i459
+	i32.const	$push734=, 0
+	i32.const	$push733=, 13
+	i32.store	bar.lastn($pop734), $pop733
+	i32.const	$push732=, 0
+	i32.const	$push731=, 0
+	i32.store	bar.lastc($pop732), $pop731
+.LBB1_76:                               # %if.end3.i473
                                         #   in Loop: Header=BB1_73 Depth=1
-	end_block                       # label17:
-	i32.const	$push864=, 24
-	i32.shl 	$push345=, $0, $pop864
-	i32.const	$push863=, 24
-	i32.shr_s	$push346=, $pop345, $pop863
-	i32.const	$push862=, 96
-	i32.xor 	$push347=, $pop346, $pop862
-	i32.ne  	$push348=, $pop347, $3
-	br_if   	1, $pop348      # 1: down to label10
-# BB#77:                                # %bar.exit462
+	end_block                       # label9:
+	i32.const	$push737=, 24
+	i32.shl 	$push351=, $0, $pop737
+	i32.const	$push736=, 24
+	i32.shr_s	$push352=, $pop351, $pop736
+	i32.const	$push735=, 104
+	i32.xor 	$push353=, $pop352, $pop735
+	i32.ne  	$push354=, $pop353, $4
+	br_if   	1, $pop354      # 1: down to label2
+# BB#77:                                # %bar.exit476
                                         #   in Loop: Header=BB1_73 Depth=1
-	i32.const	$push872=, 0
-	i32.const	$push871=, 1
-	i32.add 	$push870=, $0, $pop871
-	tee_local	$push869=, $0=, $pop870
-	i32.store	bar.lastc($pop872), $pop869
-	i32.const	$7=, 12
-	i32.const	$push868=, 1
-	i32.add 	$push867=, $2, $pop868
-	tee_local	$push866=, $2=, $pop867
-	i32.const	$push865=, 12
-	i32.lt_s	$push349=, $pop866, $pop865
-	br_if   	0, $pop349      # 0: up to label16
-# BB#78:                                # %for.end146
+	i32.const	$push743=, 0
+	i32.const	$push742=, 1
+	i32.add 	$push741=, $0, $pop742
+	tee_local	$push740=, $0=, $pop741
+	i32.store	bar.lastc($pop743), $pop740
+	i32.const	$push739=, 12
+	i32.lt_u	$4=, $3, $pop739
+	i32.const	$7=, 13
+	i32.const	$push738=, 1
+	i32.add 	$push6=, $3, $pop738
+	copy_local	$3=, $pop6
+	br_if   	0, $4           # 0: up to label8
+# BB#78:                                # %for.end158
 	end_loop
-	i32.const	$push522=, 232
-	i32.add 	$push523=, $9, $pop522
-	i32.const	$push350=, 12
-	i32.add 	$push353=, $pop523, $pop350
-	i32.const	$push876=, 12
-	i32.add 	$push351=, $6, $pop876
-	i32.load8_u	$push352=, 0($pop351)
-	i32.store8	0($pop353), $pop352
-	i32.const	$push524=, 232
-	i32.add 	$push525=, $9, $pop524
-	i32.const	$push354=, 8
-	i32.add 	$push357=, $pop525, $pop354
-	i32.const	$push875=, 8
-	i32.add 	$push355=, $6, $pop875
-	i32.load	$push356=, 0($pop355):p2align=0
-	i32.store	0($pop357), $pop356
-	i32.const	$push358=, 112
-	i32.add 	$push874=, $1, $pop358
-	tee_local	$push873=, $4=, $pop874
-	i32.store	4($9), $pop873
-	i32.const	$push359=, 4
-	i32.add 	$push360=, $6, $pop359
-	i32.load	$push361=, 0($pop360):p2align=0
-	i32.store	236($9), $pop361
-	i32.load	$push362=, 0($6):p2align=0
-	i32.store	232($9), $pop362
+	i64.load	$push355=, 0($5):p2align=0
+	i64.store	224($9), $pop355
+	i32.const	$push356=, 128
+	i32.add 	$push745=, $1, $pop356
+	tee_local	$push744=, $6=, $pop745
+	i32.store	12($9), $pop744
+	i32.const	$push357=, 6
+	i32.add 	$push358=, $5, $pop357
+	i64.load	$push359=, 0($pop358):p2align=0
+	i64.store	230($9):p2align=1, $pop359
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_79:                               # %for.body152
+	i32.const	$3=, 0
+.LBB1_79:                               # %for.body164
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label18:
-	i32.const	$push526=, 232
-	i32.add 	$push527=, $9, $pop526
-	i32.add 	$push364=, $pop527, $2
-	i32.load8_s	$3=, 0($pop364)
+	loop    	                # label10:
+	i32.const	$push491=, 224
+	i32.add 	$push492=, $9, $pop491
+	i32.add 	$push361=, $pop492, $3
+	i32.load8_s	$4=, 0($pop361)
 	block   	
-	i32.const	$push877=, 13
-	i32.eq  	$push363=, $7, $pop877
-	br_if   	0, $pop363      # 0: down to label19
-# BB#80:                                # %if.then.i466
+	i32.const	$push746=, 14
+	i32.eq  	$push360=, $7, $pop746
+	br_if   	0, $pop360      # 0: down to label11
+# BB#80:                                # %if.then.i480
                                         #   in Loop: Header=BB1_79 Depth=1
-	i32.ne  	$push365=, $0, $7
-	br_if   	2, $pop365      # 2: down to label10
-# BB#81:                                # %if.end.i468
+	i32.ne  	$push362=, $0, $7
+	br_if   	2, $pop362      # 2: down to label2
+# BB#81:                                # %if.end.i482
                                         #   in Loop: Header=BB1_79 Depth=1
-	i32.const	$8=, 13
+	i32.const	$8=, 14
 	i32.const	$0=, 0
-	i32.const	$push881=, 0
-	i32.const	$push880=, 13
-	i32.store	bar.lastn($pop881), $pop880
-	i32.const	$push879=, 0
-	i32.const	$push878=, 0
-	i32.store	bar.lastc($pop879), $pop878
-.LBB1_82:                               # %if.end3.i473
+	i32.const	$push750=, 0
+	i32.const	$push749=, 14
+	i32.store	bar.lastn($pop750), $pop749
+	i32.const	$push748=, 0
+	i32.const	$push747=, 0
+	i32.store	bar.lastc($pop748), $pop747
+.LBB1_82:                               # %if.end3.i487
                                         #   in Loop: Header=BB1_79 Depth=1
-	end_block                       # label19:
-	i32.const	$push884=, 24
-	i32.shl 	$push366=, $0, $pop884
-	i32.const	$push883=, 24
-	i32.shr_s	$push367=, $pop366, $pop883
-	i32.const	$push882=, 104
-	i32.xor 	$push368=, $pop367, $pop882
-	i32.ne  	$push369=, $pop368, $3
-	br_if   	1, $pop369      # 1: down to label10
-# BB#83:                                # %bar.exit476
+	end_block                       # label11:
+	i32.const	$push753=, 24
+	i32.shl 	$push363=, $0, $pop753
+	i32.const	$push752=, 24
+	i32.shr_s	$push364=, $pop363, $pop752
+	i32.const	$push751=, 112
+	i32.xor 	$push365=, $pop364, $pop751
+	i32.ne  	$push366=, $pop365, $4
+	br_if   	1, $pop366      # 1: down to label2
+# BB#83:                                # %bar.exit490
                                         #   in Loop: Header=BB1_79 Depth=1
-	i32.const	$push892=, 0
-	i32.const	$push891=, 1
-	i32.add 	$push890=, $0, $pop891
-	tee_local	$push889=, $0=, $pop890
-	i32.store	bar.lastc($pop892), $pop889
-	i32.const	$7=, 13
-	i32.const	$push888=, 1
-	i32.add 	$push887=, $2, $pop888
-	tee_local	$push886=, $2=, $pop887
-	i32.const	$push885=, 13
-	i32.lt_s	$push370=, $pop886, $pop885
-	br_if   	0, $pop370      # 0: up to label18
-# BB#84:                                # %for.end158
+	i32.const	$push759=, 0
+	i32.const	$push758=, 1
+	i32.add 	$push757=, $0, $pop758
+	tee_local	$push756=, $0=, $pop757
+	i32.store	bar.lastc($pop759), $pop756
+	i32.const	$push755=, 13
+	i32.lt_u	$4=, $3, $pop755
+	i32.const	$7=, 14
+	i32.const	$push754=, 1
+	i32.add 	$push7=, $3, $pop754
+	copy_local	$3=, $pop7
+	br_if   	0, $4           # 0: up to label10
+# BB#84:                                # %for.end170
 	end_loop
-	i32.const	$push528=, 216
-	i32.add 	$push529=, $9, $pop528
-	i32.const	$push371=, 12
-	i32.add 	$push374=, $pop529, $pop371
-	i32.const	$push896=, 12
-	i32.add 	$push372=, $4, $pop896
-	i32.load16_u	$push373=, 0($pop372):p2align=0
-	i32.store16	0($pop374), $pop373
-	i32.const	$push530=, 216
-	i32.add 	$push531=, $9, $pop530
-	i32.const	$push375=, 8
-	i32.add 	$push378=, $pop531, $pop375
-	i32.const	$push895=, 8
-	i32.add 	$push376=, $4, $pop895
-	i32.load	$push377=, 0($pop376):p2align=0
-	i32.store	0($pop378), $pop377
-	i32.const	$push379=, 128
-	i32.add 	$push894=, $1, $pop379
-	tee_local	$push893=, $6=, $pop894
-	i32.store	4($9), $pop893
-	i32.const	$push380=, 4
-	i32.add 	$push381=, $4, $pop380
-	i32.load	$push382=, 0($pop381):p2align=0
-	i32.store	220($9), $pop382
-	i32.load	$push383=, 0($4):p2align=0
-	i32.store	216($9), $pop383
+	i64.load	$push367=, 0($6):p2align=0
+	i64.store	208($9), $pop367
+	i32.const	$push368=, 144
+	i32.add 	$push761=, $1, $pop368
+	tee_local	$push760=, $5=, $pop761
+	i32.store	12($9), $pop760
+	i32.const	$push369=, 7
+	i32.add 	$push370=, $6, $pop369
+	i64.load	$push371=, 0($pop370):p2align=0
+	i64.store	215($9):p2align=0, $pop371
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_85:                               # %for.body164
+	i32.const	$3=, 0
+.LBB1_85:                               # %for.body176
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label20:
-	i32.const	$push532=, 216
-	i32.add 	$push533=, $9, $pop532
-	i32.add 	$push385=, $pop533, $2
-	i32.load8_s	$3=, 0($pop385)
+	loop    	                # label12:
+	i32.const	$push493=, 208
+	i32.add 	$push494=, $9, $pop493
+	i32.add 	$push373=, $pop494, $3
+	i32.load8_s	$4=, 0($pop373)
 	block   	
-	i32.const	$push897=, 14
-	i32.eq  	$push384=, $7, $pop897
-	br_if   	0, $pop384      # 0: down to label21
-# BB#86:                                # %if.then.i480
+	i32.const	$push762=, 15
+	i32.eq  	$push372=, $7, $pop762
+	br_if   	0, $pop372      # 0: down to label13
+# BB#86:                                # %if.then.i494
                                         #   in Loop: Header=BB1_85 Depth=1
-	i32.ne  	$push386=, $0, $7
-	br_if   	2, $pop386      # 2: down to label10
-# BB#87:                                # %if.end.i482
+	i32.ne  	$push374=, $0, $7
+	br_if   	2, $pop374      # 2: down to label2
+# BB#87:                                # %if.end.i496
                                         #   in Loop: Header=BB1_85 Depth=1
-	i32.const	$8=, 14
+	i32.const	$8=, 15
 	i32.const	$0=, 0
-	i32.const	$push901=, 0
-	i32.const	$push900=, 14
-	i32.store	bar.lastn($pop901), $pop900
-	i32.const	$push899=, 0
-	i32.const	$push898=, 0
-	i32.store	bar.lastc($pop899), $pop898
-.LBB1_88:                               # %if.end3.i487
+	i32.const	$push766=, 0
+	i32.const	$push765=, 15
+	i32.store	bar.lastn($pop766), $pop765
+	i32.const	$push764=, 0
+	i32.const	$push763=, 0
+	i32.store	bar.lastc($pop764), $pop763
+.LBB1_88:                               # %if.end3.i501
                                         #   in Loop: Header=BB1_85 Depth=1
-	end_block                       # label21:
-	i32.const	$push904=, 24
-	i32.shl 	$push387=, $0, $pop904
-	i32.const	$push903=, 24
-	i32.shr_s	$push388=, $pop387, $pop903
-	i32.const	$push902=, 112
-	i32.xor 	$push389=, $pop388, $pop902
-	i32.ne  	$push390=, $pop389, $3
-	br_if   	1, $pop390      # 1: down to label10
-# BB#89:                                # %bar.exit490
+	end_block                       # label13:
+	i32.const	$push769=, 24
+	i32.shl 	$push375=, $0, $pop769
+	i32.const	$push768=, 24
+	i32.shr_s	$push376=, $pop375, $pop768
+	i32.const	$push767=, 120
+	i32.xor 	$push377=, $pop376, $pop767
+	i32.ne  	$push378=, $pop377, $4
+	br_if   	1, $pop378      # 1: down to label2
+# BB#89:                                # %bar.exit504
                                         #   in Loop: Header=BB1_85 Depth=1
-	i32.const	$push912=, 0
-	i32.const	$push911=, 1
-	i32.add 	$push910=, $0, $pop911
-	tee_local	$push909=, $0=, $pop910
-	i32.store	bar.lastc($pop912), $pop909
-	i32.const	$7=, 14
-	i32.const	$push908=, 1
-	i32.add 	$push907=, $2, $pop908
-	tee_local	$push906=, $2=, $pop907
-	i32.const	$push905=, 14
-	i32.lt_s	$push391=, $pop906, $pop905
-	br_if   	0, $pop391      # 0: up to label20
-# BB#90:                                # %for.end170
+	i32.const	$push775=, 0
+	i32.const	$push774=, 1
+	i32.add 	$push773=, $0, $pop774
+	tee_local	$push772=, $0=, $pop773
+	i32.store	bar.lastc($pop775), $pop772
+	i32.const	$push771=, 14
+	i32.lt_u	$4=, $3, $pop771
+	i32.const	$7=, 15
+	i32.const	$push770=, 1
+	i32.add 	$push8=, $3, $pop770
+	copy_local	$3=, $pop8
+	br_if   	0, $4           # 0: up to label12
+# BB#90:                                # %for.end182
 	end_loop
-	i32.const	$push534=, 200
-	i32.add 	$push535=, $9, $pop534
-	i32.const	$push392=, 14
-	i32.add 	$push395=, $pop535, $pop392
-	i32.const	$push917=, 14
-	i32.add 	$push393=, $6, $pop917
-	i32.load8_u	$push394=, 0($pop393)
-	i32.store8	0($pop395), $pop394
-	i32.const	$push536=, 200
-	i32.add 	$push537=, $9, $pop536
-	i32.const	$push396=, 12
-	i32.add 	$push399=, $pop537, $pop396
-	i32.const	$push916=, 12
-	i32.add 	$push397=, $6, $pop916
-	i32.load16_u	$push398=, 0($pop397):p2align=0
-	i32.store16	0($pop399), $pop398
-	i32.const	$push538=, 200
-	i32.add 	$push539=, $9, $pop538
-	i32.const	$push400=, 8
-	i32.add 	$push403=, $pop539, $pop400
-	i32.const	$push915=, 8
-	i32.add 	$push401=, $6, $pop915
-	i32.load	$push402=, 0($pop401):p2align=0
-	i32.store	0($pop403), $pop402
-	i32.const	$push404=, 144
-	i32.add 	$push914=, $1, $pop404
-	tee_local	$push913=, $4=, $pop914
-	i32.store	4($9), $pop913
-	i32.const	$push405=, 4
-	i32.add 	$push406=, $6, $pop405
-	i32.load	$push407=, 0($pop406):p2align=0
-	i32.store	204($9), $pop407
-	i32.load	$push408=, 0($6):p2align=0
-	i32.store	200($9), $pop408
+	i32.const	$push495=, 192
+	i32.add 	$push496=, $9, $pop495
+	i32.const	$push379=, 8
+	i32.add 	$push382=, $pop496, $pop379
+	i32.const	$push778=, 8
+	i32.add 	$push380=, $5, $pop778
+	i64.load	$push381=, 0($pop380):p2align=0
+	i64.store	0($pop382), $pop381
+	i64.load	$push383=, 0($5):p2align=0
+	i64.store	192($9), $pop383
+	i32.const	$push384=, 160
+	i32.add 	$push777=, $1, $pop384
+	tee_local	$push776=, $6=, $pop777
+	i32.store	12($9), $pop776
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_91:                               # %for.body176
+	i32.const	$3=, 0
+.LBB1_91:                               # %for.body188
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label22:
-	i32.const	$push540=, 200
-	i32.add 	$push541=, $9, $pop540
-	i32.add 	$push410=, $pop541, $2
-	i32.load8_s	$3=, 0($pop410)
+	loop    	                # label14:
+	i32.const	$push497=, 192
+	i32.add 	$push498=, $9, $pop497
+	i32.add 	$push386=, $pop498, $3
+	i32.load8_s	$4=, 0($pop386)
 	block   	
-	i32.const	$push918=, 15
-	i32.eq  	$push409=, $7, $pop918
-	br_if   	0, $pop409      # 0: down to label23
-# BB#92:                                # %if.then.i494
+	i32.const	$push779=, 16
+	i32.eq  	$push385=, $7, $pop779
+	br_if   	0, $pop385      # 0: down to label15
+# BB#92:                                # %if.then.i508
                                         #   in Loop: Header=BB1_91 Depth=1
-	i32.ne  	$push411=, $0, $7
-	br_if   	2, $pop411      # 2: down to label10
-# BB#93:                                # %if.end.i496
+	i32.ne  	$push387=, $0, $7
+	br_if   	2, $pop387      # 2: down to label2
+# BB#93:                                # %if.end.i510
                                         #   in Loop: Header=BB1_91 Depth=1
-	i32.const	$8=, 15
+	i32.const	$8=, 16
 	i32.const	$0=, 0
-	i32.const	$push922=, 0
-	i32.const	$push921=, 15
-	i32.store	bar.lastn($pop922), $pop921
-	i32.const	$push920=, 0
-	i32.const	$push919=, 0
-	i32.store	bar.lastc($pop920), $pop919
-.LBB1_94:                               # %if.end3.i501
+	i32.const	$push783=, 0
+	i32.const	$push782=, 16
+	i32.store	bar.lastn($pop783), $pop782
+	i32.const	$push781=, 0
+	i32.const	$push780=, 0
+	i32.store	bar.lastc($pop781), $pop780
+.LBB1_94:                               # %if.end3.i515
                                         #   in Loop: Header=BB1_91 Depth=1
-	end_block                       # label23:
-	i32.const	$push925=, 24
-	i32.shl 	$push412=, $0, $pop925
-	i32.const	$push924=, 24
-	i32.shr_s	$push413=, $pop412, $pop924
-	i32.const	$push923=, 120
-	i32.xor 	$push414=, $pop413, $pop923
-	i32.ne  	$push415=, $pop414, $3
-	br_if   	1, $pop415      # 1: down to label10
-# BB#95:                                # %bar.exit504
+	end_block                       # label15:
+	i32.const	$push786=, 24
+	i32.shl 	$push388=, $0, $pop786
+	i32.const	$push785=, -2147483648
+	i32.xor 	$push389=, $pop388, $pop785
+	i32.const	$push784=, 24
+	i32.shr_s	$push390=, $pop389, $pop784
+	i32.ne  	$push391=, $pop390, $4
+	br_if   	1, $pop391      # 1: down to label2
+# BB#95:                                # %bar.exit518
                                         #   in Loop: Header=BB1_91 Depth=1
-	i32.const	$push933=, 0
-	i32.const	$push932=, 1
-	i32.add 	$push931=, $0, $pop932
-	tee_local	$push930=, $0=, $pop931
-	i32.store	bar.lastc($pop933), $pop930
-	i32.const	$7=, 15
-	i32.const	$push929=, 1
-	i32.add 	$push928=, $2, $pop929
-	tee_local	$push927=, $2=, $pop928
-	i32.const	$push926=, 15
-	i32.lt_s	$push416=, $pop927, $pop926
-	br_if   	0, $pop416      # 0: up to label22
-# BB#96:                                # %for.end182
+	i32.const	$push792=, 0
+	i32.const	$push791=, 1
+	i32.add 	$push790=, $0, $pop791
+	tee_local	$push789=, $0=, $pop790
+	i32.store	bar.lastc($pop792), $pop789
+	i32.const	$push788=, 15
+	i32.lt_u	$4=, $3, $pop788
+	i32.const	$7=, 16
+	i32.const	$push787=, 1
+	i32.add 	$push9=, $3, $pop787
+	copy_local	$3=, $pop9
+	br_if   	0, $4           # 0: up to label14
+# BB#96:                                # %for.end194
 	end_loop
-	i32.const	$push542=, 184
-	i32.add 	$push543=, $9, $pop542
-	i32.const	$push417=, 12
-	i32.add 	$push420=, $pop543, $pop417
-	i32.const	$push937=, 12
-	i32.add 	$push418=, $4, $pop937
-	i32.load	$push419=, 0($pop418):p2align=0
-	i32.store	0($pop420), $pop419
-	i32.const	$push544=, 184
-	i32.add 	$push545=, $9, $pop544
-	i32.const	$push421=, 8
-	i32.add 	$push424=, $pop545, $pop421
-	i32.const	$push936=, 8
-	i32.add 	$push422=, $4, $pop936
-	i32.load	$push423=, 0($pop422):p2align=0
-	i32.store	0($pop424), $pop423
-	i32.const	$push425=, 160
-	i32.add 	$push935=, $1, $pop425
-	tee_local	$push934=, $5=, $pop935
-	i32.store	4($9), $pop934
-	i32.const	$push426=, 4
-	i32.add 	$push427=, $4, $pop426
-	i32.load	$push428=, 0($pop427):p2align=0
-	i32.store	188($9), $pop428
-	i32.load	$push429=, 0($4):p2align=0
-	i32.store	184($9), $pop429
+	i32.const	$push499=, 160
+	i32.add 	$push500=, $9, $pop499
+	i32.const	$push392=, 8
+	i32.add 	$push395=, $pop500, $pop392
+	i32.const	$push797=, 8
+	i32.add 	$push393=, $6, $pop797
+	i64.load	$push394=, 0($pop393):p2align=0
+	i64.store	0($pop395), $pop394
+	i32.const	$push501=, 160
+	i32.add 	$push502=, $9, $pop501
+	i32.const	$push396=, 16
+	i32.add 	$push399=, $pop502, $pop396
+	i32.const	$push796=, 16
+	i32.add 	$push397=, $6, $pop796
+	i64.load	$push398=, 0($pop397):p2align=0
+	i64.store	0($pop399), $pop398
+	i32.const	$push503=, 160
+	i32.add 	$push504=, $9, $pop503
+	i32.const	$push400=, 23
+	i32.add 	$push403=, $pop504, $pop400
+	i32.const	$push795=, 23
+	i32.add 	$push401=, $6, $pop795
+	i64.load	$push402=, 0($pop401):p2align=0
+	i64.store	0($pop403):p2align=0, $pop402
+	i64.load	$push404=, 0($6):p2align=0
+	i64.store	160($9), $pop404
+	i32.const	$push405=, 192
+	i32.add 	$push794=, $1, $pop405
+	tee_local	$push793=, $6=, $pop794
+	i32.store	12($9), $pop793
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_97:                               # %for.body188
+	i32.const	$3=, 0
+.LBB1_97:                               # %for.body200
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label24:
-	i32.const	$push546=, 184
-	i32.add 	$push547=, $9, $pop546
-	i32.add 	$push431=, $pop547, $2
-	i32.load8_s	$3=, 0($pop431)
+	loop    	                # label16:
+	i32.const	$push505=, 160
+	i32.add 	$push506=, $9, $pop505
+	i32.add 	$push407=, $pop506, $3
+	i32.load8_s	$4=, 0($pop407)
 	block   	
-	i32.const	$push938=, 16
-	i32.eq  	$push430=, $7, $pop938
-	br_if   	0, $pop430      # 0: down to label25
-# BB#98:                                # %if.then.i508
+	i32.const	$push798=, 31
+	i32.eq  	$push406=, $7, $pop798
+	br_if   	0, $pop406      # 0: down to label17
+# BB#98:                                # %if.then.i522
                                         #   in Loop: Header=BB1_97 Depth=1
-	i32.ne  	$push432=, $0, $7
-	br_if   	2, $pop432      # 2: down to label10
-# BB#99:                                # %if.end.i510
+	i32.ne  	$push408=, $0, $7
+	br_if   	2, $pop408      # 2: down to label2
+# BB#99:                                # %if.end.i524
                                         #   in Loop: Header=BB1_97 Depth=1
-	i32.const	$8=, 16
+	i32.const	$8=, 31
 	i32.const	$0=, 0
-	i32.const	$push942=, 0
-	i32.const	$push941=, 16
-	i32.store	bar.lastn($pop942), $pop941
-	i32.const	$push940=, 0
-	i32.const	$push939=, 0
-	i32.store	bar.lastc($pop940), $pop939
-.LBB1_100:                              # %if.end3.i515
+	i32.const	$push802=, 0
+	i32.const	$push801=, 31
+	i32.store	bar.lastn($pop802), $pop801
+	i32.const	$push800=, 0
+	i32.const	$push799=, 0
+	i32.store	bar.lastc($pop800), $pop799
+.LBB1_100:                              # %if.end3.i529
                                         #   in Loop: Header=BB1_97 Depth=1
-	end_block                       # label25:
-	i32.const	$push945=, 24
-	i32.shl 	$push433=, $0, $pop945
-	i32.const	$push944=, -2147483648
-	i32.xor 	$push434=, $pop433, $pop944
-	i32.const	$push943=, 24
-	i32.shr_s	$push435=, $pop434, $pop943
-	i32.ne  	$push436=, $pop435, $3
-	br_if   	1, $pop436      # 1: down to label10
-# BB#101:                               # %bar.exit518
+	end_block                       # label17:
+	i32.const	$push805=, 24
+	i32.shl 	$push409=, $0, $pop805
+	i32.const	$push804=, -134217728
+	i32.xor 	$push410=, $pop409, $pop804
+	i32.const	$push803=, 24
+	i32.shr_s	$push411=, $pop410, $pop803
+	i32.ne  	$push412=, $pop411, $4
+	br_if   	1, $pop412      # 1: down to label2
+# BB#101:                               # %bar.exit532
                                         #   in Loop: Header=BB1_97 Depth=1
-	i32.const	$push953=, 0
-	i32.const	$push952=, 1
-	i32.add 	$push951=, $0, $pop952
-	tee_local	$push950=, $0=, $pop951
-	i32.store	bar.lastc($pop953), $pop950
-	i32.const	$7=, 16
-	i32.const	$push949=, 1
-	i32.add 	$push948=, $2, $pop949
-	tee_local	$push947=, $2=, $pop948
-	i32.const	$push946=, 16
-	i32.lt_s	$push437=, $pop947, $pop946
-	br_if   	0, $pop437      # 0: up to label24
-# BB#102:                               # %for.end194
+	i32.const	$push811=, 0
+	i32.const	$push810=, 1
+	i32.add 	$push809=, $0, $pop810
+	tee_local	$push808=, $0=, $pop809
+	i32.store	bar.lastc($pop811), $pop808
+	i32.const	$push807=, 30
+	i32.lt_u	$4=, $3, $pop807
+	i32.const	$7=, 31
+	i32.const	$push806=, 1
+	i32.add 	$push10=, $3, $pop806
+	copy_local	$3=, $pop10
+	br_if   	0, $4           # 0: up to label16
+# BB#102:                               # %for.end206
 	end_loop
-	i32.const	$push438=, 192
-	i32.add 	$push956=, $1, $pop438
-	tee_local	$push955=, $6=, $pop956
-	i32.store	4($9), $pop955
-	i32.const	$push548=, 152
-	i32.add 	$push549=, $9, $pop548
-	i32.const	$push954=, 31
-	i32.call	$drop=, memcpy@FUNCTION, $pop549, $5, $pop954
+	i32.const	$push507=, 128
+	i32.add 	$push508=, $9, $pop507
+	i32.const	$push413=, 8
+	i32.add 	$push416=, $pop508, $pop413
+	i32.const	$push817=, 8
+	i32.add 	$push414=, $6, $pop817
+	i64.load	$push415=, 0($pop414):p2align=0
+	i64.store	0($pop416), $pop415
+	i32.const	$push509=, 128
+	i32.add 	$push510=, $9, $pop509
+	i32.const	$push417=, 16
+	i32.add 	$push420=, $pop510, $pop417
+	i32.const	$push816=, 16
+	i32.add 	$push418=, $6, $pop816
+	i64.load	$push419=, 0($pop418):p2align=0
+	i64.store	0($pop420), $pop419
+	i32.const	$push511=, 128
+	i32.add 	$push512=, $9, $pop511
+	i32.const	$push815=, 24
+	i32.add 	$push423=, $pop512, $pop815
+	i32.const	$push814=, 24
+	i32.add 	$push421=, $6, $pop814
+	i64.load	$push422=, 0($pop421):p2align=0
+	i64.store	0($pop423), $pop422
+	i64.load	$push424=, 0($6):p2align=0
+	i64.store	128($9), $pop424
+	i32.const	$push425=, 224
+	i32.add 	$push813=, $1, $pop425
+	tee_local	$push812=, $6=, $pop813
+	i32.store	12($9), $pop812
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_103:                              # %for.body200
+	i32.const	$3=, 0
+.LBB1_103:                              # %for.body212
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label26:
-	i32.const	$push550=, 152
-	i32.add 	$push551=, $9, $pop550
-	i32.add 	$push440=, $pop551, $2
-	i32.load8_s	$3=, 0($pop440)
+	loop    	                # label18:
+	i32.const	$push513=, 128
+	i32.add 	$push514=, $9, $pop513
+	i32.add 	$push427=, $pop514, $3
+	i32.load8_s	$4=, 0($pop427)
 	block   	
-	i32.const	$push957=, 31
-	i32.eq  	$push439=, $7, $pop957
-	br_if   	0, $pop439      # 0: down to label27
-# BB#104:                               # %if.then.i522
+	i32.const	$push818=, 32
+	i32.eq  	$push426=, $7, $pop818
+	br_if   	0, $pop426      # 0: down to label19
+# BB#104:                               # %if.then.i536
                                         #   in Loop: Header=BB1_103 Depth=1
-	i32.ne  	$push441=, $0, $7
-	br_if   	2, $pop441      # 2: down to label10
-# BB#105:                               # %if.end.i524
+	i32.ne  	$push428=, $0, $7
+	br_if   	2, $pop428      # 2: down to label2
+# BB#105:                               # %if.end.i538
                                         #   in Loop: Header=BB1_103 Depth=1
-	i32.const	$8=, 31
+	i32.const	$8=, 32
 	i32.const	$0=, 0
-	i32.const	$push961=, 0
-	i32.const	$push960=, 31
-	i32.store	bar.lastn($pop961), $pop960
-	i32.const	$push959=, 0
-	i32.const	$push958=, 0
-	i32.store	bar.lastc($pop959), $pop958
-.LBB1_106:                              # %if.end3.i529
+	i32.const	$push822=, 0
+	i32.const	$push821=, 32
+	i32.store	bar.lastn($pop822), $pop821
+	i32.const	$push820=, 0
+	i32.const	$push819=, 0
+	i32.store	bar.lastc($pop820), $pop819
+.LBB1_106:                              # %if.end3.i543
                                         #   in Loop: Header=BB1_103 Depth=1
-	end_block                       # label27:
-	i32.const	$push964=, 24
-	i32.shl 	$push442=, $0, $pop964
-	i32.const	$push963=, -134217728
-	i32.xor 	$push443=, $pop442, $pop963
-	i32.const	$push962=, 24
-	i32.shr_s	$push444=, $pop443, $pop962
-	i32.ne  	$push445=, $pop444, $3
-	br_if   	1, $pop445      # 1: down to label10
-# BB#107:                               # %bar.exit532
+	end_block                       # label19:
+	i32.const	$push824=, 24
+	i32.shl 	$push429=, $0, $pop824
+	i32.const	$push823=, 24
+	i32.shr_s	$push430=, $pop429, $pop823
+	i32.ne  	$push431=, $pop430, $4
+	br_if   	1, $pop431      # 1: down to label2
+# BB#107:                               # %bar.exit546
                                         #   in Loop: Header=BB1_103 Depth=1
-	i32.const	$push972=, 0
-	i32.const	$push971=, 1
-	i32.add 	$push970=, $0, $pop971
-	tee_local	$push969=, $0=, $pop970
-	i32.store	bar.lastc($pop972), $pop969
-	i32.const	$7=, 31
-	i32.const	$push968=, 1
-	i32.add 	$push967=, $2, $pop968
-	tee_local	$push966=, $2=, $pop967
-	i32.const	$push965=, 31
-	i32.lt_s	$push446=, $pop966, $pop965
-	br_if   	0, $pop446      # 0: up to label26
-# BB#108:                               # %for.end206
+	i32.const	$push830=, 0
+	i32.const	$push829=, 1
+	i32.add 	$push828=, $0, $pop829
+	tee_local	$push827=, $0=, $pop828
+	i32.store	bar.lastc($pop830), $pop827
+	i32.const	$push826=, 31
+	i32.lt_u	$4=, $3, $pop826
+	i32.const	$7=, 32
+	i32.const	$push825=, 1
+	i32.add 	$push11=, $3, $pop825
+	copy_local	$3=, $pop11
+	br_if   	0, $4           # 0: up to label18
+# BB#108:                               # %for.end218
 	end_loop
-	i32.const	$push552=, 120
-	i32.add 	$push553=, $9, $pop552
-	i32.const	$push447=, 28
-	i32.add 	$push450=, $pop553, $pop447
-	i32.const	$push981=, 28
-	i32.add 	$push448=, $6, $pop981
-	i32.load	$push449=, 0($pop448):p2align=0
-	i32.store	0($pop450), $pop449
-	i32.const	$push554=, 120
-	i32.add 	$push555=, $9, $pop554
-	i32.const	$push980=, 24
-	i32.add 	$push453=, $pop555, $pop980
-	i32.const	$push979=, 24
-	i32.add 	$push451=, $6, $pop979
-	i32.load	$push452=, 0($pop451):p2align=0
-	i32.store	0($pop453), $pop452
-	i32.const	$push556=, 120
-	i32.add 	$push557=, $9, $pop556
-	i32.const	$push454=, 20
-	i32.add 	$push457=, $pop557, $pop454
-	i32.const	$push978=, 20
-	i32.add 	$push455=, $6, $pop978
-	i32.load	$push456=, 0($pop455):p2align=0
-	i32.store	0($pop457), $pop456
-	i32.const	$push558=, 120
-	i32.add 	$push559=, $9, $pop558
-	i32.const	$push458=, 16
-	i32.add 	$push461=, $pop559, $pop458
-	i32.const	$push977=, 16
-	i32.add 	$push459=, $6, $pop977
-	i32.load	$push460=, 0($pop459):p2align=0
-	i32.store	0($pop461), $pop460
-	i32.const	$push560=, 120
-	i32.add 	$push561=, $9, $pop560
-	i32.const	$push462=, 12
-	i32.add 	$push465=, $pop561, $pop462
-	i32.const	$push976=, 12
-	i32.add 	$push463=, $6, $pop976
-	i32.load	$push464=, 0($pop463):p2align=0
-	i32.store	0($pop465), $pop464
-	i32.const	$push562=, 120
-	i32.add 	$push563=, $9, $pop562
-	i32.const	$push466=, 8
-	i32.add 	$push469=, $pop563, $pop466
-	i32.const	$push975=, 8
-	i32.add 	$push467=, $6, $pop975
-	i32.load	$push468=, 0($pop467):p2align=0
-	i32.store	0($pop469), $pop468
-	i32.const	$push470=, 224
-	i32.add 	$push974=, $1, $pop470
-	tee_local	$push973=, $4=, $pop974
-	i32.store	4($9), $pop973
-	i32.const	$push471=, 4
-	i32.add 	$push472=, $6, $pop471
-	i32.load	$push473=, 0($pop472):p2align=0
-	i32.store	124($9), $pop473
-	i32.load	$push474=, 0($6):p2align=0
-	i32.store	120($9), $pop474
+	i32.const	$push515=, 88
+	i32.add 	$push516=, $9, $pop515
+	i32.const	$push432=, 8
+	i32.add 	$push435=, $pop516, $pop432
+	i32.const	$push839=, 8
+	i32.add 	$push433=, $6, $pop839
+	i64.load	$push434=, 0($pop433):p2align=0
+	i64.store	0($pop435), $pop434
+	i32.const	$push517=, 88
+	i32.add 	$push518=, $9, $pop517
+	i32.const	$push436=, 16
+	i32.add 	$push439=, $pop518, $pop436
+	i32.const	$push838=, 16
+	i32.add 	$push437=, $6, $pop838
+	i64.load	$push438=, 0($pop437):p2align=0
+	i64.store	0($pop439), $pop438
+	i32.const	$push519=, 88
+	i32.add 	$push520=, $9, $pop519
+	i32.const	$push837=, 24
+	i32.add 	$push442=, $pop520, $pop837
+	i32.const	$push836=, 24
+	i32.add 	$push440=, $6, $pop836
+	i64.load	$push441=, 0($pop440):p2align=0
+	i64.store	0($pop442), $pop441
+	i32.const	$push521=, 88
+	i32.add 	$push522=, $9, $pop521
+	i32.const	$push443=, 32
+	i32.add 	$push446=, $pop522, $pop443
+	i32.const	$push835=, 32
+	i32.add 	$push444=, $6, $pop835
+	i32.load16_u	$push445=, 0($pop444):p2align=0
+	i32.store16	0($pop446), $pop445
+	i32.const	$push523=, 88
+	i32.add 	$push524=, $9, $pop523
+	i32.const	$push834=, 34
+	i32.add 	$push449=, $pop524, $pop834
+	i32.const	$push833=, 34
+	i32.add 	$push447=, $6, $pop833
+	i32.load8_u	$push448=, 0($pop447)
+	i32.store8	0($pop449), $pop448
+	i64.load	$push450=, 0($6):p2align=0
+	i64.store	88($9), $pop450
+	i32.const	$push451=, 260
+	i32.add 	$push832=, $1, $pop451
+	tee_local	$push831=, $6=, $pop832
+	i32.store	12($9), $pop831
 	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_109:                              # %for.body212
+	i32.const	$3=, 0
+.LBB1_109:                              # %for.body224
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label28:
-	i32.const	$push564=, 120
-	i32.add 	$push565=, $9, $pop564
-	i32.add 	$push476=, $pop565, $2
-	i32.load8_s	$3=, 0($pop476)
+	loop    	                # label20:
+	i32.const	$push525=, 88
+	i32.add 	$push526=, $9, $pop525
+	i32.add 	$push453=, $pop526, $3
+	i32.load8_s	$4=, 0($pop453)
 	block   	
-	i32.const	$push982=, 32
-	i32.eq  	$push475=, $7, $pop982
-	br_if   	0, $pop475      # 0: down to label29
-# BB#110:                               # %if.then.i536
+	i32.const	$push840=, 35
+	i32.eq  	$push452=, $7, $pop840
+	br_if   	0, $pop452      # 0: down to label21
+# BB#110:                               # %if.then.i550
                                         #   in Loop: Header=BB1_109 Depth=1
-	i32.ne  	$push477=, $0, $7
-	br_if   	2, $pop477      # 2: down to label10
-# BB#111:                               # %if.end.i538
+	i32.ne  	$push454=, $0, $7
+	br_if   	2, $pop454      # 2: down to label2
+# BB#111:                               # %if.end.i552
                                         #   in Loop: Header=BB1_109 Depth=1
-	i32.const	$8=, 32
+	i32.const	$8=, 35
 	i32.const	$0=, 0
-	i32.const	$push986=, 0
-	i32.const	$push985=, 32
-	i32.store	bar.lastn($pop986), $pop985
-	i32.const	$push984=, 0
-	i32.const	$push983=, 0
-	i32.store	bar.lastc($pop984), $pop983
-.LBB1_112:                              # %if.end3.i543
+	i32.const	$push844=, 0
+	i32.const	$push843=, 35
+	i32.store	bar.lastn($pop844), $pop843
+	i32.const	$push842=, 0
+	i32.const	$push841=, 0
+	i32.store	bar.lastc($pop842), $pop841
+.LBB1_112:                              # %if.end3.i557
                                         #   in Loop: Header=BB1_109 Depth=1
-	end_block                       # label29:
-	i32.const	$push988=, 24
-	i32.shl 	$push478=, $0, $pop988
-	i32.const	$push987=, 24
-	i32.shr_s	$push479=, $pop478, $pop987
-	i32.ne  	$push480=, $pop479, $3
-	br_if   	1, $pop480      # 1: down to label10
-# BB#113:                               # %bar.exit546
+	end_block                       # label21:
+	i32.const	$push847=, 24
+	i32.shl 	$push455=, $0, $pop847
+	i32.const	$push846=, 24
+	i32.shr_s	$push456=, $pop455, $pop846
+	i32.const	$push845=, 24
+	i32.xor 	$push457=, $pop456, $pop845
+	i32.ne  	$push458=, $pop457, $4
+	br_if   	1, $pop458      # 1: down to label2
+# BB#113:                               # %bar.exit560
                                         #   in Loop: Header=BB1_109 Depth=1
-	i32.const	$push996=, 0
-	i32.const	$push995=, 1
-	i32.add 	$push994=, $0, $pop995
-	tee_local	$push993=, $0=, $pop994
-	i32.store	bar.lastc($pop996), $pop993
-	i32.const	$7=, 32
-	i32.const	$push992=, 1
-	i32.add 	$push991=, $2, $pop992
-	tee_local	$push990=, $2=, $pop991
-	i32.const	$push989=, 32
-	i32.lt_s	$push481=, $pop990, $pop989
-	br_if   	0, $pop481      # 0: up to label28
-# BB#114:                               # %for.end218
+	i32.const	$push853=, 0
+	i32.const	$push852=, 1
+	i32.add 	$push851=, $0, $pop852
+	tee_local	$push850=, $0=, $pop851
+	i32.store	bar.lastc($pop853), $pop850
+	i32.const	$push849=, 34
+	i32.lt_u	$4=, $3, $pop849
+	i32.const	$7=, 35
+	i32.const	$push848=, 1
+	i32.add 	$push12=, $3, $pop848
+	copy_local	$3=, $pop12
+	br_if   	0, $4           # 0: up to label20
+# BB#114:                               # %for.end230
 	end_loop
-	i32.const	$push482=, 260
-	i32.add 	$push999=, $1, $pop482
-	tee_local	$push998=, $6=, $pop999
-	i32.store	4($9), $pop998
-	i32.const	$push566=, 80
-	i32.add 	$push567=, $9, $pop566
-	i32.const	$push997=, 35
-	i32.call	$drop=, memcpy@FUNCTION, $pop567, $4, $pop997
-	copy_local	$7=, $8
-	i32.const	$2=, 0
-.LBB1_115:                              # %for.body224
+	i32.const	$push459=, 332
+	i32.add 	$push460=, $1, $pop459
+	i32.store	12($9), $pop460
+	i32.const	$push527=, 16
+	i32.add 	$push528=, $9, $pop527
+	i32.const	$push854=, 72
+	i32.call	$drop=, memcpy@FUNCTION, $pop528, $6, $pop854
+	i32.const	$3=, 0
+.LBB1_115:                              # %for.body236
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label30:
-	i32.const	$push568=, 80
-	i32.add 	$push569=, $9, $pop568
-	i32.add 	$push484=, $pop569, $2
-	i32.load8_s	$3=, 0($pop484)
+	loop    	                # label22:
+	i32.const	$push529=, 16
+	i32.add 	$push530=, $9, $pop529
+	i32.add 	$push462=, $pop530, $3
+	i32.load8_s	$7=, 0($pop462)
 	block   	
-	i32.const	$push1000=, 35
-	i32.eq  	$push483=, $7, $pop1000
-	br_if   	0, $pop483      # 0: down to label31
-# BB#116:                               # %if.then.i550
+	i32.const	$push855=, 72
+	i32.eq  	$push461=, $8, $pop855
+	br_if   	0, $pop461      # 0: down to label23
+# BB#116:                               # %if.then.i564
                                         #   in Loop: Header=BB1_115 Depth=1
-	i32.ne  	$push485=, $0, $7
-	br_if   	2, $pop485      # 2: down to label10
-# BB#117:                               # %if.end.i552
+	i32.ne  	$push463=, $0, $8
+	br_if   	2, $pop463      # 2: down to label2
+# BB#117:                               # %if.end.i566
                                         #   in Loop: Header=BB1_115 Depth=1
-	i32.const	$8=, 35
 	i32.const	$0=, 0
-	i32.const	$push1004=, 0
-	i32.const	$push1003=, 35
-	i32.store	bar.lastn($pop1004), $pop1003
-	i32.const	$push1002=, 0
-	i32.const	$push1001=, 0
-	i32.store	bar.lastc($pop1002), $pop1001
-.LBB1_118:                              # %if.end3.i557
+	i32.const	$push859=, 0
+	i32.const	$push858=, 72
+	i32.store	bar.lastn($pop859), $pop858
+	i32.const	$push857=, 0
+	i32.const	$push856=, 0
+	i32.store	bar.lastc($pop857), $pop856
+.LBB1_118:                              # %if.end3.i571
                                         #   in Loop: Header=BB1_115 Depth=1
-	end_block                       # label31:
-	i32.const	$push1007=, 24
-	i32.shl 	$push486=, $0, $pop1007
-	i32.const	$push1006=, 24
-	i32.shr_s	$push487=, $pop486, $pop1006
-	i32.const	$push1005=, 24
-	i32.xor 	$push488=, $pop487, $pop1005
-	i32.ne  	$push489=, $pop488, $3
-	br_if   	1, $pop489      # 1: down to label10
-# BB#119:                               # %bar.exit560
+	end_block                       # label23:
+	i32.const	$push862=, 24
+	i32.shl 	$push464=, $0, $pop862
+	i32.const	$push861=, 24
+	i32.shr_s	$push465=, $pop464, $pop861
+	i32.const	$push860=, 64
+	i32.xor 	$push466=, $pop465, $pop860
+	i32.ne  	$push467=, $pop466, $7
+	br_if   	1, $pop467      # 1: down to label2
+# BB#119:                               # %bar.exit574
                                         #   in Loop: Header=BB1_115 Depth=1
-	i32.const	$push1015=, 0
-	i32.const	$push1014=, 1
-	i32.add 	$push1013=, $0, $pop1014
-	tee_local	$push1012=, $0=, $pop1013
-	i32.store	bar.lastc($pop1015), $pop1012
-	i32.const	$7=, 35
-	i32.const	$push1011=, 1
-	i32.add 	$push1010=, $2, $pop1011
-	tee_local	$push1009=, $2=, $pop1010
-	i32.const	$push1008=, 35
-	i32.lt_s	$push490=, $pop1009, $pop1008
-	br_if   	0, $pop490      # 0: up to label30
-# BB#120:                               # %for.end230
-	end_loop
-	i32.const	$push491=, 332
-	i32.add 	$push492=, $1, $pop491
-	i32.store	4($9), $pop492
-	i32.const	$push570=, 8
-	i32.add 	$push571=, $9, $pop570
-	i32.const	$push1016=, 72
-	i32.call	$drop=, memcpy@FUNCTION, $pop571, $6, $pop1016
-	i32.const	$2=, 0
-.LBB1_121:                              # %for.body236
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label32:
-	i32.const	$push572=, 8
-	i32.add 	$push573=, $9, $pop572
-	i32.add 	$push494=, $pop573, $2
-	i32.load8_s	$7=, 0($pop494)
-	block   	
-	i32.const	$push1017=, 72
-	i32.eq  	$push493=, $8, $pop1017
-	br_if   	0, $pop493      # 0: down to label33
-# BB#122:                               # %if.then.i564
-                                        #   in Loop: Header=BB1_121 Depth=1
-	i32.ne  	$push495=, $0, $8
-	br_if   	2, $pop495      # 2: down to label10
-# BB#123:                               # %if.end.i566
-                                        #   in Loop: Header=BB1_121 Depth=1
-	i32.const	$0=, 0
-	i32.const	$push1021=, 0
-	i32.const	$push1020=, 72
-	i32.store	bar.lastn($pop1021), $pop1020
-	i32.const	$push1019=, 0
-	i32.const	$push1018=, 0
-	i32.store	bar.lastc($pop1019), $pop1018
-.LBB1_124:                              # %if.end3.i571
-                                        #   in Loop: Header=BB1_121 Depth=1
-	end_block                       # label33:
-	i32.const	$push1024=, 24
-	i32.shl 	$push496=, $0, $pop1024
-	i32.const	$push1023=, 24
-	i32.shr_s	$push497=, $pop496, $pop1023
-	i32.const	$push1022=, 64
-	i32.xor 	$push498=, $pop497, $pop1022
-	i32.ne  	$push499=, $pop498, $7
-	br_if   	1, $pop499      # 1: down to label10
-# BB#125:                               # %bar.exit574
-                                        #   in Loop: Header=BB1_121 Depth=1
-	i32.const	$push1032=, 0
-	i32.const	$push1031=, 1
-	i32.add 	$push1030=, $0, $pop1031
-	tee_local	$push1029=, $0=, $pop1030
-	i32.store	bar.lastc($pop1032), $pop1029
+	i32.const	$push868=, 0
+	i32.const	$push867=, 1
+	i32.add 	$push866=, $0, $pop867
+	tee_local	$push865=, $0=, $pop866
+	i32.store	bar.lastc($pop868), $pop865
+	i32.const	$push864=, 71
+	i32.lt_u	$7=, $3, $pop864
 	i32.const	$8=, 72
-	i32.const	$push1028=, 1
-	i32.add 	$push1027=, $2, $pop1028
-	tee_local	$push1026=, $2=, $pop1027
-	i32.const	$push1025=, 72
-	i32.lt_s	$push500=, $pop1026, $pop1025
-	br_if   	0, $pop500      # 0: up to label32
-# BB#126:                               # %for.end242
+	i32.const	$push863=, 1
+	i32.add 	$push13=, $3, $pop863
+	copy_local	$3=, $pop13
+	br_if   	0, $7           # 0: up to label22
+# BB#120:                               # %for.end242
 	end_loop
-	i32.const	$push507=, 0
-	i32.const	$push505=, 352
-	i32.add 	$push506=, $9, $pop505
-	i32.store	__stack_pointer($pop507), $pop506
+	i32.const	$push474=, 0
+	i32.const	$push472=, 352
+	i32.add 	$push473=, $9, $pop472
+	i32.store	__stack_pointer($pop474), $pop473
 	return
-.LBB1_127:                              # %if.then7.i320
-	end_block                       # label10:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_128:                              # %if.then7.i432
-	end_block                       # label9:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_129:                              # %if.then7.i418
-	end_block                       # label8:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_130:                              # %if.then7.i404
-	end_block                       # label7:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_131:                              # %if.then7.i390
-	end_block                       # label6:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_132:                              # %if.then7.i376
-	end_block                       # label5:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_133:                              # %if.then7.i362
-	end_block                       # label4:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_134:                              # %if.then7.i348
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_135:                              # %if.then7.i334
+.LBB1_121:                              # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push257=, 0
-	i32.const	$push254=, 0
-	i32.load	$push255=, __stack_pointer($pop254)
-	i32.const	$push256=, 768
-	i32.sub 	$push413=, $pop255, $pop256
-	tee_local	$push412=, $1=, $pop413
-	i32.store	__stack_pointer($pop257), $pop412
+	i32.const	$push218=, 0
+	i32.const	$push216=, 0
+	i32.load	$push215=, __stack_pointer($pop216)
+	i32.const	$push217=, 800
+	i32.sub 	$push366=, $pop215, $pop217
+	tee_local	$push365=, $1=, $pop366
+	i32.store	__stack_pointer($pop218), $pop365
 	i32.const	$push0=, 4368
-	i32.store16	760($1), $pop0
-	i32.const	$push1=, 24
-	i32.store8	752($1), $pop1
-	i32.const	$push2=, 25
-	i32.store8	753($1), $pop2
-	i32.const	$push3=, 26
-	i32.store8	754($1), $pop3
-	i32.const	$push4=, 32
-	i32.store8	744($1), $pop4
-	i32.const	$push5=, 33
-	i32.store8	745($1), $pop5
-	i32.const	$push6=, 34
-	i32.store8	746($1), $pop6
-	i32.const	$push7=, 40
-	i32.store8	736($1), $pop7
-	i32.const	$push8=, 35
-	i32.store8	747($1), $pop8
-	i32.const	$push9=, 41
-	i32.store8	737($1), $pop9
-	i32.const	$push10=, 42
-	i32.store8	738($1), $pop10
-	i32.const	$push11=, 43
-	i32.store8	739($1), $pop11
-	i32.const	$push12=, 48
-	i32.store8	728($1), $pop12
-	i32.const	$push13=, 44
-	i32.store8	740($1), $pop13
-	i32.const	$push14=, 49
-	i32.store8	729($1), $pop14
-	i32.const	$push15=, 50
-	i32.store8	730($1), $pop15
-	i32.const	$push16=, 51
-	i32.store8	731($1), $pop16
-	i32.const	$push17=, 52
-	i32.store8	732($1), $pop17
-	i32.const	$push18=, 56
-	i32.store8	720($1), $pop18
-	i32.const	$push19=, 53
-	i32.store8	733($1), $pop19
-	i32.const	$push20=, 57
-	i32.store8	721($1), $pop20
-	i32.const	$push21=, 58
-	i32.store8	722($1), $pop21
-	i32.const	$push22=, 59
-	i32.store8	723($1), $pop22
-	i32.const	$push23=, 60
-	i32.store8	724($1), $pop23
-	i32.const	$push24=, 61
-	i32.store8	725($1), $pop24
-	i32.const	$push25=, 62
-	i32.store8	726($1), $pop25
-	i32.const	$push26=, 64
-	i32.store8	712($1), $pop26
-	i32.const	$push27=, 65
-	i32.store8	713($1), $pop27
-	i32.const	$push28=, 66
-	i32.store8	714($1), $pop28
-	i32.const	$push29=, 67
-	i32.store8	715($1), $pop29
-	i32.const	$push30=, 68
-	i32.store8	716($1), $pop30
-	i32.const	$push31=, 69
-	i32.store8	717($1), $pop31
-	i32.const	$push32=, 70
-	i32.store8	718($1), $pop32
-	i32.const	$push33=, 71
-	i32.store8	719($1), $pop33
-	i32.const	$push34=, 72
-	i32.store8	696($1), $pop34
-	i32.const	$push35=, 73
-	i32.store8	697($1), $pop35
-	i32.const	$push36=, 74
-	i32.store8	698($1), $pop36
-	i32.const	$push37=, 75
-	i32.store8	699($1), $pop37
-	i32.const	$push38=, 76
-	i32.store8	700($1), $pop38
-	i32.const	$push39=, 77
-	i32.store8	701($1), $pop39
-	i32.const	$push40=, 78
-	i32.store8	702($1), $pop40
-	i32.const	$push41=, 79
-	i32.store8	703($1), $pop41
-	i32.const	$push411=, 64
-	i32.store8	704($1), $pop411
-	i32.const	$push42=, 80
-	i32.store8	680($1), $pop42
-	i32.const	$push43=, 81
-	i32.store8	681($1), $pop43
-	i32.const	$push44=, 82
-	i32.store8	682($1), $pop44
-	i32.const	$push45=, 83
-	i32.store8	683($1), $pop45
-	i32.const	$push46=, 84
-	i32.store8	684($1), $pop46
-	i32.const	$push47=, 85
-	i32.store8	685($1), $pop47
-	i32.const	$push48=, 86
-	i32.store8	686($1), $pop48
-	i32.const	$push49=, 87
-	i32.store8	687($1), $pop49
-	i32.const	$push50=, 88
-	i32.store8	688($1), $pop50
-	i32.const	$push51=, 89
-	i32.store8	689($1), $pop51
-	i32.const	$push410=, 88
-	i32.store8	664($1), $pop410
-	i32.const	$push409=, 89
-	i32.store8	665($1), $pop409
-	i32.const	$push52=, 90
-	i32.store8	666($1), $pop52
-	i32.const	$push53=, 91
-	i32.store8	667($1), $pop53
-	i32.const	$push54=, 92
-	i32.store8	668($1), $pop54
-	i32.const	$push55=, 93
-	i32.store8	669($1), $pop55
-	i32.const	$push56=, 94
-	i32.store8	670($1), $pop56
-	i32.const	$push57=, 95
-	i32.store8	671($1), $pop57
-	i32.const	$push408=, 80
-	i32.store8	672($1), $pop408
-	i32.const	$push407=, 81
-	i32.store8	673($1), $pop407
-	i32.const	$push406=, 82
-	i32.store8	674($1), $pop406
-	i32.const	$push58=, 96
-	i32.store8	648($1), $pop58
-	i32.const	$push59=, 97
-	i32.store8	649($1), $pop59
-	i32.const	$push60=, 98
-	i32.store8	650($1), $pop60
-	i32.const	$push61=, 99
-	i32.store8	651($1), $pop61
-	i32.const	$push62=, 100
-	i32.store8	652($1), $pop62
-	i32.const	$push63=, 101
-	i32.store8	653($1), $pop63
-	i32.const	$push64=, 102
-	i32.store8	654($1), $pop64
-	i32.const	$push65=, 103
-	i32.store8	655($1), $pop65
-	i32.const	$push66=, 104
-	i32.store8	656($1), $pop66
-	i32.const	$push67=, 105
-	i32.store8	657($1), $pop67
-	i32.const	$push68=, 106
-	i32.store8	658($1), $pop68
-	i32.const	$push69=, 107
-	i32.store8	659($1), $pop69
-	i32.const	$push405=, 104
-	i32.store8	632($1), $pop405
-	i32.const	$push404=, 105
-	i32.store8	633($1), $pop404
-	i32.const	$push403=, 106
-	i32.store8	634($1), $pop403
-	i32.const	$push402=, 107
-	i32.store8	635($1), $pop402
-	i32.const	$push70=, 108
-	i32.store8	636($1), $pop70
-	i32.const	$push71=, 109
-	i32.store8	637($1), $pop71
-	i32.const	$push72=, 110
-	i32.store8	638($1), $pop72
-	i32.const	$push73=, 111
-	i32.store8	639($1), $pop73
-	i32.const	$push401=, 96
-	i32.store8	640($1), $pop401
-	i32.const	$push400=, 97
-	i32.store8	641($1), $pop400
-	i32.const	$push399=, 98
-	i32.store8	642($1), $pop399
-	i32.const	$push398=, 99
-	i32.store8	643($1), $pop398
-	i32.const	$push397=, 100
-	i32.store8	644($1), $pop397
-	i32.const	$push74=, 112
-	i32.store8	616($1), $pop74
-	i32.const	$push75=, 113
-	i32.store8	617($1), $pop75
-	i32.const	$push76=, 114
-	i32.store8	618($1), $pop76
-	i32.const	$push77=, 115
-	i32.store8	619($1), $pop77
-	i32.const	$push78=, 116
-	i32.store8	620($1), $pop78
-	i32.const	$push79=, 117
-	i32.store8	621($1), $pop79
-	i32.const	$push80=, 118
-	i32.store8	622($1), $pop80
-	i32.const	$push81=, 119
-	i32.store8	623($1), $pop81
-	i32.const	$push82=, 120
-	i32.store8	624($1), $pop82
-	i32.const	$push83=, 121
-	i32.store8	625($1), $pop83
-	i32.const	$push84=, 122
-	i32.store8	626($1), $pop84
-	i32.const	$push85=, 123
-	i32.store8	627($1), $pop85
-	i32.const	$push86=, 124
-	i32.store8	628($1), $pop86
-	i32.const	$push87=, 125
-	i32.store8	629($1), $pop87
-	i32.const	$push396=, 120
-	i32.store8	600($1), $pop396
-	i32.const	$push395=, 121
-	i32.store8	601($1), $pop395
-	i32.const	$push394=, 122
-	i32.store8	602($1), $pop394
-	i32.const	$push393=, 123
-	i32.store8	603($1), $pop393
-	i32.const	$push392=, 124
-	i32.store8	604($1), $pop392
-	i32.const	$push391=, 125
-	i32.store8	605($1), $pop391
-	i32.const	$push88=, 126
-	i32.store8	606($1), $pop88
-	i32.const	$push89=, 127
-	i32.store8	607($1), $pop89
-	i32.const	$push390=, 112
-	i32.store8	608($1), $pop390
-	i32.const	$push389=, 113
-	i32.store8	609($1), $pop389
-	i32.const	$push388=, 114
-	i32.store8	610($1), $pop388
-	i32.const	$push387=, 115
-	i32.store8	611($1), $pop387
-	i32.const	$push386=, 116
-	i32.store8	612($1), $pop386
-	i32.const	$push385=, 117
-	i32.store8	613($1), $pop385
-	i32.const	$push384=, 118
-	i32.store8	614($1), $pop384
-	i32.const	$push90=, 128
-	i32.store8	584($1), $pop90
-	i32.const	$push91=, 129
-	i32.store8	585($1), $pop91
-	i32.const	$push92=, 130
-	i32.store8	586($1), $pop92
-	i32.const	$push93=, 131
-	i32.store8	587($1), $pop93
-	i32.const	$push94=, 132
-	i32.store8	588($1), $pop94
-	i32.const	$push95=, 133
-	i32.store8	589($1), $pop95
-	i32.const	$push96=, 134
-	i32.store8	590($1), $pop96
-	i32.const	$push97=, 135
-	i32.store8	591($1), $pop97
-	i32.const	$push98=, 136
-	i32.store8	592($1), $pop98
-	i32.const	$push99=, 137
-	i32.store8	593($1), $pop99
-	i32.const	$push100=, 138
-	i32.store8	594($1), $pop100
-	i32.const	$push101=, 139
-	i32.store8	595($1), $pop101
-	i32.const	$push102=, 140
-	i32.store8	596($1), $pop102
-	i32.const	$push103=, 141
-	i32.store8	597($1), $pop103
-	i32.const	$push104=, 142
-	i32.store8	598($1), $pop104
-	i32.const	$push105=, 143
-	i32.store8	599($1), $pop105
+	i32.store16	792($1), $pop0
+	i32.const	$push1=, 6424
+	i32.store16	784($1), $pop1
+	i32.const	$push2=, 26
+	i32.store8	786($1), $pop2
+	i32.const	$push3=, 589439264
+	i32.store	776($1), $pop3
+	i32.const	$push4=, 724183336
+	i32.store	768($1), $pop4
+	i32.const	$push5=, 44
+	i32.store8	772($1), $pop5
+	i32.const	$push6=, 858927408
+	i32.store	760($1), $pop6
+	i32.const	$push7=, 13620
+	i32.store16	764($1), $pop7
+	i32.const	$push8=, 993671480
+	i32.store	752($1), $pop8
+	i32.const	$push9=, 15676
+	i32.store16	756($1), $pop9
+	i32.const	$push10=, 62
+	i32.store8	758($1), $pop10
+	i64.const	$push11=, 5135868584551137600
+	i64.store	744($1), $pop11
+	i64.const	$push12=, 5714589967255750984
+	i64.store	728($1), $pop12
+	i32.const	$push13=, 64
+	i32.store8	736($1), $pop13
+	i32.const	$push14=, 1397903696
+	i32.store	712($1), $pop14
+	i32.const	$push15=, 21844
+	i32.store16	716($1), $pop15
+	i32.const	$push16=, 86
+	i32.store8	718($1), $pop16
+	i32.const	$push17=, 88
+	i32.store8	720($1), $pop17
+	i32.const	$push18=, 87
+	i32.store8	719($1), $pop18
+	i32.const	$push19=, 89
+	i32.store8	721($1), $pop19
+	i32.const	$push364=, 88
+	i32.store8	696($1), $pop364
+	i32.const	$push363=, 89
+	i32.store8	697($1), $pop363
+	i32.const	$push20=, 90
+	i32.store8	698($1), $pop20
+	i32.const	$push21=, 91
+	i32.store8	699($1), $pop21
+	i32.const	$push22=, 92
+	i32.store8	700($1), $pop22
+	i32.const	$push23=, 93
+	i32.store8	701($1), $pop23
+	i32.const	$push24=, 94
+	i32.store8	702($1), $pop24
+	i32.const	$push25=, 95
+	i32.store8	703($1), $pop25
+	i32.const	$push26=, 80
+	i32.store8	704($1), $pop26
+	i32.const	$push27=, 81
+	i32.store8	705($1), $pop27
+	i32.const	$push28=, 82
+	i32.store8	706($1), $pop28
+	i32.const	$push29=, 96
+	i32.store8	680($1), $pop29
+	i32.const	$push30=, 97
+	i32.store8	681($1), $pop30
+	i32.const	$push31=, 98
+	i32.store8	682($1), $pop31
+	i32.const	$push32=, 99
+	i32.store8	683($1), $pop32
+	i32.const	$push33=, 100
+	i32.store8	684($1), $pop33
+	i32.const	$push34=, 102
+	i32.store8	686($1), $pop34
+	i32.const	$push35=, 101
+	i32.store8	685($1), $pop35
+	i32.const	$push36=, 103
+	i32.store8	687($1), $pop36
+	i32.const	$push37=, 104
+	i32.store8	688($1), $pop37
+	i32.const	$push38=, 105
+	i32.store8	689($1), $pop38
+	i32.const	$push39=, 106
+	i32.store8	690($1), $pop39
+	i32.const	$push40=, 107
+	i32.store8	691($1), $pop40
+	i32.const	$push362=, 104
+	i32.store8	664($1), $pop362
+	i32.const	$push361=, 105
+	i32.store8	665($1), $pop361
+	i32.const	$push360=, 106
+	i32.store8	666($1), $pop360
+	i32.const	$push359=, 107
+	i32.store8	667($1), $pop359
+	i32.const	$push41=, 108
+	i32.store8	668($1), $pop41
+	i32.const	$push42=, 109
+	i32.store8	669($1), $pop42
+	i32.const	$push43=, 110
+	i32.store8	670($1), $pop43
+	i32.const	$push44=, 111
+	i32.store8	671($1), $pop44
+	i32.const	$push358=, 96
+	i32.store8	672($1), $pop358
+	i32.const	$push357=, 97
+	i32.store8	673($1), $pop357
+	i32.const	$push356=, 98
+	i32.store8	674($1), $pop356
+	i32.const	$push355=, 99
+	i32.store8	675($1), $pop355
+	i32.const	$push354=, 100
+	i32.store8	676($1), $pop354
+	i32.const	$push45=, 112
+	i32.store8	648($1), $pop45
+	i32.const	$push46=, 113
+	i32.store8	649($1), $pop46
+	i32.const	$push47=, 114
+	i32.store8	650($1), $pop47
+	i32.const	$push48=, 115
+	i32.store8	651($1), $pop48
+	i32.const	$push49=, 116
+	i32.store8	652($1), $pop49
+	i32.const	$push50=, 117
+	i32.store8	653($1), $pop50
+	i32.const	$push51=, 118
+	i32.store8	654($1), $pop51
+	i32.const	$push52=, 119
+	i32.store8	655($1), $pop52
+	i32.const	$push53=, 120
+	i32.store8	656($1), $pop53
+	i32.const	$push54=, 121
+	i32.store8	657($1), $pop54
+	i32.const	$push55=, 122
+	i32.store8	658($1), $pop55
+	i32.const	$push56=, 123
+	i32.store8	659($1), $pop56
+	i32.const	$push57=, 124
+	i32.store8	660($1), $pop57
+	i32.const	$push58=, 125
+	i32.store8	661($1), $pop58
+	i32.const	$push353=, 120
+	i32.store8	632($1), $pop353
+	i32.const	$push352=, 121
+	i32.store8	633($1), $pop352
+	i32.const	$push351=, 122
+	i32.store8	634($1), $pop351
+	i32.const	$push350=, 123
+	i32.store8	635($1), $pop350
+	i32.const	$push349=, 124
+	i32.store8	636($1), $pop349
+	i32.const	$push348=, 125
+	i32.store8	637($1), $pop348
+	i32.const	$push59=, 126
+	i32.store8	638($1), $pop59
+	i32.const	$push60=, 127
+	i32.store8	639($1), $pop60
+	i32.const	$push347=, 112
+	i32.store8	640($1), $pop347
+	i32.const	$push346=, 113
+	i32.store8	641($1), $pop346
+	i32.const	$push345=, 114
+	i32.store8	642($1), $pop345
+	i32.const	$push344=, 115
+	i32.store8	643($1), $pop344
+	i32.const	$push343=, 116
+	i32.store8	644($1), $pop343
+	i32.const	$push342=, 117
+	i32.store8	645($1), $pop342
+	i32.const	$push341=, 118
+	i32.store8	646($1), $pop341
+	i32.const	$push61=, 128
+	i32.store8	616($1), $pop61
+	i32.const	$push62=, 129
+	i32.store8	617($1), $pop62
+	i32.const	$push63=, 130
+	i32.store8	618($1), $pop63
+	i32.const	$push64=, 131
+	i32.store8	619($1), $pop64
+	i32.const	$push65=, 132
+	i32.store8	620($1), $pop65
+	i32.const	$push66=, 133
+	i32.store8	621($1), $pop66
+	i32.const	$push67=, 134
+	i32.store8	622($1), $pop67
+	i32.const	$push68=, 135
+	i32.store8	623($1), $pop68
+	i32.const	$push69=, 136
+	i32.store8	624($1), $pop69
+	i32.const	$push70=, 137
+	i32.store8	625($1), $pop70
+	i32.const	$push71=, 138
+	i32.store8	626($1), $pop71
+	i32.const	$push72=, 139
+	i32.store8	627($1), $pop72
+	i32.const	$push73=, 140
+	i32.store8	628($1), $pop73
+	i32.const	$push74=, 141
+	i32.store8	629($1), $pop74
+	i32.const	$push75=, 142
+	i32.store8	630($1), $pop75
+	i32.const	$push76=, 143
+	i32.store8	631($1), $pop76
 	i32.const	$0=, 0
 .LBB2_1:                                # %for.body180
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label34:
-	i32.const	$push258=, 552
-	i32.add 	$push259=, $1, $pop258
-	i32.add 	$push107=, $pop259, $0
-	i32.const	$push418=, 248
-	i32.xor 	$push106=, $0, $pop418
-	i32.store8	0($pop107), $pop106
-	i32.const	$push417=, 1
-	i32.add 	$push416=, $0, $pop417
-	tee_local	$push415=, $0=, $pop416
-	i32.const	$push414=, 31
-	i32.ne  	$push108=, $pop415, $pop414
-	br_if   	0, $pop108      # 0: up to label34
-# BB#2:                                 # %for.body191.preheader
+	loop    	                # label24:
+	i32.const	$push219=, 584
+	i32.add 	$push220=, $1, $pop219
+	i32.add 	$push78=, $pop220, $0
+	i32.const	$push371=, 248
+	i32.xor 	$push77=, $0, $pop371
+	i32.store8	0($pop78), $pop77
+	i32.const	$push370=, 1
+	i32.add 	$push369=, $0, $pop370
+	tee_local	$push368=, $0=, $pop369
+	i32.const	$push367=, 31
+	i32.ne  	$push79=, $pop368, $pop367
+	br_if   	0, $pop79       # 0: up to label24
+# BB#2:                                 # %for.end187
 	end_loop
-	i32.const	$push109=, 50462976
-	i32.store	520($1), $pop109
-	i32.const	$push110=, 1284
-	i32.store16	524($1), $pop110
-	i32.const	$push111=, 151521030
-	i32.store	526($1):p2align=1, $pop111
-	i32.const	$push112=, 2826
-	i32.store16	530($1), $pop112
-	i32.const	$push113=, 3340
-	i32.store16	532($1), $pop113
-	i32.const	$push114=, 14
-	i32.store8	534($1), $pop114
-	i32.const	$push115=, 15
-	i32.store8	535($1), $pop115
-	i32.const	$push116=, 16
-	i32.store8	536($1), $pop116
-	i32.const	$push117=, 17
-	i32.store8	537($1), $pop117
-	i32.const	$push118=, 18
-	i32.store8	538($1), $pop118
-	i32.const	$push119=, 19
-	i32.store8	539($1), $pop119
-	i32.const	$push120=, 20
-	i32.store8	540($1), $pop120
-	i32.const	$push121=, 21
-	i32.store8	541($1), $pop121
-	i32.const	$push122=, 22
-	i32.store8	542($1), $pop122
-	i32.const	$push123=, 23
-	i32.store8	543($1), $pop123
-	i32.const	$push419=, 24
-	i32.store8	544($1), $pop419
-	i32.const	$push124=, 25
-	i32.store8	545($1), $pop124
-	i32.const	$push125=, 26
-	i32.store8	546($1), $pop125
-	i32.const	$push126=, 27
-	i32.store8	547($1), $pop126
-	i32.const	$push127=, 28
-	i32.store8	548($1), $pop127
-	i32.const	$push128=, 29
-	i32.store8	549($1), $pop128
-	i32.const	$push129=, 30
-	i32.store8	550($1), $pop129
-	i32.const	$push130=, 31
-	i32.store8	551($1), $pop130
+	i64.const	$push80=, 506097522914230528
+	i64.store	552($1), $pop80
+	i64.const	$push81=, 1084818905618843912
+	i64.store	560($1), $pop81
+	i32.const	$push82=, 4368
+	i32.store16	568($1), $pop82
+	i64.const	$push83=, 1808220633999610642
+	i64.store	570($1):p2align=1, $pop83
+	i32.const	$push84=, 488381210
+	i32.store	578($1):p2align=1, $pop84
+	i32.const	$push85=, 7966
+	i32.store16	582($1), $pop85
 	i32.const	$0=, 0
 .LBB2_3:                                # %for.body202
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label35:
-	i32.const	$push260=, 480
-	i32.add 	$push261=, $1, $pop260
-	i32.add 	$push132=, $pop261, $0
-	i32.const	$push424=, 24
-	i32.xor 	$push131=, $0, $pop424
-	i32.store8	0($pop132), $pop131
-	i32.const	$push423=, 1
-	i32.add 	$push422=, $0, $pop423
-	tee_local	$push421=, $0=, $pop422
-	i32.const	$push420=, 35
-	i32.ne  	$push133=, $pop421, $pop420
-	br_if   	0, $pop133      # 0: up to label35
+	loop    	                # label25:
+	i32.const	$push221=, 512
+	i32.add 	$push222=, $1, $pop221
+	i32.add 	$push87=, $pop222, $0
+	i32.const	$push376=, 24
+	i32.xor 	$push86=, $0, $pop376
+	i32.store8	0($pop87), $pop86
+	i32.const	$push375=, 1
+	i32.add 	$push374=, $0, $pop375
+	tee_local	$push373=, $0=, $pop374
+	i32.const	$push372=, 35
+	i32.ne  	$push88=, $pop373, $pop372
+	br_if   	0, $pop88       # 0: up to label25
 # BB#4:                                 # %for.body213.preheader
 	end_loop
 	i32.const	$0=, 0
 .LBB2_5:                                # %for.body213
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label36:
-	i32.const	$push262=, 408
-	i32.add 	$push263=, $1, $pop262
-	i32.add 	$push135=, $pop263, $0
-	i32.const	$push429=, 64
-	i32.xor 	$push134=, $0, $pop429
-	i32.store8	0($pop135), $pop134
-	i32.const	$push428=, 1
-	i32.add 	$push427=, $0, $pop428
-	tee_local	$push426=, $0=, $pop427
-	i32.const	$push425=, 72
-	i32.ne  	$push136=, $pop426, $pop425
-	br_if   	0, $pop136      # 0: up to label36
+	loop    	                # label26:
+	i32.const	$push223=, 440
+	i32.add 	$push224=, $1, $pop223
+	i32.add 	$push90=, $pop224, $0
+	i32.const	$push381=, 64
+	i32.xor 	$push89=, $0, $pop381
+	i32.store8	0($pop90), $pop89
+	i32.const	$push380=, 1
+	i32.add 	$push379=, $0, $pop380
+	tee_local	$push378=, $0=, $pop379
+	i32.const	$push377=, 72
+	i32.ne  	$push91=, $pop378, $pop377
+	br_if   	0, $pop91       # 0: up to label26
 # BB#6:                                 # %for.end220
 	end_loop
-	i32.const	$push137=, 404
-	i32.add 	$push138=, $1, $pop137
-	i32.load8_u	$push139=, 754($1)
-	i32.store8	0($pop138), $pop139
-	i32.load16_u	$push140=, 760($1)
-	i32.store16	406($1), $pop140
-	i32.load16_u	$push141=, 752($1)
-	i32.store16	402($1), $pop141
-	i32.load	$push142=, 744($1)
-	i32.store	396($1), $pop142
-	i32.const	$push264=, 388
-	i32.add 	$push265=, $1, $pop264
-	i32.const	$push143=, 4
-	i32.add 	$push144=, $pop265, $pop143
-	i32.load8_u	$push145=, 740($1)
-	i32.store8	0($pop144), $pop145
-	i32.load	$push146=, 736($1)
-	i32.store	388($1), $pop146
-	i32.const	$push266=, 380
-	i32.add 	$push267=, $1, $pop266
-	i32.const	$push461=, 4
-	i32.add 	$push147=, $pop267, $pop461
-	i32.load16_u	$push148=, 732($1)
-	i32.store16	0($pop147), $pop148
-	i32.load	$push149=, 728($1)
-	i32.store	380($1), $pop149
-	i32.const	$push150=, 378
-	i32.add 	$push151=, $1, $pop150
-	i32.load8_u	$push152=, 726($1)
-	i32.store8	0($pop151), $pop152
-	i32.const	$push268=, 372
-	i32.add 	$push269=, $1, $pop268
-	i32.const	$push460=, 4
-	i32.add 	$push153=, $pop269, $pop460
-	i32.load16_u	$push154=, 724($1)
-	i32.store16	0($pop153), $pop154
-	i32.load	$push155=, 720($1)
-	i32.store	372($1), $pop155
-	i64.load	$push156=, 712($1)
-	i64.store	364($1):p2align=2, $pop156
-	i32.const	$push270=, 352
-	i32.add 	$push271=, $1, $pop270
-	i32.const	$push157=, 8
-	i32.add 	$push158=, $pop271, $pop157
-	i32.const	$push272=, 696
-	i32.add 	$push273=, $1, $pop272
-	i32.const	$push459=, 8
-	i32.add 	$push159=, $pop273, $pop459
-	i32.load8_u	$push160=, 0($pop159)
-	i32.store8	0($pop158), $pop160
-	i64.load	$push161=, 696($1)
-	i64.store	352($1):p2align=2, $pop161
-	i32.const	$push274=, 340
-	i32.add 	$push275=, $1, $pop274
-	i32.const	$push458=, 8
-	i32.add 	$push162=, $pop275, $pop458
-	i32.const	$push276=, 680
-	i32.add 	$push277=, $1, $pop276
-	i32.const	$push457=, 8
-	i32.add 	$push163=, $pop277, $pop457
-	i32.load16_u	$push164=, 0($pop163)
-	i32.store16	0($pop162), $pop164
-	i64.load	$push165=, 680($1)
-	i64.store	340($1):p2align=2, $pop165
-	i32.const	$push278=, 328
-	i32.add 	$push279=, $1, $pop278
-	i32.const	$push166=, 10
-	i32.add 	$push167=, $pop279, $pop166
-	i32.const	$push280=, 664
-	i32.add 	$push281=, $1, $pop280
-	i32.const	$push456=, 10
-	i32.add 	$push168=, $pop281, $pop456
-	i32.load8_u	$push169=, 0($pop168)
-	i32.store8	0($pop167), $pop169
-	i32.const	$push282=, 328
-	i32.add 	$push283=, $1, $pop282
-	i32.const	$push455=, 8
-	i32.add 	$push170=, $pop283, $pop455
-	i32.const	$push284=, 664
-	i32.add 	$push285=, $1, $pop284
-	i32.const	$push454=, 8
-	i32.add 	$push171=, $pop285, $pop454
-	i32.load16_u	$push172=, 0($pop171)
-	i32.store16	0($pop170), $pop172
-	i64.load	$push173=, 664($1)
-	i64.store	328($1):p2align=2, $pop173
-	i32.const	$push286=, 316
-	i32.add 	$push287=, $1, $pop286
-	i32.const	$push453=, 8
-	i32.add 	$push174=, $pop287, $pop453
-	i32.const	$push288=, 648
-	i32.add 	$push289=, $1, $pop288
-	i32.const	$push452=, 8
-	i32.add 	$push175=, $pop289, $pop452
-	i32.load	$push176=, 0($pop175)
-	i32.store	0($pop174), $pop176
-	i64.load	$push177=, 648($1)
-	i64.store	316($1):p2align=2, $pop177
-	i32.const	$push290=, 300
-	i32.add 	$push291=, $1, $pop290
-	i32.const	$push178=, 12
-	i32.add 	$push179=, $pop291, $pop178
-	i32.const	$push292=, 632
-	i32.add 	$push293=, $1, $pop292
-	i32.const	$push451=, 12
-	i32.add 	$push180=, $pop293, $pop451
-	i32.load8_u	$push181=, 0($pop180)
-	i32.store8	0($pop179), $pop181
-	i32.const	$push294=, 300
-	i32.add 	$push295=, $1, $pop294
-	i32.const	$push450=, 8
-	i32.add 	$push182=, $pop295, $pop450
-	i32.const	$push296=, 632
-	i32.add 	$push297=, $1, $pop296
-	i32.const	$push449=, 8
-	i32.add 	$push183=, $pop297, $pop449
-	i32.load	$push184=, 0($pop183)
-	i32.store	0($pop182), $pop184
-	i64.load	$push185=, 632($1)
-	i64.store	300($1):p2align=2, $pop185
-	i32.const	$push298=, 284
-	i32.add 	$push299=, $1, $pop298
-	i32.const	$push448=, 12
-	i32.add 	$push186=, $pop299, $pop448
-	i32.const	$push300=, 616
-	i32.add 	$push301=, $1, $pop300
-	i32.const	$push447=, 12
-	i32.add 	$push187=, $pop301, $pop447
-	i32.load16_u	$push188=, 0($pop187)
-	i32.store16	0($pop186), $pop188
-	i32.const	$push302=, 284
-	i32.add 	$push303=, $1, $pop302
-	i32.const	$push446=, 8
-	i32.add 	$push189=, $pop303, $pop446
-	i32.const	$push304=, 616
-	i32.add 	$push305=, $1, $pop304
-	i32.const	$push445=, 8
-	i32.add 	$push190=, $pop305, $pop445
-	i32.load	$push191=, 0($pop190)
-	i32.store	0($pop189), $pop191
-	i64.load	$push192=, 616($1)
-	i64.store	284($1):p2align=2, $pop192
-	i32.const	$push306=, 268
-	i32.add 	$push307=, $1, $pop306
-	i32.const	$push193=, 14
-	i32.add 	$push194=, $pop307, $pop193
-	i32.const	$push308=, 600
-	i32.add 	$push309=, $1, $pop308
-	i32.const	$push444=, 14
-	i32.add 	$push195=, $pop309, $pop444
-	i32.load8_u	$push196=, 0($pop195)
-	i32.store8	0($pop194), $pop196
-	i32.const	$push310=, 268
-	i32.add 	$push311=, $1, $pop310
-	i32.const	$push443=, 12
-	i32.add 	$push197=, $pop311, $pop443
-	i32.const	$push312=, 600
-	i32.add 	$push313=, $1, $pop312
-	i32.const	$push442=, 12
-	i32.add 	$push198=, $pop313, $pop442
-	i32.load16_u	$push199=, 0($pop198)
-	i32.store16	0($pop197), $pop199
-	i32.const	$push314=, 268
-	i32.add 	$push315=, $1, $pop314
-	i32.const	$push441=, 8
-	i32.add 	$push200=, $pop315, $pop441
-	i32.const	$push316=, 600
-	i32.add 	$push317=, $1, $pop316
-	i32.const	$push440=, 8
-	i32.add 	$push201=, $pop317, $pop440
-	i32.load	$push202=, 0($pop201)
-	i32.store	0($pop200), $pop202
-	i64.load	$push203=, 600($1)
-	i64.store	268($1):p2align=2, $pop203
-	i32.const	$push318=, 252
-	i32.add 	$push319=, $1, $pop318
-	i32.const	$push439=, 8
-	i32.add 	$push204=, $pop319, $pop439
-	i32.const	$push320=, 584
-	i32.add 	$push321=, $1, $pop320
-	i32.const	$push438=, 8
-	i32.add 	$push205=, $pop321, $pop438
-	i64.load	$push206=, 0($pop205)
-	i64.store	0($pop204):p2align=2, $pop206
-	i64.load	$push207=, 584($1)
-	i64.store	252($1):p2align=2, $pop207
-	i32.const	$push322=, 221
-	i32.add 	$push323=, $1, $pop322
-	i32.const	$push324=, 552
-	i32.add 	$push325=, $1, $pop324
-	i32.const	$push208=, 31
-	i32.call	$drop=, memcpy@FUNCTION, $pop323, $pop325, $pop208
-	i32.const	$push326=, 188
-	i32.add 	$push327=, $1, $pop326
-	i32.const	$push209=, 24
-	i32.add 	$push210=, $pop327, $pop209
-	i32.const	$push328=, 520
-	i32.add 	$push329=, $1, $pop328
-	i32.const	$push437=, 24
-	i32.add 	$push211=, $pop329, $pop437
-	i64.load	$push212=, 0($pop211)
-	i64.store	0($pop210):p2align=2, $pop212
-	i32.const	$push330=, 188
-	i32.add 	$push331=, $1, $pop330
-	i32.const	$push213=, 16
-	i32.add 	$push214=, $pop331, $pop213
-	i32.const	$push332=, 520
-	i32.add 	$push333=, $1, $pop332
-	i32.const	$push436=, 16
-	i32.add 	$push215=, $pop333, $pop436
-	i64.load	$push216=, 0($pop215)
-	i64.store	0($pop214):p2align=2, $pop216
-	i32.const	$push334=, 188
-	i32.add 	$push335=, $1, $pop334
-	i32.const	$push435=, 8
-	i32.add 	$push217=, $pop335, $pop435
-	i32.const	$push336=, 520
-	i32.add 	$push337=, $1, $pop336
-	i32.const	$push434=, 8
-	i32.add 	$push218=, $pop337, $pop434
-	i64.load	$push219=, 0($pop218)
-	i64.store	0($pop217):p2align=2, $pop219
-	i64.load	$push220=, 520($1)
-	i64.store	188($1):p2align=2, $pop220
-	i32.const	$push338=, 153
-	i32.add 	$push339=, $1, $pop338
-	i32.const	$push340=, 480
-	i32.add 	$push341=, $1, $pop340
-	i32.const	$push221=, 35
-	i32.call	$drop=, memcpy@FUNCTION, $pop339, $pop341, $pop221
-	i32.const	$push342=, 81
-	i32.add 	$push343=, $1, $pop342
-	i32.const	$push344=, 408
-	i32.add 	$push345=, $1, $pop344
-	i32.const	$push222=, 72
-	i32.call	$drop=, memcpy@FUNCTION, $pop343, $pop345, $pop222
-	i32.const	$push223=, 76
-	i32.add 	$push224=, $1, $pop223
-	i32.const	$push346=, 81
-	i32.add 	$push347=, $1, $pop346
-	i32.store	0($pop224), $pop347
-	i32.const	$push225=, 68
+	i32.const	$push92=, 436
+	i32.add 	$push93=, $1, $pop92
+	i32.load8_u	$push94=, 786($1)
+	i32.store8	0($pop93), $pop94
+	i32.const	$push225=, 420
 	i32.add 	$push226=, $1, $pop225
-	i32.const	$push348=, 188
-	i32.add 	$push349=, $1, $pop348
-	i32.store	0($pop226), $pop349
-	i32.const	$push227=, 64
+	i32.const	$push95=, 4
+	i32.add 	$push96=, $pop226, $pop95
+	i32.load8_u	$push97=, 772($1)
+	i32.store8	0($pop96), $pop97
+	i32.const	$push227=, 412
 	i32.add 	$push228=, $1, $pop227
-	i32.const	$push350=, 221
-	i32.add 	$push351=, $1, $pop350
-	i32.store	0($pop228), $pop351
-	i32.const	$push229=, 60
+	i32.const	$push415=, 4
+	i32.add 	$push98=, $pop228, $pop415
+	i32.load16_u	$push99=, 764($1)
+	i32.store16	0($pop98), $pop99
+	i32.const	$push100=, 410
+	i32.add 	$push101=, $1, $pop100
+	i32.load8_u	$push102=, 758($1)
+	i32.store8	0($pop101), $pop102
+	i32.const	$push229=, 404
 	i32.add 	$push230=, $1, $pop229
-	i32.const	$push352=, 252
-	i32.add 	$push353=, $1, $pop352
-	i32.store	0($pop230), $pop353
-	i32.const	$push231=, 56
+	i32.const	$push414=, 4
+	i32.add 	$push103=, $pop230, $pop414
+	i32.load16_u	$push104=, 756($1)
+	i32.store16	0($pop103), $pop104
+	i32.load16_u	$push105=, 792($1)
+	i32.store16	438($1), $pop105
+	i32.load16_u	$push106=, 784($1)
+	i32.store16	434($1), $pop106
+	i32.load	$push107=, 776($1)
+	i32.store	428($1), $pop107
+	i32.load	$push108=, 768($1)
+	i32.store	420($1), $pop108
+	i32.load	$push109=, 760($1)
+	i32.store	412($1), $pop109
+	i32.load	$push110=, 752($1)
+	i32.store	404($1), $pop110
+	i32.const	$push231=, 376
 	i32.add 	$push232=, $1, $pop231
-	i32.const	$push354=, 268
-	i32.add 	$push355=, $1, $pop354
-	i32.store	0($pop232), $pop355
-	i32.const	$push233=, 52
+	i32.const	$push111=, 8
+	i32.add 	$push112=, $pop232, $pop111
+	i32.const	$push233=, 728
 	i32.add 	$push234=, $1, $pop233
-	i32.const	$push356=, 284
-	i32.add 	$push357=, $1, $pop356
-	i32.store	0($pop234), $pop357
-	i32.const	$push235=, 48
+	i32.const	$push413=, 8
+	i32.add 	$push113=, $pop234, $pop413
+	i32.load8_u	$push114=, 0($pop113)
+	i32.store8	0($pop112), $pop114
+	i32.const	$push235=, 360
 	i32.add 	$push236=, $1, $pop235
-	i32.const	$push358=, 300
-	i32.add 	$push359=, $1, $pop358
-	i32.store	0($pop236), $pop359
-	i32.const	$push237=, 44
+	i32.const	$push412=, 8
+	i32.add 	$push115=, $pop236, $pop412
+	i32.const	$push237=, 712
 	i32.add 	$push238=, $1, $pop237
-	i32.const	$push360=, 316
-	i32.add 	$push361=, $1, $pop360
-	i32.store	0($pop238), $pop361
-	i32.const	$push239=, 40
+	i32.const	$push411=, 8
+	i32.add 	$push116=, $pop238, $pop411
+	i32.load16_u	$push117=, 0($pop116)
+	i32.store16	0($pop115), $pop117
+	i32.const	$push239=, 344
 	i32.add 	$push240=, $1, $pop239
-	i32.const	$push362=, 328
-	i32.add 	$push363=, $1, $pop362
-	i32.store	0($pop240), $pop363
-	i32.const	$push241=, 36
+	i32.const	$push118=, 10
+	i32.add 	$push119=, $pop240, $pop118
+	i32.const	$push241=, 696
 	i32.add 	$push242=, $1, $pop241
-	i32.const	$push364=, 340
-	i32.add 	$push365=, $1, $pop364
-	i32.store	0($pop242), $pop365
-	i32.const	$push243=, 32
+	i32.const	$push410=, 10
+	i32.add 	$push120=, $pop242, $pop410
+	i32.load8_u	$push121=, 0($pop120)
+	i32.store8	0($pop119), $pop121
+	i32.const	$push243=, 344
 	i32.add 	$push244=, $1, $pop243
-	i32.const	$push366=, 352
-	i32.add 	$push367=, $1, $pop366
-	i32.store	0($pop244), $pop367
-	i32.const	$push245=, 28
+	i32.const	$push409=, 8
+	i32.add 	$push122=, $pop244, $pop409
+	i32.const	$push245=, 696
 	i32.add 	$push246=, $1, $pop245
-	i32.const	$push368=, 364
-	i32.add 	$push369=, $1, $pop368
-	i32.store	0($pop246), $pop369
-	i32.const	$push433=, 24
-	i32.add 	$push247=, $1, $pop433
-	i32.const	$push370=, 372
-	i32.add 	$push371=, $1, $pop370
-	i32.store	0($pop247), $pop371
-	i32.const	$push248=, 20
-	i32.add 	$push249=, $1, $pop248
-	i32.const	$push372=, 380
-	i32.add 	$push373=, $1, $pop372
-	i32.store	0($pop249), $pop373
-	i32.const	$push432=, 16
-	i32.add 	$push250=, $1, $pop432
-	i32.const	$push374=, 388
-	i32.add 	$push375=, $1, $pop374
-	i32.store	0($pop250), $pop375
-	i32.const	$push431=, 8
-	i32.store	0($1), $pop431
-	i32.const	$push430=, 72
-	i32.add 	$push251=, $1, $pop430
-	i32.const	$push376=, 153
-	i32.add 	$push377=, $1, $pop376
-	i32.store	0($pop251), $pop377
-	i32.const	$push378=, 396
-	i32.add 	$push379=, $1, $pop378
-	i32.store	12($1), $pop379
-	i32.const	$push380=, 402
-	i32.add 	$push381=, $1, $pop380
-	i32.store	8($1), $pop381
-	i32.const	$push382=, 406
-	i32.add 	$push383=, $1, $pop382
-	i32.store	4($1), $pop383
-	i32.const	$push252=, 21
-	call    	foo@FUNCTION, $pop252, $1
-	i32.const	$push253=, 0
-	call    	exit@FUNCTION, $pop253
+	i32.const	$push408=, 8
+	i32.add 	$push123=, $pop246, $pop408
+	i32.load16_u	$push124=, 0($pop123)
+	i32.store16	0($pop122), $pop124
+	i32.const	$push247=, 328
+	i32.add 	$push248=, $1, $pop247
+	i32.const	$push407=, 8
+	i32.add 	$push125=, $pop248, $pop407
+	i32.const	$push249=, 680
+	i32.add 	$push250=, $1, $pop249
+	i32.const	$push406=, 8
+	i32.add 	$push126=, $pop250, $pop406
+	i32.load	$push127=, 0($pop126)
+	i32.store	0($pop125), $pop127
+	i64.load	$push128=, 744($1)
+	i64.store	392($1), $pop128
+	i64.load	$push129=, 728($1)
+	i64.store	376($1), $pop129
+	i64.load	$push130=, 712($1)
+	i64.store	360($1), $pop130
+	i64.load	$push131=, 696($1)
+	i64.store	344($1), $pop131
+	i64.load	$push132=, 680($1)
+	i64.store	328($1), $pop132
+	i64.load	$push133=, 669($1):p2align=0
+	i64.store	317($1):p2align=0, $pop133
+	i64.load	$push134=, 664($1)
+	i64.store	312($1), $pop134
+	i64.load	$push135=, 654($1):p2align=1
+	i64.store	302($1):p2align=1, $pop135
+	i64.load	$push136=, 648($1)
+	i64.store	296($1), $pop136
+	i64.load	$push137=, 639($1):p2align=0
+	i64.store	287($1):p2align=0, $pop137
+	i64.load	$push138=, 632($1)
+	i64.store	280($1), $pop138
+	i32.const	$push251=, 264
+	i32.add 	$push252=, $1, $pop251
+	i32.const	$push405=, 8
+	i32.add 	$push139=, $pop252, $pop405
+	i32.const	$push253=, 616
+	i32.add 	$push254=, $1, $pop253
+	i32.const	$push404=, 8
+	i32.add 	$push140=, $pop254, $pop404
+	i64.load	$push141=, 0($pop140)
+	i64.store	0($pop139), $pop141
+	i64.load	$push142=, 616($1)
+	i64.store	264($1), $pop142
+	i32.const	$push255=, 232
+	i32.add 	$push256=, $1, $pop255
+	i32.const	$push143=, 23
+	i32.add 	$push144=, $pop256, $pop143
+	i32.const	$push257=, 584
+	i32.add 	$push258=, $1, $pop257
+	i32.const	$push403=, 23
+	i32.add 	$push145=, $pop258, $pop403
+	i64.load	$push146=, 0($pop145):p2align=0
+	i64.store	0($pop144):p2align=0, $pop146
+	i32.const	$push259=, 232
+	i32.add 	$push260=, $1, $pop259
+	i32.const	$push147=, 16
+	i32.add 	$push148=, $pop260, $pop147
+	i32.const	$push261=, 584
+	i32.add 	$push262=, $1, $pop261
+	i32.const	$push402=, 16
+	i32.add 	$push149=, $pop262, $pop402
+	i64.load	$push150=, 0($pop149)
+	i64.store	0($pop148), $pop150
+	i32.const	$push263=, 232
+	i32.add 	$push264=, $1, $pop263
+	i32.const	$push401=, 8
+	i32.add 	$push151=, $pop264, $pop401
+	i32.const	$push265=, 584
+	i32.add 	$push266=, $1, $pop265
+	i32.const	$push400=, 8
+	i32.add 	$push152=, $pop266, $pop400
+	i64.load	$push153=, 0($pop152)
+	i64.store	0($pop151), $pop153
+	i64.load	$push154=, 584($1)
+	i64.store	232($1), $pop154
+	i32.const	$push267=, 200
+	i32.add 	$push268=, $1, $pop267
+	i32.const	$push155=, 24
+	i32.add 	$push156=, $pop268, $pop155
+	i32.const	$push269=, 552
+	i32.add 	$push270=, $1, $pop269
+	i32.const	$push399=, 24
+	i32.add 	$push157=, $pop270, $pop399
+	i64.load	$push158=, 0($pop157)
+	i64.store	0($pop156), $pop158
+	i32.const	$push271=, 200
+	i32.add 	$push272=, $1, $pop271
+	i32.const	$push398=, 16
+	i32.add 	$push159=, $pop272, $pop398
+	i32.const	$push273=, 552
+	i32.add 	$push274=, $1, $pop273
+	i32.const	$push397=, 16
+	i32.add 	$push160=, $pop274, $pop397
+	i64.load	$push161=, 0($pop160)
+	i64.store	0($pop159), $pop161
+	i32.const	$push275=, 200
+	i32.add 	$push276=, $1, $pop275
+	i32.const	$push396=, 8
+	i32.add 	$push162=, $pop276, $pop396
+	i32.const	$push277=, 552
+	i32.add 	$push278=, $1, $pop277
+	i32.const	$push395=, 8
+	i32.add 	$push163=, $pop278, $pop395
+	i64.load	$push164=, 0($pop163)
+	i64.store	0($pop162), $pop164
+	i64.load	$push165=, 552($1)
+	i64.store	200($1), $pop165
+	i32.const	$push279=, 160
+	i32.add 	$push280=, $1, $pop279
+	i32.const	$push166=, 34
+	i32.add 	$push167=, $pop280, $pop166
+	i32.const	$push281=, 512
+	i32.add 	$push282=, $1, $pop281
+	i32.const	$push394=, 34
+	i32.add 	$push168=, $pop282, $pop394
+	i32.load8_u	$push169=, 0($pop168)
+	i32.store8	0($pop167), $pop169
+	i32.const	$push283=, 160
+	i32.add 	$push284=, $1, $pop283
+	i32.const	$push170=, 32
+	i32.add 	$push171=, $pop284, $pop170
+	i32.const	$push285=, 512
+	i32.add 	$push286=, $1, $pop285
+	i32.const	$push393=, 32
+	i32.add 	$push172=, $pop286, $pop393
+	i32.load16_u	$push173=, 0($pop172)
+	i32.store16	0($pop171), $pop173
+	i32.const	$push287=, 160
+	i32.add 	$push288=, $1, $pop287
+	i32.const	$push392=, 24
+	i32.add 	$push174=, $pop288, $pop392
+	i32.const	$push289=, 512
+	i32.add 	$push290=, $1, $pop289
+	i32.const	$push391=, 24
+	i32.add 	$push175=, $pop290, $pop391
+	i64.load	$push176=, 0($pop175)
+	i64.store	0($pop174), $pop176
+	i32.const	$push291=, 160
+	i32.add 	$push292=, $1, $pop291
+	i32.const	$push390=, 16
+	i32.add 	$push177=, $pop292, $pop390
+	i32.const	$push293=, 512
+	i32.add 	$push294=, $1, $pop293
+	i32.const	$push389=, 16
+	i32.add 	$push178=, $pop294, $pop389
+	i64.load	$push179=, 0($pop178)
+	i64.store	0($pop177), $pop179
+	i32.const	$push295=, 160
+	i32.add 	$push296=, $1, $pop295
+	i32.const	$push388=, 8
+	i32.add 	$push180=, $pop296, $pop388
+	i32.const	$push297=, 512
+	i32.add 	$push298=, $1, $pop297
+	i32.const	$push387=, 8
+	i32.add 	$push181=, $pop298, $pop387
+	i64.load	$push182=, 0($pop181)
+	i64.store	0($pop180), $pop182
+	i64.load	$push183=, 512($1)
+	i64.store	160($1), $pop183
+	i32.const	$push299=, 88
+	i32.add 	$push300=, $1, $pop299
+	i32.const	$push301=, 440
+	i32.add 	$push302=, $1, $pop301
+	i32.const	$push184=, 72
+	i32.call	$drop=, memcpy@FUNCTION, $pop300, $pop302, $pop184
+	i32.const	$push185=, 76
+	i32.add 	$push186=, $1, $pop185
+	i32.const	$push303=, 88
+	i32.add 	$push304=, $1, $pop303
+	i32.store	0($pop186), $pop304
+	i32.const	$push187=, 68
+	i32.add 	$push188=, $1, $pop187
+	i32.const	$push305=, 200
+	i32.add 	$push306=, $1, $pop305
+	i32.store	0($pop188), $pop306
+	i32.const	$push189=, 64
+	i32.add 	$push190=, $1, $pop189
+	i32.const	$push307=, 232
+	i32.add 	$push308=, $1, $pop307
+	i32.store	0($pop190), $pop308
+	i32.const	$push191=, 60
+	i32.add 	$push192=, $1, $pop191
+	i32.const	$push309=, 264
+	i32.add 	$push310=, $1, $pop309
+	i32.store	0($pop192), $pop310
+	i32.const	$push193=, 56
+	i32.add 	$push194=, $1, $pop193
+	i32.const	$push311=, 280
+	i32.add 	$push312=, $1, $pop311
+	i32.store	0($pop194), $pop312
+	i32.const	$push195=, 52
+	i32.add 	$push196=, $1, $pop195
+	i32.const	$push313=, 296
+	i32.add 	$push314=, $1, $pop313
+	i32.store	0($pop196), $pop314
+	i32.const	$push197=, 48
+	i32.add 	$push198=, $1, $pop197
+	i32.const	$push315=, 312
+	i32.add 	$push316=, $1, $pop315
+	i32.store	0($pop198), $pop316
+	i32.const	$push199=, 44
+	i32.add 	$push200=, $1, $pop199
+	i32.const	$push317=, 328
+	i32.add 	$push318=, $1, $pop317
+	i32.store	0($pop200), $pop318
+	i32.const	$push201=, 40
+	i32.add 	$push202=, $1, $pop201
+	i32.const	$push319=, 344
+	i32.add 	$push320=, $1, $pop319
+	i32.store	0($pop202), $pop320
+	i32.const	$push203=, 36
+	i32.add 	$push204=, $1, $pop203
+	i32.const	$push321=, 360
+	i32.add 	$push322=, $1, $pop321
+	i32.store	0($pop204), $pop322
+	i32.const	$push386=, 32
+	i32.add 	$push205=, $1, $pop386
+	i32.const	$push323=, 376
+	i32.add 	$push324=, $1, $pop323
+	i32.store	0($pop205), $pop324
+	i32.const	$push206=, 28
+	i32.add 	$push207=, $1, $pop206
+	i32.const	$push325=, 392
+	i32.add 	$push326=, $1, $pop325
+	i32.store	0($pop207), $pop326
+	i32.const	$push385=, 24
+	i32.add 	$push208=, $1, $pop385
+	i32.const	$push327=, 404
+	i32.add 	$push328=, $1, $pop327
+	i32.store	0($pop208), $pop328
+	i32.const	$push209=, 20
+	i32.add 	$push210=, $1, $pop209
+	i32.const	$push329=, 412
+	i32.add 	$push330=, $1, $pop329
+	i32.store	0($pop210), $pop330
+	i32.const	$push384=, 16
+	i32.add 	$push211=, $1, $pop384
+	i32.const	$push331=, 420
+	i32.add 	$push332=, $1, $pop331
+	i32.store	0($pop211), $pop332
+	i32.const	$push383=, 8
+	i32.store	0($1), $pop383
+	i32.const	$push382=, 72
+	i32.add 	$push212=, $1, $pop382
+	i32.const	$push333=, 160
+	i32.add 	$push334=, $1, $pop333
+	i32.store	0($pop212), $pop334
+	i32.const	$push335=, 428
+	i32.add 	$push336=, $1, $pop335
+	i32.store	12($1), $pop336
+	i32.const	$push337=, 434
+	i32.add 	$push338=, $1, $pop337
+	i32.store	8($1), $pop338
+	i32.const	$push339=, 438
+	i32.add 	$push340=, $1, $pop339
+	i32.store	4($1), $pop340
+	i32.const	$push213=, 21
+	call    	foo@FUNCTION, $pop213, $1
+	i32.const	$push214=, 0
+	call    	exit@FUNCTION, $pop214
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.type	bar.lastn,@object       # @bar.lastn
 	.section	.data.bar.lastn,"aw",@progbits
 	.p2align	2
@@ -2450,6 +2137,6 @@ bar.lastc:
 	.size	bar.lastc, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-23.c.s b/test/torture-s/va-arg-23.c.s
index fc9a040ea..dbc80d47a 100644
--- a/test/torture-s/va-arg-23.c.s
+++ b/test/torture-s/va-arg-23.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-23.c"
+	.file	"va-arg-23.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -9,13 +9,12 @@ foo:                                    # @foo
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
+	i32.const	$push8=, 0
+	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
+	i32.sub 	$push15=, $pop7, $pop9
 	tee_local	$push14=, $8=, $pop15
 	i32.store	__stack_pointer($pop10), $pop14
-	i32.store	12($8), $7
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $7, $pop1
 	i32.store	12($8), $pop2
@@ -41,9 +40,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -51,16 +50,16 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push7=, 0
-	i32.const	$push4=, 0
-	i32.load	$push5=, __stack_pointer($pop4)
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 32
-	i32.sub 	$push14=, $pop5, $pop6
+	i32.sub 	$push14=, $pop4, $pop6
 	tee_local	$push13=, $0=, $pop14
 	i32.store	__stack_pointer($pop7), $pop13
-	i64.load	$push0=, 24($0)
-	i64.store	16($0):p2align=2, $pop0
-	i32.const	$push1=, 2
-	i32.store	0($0), $pop1
+	i32.const	$push0=, 2
+	i32.store	0($0), $pop0
+	i64.load	$push1=, 24($0)
+	i64.store	16($0), $pop1
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $0, $pop11
 	i32.const	$push2=, 1
@@ -74,7 +73,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/va-arg-24.c.s b/test/torture-s/va-arg-24.c.s
index 4eb90038c..df1150405 100644
--- a/test/torture-s/va-arg-24.c.s
+++ b/test/torture-s/va-arg-24.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-24.c"
+	.file	"va-arg-24.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -9,10 +9,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push29=, 0
-	i32.const	$push26=, 0
-	i32.load	$push27=, __stack_pointer($pop26)
+	i32.const	$push27=, 0
+	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 288
-	i32.sub 	$push103=, $pop27, $pop28
+	i32.sub 	$push103=, $pop26, $pop28
 	tee_local	$push102=, $0=, $pop103
 	i32.store	__stack_pointer($pop29), $pop102
 	i32.const	$push30=, 240
@@ -166,63 +166,53 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.varargs0,"ax",@progbits
-	.type	varargs0,@function
+	.type	varargs0,@function      # -- Begin function varargs0
 varargs0:                               # @varargs0
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
-	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
-	i32.const	$push21=, 64
-	i32.sub 	$push36=, $pop20, $pop21
-	tee_local	$push35=, $4=, $pop36
-	i32.store	__stack_pointer($pop22), $pop35
+	i32.const	$push18=, 0
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 64
+	i32.sub 	$push30=, $pop15, $pop17
+	tee_local	$push29=, $4=, $pop30
+	i32.store	__stack_pointer($pop18), $pop29
 	i32.store	60($4), $1
-	i32.const	$push34=, 0
-	i32.store	16($4), $pop34
-	i32.load	$push33=, 60($4)
-	tee_local	$push32=, $1=, $pop33
-	i32.const	$push31=, 4
-	i32.add 	$push1=, $pop32, $pop31
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $1, $pop28
 	i32.store	60($4), $pop1
-	i32.load	$push2=, 4($1)
-	i32.store	24($4), $pop2
-	i32.load	$push3=, 0($1)
-	i32.store	20($4), $pop3
-	i32.load	$push4=, 8($1)
-	i32.store	28($4), $pop4
-	i32.load	$push5=, 12($1)
-	i32.store	32($4), $pop5
-	i32.load	$push6=, 16($1)
-	i32.store	36($4), $pop6
-	i32.load	$push7=, 20($1)
-	i32.store	40($4), $pop7
-	i32.load	$push8=, 24($1)
-	i32.store	44($4), $pop8
-	i32.load	$push9=, 28($1)
-	i32.store	48($4), $pop9
-	i32.load	$push10=, 32($1)
-	i32.store	52($4), $pop10
-	i32.const	$push11=, 40
-	i32.add 	$push12=, $1, $pop11
-	i32.store	60($4), $pop12
-	i32.load	$push13=, 36($1)
-	i32.store	56($4), $pop13
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $4, $pop26
-	i32.const	$push30=, 4
-	i32.or  	$2=, $pop27, $pop30
+	i32.const	$push27=, 0
+	i32.store	16($4), $pop27
+	i64.load	$push2=, 4($1):p2align=2
+	i64.store	24($4), $pop2
+	i64.load	$push3=, 12($1):p2align=2
+	i64.store	32($4), $pop3
+	i64.load	$push4=, 20($1):p2align=2
+	i64.store	40($4), $pop4
+	i64.load	$push5=, 28($1):p2align=2
+	i64.store	48($4), $pop5
+	i32.load	$push6=, 36($1)
+	i32.store	56($4), $pop6
+	i32.load	$push7=, 0($1)
+	i32.store	20($4), $pop7
+	i32.const	$push8=, 40
+	i32.add 	$push9=, $1, $pop8
+	i32.store	60($4), $pop9
+	i32.const	$push22=, 16
+	i32.add 	$push23=, $4, $pop22
+	i32.const	$push26=, 4
+	i32.or  	$2=, $pop23, $pop26
 	i32.const	$3=, 0
 	i32.const	$1=, 0
 	block   	
 	block   	
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.ne  	$push14=, $pop29, $pop28
-	br_if   	0, $pop14       # 0: down to label2
+	i32.const	$push25=, 0
+	i32.const	$push24=, 0
+	i32.ne  	$push10=, $pop25, $pop24
+	br_if   	0, $pop10       # 0: down to label2
 # BB#1:
 	i32.const	$5=, 1
 	br      	1               # 1: down to label1
@@ -246,14 +236,14 @@ varargs0:                               # @varargs0
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label9:
 	i32.load	$3=, 0($2)
-	i32.const	$push40=, 4
-	i32.add 	$push0=, $2, $pop40
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $2, $pop34
 	copy_local	$2=, $pop0
-	i32.const	$push39=, 1
-	i32.add 	$push38=, $1, $pop39
-	tee_local	$push37=, $1=, $pop38
-	i32.eq  	$push15=, $3, $pop37
-	br_if   	3, $pop15       # 3: down to label5
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $1, $pop33
+	tee_local	$push31=, $1=, $pop32
+	i32.eq  	$push11=, $3, $pop31
+	br_if   	3, $pop11       # 3: down to label5
 # BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 0
 	br      	5               # 5: up to label3
@@ -263,34 +253,34 @@ varargs0:                               # @varargs0
 	i32.store	12($4), $1
 	i32.store	8($4), $3
 	i32.store	4($4), $1
-	i32.const	$push45=, .L.str
-	i32.store	0($4), $pop45
-	i32.const	$push44=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop44, $4
-	i32.const	$push43=, 0
-	i32.const	$push42=, 0
-	i32.load	$push16=, errors($pop42)
-	i32.const	$push41=, 1
-	i32.add 	$push17=, $pop16, $pop41
-	i32.store	errors($pop43), $pop17
+	i32.const	$push39=, .L.str
+	i32.store	0($4), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $4
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push12=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push13=, $pop12, $pop35
+	i32.store	errors($pop37), $pop13
 # BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 1
 	br      	4               # 4: up to label3
 .LBB1_8:                                # %for.inc.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label7:
-	i32.const	$push46=, 10
-	i32.ne  	$push18=, $1, $pop46
-	br_if   	2, $pop18       # 2: down to label4
+	i32.const	$push40=, 10
+	i32.ne  	$push14=, $1, $pop40
+	br_if   	2, $pop14       # 2: down to label4
 # BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 3
 	br      	3               # 3: up to label3
 .LBB1_10:                               # %verify.exit
 	end_block                       # label6:
-	i32.const	$push25=, 0
-	i32.const	$push23=, 64
-	i32.add 	$push24=, $4, $pop23
-	i32.store	__stack_pointer($pop25), $pop24
+	i32.const	$push21=, 0
+	i32.const	$push19=, 64
+	i32.add 	$push20=, $4, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
 	return
 .LBB1_11:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label5:
@@ -305,61 +295,53 @@ varargs0:                               # @varargs0
 	.endfunc
 .Lfunc_end1:
 	.size	varargs0, .Lfunc_end1-varargs0
-
+                                        # -- End function
 	.section	.text.varargs1,"ax",@progbits
-	.type	varargs1,@function
+	.type	varargs1,@function      # -- Begin function varargs1
 varargs1:                               # @varargs1
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
 	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
-	i32.const	$push21=, 64
-	i32.sub 	$push35=, $pop20, $pop21
-	tee_local	$push34=, $5=, $pop35
-	i32.store	__stack_pointer($pop22), $pop34
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 64
+	i32.sub 	$push30=, $pop16, $pop18
+	tee_local	$push29=, $5=, $pop30
+	i32.store	__stack_pointer($pop19), $pop29
 	i32.store	60($5), $2
-	i64.const	$push1=, 4294967296
-	i64.store	16($5), $pop1
-	i32.load	$push33=, 60($5)
-	tee_local	$push32=, $2=, $pop33
-	i32.const	$push31=, 4
-	i32.add 	$push2=, $pop32, $pop31
-	i32.store	60($5), $pop2
-	i32.load	$push3=, 0($2)
-	i32.store	24($5), $pop3
-	i32.load	$push4=, 4($2)
-	i32.store	28($5), $pop4
-	i32.load	$push5=, 8($2)
-	i32.store	32($5), $pop5
-	i32.load	$push6=, 12($2)
-	i32.store	36($5), $pop6
-	i32.load	$push7=, 16($2)
-	i32.store	40($5), $pop7
-	i32.load	$push8=, 20($2)
-	i32.store	44($5), $pop8
-	i32.load	$push9=, 24($2)
-	i32.store	48($5), $pop9
-	i32.load	$push10=, 28($2)
-	i32.store	52($5), $pop10
-	i32.const	$push11=, 36
-	i32.add 	$push12=, $2, $pop11
-	i32.store	60($5), $pop12
-	i32.load	$push13=, 32($2)
-	i32.store	56($5), $pop13
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $5, $pop26
-	i32.const	$push30=, 4
-	i32.or  	$3=, $pop27, $pop30
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $2, $pop28
+	i32.store	60($5), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($5), $pop2
+	i32.load	$push3=, 4($2)
+	i32.store	28($5), $pop3
+	i64.load	$push4=, 8($2):p2align=2
+	i64.store	32($5), $pop4
+	i64.load	$push5=, 16($2):p2align=2
+	i64.store	40($5), $pop5
+	i64.load	$push6=, 24($2):p2align=2
+	i64.store	48($5), $pop6
+	i32.load	$push7=, 32($2)
+	i32.store	56($5), $pop7
+	i32.load	$push8=, 0($2)
+	i32.store	24($5), $pop8
+	i32.const	$push9=, 36
+	i32.add 	$push10=, $2, $pop9
+	i32.store	60($5), $pop10
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $5, $pop23
+	i32.const	$push27=, 4
+	i32.or  	$3=, $pop24, $pop27
 	i32.const	$4=, 0
 	i32.const	$2=, 0
 	block   	
 	block   	
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.ne  	$push14=, $pop29, $pop28
-	br_if   	0, $pop14       # 0: down to label11
+	i32.const	$push26=, 0
+	i32.const	$push25=, 0
+	i32.ne  	$push11=, $pop26, $pop25
+	br_if   	0, $pop11       # 0: down to label11
 # BB#1:
 	i32.const	$6=, 1
 	br      	1               # 1: down to label10
@@ -383,14 +365,14 @@ varargs1:                               # @varargs1
                                         #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label18:
 	i32.load	$4=, 0($3)
-	i32.const	$push39=, 4
-	i32.add 	$push0=, $3, $pop39
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $3, $pop34
 	copy_local	$3=, $pop0
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $2, $pop38
-	tee_local	$push36=, $2=, $pop37
-	i32.eq  	$push15=, $4, $pop36
-	br_if   	3, $pop15       # 3: down to label14
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $2, $pop33
+	tee_local	$push31=, $2=, $pop32
+	i32.eq  	$push12=, $4, $pop31
+	br_if   	3, $pop12       # 3: down to label14
 # BB#5:                                 #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$6=, 0
 	br      	5               # 5: up to label12
@@ -400,34 +382,34 @@ varargs1:                               # @varargs1
 	i32.store	12($5), $2
 	i32.store	8($5), $4
 	i32.store	4($5), $2
-	i32.const	$push44=, .L.str.2
-	i32.store	0($5), $pop44
-	i32.const	$push43=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop43, $5
-	i32.const	$push42=, 0
-	i32.const	$push41=, 0
-	i32.load	$push16=, errors($pop41)
-	i32.const	$push40=, 1
-	i32.add 	$push17=, $pop16, $pop40
-	i32.store	errors($pop42), $pop17
+	i32.const	$push39=, .L.str.2
+	i32.store	0($5), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $5
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push14=, $pop13, $pop35
+	i32.store	errors($pop37), $pop14
 # BB#7:                                 #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$6=, 1
 	br      	4               # 4: up to label12
 .LBB2_8:                                # %for.inc.i
                                         #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label16:
-	i32.const	$push45=, 10
-	i32.ne  	$push18=, $2, $pop45
-	br_if   	2, $pop18       # 2: down to label13
+	i32.const	$push40=, 10
+	i32.ne  	$push15=, $2, $pop40
+	br_if   	2, $pop15       # 2: down to label13
 # BB#9:                                 #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$6=, 3
 	br      	3               # 3: up to label12
 .LBB2_10:                               # %verify.exit
 	end_block                       # label15:
-	i32.const	$push25=, 0
-	i32.const	$push23=, 64
-	i32.add 	$push24=, $5, $pop23
-	i32.store	__stack_pointer($pop25), $pop24
+	i32.const	$push22=, 0
+	i32.const	$push20=, 64
+	i32.add 	$push21=, $5, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
 	return
 .LBB2_11:                               #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label14:
@@ -442,61 +424,53 @@ varargs1:                               # @varargs1
 	.endfunc
 .Lfunc_end2:
 	.size	varargs1, .Lfunc_end2-varargs1
-
+                                        # -- End function
 	.section	.text.varargs2,"ax",@progbits
-	.type	varargs2,@function
+	.type	varargs2,@function      # -- Begin function varargs2
 varargs2:                               # @varargs2
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
 	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
-	i32.const	$push21=, 64
-	i32.sub 	$push35=, $pop20, $pop21
-	tee_local	$push34=, $6=, $pop35
-	i32.store	__stack_pointer($pop22), $pop34
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 64
+	i32.sub 	$push30=, $pop16, $pop18
+	tee_local	$push29=, $6=, $pop30
+	i32.store	__stack_pointer($pop19), $pop29
 	i32.store	60($6), $3
-	i64.const	$push1=, 4294967296
-	i64.store	16($6), $pop1
-	i32.load	$push33=, 60($6)
-	tee_local	$push32=, $3=, $pop33
-	i32.const	$push31=, 4
-	i32.add 	$push2=, $pop32, $pop31
-	i32.store	60($6), $pop2
-	i32.const	$push3=, 2
-	i32.store	24($6), $pop3
-	i32.load	$push4=, 0($3)
-	i32.store	28($6), $pop4
-	i32.load	$push5=, 4($3)
-	i32.store	32($6), $pop5
-	i32.load	$push6=, 8($3)
-	i32.store	36($6), $pop6
-	i32.load	$push7=, 12($3)
-	i32.store	40($6), $pop7
-	i32.load	$push8=, 16($3)
-	i32.store	44($6), $pop8
-	i32.load	$push9=, 20($3)
-	i32.store	48($6), $pop9
-	i32.load	$push10=, 24($3)
-	i32.store	52($6), $pop10
-	i32.const	$push11=, 32
-	i32.add 	$push12=, $3, $pop11
-	i32.store	60($6), $pop12
-	i32.load	$push13=, 28($3)
-	i32.store	56($6), $pop13
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $6, $pop26
-	i32.const	$push30=, 4
-	i32.or  	$4=, $pop27, $pop30
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $3, $pop28
+	i32.store	60($6), $pop1
+	i32.const	$push2=, 2
+	i32.store	24($6), $pop2
+	i64.const	$push3=, 4294967296
+	i64.store	16($6), $pop3
+	i64.load	$push4=, 4($3):p2align=2
+	i64.store	32($6), $pop4
+	i64.load	$push5=, 12($3):p2align=2
+	i64.store	40($6), $pop5
+	i64.load	$push6=, 20($3):p2align=2
+	i64.store	48($6), $pop6
+	i32.load	$push7=, 28($3)
+	i32.store	56($6), $pop7
+	i32.load	$push8=, 0($3)
+	i32.store	28($6), $pop8
+	i32.const	$push9=, 32
+	i32.add 	$push10=, $3, $pop9
+	i32.store	60($6), $pop10
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $6, $pop23
+	i32.const	$push27=, 4
+	i32.or  	$4=, $pop24, $pop27
 	i32.const	$5=, 0
 	i32.const	$3=, 0
 	block   	
 	block   	
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.ne  	$push14=, $pop29, $pop28
-	br_if   	0, $pop14       # 0: down to label20
+	i32.const	$push26=, 0
+	i32.const	$push25=, 0
+	i32.ne  	$push11=, $pop26, $pop25
+	br_if   	0, $pop11       # 0: down to label20
 # BB#1:
 	i32.const	$7=, 1
 	br      	1               # 1: down to label19
@@ -520,14 +494,14 @@ varargs2:                               # @varargs2
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label27:
 	i32.load	$5=, 0($4)
-	i32.const	$push39=, 4
-	i32.add 	$push0=, $4, $pop39
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $4, $pop34
 	copy_local	$4=, $pop0
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $3, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.eq  	$push15=, $5, $pop36
-	br_if   	3, $pop15       # 3: down to label23
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $3, $pop33
+	tee_local	$push31=, $3=, $pop32
+	i32.eq  	$push12=, $5, $pop31
+	br_if   	3, $pop12       # 3: down to label23
 # BB#5:                                 #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$7=, 0
 	br      	5               # 5: up to label21
@@ -537,34 +511,34 @@ varargs2:                               # @varargs2
 	i32.store	12($6), $3
 	i32.store	8($6), $5
 	i32.store	4($6), $3
-	i32.const	$push44=, .L.str.3
-	i32.store	0($6), $pop44
-	i32.const	$push43=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop43, $6
-	i32.const	$push42=, 0
-	i32.const	$push41=, 0
-	i32.load	$push16=, errors($pop41)
-	i32.const	$push40=, 1
-	i32.add 	$push17=, $pop16, $pop40
-	i32.store	errors($pop42), $pop17
+	i32.const	$push39=, .L.str.3
+	i32.store	0($6), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $6
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push14=, $pop13, $pop35
+	i32.store	errors($pop37), $pop14
 # BB#7:                                 #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$7=, 1
 	br      	4               # 4: up to label21
 .LBB3_8:                                # %for.inc.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label25:
-	i32.const	$push45=, 10
-	i32.ne  	$push18=, $3, $pop45
-	br_if   	2, $pop18       # 2: down to label22
+	i32.const	$push40=, 10
+	i32.ne  	$push15=, $3, $pop40
+	br_if   	2, $pop15       # 2: down to label22
 # BB#9:                                 #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$7=, 3
 	br      	3               # 3: up to label21
 .LBB3_10:                               # %verify.exit
 	end_block                       # label24:
-	i32.const	$push25=, 0
-	i32.const	$push23=, 64
-	i32.add 	$push24=, $6, $pop23
-	i32.store	__stack_pointer($pop25), $pop24
+	i32.const	$push22=, 0
+	i32.const	$push20=, 64
+	i32.add 	$push21=, $6, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
 	return
 .LBB3_11:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label23:
@@ -579,61 +553,57 @@ varargs2:                               # @varargs2
 	.endfunc
 .Lfunc_end3:
 	.size	varargs2, .Lfunc_end3-varargs2
-
+                                        # -- End function
 	.section	.text.varargs3,"ax",@progbits
-	.type	varargs3,@function
+	.type	varargs3,@function      # -- Begin function varargs3
 varargs3:                               # @varargs3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push22=, 0
+	i32.const	$push21=, 0
 	i32.const	$push19=, 0
-	i32.load	$push20=, __stack_pointer($pop19)
-	i32.const	$push21=, 64
-	i32.sub 	$push35=, $pop20, $pop21
-	tee_local	$push34=, $7=, $pop35
-	i32.store	__stack_pointer($pop22), $pop34
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 64
+	i32.sub 	$push32=, $pop18, $pop20
+	tee_local	$push31=, $7=, $pop32
+	i32.store	__stack_pointer($pop21), $pop31
 	i32.store	60($7), $4
-	i64.const	$push1=, 4294967296
-	i64.store	16($7), $pop1
-	i32.load	$push33=, 60($7)
-	tee_local	$push32=, $4=, $pop33
-	i32.const	$push31=, 4
-	i32.add 	$push2=, $pop32, $pop31
-	i32.store	60($7), $pop2
-	i32.const	$push3=, 2
-	i32.store	24($7), $pop3
-	i32.const	$push4=, 3
-	i32.store	28($7), $pop4
-	i32.load	$push5=, 0($4)
-	i32.store	32($7), $pop5
-	i32.load	$push6=, 4($4)
-	i32.store	36($7), $pop6
-	i32.load	$push7=, 8($4)
-	i32.store	40($7), $pop7
-	i32.load	$push8=, 12($4)
-	i32.store	44($7), $pop8
-	i32.load	$push9=, 16($4)
-	i32.store	48($7), $pop9
-	i32.load	$push10=, 20($4)
-	i32.store	52($7), $pop10
-	i32.const	$push11=, 28
-	i32.add 	$push12=, $4, $pop11
-	i32.store	60($7), $pop12
-	i32.load	$push13=, 24($4)
-	i32.store	56($7), $pop13
-	i32.const	$push26=, 16
-	i32.add 	$push27=, $7, $pop26
 	i32.const	$push30=, 4
-	i32.or  	$5=, $pop27, $pop30
+	i32.add 	$push1=, $4, $pop30
+	i32.store	60($7), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($7), $pop2
+	i64.const	$push3=, 12884901890
+	i64.store	24($7), $pop3
+	i32.load	$push4=, 4($4)
+	i32.store	36($7), $pop4
+	i32.load	$push5=, 8($4)
+	i32.store	40($7), $pop5
+	i32.load	$push6=, 12($4)
+	i32.store	44($7), $pop6
+	i32.load	$push7=, 16($4)
+	i32.store	48($7), $pop7
+	i32.load	$push8=, 20($4)
+	i32.store	52($7), $pop8
+	i32.load	$push9=, 0($4)
+	i32.store	32($7), $pop9
+	i32.const	$push10=, 28
+	i32.add 	$push11=, $4, $pop10
+	i32.store	60($7), $pop11
+	i32.load	$push12=, 24($4)
+	i32.store	56($7), $pop12
+	i32.const	$push25=, 16
+	i32.add 	$push26=, $7, $pop25
+	i32.const	$push29=, 4
+	i32.or  	$5=, $pop26, $pop29
 	i32.const	$6=, 0
 	i32.const	$4=, 0
 	block   	
 	block   	
-	i32.const	$push29=, 0
 	i32.const	$push28=, 0
-	i32.ne  	$push14=, $pop29, $pop28
-	br_if   	0, $pop14       # 0: down to label29
+	i32.const	$push27=, 0
+	i32.ne  	$push13=, $pop28, $pop27
+	br_if   	0, $pop13       # 0: down to label29
 # BB#1:
 	i32.const	$8=, 1
 	br      	1               # 1: down to label28
@@ -657,14 +627,14 @@ varargs3:                               # @varargs3
                                         #   in Loop: Header=BB4_3 Depth=1
 	end_block                       # label36:
 	i32.load	$6=, 0($5)
-	i32.const	$push39=, 4
-	i32.add 	$push0=, $5, $pop39
+	i32.const	$push36=, 4
+	i32.add 	$push0=, $5, $pop36
 	copy_local	$5=, $pop0
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $4, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.eq  	$push15=, $6, $pop36
-	br_if   	3, $pop15       # 3: down to label32
+	i32.const	$push35=, 1
+	i32.add 	$push34=, $4, $pop35
+	tee_local	$push33=, $4=, $pop34
+	i32.eq  	$push14=, $6, $pop33
+	br_if   	3, $pop14       # 3: down to label32
 # BB#5:                                 #   in Loop: Header=BB4_3 Depth=1
 	i32.const	$8=, 0
 	br      	5               # 5: up to label30
@@ -674,34 +644,34 @@ varargs3:                               # @varargs3
 	i32.store	12($7), $4
 	i32.store	8($7), $6
 	i32.store	4($7), $4
-	i32.const	$push44=, .L.str.4
-	i32.store	0($7), $pop44
-	i32.const	$push43=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop43, $7
-	i32.const	$push42=, 0
-	i32.const	$push41=, 0
-	i32.load	$push16=, errors($pop41)
-	i32.const	$push40=, 1
-	i32.add 	$push17=, $pop16, $pop40
-	i32.store	errors($pop42), $pop17
+	i32.const	$push41=, .L.str.4
+	i32.store	0($7), $pop41
+	i32.const	$push40=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop40, $7
+	i32.const	$push39=, 0
+	i32.const	$push38=, 0
+	i32.load	$push15=, errors($pop38)
+	i32.const	$push37=, 1
+	i32.add 	$push16=, $pop15, $pop37
+	i32.store	errors($pop39), $pop16
 # BB#7:                                 #   in Loop: Header=BB4_3 Depth=1
 	i32.const	$8=, 1
 	br      	4               # 4: up to label30
 .LBB4_8:                                # %for.inc.i
                                         #   in Loop: Header=BB4_3 Depth=1
 	end_block                       # label34:
-	i32.const	$push45=, 10
-	i32.ne  	$push18=, $4, $pop45
-	br_if   	2, $pop18       # 2: down to label31
+	i32.const	$push42=, 10
+	i32.ne  	$push17=, $4, $pop42
+	br_if   	2, $pop17       # 2: down to label31
 # BB#9:                                 #   in Loop: Header=BB4_3 Depth=1
 	i32.const	$8=, 3
 	br      	3               # 3: up to label30
 .LBB4_10:                               # %verify.exit
 	end_block                       # label33:
-	i32.const	$push25=, 0
-	i32.const	$push23=, 64
-	i32.add 	$push24=, $7, $pop23
-	i32.store	__stack_pointer($pop25), $pop24
+	i32.const	$push24=, 0
+	i32.const	$push22=, 64
+	i32.add 	$push23=, $7, $pop22
+	i32.store	__stack_pointer($pop24), $pop23
 	return
 .LBB4_11:                               #   in Loop: Header=BB4_3 Depth=1
 	end_block                       # label32:
@@ -716,59 +686,53 @@ varargs3:                               # @varargs3
 	.endfunc
 .Lfunc_end4:
 	.size	varargs3, .Lfunc_end4-varargs3
-
+                                        # -- End function
 	.section	.text.varargs4,"ax",@progbits
-	.type	varargs4,@function
+	.type	varargs4,@function      # -- Begin function varargs4
 varargs4:                               # @varargs4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push20=, 0
-	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
-	i32.const	$push19=, 64
-	i32.sub 	$push34=, $pop18, $pop19
-	tee_local	$push33=, $8=, $pop34
-	i32.store	__stack_pointer($pop20), $pop33
+	i32.const	$push18=, 0
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 64
+	i32.sub 	$push30=, $pop15, $pop17
+	tee_local	$push29=, $8=, $pop30
+	i32.store	__stack_pointer($pop18), $pop29
+	i32.const	$push28=, 4
+	i32.store	32($8), $pop28
 	i32.store	60($8), $5
-	i64.const	$push1=, 4294967296
-	i64.store	16($8), $pop1
-	i32.const	$push32=, 4
-	i32.store	32($8), $pop32
-	i32.load	$push31=, 60($8)
-	tee_local	$push30=, $5=, $pop31
-	i32.const	$push29=, 4
-	i32.add 	$push2=, $pop30, $pop29
-	i32.store	60($8), $pop2
+	i32.const	$push27=, 4
+	i32.add 	$push1=, $5, $pop27
+	i32.store	60($8), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($8), $pop2
 	i64.const	$push3=, 12884901890
 	i64.store	24($8), $pop3
-	i32.load	$push4=, 0($5)
-	i32.store	36($8), $pop4
-	i32.load	$push5=, 4($5)
-	i32.store	40($8), $pop5
-	i32.load	$push6=, 8($5)
-	i32.store	44($8), $pop6
-	i32.load	$push7=, 12($5)
-	i32.store	48($8), $pop7
-	i32.load	$push8=, 16($5)
-	i32.store	52($8), $pop8
-	i32.const	$push9=, 24
-	i32.add 	$push10=, $5, $pop9
-	i32.store	60($8), $pop10
-	i32.load	$push11=, 20($5)
-	i32.store	56($8), $pop11
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $8, $pop24
-	i32.const	$push28=, 4
-	i32.or  	$6=, $pop25, $pop28
+	i64.load	$push4=, 4($5):p2align=2
+	i64.store	40($8), $pop4
+	i64.load	$push5=, 12($5):p2align=2
+	i64.store	48($8), $pop5
+	i32.load	$push6=, 20($5)
+	i32.store	56($8), $pop6
+	i32.load	$push7=, 0($5)
+	i32.store	36($8), $pop7
+	i32.const	$push8=, 24
+	i32.add 	$push9=, $5, $pop8
+	i32.store	60($8), $pop9
+	i32.const	$push22=, 16
+	i32.add 	$push23=, $8, $pop22
+	i32.const	$push26=, 4
+	i32.or  	$6=, $pop23, $pop26
 	i32.const	$7=, 0
 	i32.const	$5=, 0
 	block   	
 	block   	
-	i32.const	$push27=, 0
-	i32.const	$push26=, 0
-	i32.ne  	$push12=, $pop27, $pop26
-	br_if   	0, $pop12       # 0: down to label38
+	i32.const	$push25=, 0
+	i32.const	$push24=, 0
+	i32.ne  	$push10=, $pop25, $pop24
+	br_if   	0, $pop10       # 0: down to label38
 # BB#1:
 	i32.const	$9=, 1
 	br      	1               # 1: down to label37
@@ -792,14 +756,14 @@ varargs4:                               # @varargs4
                                         #   in Loop: Header=BB5_3 Depth=1
 	end_block                       # label45:
 	i32.load	$7=, 0($6)
-	i32.const	$push38=, 4
-	i32.add 	$push0=, $6, $pop38
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $6, $pop34
 	copy_local	$6=, $pop0
-	i32.const	$push37=, 1
-	i32.add 	$push36=, $5, $pop37
-	tee_local	$push35=, $5=, $pop36
-	i32.eq  	$push13=, $7, $pop35
-	br_if   	3, $pop13       # 3: down to label41
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $5, $pop33
+	tee_local	$push31=, $5=, $pop32
+	i32.eq  	$push11=, $7, $pop31
+	br_if   	3, $pop11       # 3: down to label41
 # BB#5:                                 #   in Loop: Header=BB5_3 Depth=1
 	i32.const	$9=, 0
 	br      	5               # 5: up to label39
@@ -809,34 +773,34 @@ varargs4:                               # @varargs4
 	i32.store	12($8), $5
 	i32.store	8($8), $7
 	i32.store	4($8), $5
-	i32.const	$push43=, .L.str.5
-	i32.store	0($8), $pop43
-	i32.const	$push42=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop42, $8
-	i32.const	$push41=, 0
-	i32.const	$push40=, 0
-	i32.load	$push14=, errors($pop40)
-	i32.const	$push39=, 1
-	i32.add 	$push15=, $pop14, $pop39
-	i32.store	errors($pop41), $pop15
+	i32.const	$push39=, .L.str.5
+	i32.store	0($8), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $8
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push12=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push13=, $pop12, $pop35
+	i32.store	errors($pop37), $pop13
 # BB#7:                                 #   in Loop: Header=BB5_3 Depth=1
 	i32.const	$9=, 1
 	br      	4               # 4: up to label39
 .LBB5_8:                                # %for.inc.i
                                         #   in Loop: Header=BB5_3 Depth=1
 	end_block                       # label43:
-	i32.const	$push44=, 10
-	i32.ne  	$push16=, $5, $pop44
-	br_if   	2, $pop16       # 2: down to label40
+	i32.const	$push40=, 10
+	i32.ne  	$push14=, $5, $pop40
+	br_if   	2, $pop14       # 2: down to label40
 # BB#9:                                 #   in Loop: Header=BB5_3 Depth=1
 	i32.const	$9=, 3
 	br      	3               # 3: up to label39
 .LBB5_10:                               # %verify.exit
 	end_block                       # label42:
-	i32.const	$push23=, 0
-	i32.const	$push21=, 64
-	i32.add 	$push22=, $8, $pop21
-	i32.store	__stack_pointer($pop23), $pop22
+	i32.const	$push21=, 0
+	i32.const	$push19=, 64
+	i32.add 	$push20=, $8, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
 	return
 .LBB5_11:                               #   in Loop: Header=BB5_3 Depth=1
 	end_block                       # label41:
@@ -851,57 +815,53 @@ varargs4:                               # @varargs4
 	.endfunc
 .Lfunc_end5:
 	.size	varargs4, .Lfunc_end5-varargs4
-
+                                        # -- End function
 	.section	.text.varargs5,"ax",@progbits
-	.type	varargs5,@function
+	.type	varargs5,@function      # -- Begin function varargs5
 varargs5:                               # @varargs5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push20=, 0
+	i32.const	$push19=, 0
 	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
-	i32.const	$push19=, 64
-	i32.sub 	$push33=, $pop18, $pop19
-	tee_local	$push32=, $9=, $pop33
-	i32.store	__stack_pointer($pop20), $pop32
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 64
+	i32.sub 	$push30=, $pop16, $pop18
+	tee_local	$push29=, $9=, $pop30
+	i32.store	__stack_pointer($pop19), $pop29
 	i32.store	60($9), $6
-	i64.const	$push1=, 4294967296
-	i64.store	16($9), $pop1
-	i32.load	$push31=, 60($9)
-	tee_local	$push30=, $6=, $pop31
-	i32.const	$push29=, 4
-	i32.add 	$push2=, $pop30, $pop29
-	i32.store	60($9), $pop2
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $6, $pop28
+	i32.store	60($9), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($9), $pop2
 	i64.const	$push3=, 12884901890
 	i64.store	24($9), $pop3
 	i64.const	$push4=, 21474836484
 	i64.store	32($9), $pop4
-	i32.load	$push5=, 0($6)
-	i32.store	40($9), $pop5
-	i32.load	$push6=, 4($6)
-	i32.store	44($9), $pop6
-	i32.load	$push7=, 8($6)
-	i32.store	48($9), $pop7
-	i32.load	$push8=, 12($6)
-	i32.store	52($9), $pop8
+	i32.load	$push5=, 4($6)
+	i32.store	44($9), $pop5
+	i64.load	$push6=, 8($6):p2align=2
+	i64.store	48($9), $pop6
+	i32.load	$push7=, 16($6)
+	i32.store	56($9), $pop7
+	i32.load	$push8=, 0($6)
+	i32.store	40($9), $pop8
 	i32.const	$push9=, 20
 	i32.add 	$push10=, $6, $pop9
 	i32.store	60($9), $pop10
-	i32.load	$push11=, 16($6)
-	i32.store	56($9), $pop11
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $9, $pop24
-	i32.const	$push28=, 4
-	i32.or  	$7=, $pop25, $pop28
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $9, $pop23
+	i32.const	$push27=, 4
+	i32.or  	$7=, $pop24, $pop27
 	i32.const	$8=, 0
 	i32.const	$6=, 0
 	block   	
 	block   	
-	i32.const	$push27=, 0
 	i32.const	$push26=, 0
-	i32.ne  	$push12=, $pop27, $pop26
-	br_if   	0, $pop12       # 0: down to label47
+	i32.const	$push25=, 0
+	i32.ne  	$push11=, $pop26, $pop25
+	br_if   	0, $pop11       # 0: down to label47
 # BB#1:
 	i32.const	$10=, 1
 	br      	1               # 1: down to label46
@@ -925,14 +885,14 @@ varargs5:                               # @varargs5
                                         #   in Loop: Header=BB6_3 Depth=1
 	end_block                       # label54:
 	i32.load	$8=, 0($7)
-	i32.const	$push37=, 4
-	i32.add 	$push0=, $7, $pop37
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $7, $pop34
 	copy_local	$7=, $pop0
-	i32.const	$push36=, 1
-	i32.add 	$push35=, $6, $pop36
-	tee_local	$push34=, $6=, $pop35
-	i32.eq  	$push13=, $8, $pop34
-	br_if   	3, $pop13       # 3: down to label50
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $6, $pop33
+	tee_local	$push31=, $6=, $pop32
+	i32.eq  	$push12=, $8, $pop31
+	br_if   	3, $pop12       # 3: down to label50
 # BB#5:                                 #   in Loop: Header=BB6_3 Depth=1
 	i32.const	$10=, 0
 	br      	5               # 5: up to label48
@@ -942,34 +902,34 @@ varargs5:                               # @varargs5
 	i32.store	12($9), $6
 	i32.store	8($9), $8
 	i32.store	4($9), $6
-	i32.const	$push42=, .L.str.6
-	i32.store	0($9), $pop42
-	i32.const	$push41=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop41, $9
-	i32.const	$push40=, 0
-	i32.const	$push39=, 0
-	i32.load	$push14=, errors($pop39)
-	i32.const	$push38=, 1
-	i32.add 	$push15=, $pop14, $pop38
-	i32.store	errors($pop40), $pop15
+	i32.const	$push39=, .L.str.6
+	i32.store	0($9), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $9
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push14=, $pop13, $pop35
+	i32.store	errors($pop37), $pop14
 # BB#7:                                 #   in Loop: Header=BB6_3 Depth=1
 	i32.const	$10=, 1
 	br      	4               # 4: up to label48
 .LBB6_8:                                # %for.inc.i
                                         #   in Loop: Header=BB6_3 Depth=1
 	end_block                       # label52:
-	i32.const	$push43=, 10
-	i32.ne  	$push16=, $6, $pop43
-	br_if   	2, $pop16       # 2: down to label49
+	i32.const	$push40=, 10
+	i32.ne  	$push15=, $6, $pop40
+	br_if   	2, $pop15       # 2: down to label49
 # BB#9:                                 #   in Loop: Header=BB6_3 Depth=1
 	i32.const	$10=, 3
 	br      	3               # 3: up to label48
 .LBB6_10:                               # %verify.exit
 	end_block                       # label51:
-	i32.const	$push23=, 0
-	i32.const	$push21=, 64
-	i32.add 	$push22=, $9, $pop21
-	i32.store	__stack_pointer($pop23), $pop22
+	i32.const	$push22=, 0
+	i32.const	$push20=, 64
+	i32.add 	$push21=, $9, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
 	return
 .LBB6_11:                               #   in Loop: Header=BB6_3 Depth=1
 	end_block                       # label50:
@@ -984,57 +944,53 @@ varargs5:                               # @varargs5
 	.endfunc
 .Lfunc_end6:
 	.size	varargs5, .Lfunc_end6-varargs5
-
+                                        # -- End function
 	.section	.text.varargs6,"ax",@progbits
-	.type	varargs6,@function
+	.type	varargs6,@function      # -- Begin function varargs6
 varargs6:                               # @varargs6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push20=, 0
+	i32.const	$push19=, 0
 	i32.const	$push17=, 0
-	i32.load	$push18=, __stack_pointer($pop17)
-	i32.const	$push19=, 64
-	i32.sub 	$push33=, $pop18, $pop19
-	tee_local	$push32=, $10=, $pop33
-	i32.store	__stack_pointer($pop20), $pop32
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 64
+	i32.sub 	$push30=, $pop16, $pop18
+	tee_local	$push29=, $10=, $pop30
+	i32.store	__stack_pointer($pop19), $pop29
 	i32.store	60($10), $7
-	i64.const	$push1=, 4294967296
-	i64.store	16($10), $pop1
-	i32.load	$push31=, 60($10)
-	tee_local	$push30=, $7=, $pop31
-	i32.const	$push29=, 4
-	i32.add 	$push2=, $pop30, $pop29
-	i32.store	60($10), $pop2
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $7, $pop28
+	i32.store	60($10), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($10), $pop2
 	i64.const	$push3=, 12884901890
 	i64.store	24($10), $pop3
 	i64.const	$push4=, 21474836484
 	i64.store	32($10), $pop4
 	i32.const	$push5=, 6
 	i32.store	40($10), $pop5
-	i32.load	$push6=, 0($7)
-	i32.store	44($10), $pop6
-	i32.load	$push7=, 4($7)
-	i32.store	48($10), $pop7
-	i32.const	$push8=, 16
-	i32.add 	$push9=, $7, $pop8
-	i32.store	60($10), $pop9
-	i32.load	$push10=, 8($7)
-	i32.store	52($10), $pop10
-	i32.load	$push11=, 12($7)
-	i32.store	56($10), $pop11
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $10, $pop24
-	i32.const	$push28=, 4
-	i32.or  	$8=, $pop25, $pop28
+	i64.load	$push6=, 4($7):p2align=2
+	i64.store	48($10), $pop6
+	i32.load	$push7=, 12($7)
+	i32.store	56($10), $pop7
+	i32.load	$push8=, 0($7)
+	i32.store	44($10), $pop8
+	i32.const	$push9=, 16
+	i32.add 	$push10=, $7, $pop9
+	i32.store	60($10), $pop10
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $10, $pop23
+	i32.const	$push27=, 4
+	i32.or  	$8=, $pop24, $pop27
 	i32.const	$9=, 0
 	i32.const	$7=, 0
 	block   	
 	block   	
-	i32.const	$push27=, 0
 	i32.const	$push26=, 0
-	i32.ne  	$push12=, $pop27, $pop26
-	br_if   	0, $pop12       # 0: down to label56
+	i32.const	$push25=, 0
+	i32.ne  	$push11=, $pop26, $pop25
+	br_if   	0, $pop11       # 0: down to label56
 # BB#1:
 	i32.const	$11=, 1
 	br      	1               # 1: down to label55
@@ -1058,14 +1014,14 @@ varargs6:                               # @varargs6
                                         #   in Loop: Header=BB7_3 Depth=1
 	end_block                       # label63:
 	i32.load	$9=, 0($8)
-	i32.const	$push37=, 4
-	i32.add 	$push0=, $8, $pop37
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $8, $pop34
 	copy_local	$8=, $pop0
-	i32.const	$push36=, 1
-	i32.add 	$push35=, $7, $pop36
-	tee_local	$push34=, $7=, $pop35
-	i32.eq  	$push13=, $9, $pop34
-	br_if   	3, $pop13       # 3: down to label59
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $7, $pop33
+	tee_local	$push31=, $7=, $pop32
+	i32.eq  	$push12=, $9, $pop31
+	br_if   	3, $pop12       # 3: down to label59
 # BB#5:                                 #   in Loop: Header=BB7_3 Depth=1
 	i32.const	$11=, 0
 	br      	5               # 5: up to label57
@@ -1075,34 +1031,34 @@ varargs6:                               # @varargs6
 	i32.store	12($10), $7
 	i32.store	8($10), $9
 	i32.store	4($10), $7
-	i32.const	$push42=, .L.str.7
-	i32.store	0($10), $pop42
-	i32.const	$push41=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop41, $10
-	i32.const	$push40=, 0
-	i32.const	$push39=, 0
-	i32.load	$push14=, errors($pop39)
-	i32.const	$push38=, 1
-	i32.add 	$push15=, $pop14, $pop38
-	i32.store	errors($pop40), $pop15
+	i32.const	$push39=, .L.str.7
+	i32.store	0($10), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $10
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push14=, $pop13, $pop35
+	i32.store	errors($pop37), $pop14
 # BB#7:                                 #   in Loop: Header=BB7_3 Depth=1
 	i32.const	$11=, 1
 	br      	4               # 4: up to label57
 .LBB7_8:                                # %for.inc.i
                                         #   in Loop: Header=BB7_3 Depth=1
 	end_block                       # label61:
-	i32.const	$push43=, 10
-	i32.ne  	$push16=, $7, $pop43
-	br_if   	2, $pop16       # 2: down to label58
+	i32.const	$push40=, 10
+	i32.ne  	$push15=, $7, $pop40
+	br_if   	2, $pop15       # 2: down to label58
 # BB#9:                                 #   in Loop: Header=BB7_3 Depth=1
 	i32.const	$11=, 3
 	br      	3               # 3: up to label57
 .LBB7_10:                               # %verify.exit
 	end_block                       # label60:
-	i32.const	$push23=, 0
-	i32.const	$push21=, 64
-	i32.add 	$push22=, $10, $pop21
-	i32.store	__stack_pointer($pop23), $pop22
+	i32.const	$push22=, 0
+	i32.const	$push20=, 64
+	i32.add 	$push21=, $10, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
 	return
 .LBB7_11:                               #   in Loop: Header=BB7_3 Depth=1
 	end_block                       # label59:
@@ -1117,43 +1073,41 @@ varargs6:                               # @varargs6
 	.endfunc
 .Lfunc_end7:
 	.size	varargs6, .Lfunc_end7-varargs6
-
+                                        # -- End function
 	.section	.text.varargs7,"ax",@progbits
-	.type	varargs7,@function
+	.type	varargs7,@function      # -- Begin function varargs7
 varargs7:                               # @varargs7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 64
-	i32.sub 	$push32=, $pop17, $pop18
-	tee_local	$push31=, $11=, $pop32
-	i32.store	__stack_pointer($pop19), $pop31
+	i32.sub 	$push30=, $pop16, $pop18
+	tee_local	$push29=, $11=, $pop30
+	i32.store	__stack_pointer($pop19), $pop29
 	i32.store	60($11), $8
-	i64.const	$push1=, 4294967296
-	i64.store	16($11), $pop1
-	i32.load	$push30=, 60($11)
-	tee_local	$push29=, $8=, $pop30
 	i32.const	$push28=, 4
-	i32.add 	$push2=, $pop29, $pop28
-	i32.store	60($11), $pop2
+	i32.add 	$push1=, $8, $pop28
+	i32.store	60($11), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($11), $pop2
 	i64.const	$push3=, 12884901890
 	i64.store	24($11), $pop3
 	i64.const	$push4=, 21474836484
 	i64.store	32($11), $pop4
 	i64.const	$push5=, 30064771078
 	i64.store	40($11), $pop5
-	i32.load	$push6=, 0($8)
-	i32.store	48($11), $pop6
-	i32.const	$push7=, 12
-	i32.add 	$push8=, $8, $pop7
-	i32.store	60($11), $pop8
-	i32.load	$push9=, 4($8)
-	i32.store	52($11), $pop9
-	i32.load	$push10=, 8($8)
-	i32.store	56($11), $pop10
+	i32.load	$push6=, 4($8)
+	i32.store	52($11), $pop6
+	i32.load	$push7=, 8($8)
+	i32.store	56($11), $pop7
+	i32.load	$push8=, 0($8)
+	i32.store	48($11), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $8, $pop9
+	i32.store	60($11), $pop10
 	i32.const	$push23=, 16
 	i32.add 	$push24=, $11, $pop23
 	i32.const	$push27=, 4
@@ -1189,13 +1143,13 @@ varargs7:                               # @varargs7
                                         #   in Loop: Header=BB8_3 Depth=1
 	end_block                       # label72:
 	i32.load	$10=, 0($9)
-	i32.const	$push36=, 4
-	i32.add 	$push0=, $9, $pop36
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $9, $pop34
 	copy_local	$9=, $pop0
-	i32.const	$push35=, 1
-	i32.add 	$push34=, $8, $pop35
-	tee_local	$push33=, $8=, $pop34
-	i32.eq  	$push12=, $10, $pop33
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $8, $pop33
+	tee_local	$push31=, $8=, $pop32
+	i32.eq  	$push12=, $10, $pop31
 	br_if   	3, $pop12       # 3: down to label68
 # BB#5:                                 #   in Loop: Header=BB8_3 Depth=1
 	i32.const	$12=, 0
@@ -1206,24 +1160,24 @@ varargs7:                               # @varargs7
 	i32.store	12($11), $8
 	i32.store	8($11), $10
 	i32.store	4($11), $8
-	i32.const	$push41=, .L.str.8
-	i32.store	0($11), $pop41
-	i32.const	$push40=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop40, $11
-	i32.const	$push39=, 0
-	i32.const	$push38=, 0
-	i32.load	$push13=, errors($pop38)
-	i32.const	$push37=, 1
-	i32.add 	$push14=, $pop13, $pop37
-	i32.store	errors($pop39), $pop14
+	i32.const	$push39=, .L.str.8
+	i32.store	0($11), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $11
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push14=, $pop13, $pop35
+	i32.store	errors($pop37), $pop14
 # BB#7:                                 #   in Loop: Header=BB8_3 Depth=1
 	i32.const	$12=, 1
 	br      	4               # 4: up to label66
 .LBB8_8:                                # %for.inc.i
                                         #   in Loop: Header=BB8_3 Depth=1
 	end_block                       # label70:
-	i32.const	$push42=, 10
-	i32.ne  	$push15=, $8, $pop42
+	i32.const	$push40=, 10
+	i32.ne  	$push15=, $8, $pop40
 	br_if   	2, $pop15       # 2: down to label67
 # BB#9:                                 #   in Loop: Header=BB8_3 Depth=1
 	i32.const	$12=, 3
@@ -1248,55 +1202,53 @@ varargs7:                               # @varargs7
 	.endfunc
 .Lfunc_end8:
 	.size	varargs7, .Lfunc_end8-varargs7
-
+                                        # -- End function
 	.section	.text.varargs8,"ax",@progbits
-	.type	varargs8,@function
+	.type	varargs8,@function      # -- Begin function varargs8
 varargs8:                               # @varargs8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
-	i32.const	$push16=, 64
-	i32.sub 	$push31=, $pop15, $pop16
-	tee_local	$push30=, $12=, $pop31
-	i32.store	__stack_pointer($pop17), $pop30
+	i32.const	$push18=, 0
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 64
+	i32.sub 	$push30=, $pop15, $pop17
+	tee_local	$push29=, $12=, $pop30
+	i32.store	__stack_pointer($pop18), $pop29
 	i32.store	60($12), $9
-	i64.const	$push1=, 4294967296
-	i64.store	16($12), $pop1
-	i64.const	$push2=, 12884901890
-	i64.store	24($12), $pop2
-	i64.const	$push3=, 21474836484
-	i64.store	32($12), $pop3
-	i64.const	$push4=, 30064771078
-	i64.store	40($12), $pop4
-	i32.load	$push29=, 60($12)
-	tee_local	$push28=, $9=, $pop29
-	i32.const	$push27=, 4
-	i32.add 	$push5=, $pop28, $pop27
-	i32.store	60($12), $pop5
-	i32.const	$push6=, 8
-	i32.store	48($12), $pop6
-	i32.load	$10=, 0($9)
-	i32.const	$push26=, 8
-	i32.add 	$push7=, $9, $pop26
-	i32.store	60($12), $pop7
-	i32.store	52($12), $10
-	i32.load	$push8=, 4($9)
-	i32.store	56($12), $pop8
-	i32.const	$push21=, 16
-	i32.add 	$push22=, $12, $pop21
-	i32.const	$push25=, 4
-	i32.or  	$10=, $pop22, $pop25
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $9, $pop28
+	i32.store	60($12), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($12), $pop2
+	i64.const	$push3=, 12884901890
+	i64.store	24($12), $pop3
+	i64.const	$push4=, 21474836484
+	i64.store	32($12), $pop4
+	i64.const	$push5=, 30064771078
+	i64.store	40($12), $pop5
+	i32.load	$push6=, 4($9)
+	i32.store	56($12), $pop6
+	i32.load	$push7=, 0($9)
+	i32.store	52($12), $pop7
+	i32.const	$push8=, 8
+	i32.store	48($12), $pop8
+	i32.const	$push27=, 8
+	i32.add 	$push9=, $9, $pop27
+	i32.store	60($12), $pop9
+	i32.const	$push22=, 16
+	i32.add 	$push23=, $12, $pop22
+	i32.const	$push26=, 4
+	i32.or  	$10=, $pop23, $pop26
 	i32.const	$11=, 0
 	i32.const	$9=, 0
 	block   	
 	block   	
+	i32.const	$push25=, 0
 	i32.const	$push24=, 0
-	i32.const	$push23=, 0
-	i32.ne  	$push9=, $pop24, $pop23
-	br_if   	0, $pop9        # 0: down to label74
+	i32.ne  	$push10=, $pop25, $pop24
+	br_if   	0, $pop10       # 0: down to label74
 # BB#1:
 	i32.const	$13=, 1
 	br      	1               # 1: down to label73
@@ -1320,14 +1272,14 @@ varargs8:                               # @varargs8
                                         #   in Loop: Header=BB9_3 Depth=1
 	end_block                       # label81:
 	i32.load	$11=, 0($10)
-	i32.const	$push35=, 4
-	i32.add 	$push0=, $10, $pop35
+	i32.const	$push34=, 4
+	i32.add 	$push0=, $10, $pop34
 	copy_local	$10=, $pop0
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $9, $pop34
-	tee_local	$push32=, $9=, $pop33
-	i32.eq  	$push10=, $11, $pop32
-	br_if   	3, $pop10       # 3: down to label77
+	i32.const	$push33=, 1
+	i32.add 	$push32=, $9, $pop33
+	tee_local	$push31=, $9=, $pop32
+	i32.eq  	$push11=, $11, $pop31
+	br_if   	3, $pop11       # 3: down to label77
 # BB#5:                                 #   in Loop: Header=BB9_3 Depth=1
 	i32.const	$13=, 0
 	br      	5               # 5: up to label75
@@ -1337,34 +1289,34 @@ varargs8:                               # @varargs8
 	i32.store	12($12), $9
 	i32.store	8($12), $11
 	i32.store	4($12), $9
-	i32.const	$push40=, .L.str.9
-	i32.store	0($12), $pop40
-	i32.const	$push39=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop39, $12
-	i32.const	$push38=, 0
+	i32.const	$push39=, .L.str.9
+	i32.store	0($12), $pop39
+	i32.const	$push38=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop38, $12
 	i32.const	$push37=, 0
-	i32.load	$push11=, errors($pop37)
-	i32.const	$push36=, 1
-	i32.add 	$push12=, $pop11, $pop36
-	i32.store	errors($pop38), $pop12
+	i32.const	$push36=, 0
+	i32.load	$push12=, errors($pop36)
+	i32.const	$push35=, 1
+	i32.add 	$push13=, $pop12, $pop35
+	i32.store	errors($pop37), $pop13
 # BB#7:                                 #   in Loop: Header=BB9_3 Depth=1
 	i32.const	$13=, 1
 	br      	4               # 4: up to label75
 .LBB9_8:                                # %for.inc.i
                                         #   in Loop: Header=BB9_3 Depth=1
 	end_block                       # label79:
-	i32.const	$push41=, 10
-	i32.ne  	$push13=, $9, $pop41
-	br_if   	2, $pop13       # 2: down to label76
+	i32.const	$push40=, 10
+	i32.ne  	$push14=, $9, $pop40
+	br_if   	2, $pop14       # 2: down to label76
 # BB#9:                                 #   in Loop: Header=BB9_3 Depth=1
 	i32.const	$13=, 3
 	br      	3               # 3: up to label75
 .LBB9_10:                               # %verify.exit
 	end_block                       # label78:
-	i32.const	$push20=, 0
-	i32.const	$push18=, 64
-	i32.add 	$push19=, $12, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
+	i32.const	$push21=, 0
+	i32.const	$push19=, 64
+	i32.add 	$push20=, $12, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
 	return
 .LBB9_11:                               #   in Loop: Header=BB9_3 Depth=1
 	end_block                       # label77:
@@ -1379,36 +1331,34 @@ varargs8:                               # @varargs8
 	.endfunc
 .Lfunc_end9:
 	.size	varargs8, .Lfunc_end9-varargs8
-
+                                        # -- End function
 	.section	.text.varargs9,"ax",@progbits
-	.type	varargs9,@function
+	.type	varargs9,@function      # -- Begin function varargs9
 varargs9:                               # @varargs9
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push16=, 0
-	i32.const	$push13=, 0
-	i32.load	$push14=, __stack_pointer($pop13)
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 64
-	i32.sub 	$push29=, $pop14, $pop15
-	tee_local	$push28=, $13=, $pop29
-	i32.store	__stack_pointer($pop16), $pop28
+	i32.sub 	$push27=, $pop13, $pop15
+	tee_local	$push26=, $13=, $pop27
+	i32.store	__stack_pointer($pop16), $pop26
 	i32.store	60($13), $10
-	i64.const	$push1=, 4294967296
-	i64.store	16($13), $pop1
-	i64.const	$push2=, 12884901890
-	i64.store	24($13), $pop2
-	i64.const	$push3=, 21474836484
-	i64.store	32($13), $pop3
-	i64.const	$push4=, 30064771078
-	i64.store	40($13), $pop4
-	i64.const	$push5=, 38654705672
-	i64.store	48($13), $pop5
-	i32.load	$push27=, 60($13)
-	tee_local	$push26=, $10=, $pop27
 	i32.const	$push25=, 4
-	i32.add 	$push6=, $pop26, $pop25
-	i32.store	60($13), $pop6
+	i32.add 	$push1=, $10, $pop25
+	i32.store	60($13), $pop1
+	i64.const	$push2=, 4294967296
+	i64.store	16($13), $pop2
+	i64.const	$push3=, 12884901890
+	i64.store	24($13), $pop3
+	i64.const	$push4=, 21474836484
+	i64.store	32($13), $pop4
+	i64.const	$push5=, 30064771078
+	i64.store	40($13), $pop5
+	i64.const	$push6=, 38654705672
+	i64.store	48($13), $pop6
 	i32.load	$push7=, 0($10)
 	i32.store	56($13), $pop7
 	i32.const	$push20=, 16
@@ -1446,13 +1396,13 @@ varargs9:                               # @varargs9
                                         #   in Loop: Header=BB10_3 Depth=1
 	end_block                       # label90:
 	i32.load	$12=, 0($11)
-	i32.const	$push33=, 4
-	i32.add 	$push0=, $11, $pop33
+	i32.const	$push31=, 4
+	i32.add 	$push0=, $11, $pop31
 	copy_local	$11=, $pop0
-	i32.const	$push32=, 1
-	i32.add 	$push31=, $10, $pop32
-	tee_local	$push30=, $10=, $pop31
-	i32.eq  	$push9=, $12, $pop30
+	i32.const	$push30=, 1
+	i32.add 	$push29=, $10, $pop30
+	tee_local	$push28=, $10=, $pop29
+	i32.eq  	$push9=, $12, $pop28
 	br_if   	3, $pop9        # 3: down to label86
 # BB#5:                                 #   in Loop: Header=BB10_3 Depth=1
 	i32.const	$14=, 0
@@ -1463,24 +1413,24 @@ varargs9:                               # @varargs9
 	i32.store	12($13), $10
 	i32.store	8($13), $12
 	i32.store	4($13), $10
-	i32.const	$push38=, .L.str.10
-	i32.store	0($13), $pop38
-	i32.const	$push37=, .L.str.1
-	i32.call	$drop=, printf@FUNCTION, $pop37, $13
-	i32.const	$push36=, 0
-	i32.const	$push35=, 0
-	i32.load	$push10=, errors($pop35)
-	i32.const	$push34=, 1
-	i32.add 	$push11=, $pop10, $pop34
-	i32.store	errors($pop36), $pop11
+	i32.const	$push36=, .L.str.10
+	i32.store	0($13), $pop36
+	i32.const	$push35=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop35, $13
+	i32.const	$push34=, 0
+	i32.const	$push33=, 0
+	i32.load	$push10=, errors($pop33)
+	i32.const	$push32=, 1
+	i32.add 	$push11=, $pop10, $pop32
+	i32.store	errors($pop34), $pop11
 # BB#7:                                 #   in Loop: Header=BB10_3 Depth=1
 	i32.const	$14=, 1
 	br      	4               # 4: up to label84
 .LBB10_8:                               # %for.inc.i
                                         #   in Loop: Header=BB10_3 Depth=1
 	end_block                       # label88:
-	i32.const	$push39=, 10
-	i32.ne  	$push12=, $10, $pop39
+	i32.const	$push37=, 10
+	i32.ne  	$push12=, $10, $pop37
 	br_if   	2, $pop12       # 2: down to label85
 # BB#9:                                 #   in Loop: Header=BB10_3 Depth=1
 	i32.const	$14=, 3
@@ -1505,7 +1455,7 @@ varargs9:                               # @varargs9
 	.endfunc
 .Lfunc_end10:
 	.size	varargs9, .Lfunc_end10-varargs9
-
+                                        # -- End function
 	.type	errors,@object          # @errors
 	.section	.bss.errors,"aw",@nobits
 	.p2align	2
@@ -1570,7 +1520,7 @@ errors:
 	.size	.L.str.10, 9
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
 	.functype	printf, i32, i32
diff --git a/test/torture-s/va-arg-26.c.s b/test/torture-s/va-arg-26.c.s
index 7340a6965..43944633d 100644
--- a/test/torture-s/va-arg-26.c.s
+++ b/test/torture-s/va-arg-26.c.s
@@ -1,36 +1,33 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-26.c"
+	.file	"va-arg-26.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
 	.param  	f32, f32, f32, f32, f32, f32, i32
 	.result 	f64
-	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push12=, $pop7, $pop8
-	tee_local	$push11=, $7=, $pop12
-	i32.store	12($pop11), $6
+	i32.sub 	$push9=, $pop6, $pop8
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $6, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push10=, $pop1, $pop2
-	tee_local	$push9=, $6=, $pop10
+	i32.and 	$push11=, $pop1, $pop2
+	tee_local	$push10=, $6=, $pop11
 	i32.const	$push3=, 8
-	i32.add 	$push4=, $pop9, $pop3
-	i32.store	12($7), $pop4
+	i32.add 	$push4=, $pop10, $pop3
+	i32.store	12($pop9), $pop4
 	f64.load	$push5=, 0($6)
                                         # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,10 +35,10 @@ main:                                   # @main
 	.local  	f32, i32
 # BB#0:                                 # %entry
 	i32.const	$push8=, 0
-	i32.const	$push5=, 0
-	i32.load	$push6=, __stack_pointer($pop5)
+	i32.const	$push6=, 0
+	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push10=, $pop6, $pop7
+	i32.sub 	$push10=, $pop5, $pop7
 	tee_local	$push9=, $1=, $pop10
 	i32.store	__stack_pointer($pop8), $pop9
 	i64.const	$push0=, 4619567317775286272
@@ -62,8 +59,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-4.c.s b/test/torture-s/va-arg-4.c.s
index ae01c779e..8c55e7f42 100644
--- a/test/torture-s/va-arg-4.c.s
+++ b/test/torture-s/va-arg-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-4.c"
+	.file	"va-arg-4.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -9,10 +9,10 @@ f:                                      # @f
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push23=, 0
-	i32.const	$push20=, 0
-	i32.load	$push21=, __stack_pointer($pop20)
+	i32.const	$push21=, 0
+	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 16
-	i32.sub 	$push28=, $pop21, $pop22
+	i32.sub 	$push28=, $pop20, $pop22
 	tee_local	$push27=, $4=, $pop28
 	i32.store	__stack_pointer($pop23), $pop27
 	block   	
@@ -31,7 +31,6 @@ f:                                      # @f
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
 # BB#3:                                 # %if.end
-	i32.store	12($4), $2
 	i32.const	$push9=, 4
 	i32.add 	$push30=, $2, $pop9
 	tee_local	$push29=, $0=, $pop30
@@ -61,61 +60,61 @@ f:                                      # @f
 	i32.add 	$push25=, $4, $pop24
 	i32.store	__stack_pointer($pop26), $pop25
 	return
-.LBB0_7:                                # %if.then28
+.LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
-	i32.const	$push14=, 48
-	i32.sub 	$push24=, $pop13, $pop14
+	i32.const	$push16=, 0
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 48
+	i32.sub 	$push24=, $pop13, $pop15
 	tee_local	$push23=, $0=, $pop24
-	i32.store	__stack_pointer($pop15), $pop23
+	i32.store	__stack_pointer($pop16), $pop23
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
 	i64.load	$push1=, main.x+24($pop0):p2align=0
-	i64.store	0($pop3):p2align=2, $pop1
+	i64.store	0($pop3), $pop1
 	i32.const	$push5=, 32
 	i32.add 	$push6=, $0, $pop5
 	i32.const	$push22=, 0
 	i64.load	$push4=, main.x+16($pop22):p2align=0
-	i64.store	0($pop6):p2align=2, $pop4
+	i64.store	0($pop6), $pop4
 	i32.const	$push8=, 24
 	i32.add 	$push9=, $0, $pop8
 	i32.const	$push21=, 0
 	i64.load	$push7=, main.x+8($pop21):p2align=0
-	i64.store	0($pop9):p2align=2, $pop7
+	i64.store	0($pop9), $pop7
+	i64.const	$push10=, 120
+	i64.store	4($0):p2align=2, $pop10
+	i32.const	$push11=, 42
+	i32.store	0($0), $pop11
 	i32.const	$push20=, 0
-	i64.load	$push10=, main.x($pop20):p2align=0
-	i64.store	16($0):p2align=2, $pop10
-	i64.const	$push11=, 515396075562
-	i64.store	0($0), $pop11
+	i64.load	$push12=, main.x($pop20):p2align=0
+	i64.store	16($0), $pop12
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $0, $pop17
+	call    	f@FUNCTION, $pop18, $0, $0
 	i32.const	$push19=, 0
-	i32.store	8($0), $pop19
-	i32.const	$push16=, 16
-	i32.add 	$push17=, $0, $pop16
-	call    	f@FUNCTION, $pop17, $0, $0
-	i32.const	$push18=, 0
-	call    	exit@FUNCTION, $pop18
+	call    	exit@FUNCTION, $pop19
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	main.x,@object          # @main.x
 	.section	.data.main.x,"aw",@progbits
 main.x:
@@ -123,6 +122,6 @@ main.x:
 	.size	main.x, 32
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-5.c.s b/test/torture-s/va-arg-5.c.s
index 2e68a5411..e3d1f2110 100644
--- a/test/torture-s/va-arg-5.c.s
+++ b/test/torture-s/va-arg-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-5.c"
+	.file	"va-arg-5.c"
 	.section	.text.va_double,"ax",@progbits
-	.hidden	va_double
+	.hidden	va_double               # -- Begin function va_double
 	.globl	va_double
 	.type	va_double,@function
 va_double:                              # @va_double
@@ -10,13 +10,12 @@ va_double:                              # @va_double
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push23=, 0
-	i32.const	$push20=, 0
-	i32.load	$push21=, __stack_pointer($pop20)
+	i32.const	$push21=, 0
+	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 16
-	i32.sub 	$push32=, $pop21, $pop22
+	i32.sub 	$push32=, $pop20, $pop22
 	tee_local	$push31=, $4=, $pop32
 	i32.store	__stack_pointer($pop23), $pop31
-	i32.store	12($4), $1
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
@@ -63,16 +62,16 @@ va_double:                              # @va_double
 	i32.add 	$push25=, $4, $pop24
 	i32.store	__stack_pointer($pop26), $pop25
 	return  	$4
-.LBB0_5:                                # %if.then15
+.LBB0_5:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	va_double, .Lfunc_end0-va_double
-
+                                        # -- End function
 	.section	.text.va_long_double,"ax",@progbits
-	.hidden	va_long_double
+	.hidden	va_long_double          # -- Begin function va_long_double
 	.globl	va_long_double
 	.type	va_long_double,@function
 va_long_double:                         # @va_long_double
@@ -81,13 +80,12 @@ va_long_double:                         # @va_long_double
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push37=, 0
-	i32.const	$push34=, 0
-	i32.load	$push35=, __stack_pointer($pop34)
+	i32.const	$push35=, 0
+	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 16
-	i32.sub 	$push46=, $pop35, $pop36
+	i32.sub 	$push46=, $pop34, $pop36
 	tee_local	$push45=, $4=, $pop46
 	i32.store	__stack_pointer($pop37), $pop45
-	i32.store	12($4), $1
 	i32.const	$push0=, 15
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -16
@@ -148,16 +146,16 @@ va_long_double:                         # @va_long_double
 	i32.add 	$push39=, $4, $pop38
 	i32.store	__stack_pointer($pop40), $pop39
 	return  	$1
-.LBB1_5:                                # %if.then15
+.LBB1_5:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	va_long_double, .Lfunc_end1-va_long_double
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -165,10 +163,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push30=, 0
-	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 96
-	i32.sub 	$push40=, $pop28, $pop29
+	i32.sub 	$push40=, $pop27, $pop29
 	tee_local	$push39=, $0=, $pop40
 	i32.store	__stack_pointer($pop30), $pop39
 	i32.const	$push31=, 64
@@ -225,8 +223,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-6.c.s b/test/torture-s/va-arg-6.c.s
index 65da57c6c..ba66717c4 100644
--- a/test/torture-s/va-arg-6.c.s
+++ b/test/torture-s/va-arg-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-6.c"
+	.file	"va-arg-6.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -10,13 +10,12 @@ f:                                      # @f
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push51=, 0
-	i32.const	$push48=, 0
-	i32.load	$push49=, __stack_pointer($pop48)
+	i32.const	$push49=, 0
+	i32.load	$push48=, __stack_pointer($pop49)
 	i32.const	$push50=, 16
-	i32.sub 	$push58=, $pop49, $pop50
+	i32.sub 	$push58=, $pop48, $pop50
 	tee_local	$push57=, $4=, $pop58
 	i32.store	__stack_pointer($pop51), $pop57
-	i32.store	12($4), $1
 	i32.const	$push0=, 4
 	i32.add 	$push56=, $1, $pop0
 	tee_local	$push55=, $2=, $pop56
@@ -120,29 +119,29 @@ f:                                      # @f
 	i32.add 	$push53=, $4, $pop52
 	i32.store	__stack_pointer($pop54), $pop53
 	return  	$4
-.LBB0_10:                               # %if.then40
+.LBB0_10:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
 	.local  	i32
 # BB#0:                                 # %entry
-	i32.const	$push30=, 0
 	i32.const	$push27=, 0
-	i32.load	$push28=, __stack_pointer($pop27)
-	i32.const	$push29=, 80
-	i32.sub 	$push32=, $pop28, $pop29
-	tee_local	$push31=, $0=, $pop32
-	i32.store	__stack_pointer($pop30), $pop31
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
+	i32.const	$push26=, 80
+	i32.sub 	$push29=, $pop24, $pop26
+	tee_local	$push28=, $0=, $pop29
+	i32.store	__stack_pointer($pop27), $pop28
 	i32.const	$push0=, 64
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 4613307314293241283
@@ -155,39 +154,35 @@ main:                                   # @main
 	i32.add 	$push7=, $0, $pop6
 	i64.const	$push8=, 20000000000
 	i64.store	0($pop7), $pop8
-	i32.const	$push9=, 44
+	i32.const	$push9=, 40
 	i32.add 	$push10=, $0, $pop9
-	i32.const	$push11=, 13
-	i32.store	0($pop10), $pop11
-	i32.const	$push12=, 40
+	i64.const	$push11=, 55834574860
+	i64.store	0($pop10), $pop11
+	i32.const	$push12=, 32
 	i32.add 	$push13=, $0, $pop12
-	i32.const	$push14=, 12
-	i32.store	0($pop13), $pop14
-	i32.const	$push15=, 32
+	i64.const	$push14=, 4611846459164112977
+	i64.store	0($pop13), $pop14
+	i32.const	$push15=, 24
 	i32.add 	$push16=, $0, $pop15
-	i64.const	$push17=, 4611846459164112977
+	i64.const	$push17=, -1475739525896764129
 	i64.store	0($pop16), $pop17
-	i32.const	$push18=, 24
+	i32.const	$push18=, 16
 	i32.add 	$push19=, $0, $pop18
-	i64.const	$push20=, -1475739525896764129
-	i64.store	0($pop19), $pop20
-	i32.const	$push21=, 16
-	i32.add 	$push22=, $0, $pop21
-	i32.const	$push23=, 11
-	i32.store	0($pop22), $pop23
-	i64.const	$push24=, 10000000000
-	i64.store	8($0), $pop24
-	i32.const	$push25=, 10
-	i32.store	0($0), $pop25
+	i32.const	$push20=, 11
+	i32.store	0($pop19), $pop20
+	i64.const	$push21=, 10000000000
+	i64.store	8($0), $pop21
+	i32.const	$push22=, 10
+	i32.store	0($0), $pop22
 	i32.call	$drop=, f@FUNCTION, $0, $0
-	i32.const	$push26=, 0
-	call    	exit@FUNCTION, $pop26
+	i32.const	$push23=, 0
+	call    	exit@FUNCTION, $pop23
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-7.c.s b/test/torture-s/va-arg-7.c.s
index af971c9a6..9da27da7b 100644
--- a/test/torture-s/va-arg-7.c.s
+++ b/test/torture-s/va-arg-7.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-7.c"
+	.file	"va-arg-7.c"
 	.section	.text.debug,"ax",@progbits
-	.hidden	debug
+	.hidden	debug                   # -- Begin function debug
 	.globl	debug
 	.type	debug,@function
 debug:                                  # @debug
@@ -9,13 +9,12 @@ debug:                                  # @debug
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push17=, 0
-	i32.const	$push14=, 0
-	i32.load	$push15=, __stack_pointer($pop14)
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push25=, $pop15, $pop16
+	i32.sub 	$push25=, $pop14, $pop16
 	tee_local	$push24=, $18=, $pop25
 	i32.store	__stack_pointer($pop17), $pop24
-	i32.store	12($18), $16
 	i32.const	$push0=, 4
 	i32.add 	$push23=, $16, $pop0
 	tee_local	$push22=, $17=, $pop23
@@ -49,16 +48,16 @@ debug:                                  # @debug
 	i32.add 	$push19=, $18, $pop18
 	i32.store	__stack_pointer($pop20), $pop19
 	return
-.LBB0_4:                                # %if.then10
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	debug, .Lfunc_end0-debug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -66,10 +65,10 @@ main:                                   # @main
 	.local  	f64, i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $1=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i32.const	$push0=, 10
@@ -83,8 +82,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-8.c.s b/test/torture-s/va-arg-8.c.s
index 754594abe..81d67834e 100644
--- a/test/torture-s/va-arg-8.c.s
+++ b/test/torture-s/va-arg-8.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-8.c"
+	.file	"va-arg-8.c"
 	.section	.text.debug,"ax",@progbits
-	.hidden	debug
+	.hidden	debug                   # -- Begin function debug
 	.globl	debug
 	.type	debug,@function
 debug:                                  # @debug
@@ -9,13 +9,12 @@ debug:                                  # @debug
 	.local  	i32, i32
 # BB#0:                                 # %entry
 	i32.const	$push15=, 0
-	i32.const	$push12=, 0
-	i32.load	$push13=, __stack_pointer($pop12)
+	i32.const	$push13=, 0
+	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop13, $pop14
+	i32.sub 	$push22=, $pop12, $pop14
 	tee_local	$push21=, $11=, $pop22
 	i32.store	__stack_pointer($pop15), $pop21
-	i32.store	12($11), $9
 	i32.const	$push0=, 4
 	i32.add 	$push20=, $9, $pop0
 	tee_local	$push19=, $10=, $pop20
@@ -44,16 +43,16 @@ debug:                                  # @debug
 	i32.add 	$push17=, $11, $pop16
 	i32.store	__stack_pointer($pop18), $pop17
 	return
-.LBB0_3:                                # %if.then5
+.LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	debug, .Lfunc_end0-debug
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -61,10 +60,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push6=, 0
-	i32.const	$push3=, 0
-	i32.load	$push4=, __stack_pointer($pop3)
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop4, $pop5
+	i32.sub 	$push8=, $pop3, $pop5
 	tee_local	$push7=, $0=, $pop8
 	i32.store	__stack_pointer($pop6), $pop7
 	i64.const	$push0=, 20014547621496
@@ -78,8 +77,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-9.c.s b/test/torture-s/va-arg-9.c.s
index 94e80af31..12df8febd 100644
--- a/test/torture-s/va-arg-9.c.s
+++ b/test/torture-s/va-arg-9.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-9.c"
+	.file	"va-arg-9.c"
 	.section	.text.to_hex,"ax",@progbits
-	.hidden	to_hex
+	.hidden	to_hex                  # -- Begin function to_hex
 	.globl	to_hex
 	.type	to_hex,@function
 to_hex:                                 # @to_hex
@@ -24,9 +24,9 @@ to_hex:                                 # @to_hex
 	.endfunc
 .Lfunc_end0:
 	.size	to_hex, .Lfunc_end0-to_hex
-
+                                        # -- End function
 	.section	.text.fap,"ax",@progbits
-	.hidden	fap
+	.hidden	fap                     # -- Begin function fap
 	.globl	fap
 	.type	fap,@function
 fap:                                    # @fap
@@ -34,1143 +34,1228 @@ fap:                                    # @fap
 	.local  	i32
 # BB#0:                                 # %entry
 	block   	
-	i32.call	$push1=, strlen@FUNCTION, $1
-	i32.const	$push7=, 16
-	i32.sub 	$push0=, $pop7, $0
-	i32.ne  	$push2=, $pop1, $pop0
-	br_if   	0, $pop2        # 0: down to label1
-# BB#1:
-.LBB1_2:                                # %while.cond
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push3=, strlen@FUNCTION, $1
+	i32.const	$push1=, 16
+	i32.sub 	$push2=, $pop1, $0
+	i32.ne  	$push4=, $pop3, $pop2
+	br_if   	0, $pop4        # 0: down to label1
+# BB#1:                                 # %if.end
 	block   	
+	i32.load8_u	$push11=, 0($1)
+	tee_local	$push10=, $0=, $pop11
+	i32.eqz 	$push20=, $pop10
+	br_if   	0, $pop20       # 0: down to label2
+# BB#2:                                 # %while.body.preheader
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
+.LBB1_3:                                # %while.body
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.load8_u	$push9=, 0($1)
-	tee_local	$push8=, $0=, $pop9
-	i32.eqz 	$push16=, $pop8
-	br_if   	1, $pop16       # 1: down to label2
-# BB#3:                                 # %while.body
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.load	$push12=, 0($2)
-	tee_local	$push11=, $3=, $pop12
-	i32.const	$push10=, 16
-	i32.ge_u	$push3=, $pop11, $pop10
-	br_if   	2, $pop3        # 2: down to label1
+	i32.load	$push15=, 0($2)
+	tee_local	$push14=, $3=, $pop15
+	i32.const	$push13=, 16
+	i32.ge_u	$push5=, $pop14, $pop13
+	br_if   	2, $pop5        # 2: down to label1
 # BB#4:                                 # %to_hex.exit
-                                        #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push15=, 1
-	i32.add 	$1=, $1, $pop15
-	i32.const	$push14=, 4
-	i32.add 	$2=, $2, $pop14
-	i32.const	$push13=, .L.str
-	i32.add 	$push4=, $3, $pop13
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $0, $pop5
-	br_if   	0, $pop6        # 0: up to label3
-# BB#5:                                 # %if.then4
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$push17=, .L.str
+	i32.add 	$push7=, $3, $pop17
+	i32.load8_u	$push8=, 0($pop7)
+	i32.const	$push16=, 255
+	i32.and 	$push6=, $0, $pop16
+	i32.ne  	$push9=, $pop8, $pop6
+	br_if   	2, $pop9        # 2: down to label1
+# BB#5:                                 # %if.end5
+                                        #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$push19=, 4
+	i32.add 	$2=, $2, $pop19
+	i32.load8_u	$0=, 0($1)
+	i32.const	$push18=, 1
+	i32.add 	$push0=, $1, $pop18
+	copy_local	$1=, $pop0
+	br_if   	0, $0           # 0: up to label3
 .LBB1_6:                                # %while.end
+	end_loop
 	end_block                       # label2:
 	return
-.LBB1_7:                                # %if.then.i
+.LBB1_7:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	fap, .Lfunc_end1-fap
-
+                                        # -- End function
 	.section	.text.f0,"ax",@progbits
-	.hidden	f0
+	.hidden	f0                      # -- Begin function f0
 	.globl	f0
 	.type	f0,@function
 f0:                                     # @f0
 	.param  	i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
-	tee_local	$push14=, $4=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $4=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($4), $1
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $0
-	i32.const	$push13=, 16
-	i32.ne  	$push1=, $pop0, $pop13
-	br_if   	0, $pop1        # 0: down to label4
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$1=, 12($4)
-.LBB2_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $0
+	i32.const	$push2=, 16
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label4
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($0)
+	tee_local	$push18=, $1=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label5
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$0=, $0, $pop20
+	i32.load	$2=, 12($4)
+.LBB2_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.load8_u	$push17=, 0($0)
-	tee_local	$push16=, $2=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label5
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB2_2 Depth=1
-	i32.load	$push20=, 0($1)
-	tee_local	$push19=, $3=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push2=, $pop19, $pop18
-	br_if   	2, $pop2        # 2: down to label4
+	i32.load	$push23=, 0($2)
+	tee_local	$push22=, $3=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label4
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB2_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$0=, $0, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$1=, $1, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push3=, $3, $pop21
-	i32.load8_u	$push4=, 0($pop3)
-	i32.eq  	$push5=, $2, $pop4
-	br_if   	0, $pop5        # 0: up to label6
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB2_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $3, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $1, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label4
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB2_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$2=, $2, $pop27
+	i32.load8_u	$1=, 0($0)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $0, $pop26
+	copy_local	$0=, $pop0
+	br_if   	0, $1           # 0: up to label6
 .LBB2_6:                                # %fap.exit
+	end_loop
 	end_block                       # label5:
-	i32.const	$push12=, 0
-	i32.const	$push10=, 16
-	i32.add 	$push11=, $4, $pop10
-	i32.store	__stack_pointer($pop12), $pop11
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $4, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB2_7:                                # %if.then.i.i
+.LBB2_7:                                # %if.then.i
 	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	f0, .Lfunc_end2-f0
-
+                                        # -- End function
 	.section	.text.f1,"ax",@progbits
-	.hidden	f1
+	.hidden	f1                      # -- Begin function f1
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $5=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $5=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($5), $2
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $1
-	i32.const	$push1=, 15
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label7
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$2=, 12($5)
-.LBB3_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $1
+	i32.const	$push2=, 15
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label7
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($1)
+	tee_local	$push18=, $2=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label8
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$1=, $1, $pop20
+	i32.load	$3=, 12($5)
+.LBB3_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.load8_u	$push17=, 0($1)
-	tee_local	$push16=, $3=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label8
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB3_2 Depth=1
-	i32.load	$push20=, 0($2)
-	tee_local	$push19=, $4=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label7
+	i32.load	$push23=, 0($3)
+	tee_local	$push22=, $4=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label7
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB3_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$1=, $1, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$2=, $2, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $4, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $3, $pop5
-	br_if   	0, $pop6        # 0: up to label9
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB3_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $4, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $2, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label7
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB3_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$3=, $3, $pop27
+	i32.load8_u	$2=, 0($1)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $1, $pop26
+	copy_local	$1=, $pop0
+	br_if   	0, $2           # 0: up to label9
 .LBB3_6:                                # %fap.exit
+	end_loop
 	end_block                       # label8:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $5, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $5, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB3_7:                                # %if.then.i.i
+.LBB3_7:                                # %if.then.i
 	end_block                       # label7:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	f1, .Lfunc_end3-f1
-
+                                        # -- End function
 	.section	.text.f2,"ax",@progbits
-	.hidden	f2
+	.hidden	f2                      # -- Begin function f2
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $6=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $6=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($6), $3
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $2
-	i32.const	$push1=, 14
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label10
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$3=, 12($6)
-.LBB4_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $2
+	i32.const	$push2=, 14
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label10
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($2)
+	tee_local	$push18=, $3=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label11
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$2=, $2, $pop20
+	i32.load	$4=, 12($6)
+.LBB4_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	i32.load8_u	$push17=, 0($2)
-	tee_local	$push16=, $4=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label11
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB4_2 Depth=1
-	i32.load	$push20=, 0($3)
-	tee_local	$push19=, $5=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label10
+	i32.load	$push23=, 0($4)
+	tee_local	$push22=, $5=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label10
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB4_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$2=, $2, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$3=, $3, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $5, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $4, $pop5
-	br_if   	0, $pop6        # 0: up to label12
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB4_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $5, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $3, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label10
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB4_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$4=, $4, $pop27
+	i32.load8_u	$3=, 0($2)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $2, $pop26
+	copy_local	$2=, $pop0
+	br_if   	0, $3           # 0: up to label12
 .LBB4_6:                                # %fap.exit
+	end_loop
 	end_block                       # label11:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $6, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $6, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB4_7:                                # %if.then.i.i
+.LBB4_7:                                # %if.then.i
 	end_block                       # label10:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	f2, .Lfunc_end4-f2
-
+                                        # -- End function
 	.section	.text.f3,"ax",@progbits
-	.hidden	f3
+	.hidden	f3                      # -- Begin function f3
 	.globl	f3
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $7=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $7=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($7), $4
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $3
-	i32.const	$push1=, 13
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label13
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$4=, 12($7)
-.LBB5_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $3
+	i32.const	$push2=, 13
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label13
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($3)
+	tee_local	$push18=, $4=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label14
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$3=, $3, $pop20
+	i32.load	$5=, 12($7)
+.LBB5_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.load8_u	$push17=, 0($3)
-	tee_local	$push16=, $5=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label14
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB5_2 Depth=1
-	i32.load	$push20=, 0($4)
-	tee_local	$push19=, $6=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label13
+	i32.load	$push23=, 0($5)
+	tee_local	$push22=, $6=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label13
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB5_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$3=, $3, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$4=, $4, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $6, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $5, $pop5
-	br_if   	0, $pop6        # 0: up to label15
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB5_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $6, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $4, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label13
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB5_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$5=, $5, $pop27
+	i32.load8_u	$4=, 0($3)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $3, $pop26
+	copy_local	$3=, $pop0
+	br_if   	0, $4           # 0: up to label15
 .LBB5_6:                                # %fap.exit
+	end_loop
 	end_block                       # label14:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $7, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $7, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB5_7:                                # %if.then.i.i
+.LBB5_7:                                # %if.then.i
 	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end5:
 	.size	f3, .Lfunc_end5-f3
-
+                                        # -- End function
 	.section	.text.f4,"ax",@progbits
-	.hidden	f4
+	.hidden	f4                      # -- Begin function f4
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $8=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $8=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($8), $5
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $4
-	i32.const	$push1=, 12
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label16
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$5=, 12($8)
-.LBB6_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $4
+	i32.const	$push2=, 12
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label16
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($4)
+	tee_local	$push18=, $5=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label17
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$4=, $4, $pop20
+	i32.load	$6=, 12($8)
+.LBB6_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.load8_u	$push17=, 0($4)
-	tee_local	$push16=, $6=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label17
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB6_2 Depth=1
-	i32.load	$push20=, 0($5)
-	tee_local	$push19=, $7=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label16
+	i32.load	$push23=, 0($6)
+	tee_local	$push22=, $7=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label16
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB6_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$4=, $4, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$5=, $5, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $7, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $6, $pop5
-	br_if   	0, $pop6        # 0: up to label18
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB6_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $7, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $5, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label16
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB6_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$6=, $6, $pop27
+	i32.load8_u	$5=, 0($4)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $4, $pop26
+	copy_local	$4=, $pop0
+	br_if   	0, $5           # 0: up to label18
 .LBB6_6:                                # %fap.exit
+	end_loop
 	end_block                       # label17:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $8, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $8, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB6_7:                                # %if.then.i.i
+.LBB6_7:                                # %if.then.i
 	end_block                       # label16:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end6:
 	.size	f4, .Lfunc_end6-f4
-
+                                        # -- End function
 	.section	.text.f5,"ax",@progbits
-	.hidden	f5
+	.hidden	f5                      # -- Begin function f5
 	.globl	f5
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $9=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $9=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($9), $6
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $5
-	i32.const	$push1=, 11
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label19
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$6=, 12($9)
-.LBB7_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $5
+	i32.const	$push2=, 11
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label19
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($5)
+	tee_local	$push18=, $6=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label20
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$5=, $5, $pop20
+	i32.load	$7=, 12($9)
+.LBB7_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label21:
-	i32.load8_u	$push17=, 0($5)
-	tee_local	$push16=, $7=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label20
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB7_2 Depth=1
-	i32.load	$push20=, 0($6)
-	tee_local	$push19=, $8=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label19
+	i32.load	$push23=, 0($7)
+	tee_local	$push22=, $8=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label19
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB7_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$5=, $5, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$6=, $6, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $8, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $7, $pop5
-	br_if   	0, $pop6        # 0: up to label21
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB7_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $8, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $6, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label19
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB7_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$7=, $7, $pop27
+	i32.load8_u	$6=, 0($5)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $5, $pop26
+	copy_local	$5=, $pop0
+	br_if   	0, $6           # 0: up to label21
 .LBB7_6:                                # %fap.exit
+	end_loop
 	end_block                       # label20:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $9, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $9, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB7_7:                                # %if.then.i.i
+.LBB7_7:                                # %if.then.i
 	end_block                       # label19:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end7:
 	.size	f5, .Lfunc_end7-f5
-
+                                        # -- End function
 	.section	.text.f6,"ax",@progbits
-	.hidden	f6
+	.hidden	f6                      # -- Begin function f6
 	.globl	f6
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $10=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $10=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($10), $7
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $6
-	i32.const	$push1=, 10
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label22
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$7=, 12($10)
-.LBB8_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $6
+	i32.const	$push2=, 10
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label22
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($6)
+	tee_local	$push18=, $7=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label23
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$6=, $6, $pop20
+	i32.load	$8=, 12($10)
+.LBB8_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label24:
-	i32.load8_u	$push17=, 0($6)
-	tee_local	$push16=, $8=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label23
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB8_2 Depth=1
-	i32.load	$push20=, 0($7)
-	tee_local	$push19=, $9=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label22
+	i32.load	$push23=, 0($8)
+	tee_local	$push22=, $9=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label22
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB8_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$6=, $6, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$7=, $7, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $9, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $8, $pop5
-	br_if   	0, $pop6        # 0: up to label24
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB8_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $9, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $7, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label22
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB8_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$8=, $8, $pop27
+	i32.load8_u	$7=, 0($6)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $6, $pop26
+	copy_local	$6=, $pop0
+	br_if   	0, $7           # 0: up to label24
 .LBB8_6:                                # %fap.exit
+	end_loop
 	end_block                       # label23:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $10, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $10, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB8_7:                                # %if.then.i.i
+.LBB8_7:                                # %if.then.i
 	end_block                       # label22:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end8:
 	.size	f6, .Lfunc_end8-f6
-
+                                        # -- End function
 	.section	.text.f7,"ax",@progbits
-	.hidden	f7
+	.hidden	f7                      # -- Begin function f7
 	.globl	f7
 	.type	f7,@function
 f7:                                     # @f7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $11=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $11=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($11), $8
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $7
-	i32.const	$push1=, 9
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label25
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$8=, 12($11)
-.LBB9_2:                                # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $7
+	i32.const	$push2=, 9
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label25
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($7)
+	tee_local	$push18=, $8=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label26
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$7=, $7, $pop20
+	i32.load	$9=, 12($11)
+.LBB9_3:                                # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label27:
-	i32.load8_u	$push17=, 0($7)
-	tee_local	$push16=, $9=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label26
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB9_2 Depth=1
-	i32.load	$push20=, 0($8)
-	tee_local	$push19=, $10=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label25
+	i32.load	$push23=, 0($9)
+	tee_local	$push22=, $10=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label25
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB9_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$7=, $7, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$8=, $8, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $10, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $9, $pop5
-	br_if   	0, $pop6        # 0: up to label27
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB9_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $10, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $8, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label25
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB9_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$9=, $9, $pop27
+	i32.load8_u	$8=, 0($7)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $7, $pop26
+	copy_local	$7=, $pop0
+	br_if   	0, $8           # 0: up to label27
 .LBB9_6:                                # %fap.exit
+	end_loop
 	end_block                       # label26:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $11, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $11, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB9_7:                                # %if.then.i.i
+.LBB9_7:                                # %if.then.i
 	end_block                       # label25:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end9:
 	.size	f7, .Lfunc_end9-f7
-
+                                        # -- End function
 	.section	.text.f8,"ax",@progbits
-	.hidden	f8
+	.hidden	f8                      # -- Begin function f8
 	.globl	f8
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $12=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $12=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($12), $9
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $8
-	i32.const	$push1=, 8
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label28
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$9=, 12($12)
-.LBB10_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $8
+	i32.const	$push2=, 8
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label28
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($8)
+	tee_local	$push18=, $9=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label29
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$8=, $8, $pop20
+	i32.load	$10=, 12($12)
+.LBB10_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label30:
-	i32.load8_u	$push17=, 0($8)
-	tee_local	$push16=, $10=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label29
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB10_2 Depth=1
-	i32.load	$push20=, 0($9)
-	tee_local	$push19=, $11=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label28
+	i32.load	$push23=, 0($10)
+	tee_local	$push22=, $11=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label28
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB10_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$8=, $8, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$9=, $9, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $11, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $10, $pop5
-	br_if   	0, $pop6        # 0: up to label30
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB10_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $11, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $9, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label28
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB10_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$10=, $10, $pop27
+	i32.load8_u	$9=, 0($8)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $8, $pop26
+	copy_local	$8=, $pop0
+	br_if   	0, $9           # 0: up to label30
 .LBB10_6:                               # %fap.exit
+	end_loop
 	end_block                       # label29:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $12, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $12, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB10_7:                               # %if.then.i.i
+.LBB10_7:                               # %if.then.i
 	end_block                       # label28:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end10:
 	.size	f8, .Lfunc_end10-f8
-
+                                        # -- End function
 	.section	.text.f9,"ax",@progbits
-	.hidden	f9
+	.hidden	f9                      # -- Begin function f9
 	.globl	f9
 	.type	f9,@function
 f9:                                     # @f9
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $13=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $13=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($13), $10
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $9
-	i32.const	$push1=, 7
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label31
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$10=, 12($13)
-.LBB11_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $9
+	i32.const	$push2=, 7
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label31
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($9)
+	tee_local	$push18=, $10=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label32
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$9=, $9, $pop20
+	i32.load	$11=, 12($13)
+.LBB11_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label33:
-	i32.load8_u	$push17=, 0($9)
-	tee_local	$push16=, $11=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label32
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB11_2 Depth=1
-	i32.load	$push20=, 0($10)
-	tee_local	$push19=, $12=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label31
+	i32.load	$push23=, 0($11)
+	tee_local	$push22=, $12=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label31
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB11_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$9=, $9, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$10=, $10, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $12, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $11, $pop5
-	br_if   	0, $pop6        # 0: up to label33
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB11_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $12, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $10, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label31
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB11_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$11=, $11, $pop27
+	i32.load8_u	$10=, 0($9)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $9, $pop26
+	copy_local	$9=, $pop0
+	br_if   	0, $10          # 0: up to label33
 .LBB11_6:                               # %fap.exit
+	end_loop
 	end_block                       # label32:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $13, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $13, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB11_7:                               # %if.then.i.i
+.LBB11_7:                               # %if.then.i
 	end_block                       # label31:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end11:
 	.size	f9, .Lfunc_end11-f9
-
+                                        # -- End function
 	.section	.text.f10,"ax",@progbits
-	.hidden	f10
+	.hidden	f10                     # -- Begin function f10
 	.globl	f10
 	.type	f10,@function
 f10:                                    # @f10
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $14=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $14=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($14), $11
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $10
-	i32.const	$push1=, 6
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label34
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$11=, 12($14)
-.LBB12_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $10
+	i32.const	$push2=, 6
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label34
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($10)
+	tee_local	$push18=, $11=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label35
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$10=, $10, $pop20
+	i32.load	$12=, 12($14)
+.LBB12_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label36:
-	i32.load8_u	$push17=, 0($10)
-	tee_local	$push16=, $12=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label35
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB12_2 Depth=1
-	i32.load	$push20=, 0($11)
-	tee_local	$push19=, $13=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label34
+	i32.load	$push23=, 0($12)
+	tee_local	$push22=, $13=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label34
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB12_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$10=, $10, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$11=, $11, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $13, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $12, $pop5
-	br_if   	0, $pop6        # 0: up to label36
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB12_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $13, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $11, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label34
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB12_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$12=, $12, $pop27
+	i32.load8_u	$11=, 0($10)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $10, $pop26
+	copy_local	$10=, $pop0
+	br_if   	0, $11          # 0: up to label36
 .LBB12_6:                               # %fap.exit
+	end_loop
 	end_block                       # label35:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $14, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $14, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB12_7:                               # %if.then.i.i
+.LBB12_7:                               # %if.then.i
 	end_block                       # label34:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end12:
 	.size	f10, .Lfunc_end12-f10
-
+                                        # -- End function
 	.section	.text.f11,"ax",@progbits
-	.hidden	f11
+	.hidden	f11                     # -- Begin function f11
 	.globl	f11
 	.type	f11,@function
 f11:                                    # @f11
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $15=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $15=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($15), $12
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $11
-	i32.const	$push1=, 5
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label37
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$12=, 12($15)
-.LBB13_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $11
+	i32.const	$push2=, 5
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label37
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($11)
+	tee_local	$push18=, $12=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label38
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$11=, $11, $pop20
+	i32.load	$13=, 12($15)
+.LBB13_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label39:
-	i32.load8_u	$push17=, 0($11)
-	tee_local	$push16=, $13=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label38
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB13_2 Depth=1
-	i32.load	$push20=, 0($12)
-	tee_local	$push19=, $14=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label37
+	i32.load	$push23=, 0($13)
+	tee_local	$push22=, $14=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label37
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB13_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$11=, $11, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$12=, $12, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $14, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $13, $pop5
-	br_if   	0, $pop6        # 0: up to label39
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB13_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $14, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $12, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label37
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB13_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$13=, $13, $pop27
+	i32.load8_u	$12=, 0($11)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $11, $pop26
+	copy_local	$11=, $pop0
+	br_if   	0, $12          # 0: up to label39
 .LBB13_6:                               # %fap.exit
+	end_loop
 	end_block                       # label38:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $15, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $15, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB13_7:                               # %if.then.i.i
+.LBB13_7:                               # %if.then.i
 	end_block                       # label37:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end13:
 	.size	f11, .Lfunc_end13-f11
-
+                                        # -- End function
 	.section	.text.f12,"ax",@progbits
-	.hidden	f12
+	.hidden	f12                     # -- Begin function f12
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
-	tee_local	$push14=, $16=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $16=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($16), $13
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $12
-	i32.const	$push13=, 4
-	i32.ne  	$push1=, $pop0, $pop13
-	br_if   	0, $pop1        # 0: down to label40
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$13=, 12($16)
-.LBB14_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $12
+	i32.const	$push2=, 4
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label40
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($12)
+	tee_local	$push18=, $13=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label41
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$12=, $12, $pop20
+	i32.load	$14=, 12($16)
+.LBB14_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label42:
-	i32.load8_u	$push17=, 0($12)
-	tee_local	$push16=, $14=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label41
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB14_2 Depth=1
-	i32.load	$push20=, 0($13)
-	tee_local	$push19=, $15=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push2=, $pop19, $pop18
-	br_if   	2, $pop2        # 2: down to label40
+	i32.load	$push23=, 0($14)
+	tee_local	$push22=, $15=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label40
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB14_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$12=, $12, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$13=, $13, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push3=, $15, $pop21
-	i32.load8_u	$push4=, 0($pop3)
-	i32.eq  	$push5=, $14, $pop4
-	br_if   	0, $pop5        # 0: up to label42
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB14_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $15, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $13, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label40
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB14_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$14=, $14, $pop27
+	i32.load8_u	$13=, 0($12)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $12, $pop26
+	copy_local	$12=, $pop0
+	br_if   	0, $13          # 0: up to label42
 .LBB14_6:                               # %fap.exit
+	end_loop
 	end_block                       # label41:
-	i32.const	$push12=, 0
-	i32.const	$push10=, 16
-	i32.add 	$push11=, $16, $pop10
-	i32.store	__stack_pointer($pop12), $pop11
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $16, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB14_7:                               # %if.then.i.i
+.LBB14_7:                               # %if.then.i
 	end_block                       # label40:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end14:
 	.size	f12, .Lfunc_end14-f12
-
+                                        # -- End function
 	.section	.text.f13,"ax",@progbits
-	.hidden	f13
+	.hidden	f13                     # -- Begin function f13
 	.globl	f13
 	.type	f13,@function
 f13:                                    # @f13
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $17=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $17=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($17), $14
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $13
-	i32.const	$push1=, 3
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label43
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$14=, 12($17)
-.LBB15_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $13
+	i32.const	$push2=, 3
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label43
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($13)
+	tee_local	$push18=, $14=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label44
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$13=, $13, $pop20
+	i32.load	$15=, 12($17)
+.LBB15_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label45:
-	i32.load8_u	$push17=, 0($13)
-	tee_local	$push16=, $15=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label44
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB15_2 Depth=1
-	i32.load	$push20=, 0($14)
-	tee_local	$push19=, $16=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label43
+	i32.load	$push23=, 0($15)
+	tee_local	$push22=, $16=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label43
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB15_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$13=, $13, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$14=, $14, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $16, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $15, $pop5
-	br_if   	0, $pop6        # 0: up to label45
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB15_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $16, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $14, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label43
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB15_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$15=, $15, $pop27
+	i32.load8_u	$14=, 0($13)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $13, $pop26
+	copy_local	$13=, $pop0
+	br_if   	0, $14          # 0: up to label45
 .LBB15_6:                               # %fap.exit
+	end_loop
 	end_block                       # label44:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $17, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $17, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB15_7:                               # %if.then.i.i
+.LBB15_7:                               # %if.then.i
 	end_block                       # label43:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end15:
 	.size	f13, .Lfunc_end15-f13
-
+                                        # -- End function
 	.section	.text.f14,"ax",@progbits
-	.hidden	f14
+	.hidden	f14                     # -- Begin function f14
 	.globl	f14
 	.type	f14,@function
 f14:                                    # @f14
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
+	i32.const	$push12=, 0
 	i32.const	$push10=, 0
-	i32.const	$push7=, 0
-	i32.load	$push8=, __stack_pointer($pop7)
-	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop8, $pop9
-	tee_local	$push14=, $18=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $18=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($18), $15
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $14
-	i32.const	$push1=, 2
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label46
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$15=, 12($18)
-.LBB16_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $14
+	i32.const	$push2=, 2
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label46
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($14)
+	tee_local	$push18=, $15=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label47
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$14=, $14, $pop20
+	i32.load	$16=, 12($18)
+.LBB16_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label48:
-	i32.load8_u	$push17=, 0($14)
-	tee_local	$push16=, $16=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label47
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB16_2 Depth=1
-	i32.load	$push20=, 0($15)
-	tee_local	$push19=, $17=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push3=, $pop19, $pop18
-	br_if   	2, $pop3        # 2: down to label46
+	i32.load	$push23=, 0($16)
+	tee_local	$push22=, $17=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label46
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB16_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$14=, $14, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$15=, $15, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push4=, $17, $pop21
-	i32.load8_u	$push5=, 0($pop4)
-	i32.eq  	$push6=, $16, $pop5
-	br_if   	0, $pop6        # 0: up to label48
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB16_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $17, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $15, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label46
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB16_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$16=, $16, $pop27
+	i32.load8_u	$15=, 0($14)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $14, $pop26
+	copy_local	$14=, $pop0
+	br_if   	0, $15          # 0: up to label48
 .LBB16_6:                               # %fap.exit
+	end_loop
 	end_block                       # label47:
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $18, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $18, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB16_7:                               # %if.then.i.i
+.LBB16_7:                               # %if.then.i
 	end_block                       # label46:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end16:
 	.size	f14, .Lfunc_end16-f14
-
+                                        # -- End function
 	.section	.text.f15,"ax",@progbits
-	.hidden	f15
+	.hidden	f15                     # -- Begin function f15
 	.globl	f15
 	.type	f15,@function
 f15:                                    # @f15
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push6=, 0
-	i32.load	$push7=, __stack_pointer($pop6)
-	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop7, $pop8
-	tee_local	$push14=, $19=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
+	i32.const	$push12=, 0
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$push17=, $pop9, $pop11
+	tee_local	$push16=, $19=, $pop17
+	i32.store	__stack_pointer($pop12), $pop16
 	i32.store	12($19), $16
 	block   	
-	i32.call	$push0=, strlen@FUNCTION, $15
-	i32.const	$push13=, 1
-	i32.ne  	$push1=, $pop0, $pop13
-	br_if   	0, $pop1        # 0: down to label49
-# BB#1:                                 # %while.cond.i.preheader
-	i32.load	$16=, 12($19)
-.LBB17_2:                               # %while.cond.i
-                                        # =>This Inner Loop Header: Depth=1
+	i32.call	$push1=, strlen@FUNCTION, $15
+	i32.const	$push2=, 1
+	i32.ne  	$push3=, $pop1, $pop2
+	br_if   	0, $pop3        # 0: down to label49
+# BB#1:                                 # %if.end.i
 	block   	
+	i32.load8_u	$push19=, 0($15)
+	tee_local	$push18=, $16=, $pop19
+	i32.eqz 	$push28=, $pop18
+	br_if   	0, $pop28       # 0: down to label50
+# BB#2:                                 # %while.body.i.preheader
+	i32.const	$push20=, 1
+	i32.add 	$15=, $15, $pop20
+	i32.load	$17=, 12($19)
+.LBB17_3:                               # %while.body.i
+                                        # =>This Inner Loop Header: Depth=1
 	loop    	                # label51:
-	i32.load8_u	$push17=, 0($15)
-	tee_local	$push16=, $17=, $pop17
-	i32.eqz 	$push24=, $pop16
-	br_if   	1, $pop24       # 1: down to label50
-# BB#3:                                 # %while.body.i
-                                        #   in Loop: Header=BB17_2 Depth=1
-	i32.load	$push20=, 0($16)
-	tee_local	$push19=, $18=, $pop20
-	i32.const	$push18=, 16
-	i32.ge_u	$push2=, $pop19, $pop18
-	br_if   	2, $pop2        # 2: down to label49
+	i32.load	$push23=, 0($17)
+	tee_local	$push22=, $18=, $pop23
+	i32.const	$push21=, 16
+	i32.ge_u	$push4=, $pop22, $pop21
+	br_if   	2, $pop4        # 2: down to label49
 # BB#4:                                 # %to_hex.exit.i
-                                        #   in Loop: Header=BB17_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$15=, $15, $pop23
-	i32.const	$push22=, 4
-	i32.add 	$16=, $16, $pop22
-	i32.const	$push21=, .L.str
-	i32.add 	$push3=, $18, $pop21
-	i32.load8_u	$push4=, 0($pop3)
-	i32.eq  	$push5=, $17, $pop4
-	br_if   	0, $pop5        # 0: up to label51
-# BB#5:                                 # %if.then4.i
-	end_loop
-	call    	abort@FUNCTION
-	unreachable
+                                        #   in Loop: Header=BB17_3 Depth=1
+	i32.const	$push25=, .L.str
+	i32.add 	$push6=, $18, $pop25
+	i32.load8_u	$push7=, 0($pop6)
+	i32.const	$push24=, 255
+	i32.and 	$push5=, $16, $pop24
+	i32.ne  	$push8=, $pop7, $pop5
+	br_if   	2, $pop8        # 2: down to label49
+# BB#5:                                 # %if.end5.i
+                                        #   in Loop: Header=BB17_3 Depth=1
+	i32.const	$push27=, 4
+	i32.add 	$17=, $17, $pop27
+	i32.load8_u	$16=, 0($15)
+	i32.const	$push26=, 1
+	i32.add 	$push0=, $15, $pop26
+	copy_local	$15=, $pop0
+	br_if   	0, $16          # 0: up to label51
 .LBB17_6:                               # %fap.exit
+	end_loop
 	end_block                       # label50:
-	i32.const	$push12=, 0
-	i32.const	$push10=, 16
-	i32.add 	$push11=, $19, $pop10
-	i32.store	__stack_pointer($pop12), $pop11
+	i32.const	$push15=, 0
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $19, $pop13
+	i32.store	__stack_pointer($pop15), $pop14
 	return
-.LBB17_7:                               # %if.then.i.i
+.LBB17_7:                               # %if.then.i
 	end_block                       # label49:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end17:
 	.size	f15, .Lfunc_end17-f15
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -1178,10 +1263,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push84=, 0
-	i32.const	$push81=, 0
-	i32.load	$push82=, __stack_pointer($pop81)
+	i32.const	$push82=, 0
+	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop82, $pop83
+	i32.sub 	$push292=, $pop81, $pop83
 	tee_local	$push291=, $0=, $pop292
 	i32.store	__stack_pointer($pop84), $pop291
 	i32.const	$push85=, 576
@@ -1564,7 +1649,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end18:
 	.size	main, .Lfunc_end18-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.16,"aMS",@progbits,1
 	.p2align	4
@@ -1573,7 +1658,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	strlen, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/va-arg-pack-1.c.s b/test/torture-s/va-arg-pack-1.c.s
index 7d391c599..ea627140b 100644
--- a/test/torture-s/va-arg-pack-1.c.s
+++ b/test/torture-s/va-arg-pack-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c"
+	.file	"va-arg-pack-1.c"
 	.section	.text.foo1,"ax",@progbits
-	.hidden	foo1
+	.hidden	foo1                    # -- Begin function foo1
 	.globl	foo1
 	.type	foo1,@function
 foo1:                                   # @foo1
@@ -9,13 +9,13 @@ foo1:                                   # @foo1
 	.result 	i32
 	.local  	i32, i64, i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push78=, 0
-	i32.const	$push75=, 0
-	i32.load	$push76=, __stack_pointer($pop75)
-	i32.const	$push77=, 32
-	i32.sub 	$push89=, $pop76, $pop77
-	tee_local	$push88=, $6=, $pop89
-	i32.store	__stack_pointer($pop78), $pop88
+	i32.const	$push71=, 0
+	i32.const	$push69=, 0
+	i32.load	$push68=, __stack_pointer($pop69)
+	i32.const	$push70=, 32
+	i32.sub 	$push80=, $pop68, $pop70
+	tee_local	$push79=, $6=, $pop80
+	i32.store	__stack_pointer($pop71), $pop79
 	i32.store	12($6), $2
 	block   	
 	i32.const	$push0=, 19
@@ -23,30 +23,30 @@ foo1:                                   # @foo1
 	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %lor.lhs.false3
 	i32.const	$push2=, seen
-	i32.add 	$push91=, $0, $pop2
-	tee_local	$push90=, $2=, $pop91
-	i32.load8_u	$push3=, 0($pop90)
+	i32.add 	$push82=, $0, $pop2
+	tee_local	$push81=, $2=, $pop82
+	i32.load8_u	$push3=, 0($pop81)
 	br_if   	0, $pop3        # 0: down to label0
 # BB#2:                                 # %if.end
 	i32.const	$push4=, 0
 	i32.load	$push5=, cnt($pop4)
 	i32.const	$push6=, 1
-	i32.add 	$push94=, $pop5, $pop6
-	tee_local	$push93=, $3=, $pop94
-	i32.store8	0($2), $pop93
-	i32.const	$push92=, 0
-	i32.store	cnt($pop92), $3
+	i32.add 	$push85=, $pop5, $pop6
+	tee_local	$push84=, $3=, $pop85
+	i32.store8	0($2), $pop84
+	i32.const	$push83=, 0
+	i32.store	cnt($pop83), $3
 	i32.const	$push7=, 6
 	i32.ne  	$push8=, $1, $pop7
 	br_if   	0, $pop8        # 0: down to label0
 # BB#3:                                 # %if.end9
-	i32.load	$push98=, 12($6)
-	tee_local	$push97=, $2=, $pop98
+	i32.load	$push89=, 12($6)
+	tee_local	$push88=, $1=, $pop89
 	i32.const	$push9=, 4
-	i32.add 	$push96=, $pop97, $pop9
-	tee_local	$push95=, $1=, $pop96
-	i32.store	12($6), $pop95
-	i32.load	$push10=, 0($2)
+	i32.add 	$push87=, $pop88, $pop9
+	tee_local	$push86=, $2=, $pop87
+	i32.store	12($6), $pop86
+	i32.load	$push10=, 0($1)
 	i32.const	$push11=, 5
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
@@ -64,143 +64,127 @@ foo1:                                   # @foo1
 	br_if   	2, $0           # 2: down to label0
 # BB#7:                                 # %sw.bb
 	i32.const	$push41=, 8
-	i32.add 	$push101=, $2, $pop41
-	tee_local	$push100=, $1=, $pop101
-	i32.store	12($6), $pop100
+	i32.add 	$push92=, $1, $pop41
+	tee_local	$push91=, $2=, $pop92
+	i32.store	12($6), $pop91
 	i32.const	$push42=, 4
-	i32.add 	$push43=, $2, $pop42
+	i32.add 	$push43=, $1, $pop42
 	i32.load	$push44=, 0($pop43)
-	i32.const	$push99=, 9
-	i32.ne  	$push45=, $pop44, $pop99
+	i32.const	$push90=, 9
+	i32.ne  	$push45=, $pop44, $pop90
 	br_if   	2, $pop45       # 2: down to label0
 # BB#8:                                 # %sw.bb
 	i32.const	$push46=, 0
 	i32.load	$push40=, v1($pop46)
-	i32.const	$push102=, 9
-	i32.ne  	$push47=, $pop40, $pop102
+	i32.const	$push93=, 9
+	i32.ne  	$push47=, $pop40, $pop93
 	br_if   	2, $pop47       # 2: down to label0
 # BB#9:                                 # %if.end22
-	i32.const	$push82=, 16
-	i32.add 	$push83=, $6, $pop82
-	i32.const	$push48=, 12
-	i32.add 	$push51=, $pop83, $pop48
-	i32.const	$push107=, 12
-	i32.add 	$push49=, $1, $pop107
-	i32.load	$push50=, 0($pop49):p2align=0
-	i32.store	0($pop51), $pop50
-	i32.const	$push84=, 16
-	i32.add 	$push85=, $6, $pop84
-	i32.const	$push52=, 8
-	i32.add 	$push55=, $pop85, $pop52
-	i32.const	$push106=, 8
-	i32.add 	$push53=, $1, $pop106
-	i32.load	$push54=, 0($pop53):p2align=0
-	i32.store	0($pop55), $pop54
-	i32.const	$push56=, 24
-	i32.add 	$push105=, $2, $pop56
-	tee_local	$push104=, $3=, $pop105
-	i32.store	12($6), $pop104
-	i32.const	$push57=, 4
-	i32.add 	$push58=, $1, $pop57
-	i32.load	$push59=, 0($pop58):p2align=0
-	i32.store	20($6), $pop59
-	i32.load	$push60=, 0($1):p2align=0
-	i32.store	16($6), $pop60
-	i32.const	$push86=, 16
-	i32.add 	$push87=, $6, $pop86
-	i32.const	$push103=, v4
-	i32.const	$push61=, 16
-	i32.call	$push62=, memcmp@FUNCTION, $pop87, $pop103, $pop61
-	br_if   	2, $pop62       # 2: down to label0
+	i32.const	$push75=, 16
+	i32.add 	$push76=, $6, $pop75
+	i32.const	$push48=, 8
+	i32.add 	$push51=, $pop76, $pop48
+	i32.const	$push97=, 8
+	i32.add 	$push49=, $2, $pop97
+	i64.load	$push50=, 0($pop49):p2align=0
+	i64.store	0($pop51), $pop50
+	i64.load	$push52=, 0($2):p2align=0
+	i64.store	16($6), $pop52
+	i32.const	$push53=, 24
+	i32.add 	$push96=, $1, $pop53
+	tee_local	$push95=, $2=, $pop96
+	i32.store	12($6), $pop95
+	i32.const	$push77=, 16
+	i32.add 	$push78=, $6, $pop77
+	i32.const	$push94=, v4
+	i32.const	$push54=, 16
+	i32.call	$push55=, memcmp@FUNCTION, $pop78, $pop94, $pop54
+	br_if   	2, $pop55       # 2: down to label0
 # BB#10:                                # %if.end28
-	i32.const	$push63=, 28
-	i32.add 	$push110=, $2, $pop63
-	tee_local	$push109=, $1=, $pop110
-	i32.store	12($6), $pop109
-	i32.load	$push64=, 0($3)
-	i32.const	$push108=, v4
-	i32.ne  	$push65=, $pop64, $pop108
-	br_if   	2, $pop65       # 2: down to label0
+	i32.const	$push56=, 28
+	i32.add 	$push100=, $1, $pop56
+	tee_local	$push99=, $3=, $pop100
+	i32.store	12($6), $pop99
+	i32.load	$push57=, 0($2)
+	i32.const	$push98=, v4
+	i32.ne  	$push58=, $pop57, $pop98
+	br_if   	2, $pop58       # 2: down to label0
 # BB#11:                                # %if.end34
-	i32.const	$push67=, 32
-	i32.add 	$push68=, $2, $pop67
-	i32.store	12($6), $pop68
-	block   	
-	i32.load	$push69=, 0($1)
-	i32.const	$push70=, 3
-	i32.ne  	$push71=, $pop69, $pop70
-	br_if   	0, $pop71       # 0: down to label3
+	i32.const	$push60=, 32
+	i32.add 	$push61=, $1, $pop60
+	i32.store	12($6), $pop61
+	i32.load	$push62=, 0($3)
+	i32.const	$push63=, 3
+	i32.ne  	$push64=, $pop62, $pop63
+	br_if   	2, $pop64       # 2: down to label0
 # BB#12:                                # %if.end34
-	i32.const	$push72=, 0
-	i32.load	$push66=, v2($pop72)
-	i32.const	$push73=, 4
-	i32.eq  	$push74=, $pop66, $pop73
-	br_if   	2, $pop74       # 2: down to label1
-.LBB0_13:                               # %if.then42
-	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_14:                               # %sw.bb44
+	i32.const	$push65=, 0
+	i32.load	$push59=, v2($pop65)
+	i32.const	$push66=, 4
+	i32.eq  	$push67=, $pop59, $pop66
+	br_if   	1, $pop67       # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_13:                               # %sw.bb44
 	end_block                       # label2:
 	i32.const	$push19=, 15
-	i32.add 	$push20=, $1, $pop19
+	i32.add 	$push20=, $2, $pop19
 	i32.const	$push21=, -16
-	i32.and 	$push116=, $pop20, $pop21
-	tee_local	$push115=, $2=, $pop116
+	i32.and 	$push106=, $pop20, $pop21
+	tee_local	$push105=, $1=, $pop106
 	i32.const	$push22=, 16
-	i32.add 	$push23=, $pop115, $pop22
+	i32.add 	$push23=, $pop105, $pop22
 	i32.store	12($6), $pop23
-	i64.load	$push114=, 0($2)
-	tee_local	$push113=, $4=, $pop114
-	i64.load	$push112=, 8($2)
-	tee_local	$push111=, $5=, $pop112
+	i64.load	$push104=, 0($1)
+	tee_local	$push103=, $4=, $pop104
+	i64.load	$push102=, 8($1)
+	tee_local	$push101=, $5=, $pop102
 	i64.const	$push25=, 0
 	i64.const	$push24=, 4612891083171430400
-	i32.call	$push26=, __netf2@FUNCTION, $pop113, $pop111, $pop25, $pop24
+	i32.call	$push26=, __netf2@FUNCTION, $pop103, $pop101, $pop25, $pop24
 	br_if   	1, $pop26       # 1: down to label0
-# BB#15:                                # %sw.bb44
+# BB#14:                                # %sw.bb44
 	i32.const	$push27=, 0
 	i64.load	$push17=, v5($pop27)
-	i32.const	$push117=, 0
-	i64.load	$push18=, v5+8($pop117)
+	i32.const	$push107=, 0
+	i64.load	$push18=, v5+8($pop107)
 	i32.call	$push28=, __eqtf2@FUNCTION, $pop17, $pop18, $4, $5
 	br_if   	1, $pop28       # 1: down to label0
-# BB#16:                                # %if.end53
+# BB#15:                                # %if.end53
 	i32.const	$push29=, 20
-	i32.add 	$push119=, $2, $pop29
-	tee_local	$push118=, $1=, $pop119
-	i32.store	12($6), $pop118
+	i32.add 	$push109=, $1, $pop29
+	tee_local	$push108=, $2=, $pop109
+	i32.store	12($6), $pop108
 	i32.const	$push30=, 16
-	i32.add 	$push31=, $2, $pop30
+	i32.add 	$push31=, $1, $pop30
 	i32.load	$push32=, 0($pop31)
 	i32.const	$push33=, 8
 	i32.ne  	$push34=, $pop32, $pop33
 	br_if   	1, $pop34       # 1: down to label0
-# BB#17:                                # %if.end59
+# BB#16:                                # %if.end59
 	i32.const	$push35=, 24
-	i32.add 	$push36=, $2, $pop35
+	i32.add 	$push36=, $1, $pop35
 	i32.store	12($6), $pop36
-	i32.load	$push37=, 0($1)
+	i32.load	$push37=, 0($2)
 	i32.const	$push38=, v2
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	1, $pop39       # 1: down to label0
-.LBB0_18:                               # %sw.epilog
+.LBB0_17:                               # %sw.epilog
 	end_block                       # label1:
-	i32.const	$push81=, 0
-	i32.const	$push79=, 32
-	i32.add 	$push80=, $6, $pop79
-	i32.store	__stack_pointer($pop81), $pop80
+	i32.const	$push74=, 0
+	i32.const	$push72=, 32
+	i32.add 	$push73=, $6, $pop72
+	i32.store	__stack_pointer($pop74), $pop73
 	return  	$0
-.LBB0_19:                               # %sw.default
+.LBB0_18:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	foo1, .Lfunc_end0-foo1
-
+                                        # -- End function
 	.section	.text.foo2,"ax",@progbits
-	.hidden	foo2
+	.hidden	foo2                    # -- Begin function foo2
 	.globl	foo2
 	.type	foo2,@function
 foo2:                                   # @foo2
@@ -208,184 +192,160 @@ foo2:                                   # @foo2
 	.result 	i32
 	.local  	i32, i32
 # BB#0:                                 # %entry
-	i32.const	$push70=, 0
-	i32.const	$push67=, 0
-	i32.load	$push68=, __stack_pointer($pop67)
-	i32.const	$push69=, 48
-	i32.sub 	$push87=, $pop68, $pop69
-	tee_local	$push86=, $4=, $pop87
-	i32.store	__stack_pointer($pop70), $pop86
+	i32.const	$push60=, 0
+	i32.const	$push58=, 0
+	i32.load	$push57=, __stack_pointer($pop58)
+	i32.const	$push59=, 48
+	i32.sub 	$push73=, $pop57, $pop59
+	tee_local	$push72=, $4=, $pop73
+	i32.store	__stack_pointer($pop60), $pop72
 	i32.store	12($4), $2
 	block   	
 	i32.const	$push0=, 19
 	i32.gt_u	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label4
+	br_if   	0, $pop1        # 0: down to label3
 # BB#1:                                 # %lor.lhs.false3
 	i32.const	$push2=, seen
-	i32.add 	$push89=, $0, $pop2
-	tee_local	$push88=, $2=, $pop89
-	i32.load8_u	$push3=, 0($pop88)
-	br_if   	0, $pop3        # 0: down to label4
+	i32.add 	$push75=, $0, $pop2
+	tee_local	$push74=, $2=, $pop75
+	i32.load8_u	$push3=, 0($pop74)
+	br_if   	0, $pop3        # 0: down to label3
 # BB#2:                                 # %if.end
 	i32.const	$push4=, 0
-	i32.const	$push92=, 0
-	i32.load	$push5=, cnt($pop92)
+	i32.const	$push78=, 0
+	i32.load	$push5=, cnt($pop78)
 	i32.const	$push6=, 1
-	i32.add 	$push91=, $pop5, $pop6
-	tee_local	$push90=, $3=, $pop91
-	i32.store	cnt($pop4), $pop90
+	i32.add 	$push77=, $pop5, $pop6
+	tee_local	$push76=, $3=, $pop77
+	i32.store	cnt($pop4), $pop76
 	i32.const	$push7=, 64
 	i32.or  	$push8=, $3, $pop7
 	i32.store8	0($2), $pop8
 	i32.const	$push9=, 10
 	i32.ne  	$push10=, $1, $pop9
-	br_if   	0, $pop10       # 0: down to label4
+	br_if   	0, $pop10       # 0: down to label3
 # BB#3:                                 # %if.end9
 	block   	
 	i32.const	$push11=, 2
 	i32.eq  	$push12=, $0, $pop11
-	br_if   	0, $pop12       # 0: down to label5
+	br_if   	0, $pop12       # 0: down to label4
 # BB#4:                                 # %if.end9
 	i32.const	$push13=, 11
 	i32.eq  	$push14=, $0, $pop13
-	br_if   	0, $pop14       # 0: down to label5
+	br_if   	0, $pop14       # 0: down to label4
 # BB#5:                                 # %if.end9
 	i32.const	$push15=, 12
 	i32.ne  	$push16=, $0, $pop15
-	br_if   	1, $pop16       # 1: down to label4
+	br_if   	1, $pop16       # 1: down to label3
 # BB#6:                                 # %sw.bb
 	i32.load	$push20=, 12($4)
 	i32.const	$push19=, 15
 	i32.add 	$push21=, $pop20, $pop19
 	i32.const	$push22=, -16
-	i32.and 	$push97=, $pop21, $pop22
-	tee_local	$push96=, $2=, $pop97
+	i32.and 	$push83=, $pop21, $pop22
+	tee_local	$push82=, $1=, $pop83
 	i32.const	$push23=, 16
-	i32.add 	$push95=, $pop96, $pop23
-	tee_local	$push94=, $1=, $pop95
-	i32.store	12($4), $pop94
-	i64.load	$push25=, 0($2)
-	i64.load	$push24=, 8($2)
-	i64.const	$push93=, 0
+	i32.add 	$push81=, $pop82, $pop23
+	tee_local	$push80=, $2=, $pop81
+	i32.store	12($4), $pop80
+	i64.load	$push25=, 0($1)
+	i64.load	$push24=, 8($1)
+	i64.const	$push79=, 0
 	i64.const	$push26=, 4612891083171430400
-	i32.call	$push27=, __netf2@FUNCTION, $pop25, $pop24, $pop93, $pop26
-	br_if   	1, $pop27       # 1: down to label4
+	i32.call	$push27=, __netf2@FUNCTION, $pop25, $pop24, $pop79, $pop26
+	br_if   	1, $pop27       # 1: down to label3
 # BB#7:                                 # %sw.bb
 	i32.const	$push28=, 0
 	i64.load	$push17=, v5($pop28)
-	i32.const	$push99=, 0
-	i64.load	$push18=, v5+8($pop99)
-	i64.const	$push98=, 0
+	i32.const	$push85=, 0
+	i64.load	$push18=, v5+8($pop85)
+	i64.const	$push84=, 0
 	i64.const	$push29=, 4612882287078408192
-	i32.call	$push30=, __eqtf2@FUNCTION, $pop17, $pop18, $pop98, $pop29
-	br_if   	1, $pop30       # 1: down to label4
+	i32.call	$push30=, __eqtf2@FUNCTION, $pop17, $pop18, $pop84, $pop29
+	br_if   	1, $pop30       # 1: down to label3
 # BB#8:                                 # %if.end16
-	i32.const	$push74=, 32
-	i32.add 	$push75=, $4, $pop74
-	i32.const	$push108=, 12
-	i32.add 	$push33=, $pop75, $pop108
-	i32.const	$push107=, 12
-	i32.add 	$push31=, $1, $pop107
-	i32.load	$push32=, 0($pop31):p2align=0
-	i32.store	0($pop33), $pop32
-	i32.const	$push76=, 32
-	i32.add 	$push77=, $4, $pop76
-	i32.const	$push106=, 8
-	i32.add 	$push36=, $pop77, $pop106
-	i32.const	$push105=, 8
-	i32.add 	$push34=, $1, $pop105
-	i32.load	$push35=, 0($pop34):p2align=0
-	i32.store	0($pop36), $pop35
-	i32.const	$push37=, 32
-	i32.add 	$push104=, $2, $pop37
-	tee_local	$push103=, $3=, $pop104
-	i32.store	12($4), $pop103
-	i32.const	$push102=, 4
-	i32.add 	$push38=, $1, $pop102
-	i32.load	$push39=, 0($pop38):p2align=0
-	i32.store	36($4), $pop39
-	i32.load	$push40=, 0($1):p2align=0
-	i32.store	32($4), $pop40
-	i32.const	$push78=, 32
-	i32.add 	$push79=, $4, $pop78
-	i32.const	$push101=, v4
-	i32.const	$push100=, 16
-	i32.call	$push41=, memcmp@FUNCTION, $pop79, $pop101, $pop100
-	br_if   	1, $pop41       # 1: down to label4
+	i32.const	$push64=, 32
+	i32.add 	$push65=, $4, $pop64
+	i32.const	$push91=, 8
+	i32.add 	$push33=, $pop65, $pop91
+	i32.const	$push90=, 8
+	i32.add 	$push31=, $2, $pop90
+	i64.load	$push32=, 0($pop31):p2align=0
+	i64.store	0($pop33), $pop32
+	i64.load	$push34=, 0($2):p2align=0
+	i64.store	32($4), $pop34
+	i32.const	$push35=, 32
+	i32.add 	$push89=, $1, $pop35
+	tee_local	$push88=, $2=, $pop89
+	i32.store	12($4), $pop88
+	i32.const	$push66=, 32
+	i32.add 	$push67=, $4, $pop66
+	i32.const	$push87=, v4
+	i32.const	$push86=, 16
+	i32.call	$push36=, memcmp@FUNCTION, $pop67, $pop87, $pop86
+	br_if   	1, $pop36       # 1: down to label3
 # BB#9:                                 # %if.end22
-	i32.const	$push80=, 16
-	i32.add 	$push81=, $4, $pop80
-	i32.const	$push117=, 12
-	i32.add 	$push44=, $pop81, $pop117
-	i32.const	$push116=, 12
-	i32.add 	$push42=, $3, $pop116
-	i32.load	$push43=, 0($pop42):p2align=0
-	i32.store	0($pop44), $pop43
-	i32.const	$push82=, 16
-	i32.add 	$push83=, $4, $pop82
-	i32.const	$push115=, 8
-	i32.add 	$push47=, $pop83, $pop115
-	i32.const	$push114=, 8
-	i32.add 	$push45=, $3, $pop114
-	i32.load	$push46=, 0($pop45):p2align=0
-	i32.store	0($pop47), $pop46
-	i32.const	$push48=, 48
-	i32.add 	$push113=, $2, $pop48
-	tee_local	$push112=, $1=, $pop113
-	i32.store	12($4), $pop112
-	i32.const	$push111=, 4
-	i32.add 	$push49=, $3, $pop111
-	i32.load	$push50=, 0($pop49):p2align=0
-	i32.store	20($4), $pop50
-	i32.load	$push51=, 0($3):p2align=0
-	i32.store	16($4), $pop51
-	i32.const	$push84=, 16
-	i32.add 	$push85=, $4, $pop84
-	i32.const	$push110=, v4
-	i32.const	$push109=, 16
-	i32.call	$push52=, memcmp@FUNCTION, $pop85, $pop110, $pop109
-	br_if   	1, $pop52       # 1: down to label4
+	i32.const	$push68=, 16
+	i32.add 	$push69=, $4, $pop68
+	i32.const	$push97=, 8
+	i32.add 	$push39=, $pop69, $pop97
+	i32.const	$push96=, 8
+	i32.add 	$push37=, $2, $pop96
+	i64.load	$push38=, 0($pop37):p2align=0
+	i64.store	0($pop39), $pop38
+	i64.load	$push40=, 0($2):p2align=0
+	i64.store	16($4), $pop40
+	i32.const	$push41=, 48
+	i32.add 	$push95=, $1, $pop41
+	tee_local	$push94=, $2=, $pop95
+	i32.store	12($4), $pop94
+	i32.const	$push70=, 16
+	i32.add 	$push71=, $4, $pop70
+	i32.const	$push93=, v4
+	i32.const	$push92=, 16
+	i32.call	$push42=, memcmp@FUNCTION, $pop71, $pop93, $pop92
+	br_if   	1, $pop42       # 1: down to label3
 # BB#10:                                # %if.end31
-	i32.const	$push53=, 52
-	i32.add 	$push119=, $2, $pop53
-	tee_local	$push118=, $2=, $pop119
-	i32.store	12($4), $pop118
-	i32.load	$push54=, 0($1)
-	i32.const	$push55=, v2
-	i32.ne  	$push56=, $pop54, $pop55
-	br_if   	1, $pop56       # 1: down to label4
+	i32.const	$push43=, 52
+	i32.add 	$push99=, $1, $pop43
+	tee_local	$push98=, $1=, $pop99
+	i32.store	12($4), $pop98
+	i32.load	$push44=, 0($2)
+	i32.const	$push45=, v2
+	i32.ne  	$push46=, $pop44, $pop45
+	br_if   	1, $pop46       # 1: down to label3
 # BB#11:                                # %if.end37
-	i32.const	$push57=, 7
-	i32.add 	$push58=, $2, $pop57
-	i32.const	$push59=, -8
-	i32.and 	$push121=, $pop58, $pop59
-	tee_local	$push120=, $2=, $pop121
-	i32.const	$push60=, 8
-	i32.add 	$push61=, $pop120, $pop60
-	i32.store	12($4), $pop61
-	i64.load	$push62=, 0($2)
-	i64.const	$push63=, 16
-	i64.ne  	$push64=, $pop62, $pop63
-	br_if   	1, $pop64       # 1: down to label4
+	i32.const	$push47=, 7
+	i32.add 	$push48=, $1, $pop47
+	i32.const	$push49=, -8
+	i32.and 	$push101=, $pop48, $pop49
+	tee_local	$push100=, $1=, $pop101
+	i32.const	$push50=, 8
+	i32.add 	$push51=, $pop100, $pop50
+	i32.store	12($4), $pop51
+	i64.load	$push52=, 0($1)
+	i64.const	$push53=, 16
+	i64.ne  	$push54=, $pop52, $pop53
+	br_if   	1, $pop54       # 1: down to label3
 .LBB1_12:                               # %sw.epilog
-	end_block                       # label5:
-	i32.const	$push73=, 0
-	i32.const	$push71=, 48
-	i32.add 	$push72=, $4, $pop71
-	i32.store	__stack_pointer($pop73), $pop72
-	i32.const	$push65=, 8
-	i32.add 	$push66=, $0, $pop65
-	return  	$pop66
-.LBB1_13:                               # %sw.default
 	end_block                       # label4:
+	i32.const	$push63=, 0
+	i32.const	$push61=, 48
+	i32.add 	$push62=, $4, $pop61
+	i32.store	__stack_pointer($pop63), $pop62
+	i32.const	$push55=, 8
+	i32.add 	$push56=, $0, $pop55
+	return  	$pop56
+.LBB1_13:                               # %if.then
+	end_block                       # label3:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	foo2, .Lfunc_end1-foo2
-
+                                        # -- End function
 	.section	.text.foo3,"ax",@progbits
-	.hidden	foo3
+	.hidden	foo3                    # -- Begin function foo3
 	.globl	foo3
 	.type	foo3,@function
 foo3:                                   # @foo3
@@ -396,222 +356,200 @@ foo3:                                   # @foo3
 	.endfunc
 .Lfunc_end2:
 	.size	foo3, .Lfunc_end2-foo3
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i64, i64, i32
+	.local  	i32, i32, i64, i64, i64, i32
 # BB#0:                                 # %entry
-	i32.const	$push66=, 0
-	i32.const	$push63=, 0
-	i32.load	$push64=, __stack_pointer($pop63)
-	i32.const	$push65=, 176
-	i32.sub 	$push111=, $pop64, $pop65
-	tee_local	$push110=, $4=, $pop111
-	i32.store	__stack_pointer($pop66), $pop110
-	i32.const	$push109=, 0
-	i32.const	$push108=, 0
-	i32.load	$push0=, v1($pop108)
-	i32.const	$push107=, 1
-	i32.add 	$push106=, $pop0, $pop107
-	tee_local	$push105=, $0=, $pop106
-	i32.store	v1($pop109), $pop105
-	i32.const	$push104=, 0
-	i32.const	$push103=, 0
-	i32.load	$push102=, v2($pop103)
-	tee_local	$push101=, $1=, $pop102
-	i32.const	$push100=, 1
-	i32.add 	$push1=, $pop101, $pop100
-	i32.store	v2($pop104), $pop1
-	i32.const	$push3=, 172
-	i32.add 	$push4=, $4, $pop3
-	i32.const	$push99=, 0
-	i32.load	$push2=, v4+12($pop99):p2align=0
-	i32.store	0($pop4), $pop2
-	i32.const	$push70=, 160
-	i32.add 	$push71=, $4, $pop70
-	i32.const	$push98=, 8
-	i32.add 	$push6=, $pop71, $pop98
-	i32.const	$push97=, 0
-	i32.load	$push5=, v4+8($pop97):p2align=0
-	i32.store	0($pop6), $pop5
-	i32.const	$push8=, 164
-	i32.add 	$push9=, $4, $pop8
-	i32.const	$push96=, 0
-	i32.load	$push7=, v4+4($pop96):p2align=0
-	i32.store	0($pop9), $pop7
-	i32.const	$push95=, 0
-	i32.load	$push10=, v4($pop95):p2align=0
-	i32.store	160($4), $pop10
-	i32.store	144($4), $0
-	i32.store	156($4), $1
-	i32.const	$push11=, v4
-	i32.store	152($4), $pop11
-	i32.const	$push72=, 160
-	i32.add 	$push73=, $4, $pop72
-	i32.store	148($4), $pop73
+	i32.const	$push52=, 0
+	i32.const	$push50=, 0
+	i32.load	$push49=, __stack_pointer($pop50)
+	i32.const	$push51=, 176
+	i32.sub 	$push95=, $pop49, $pop51
+	tee_local	$push94=, $5=, $pop95
+	i32.store	__stack_pointer($pop52), $pop94
+	i32.const	$push56=, 160
+	i32.add 	$push57=, $5, $pop56
+	i32.const	$push93=, 8
+	i32.add 	$push1=, $pop57, $pop93
+	i32.const	$push92=, 0
+	i64.load	$push0=, v4+8($pop92):p2align=0
+	i64.store	0($pop1), $pop0
+	i32.const	$push91=, 0
+	i32.const	$push90=, 0
+	i32.load	$push2=, v1($pop90)
+	i32.const	$push89=, 1
+	i32.add 	$push88=, $pop2, $pop89
+	tee_local	$push87=, $0=, $pop88
+	i32.store	v1($pop91), $pop87
+	i32.const	$push86=, 0
+	i32.const	$push85=, 0
+	i32.load	$push84=, v2($pop85)
+	tee_local	$push83=, $1=, $pop84
+	i32.const	$push82=, 1
+	i32.add 	$push3=, $pop83, $pop82
+	i32.store	v2($pop86), $pop3
+	i32.const	$push4=, v4
+	i32.store	152($5), $pop4
+	i32.const	$push81=, 0
+	i64.load	$push5=, v4($pop81):p2align=0
+	i64.store	160($5), $pop5
+	i32.store	156($5), $1
+	i32.store	144($5), $0
+	i32.const	$push58=, 160
+	i32.add 	$push59=, $5, $pop58
+	i32.store	148($5), $pop59
 	block   	
-	i32.const	$push94=, 0
-	i32.const	$push74=, 144
-	i32.add 	$push75=, $4, $pop74
-	i32.call	$push12=, bar@FUNCTION, $pop94, $pop75
-	br_if   	0, $pop12       # 0: down to label6
+	i32.const	$push80=, 0
+	i32.const	$push60=, 144
+	i32.add 	$push61=, $5, $pop60
+	i32.call	$push6=, bar@FUNCTION, $pop80, $pop61
+	br_if   	0, $pop6        # 0: down to label5
 # BB#1:                                 # %if.end
-	i32.const	$push76=, 96
-	i32.add 	$push77=, $4, $pop76
-	i32.const	$push124=, 0
-	i64.load	$push14=, v5($pop124)
+	i32.const	$push62=, 96
+	i32.add 	$push63=, $5, $pop62
+	i32.const	$push108=, 0
+	i64.load	$push8=, v5($pop108)
+	i32.const	$push107=, 0
+	i64.load	$push7=, v5+8($pop107)
+	i64.const	$push10=, 0
+	i64.const	$push9=, 4611404543450677248
+	call    	__addtf3@FUNCTION, $pop63, $pop8, $pop7, $pop10, $pop9
+	i32.const	$push12=, 132
+	i32.add 	$push13=, $5, $pop12
+	i32.const	$push106=, 0
+	i32.load	$push11=, v3($pop106)
+	i32.store	0($pop13), $pop11
+	i32.const	$push14=, 128
+	i32.add 	$push15=, $5, $pop14
+	i32.const	$push105=, 8
+	i32.store	0($pop15), $pop105
+	i32.const	$push104=, 0
+	i32.const	$push64=, 96
+	i32.add 	$push65=, $5, $pop64
+	i32.const	$push103=, 8
+	i32.add 	$push16=, $pop65, $pop103
+	i64.load	$push102=, 0($pop16)
+	tee_local	$push101=, $2=, $pop102
+	i64.store	v5+8($pop104), $pop101
+	i32.const	$push100=, 0
+	i64.load	$push99=, 96($5)
+	tee_local	$push98=, $3=, $pop99
+	i64.store	v5($pop100), $pop98
+	i64.store	120($5), $2
+	i64.store	112($5), $3
+	i32.const	$push97=, 1
+	i32.const	$push66=, 112
+	i32.add 	$push67=, $5, $pop66
+	i32.call	$push17=, bar@FUNCTION, $pop97, $pop67
+	i32.const	$push96=, 1
+	i32.ne  	$push18=, $pop17, $pop96
+	br_if   	0, $pop18       # 0: down to label5
+# BB#2:                                 # %if.end6
+	i32.const	$push111=, 2
+	i32.const	$push110=, 0
+	i32.call	$push19=, bar@FUNCTION, $pop111, $pop110
+	i32.const	$push109=, 2
+	i32.ne  	$push20=, $pop19, $pop109
+	br_if   	0, $pop20       # 0: down to label5
+# BB#3:                                 # %if.end10
+	i32.const	$push114=, 0
+	i32.load	$push21=, v1($pop114)
+	i32.const	$push113=, 2
+	i32.add 	$push22=, $pop21, $pop113
+	i32.const	$push112=, 0
+	i32.call	$push23=, bar@FUNCTION, $pop22, $pop112
+	i32.const	$push24=, 19
+	i32.ne  	$push25=, $pop23, $pop24
+	br_if   	0, $pop25       # 0: down to label5
+# BB#4:                                 # %if.end14
+	i32.const	$push133=, 0
+	i64.load	$push132=, v5($pop133)
+	tee_local	$push131=, $2=, $pop132
+	i32.const	$push130=, 0
+	i64.load	$push129=, v5+8($pop130)
+	tee_local	$push128=, $3=, $pop129
+	i64.const	$push27=, 0
+	i64.const	$push26=, -4611967493404098560
+	call    	__addtf3@FUNCTION, $5, $pop131, $pop128, $pop27, $pop26
+	i32.const	$push68=, 80
+	i32.add 	$push69=, $5, $pop68
+	i32.const	$push28=, 8
+	i32.add 	$push29=, $pop69, $pop28
+	i32.const	$push127=, 0
+	i64.load	$push126=, v4+8($pop127):p2align=0
+	tee_local	$push125=, $4=, $pop126
+	i64.store	0($pop29), $pop125
+	i32.const	$push70=, 64
+	i32.add 	$push71=, $5, $pop70
+	i32.const	$push124=, 8
+	i32.add 	$push30=, $pop71, $pop124
+	i64.store	0($pop30), $4
+	i32.const	$push31=, 48
+	i32.add 	$push32=, $5, $pop31
+	i64.const	$push33=, 16
+	i64.store	0($pop32), $pop33
+	i32.const	$push35=, 40
+	i32.add 	$push36=, $5, $pop35
 	i32.const	$push123=, 0
-	i64.load	$push13=, v5+8($pop123)
-	i64.const	$push16=, 0
-	i64.const	$push15=, 4611404543450677248
-	call    	__addtf3@FUNCTION, $pop77, $pop14, $pop13, $pop16, $pop15
-	i32.const	$push18=, 132
-	i32.add 	$push19=, $4, $pop18
+	i32.load	$push34=, v3($pop123)
+	i32.store	0($pop36), $pop34
 	i32.const	$push122=, 0
-	i32.load	$push17=, v3($pop122)
-	i32.store	0($pop19), $pop17
-	i32.const	$push20=, 128
-	i32.add 	$push21=, $4, $pop20
 	i32.const	$push121=, 8
-	i32.store	0($pop21), $pop121
+	i32.add 	$push37=, $5, $pop121
+	i64.load	$push38=, 0($pop37)
+	i64.store	v5+8($pop122), $pop38
 	i32.const	$push120=, 0
-	i32.const	$push78=, 96
-	i32.add 	$push79=, $4, $pop78
-	i32.const	$push119=, 8
-	i32.add 	$push22=, $pop79, $pop119
-	i64.load	$push118=, 0($pop22)
-	tee_local	$push117=, $2=, $pop118
-	i64.store	v5+8($pop120), $pop117
+	i64.load	$push39=, 0($5)
+	i64.store	v5($pop120), $pop39
+	i32.const	$push119=, 0
+	i64.load	$push118=, v4($pop119):p2align=0
+	tee_local	$push117=, $4=, $pop118
+	i64.store	80($5), $pop117
+	i64.store	64($5), $4
+	i32.const	$push72=, 16
+	i32.add 	$push73=, $5, $pop72
+	i32.const	$push40=, 20
+	i32.add 	$push41=, $pop73, $pop40
+	i32.const	$push74=, 64
+	i32.add 	$push75=, $5, $pop74
+	i32.store	0($pop41), $pop75
+	i32.const	$push42=, 32
+	i32.add 	$push43=, $5, $pop42
+	i32.const	$push76=, 80
+	i32.add 	$push77=, $5, $pop76
+	i32.store	0($pop43), $pop77
+	i64.store	24($5), $3
+	i64.store	16($5), $2
 	i32.const	$push116=, 0
-	i64.load	$push115=, 96($4)
-	tee_local	$push114=, $3=, $pop115
-	i64.store	v5($pop116), $pop114
-	i64.store	120($4), $2
-	i64.store	112($4), $3
-	i32.const	$push113=, 1
-	i32.const	$push80=, 112
-	i32.add 	$push81=, $4, $pop80
-	i32.call	$push23=, bar@FUNCTION, $pop113, $pop81
-	i32.const	$push112=, 1
-	i32.ne  	$push24=, $pop23, $pop112
-	br_if   	0, $pop24       # 0: down to label6
-# BB#2:                                 # %if.end6
-	i32.const	$push127=, 2
-	i32.const	$push126=, 0
-	i32.call	$push25=, bar@FUNCTION, $pop127, $pop126
-	i32.const	$push125=, 2
-	i32.ne  	$push26=, $pop25, $pop125
-	br_if   	0, $pop26       # 0: down to label6
-# BB#3:                                 # %if.end10
-	i32.const	$push130=, 0
-	i32.load	$push27=, v1($pop130)
-	i32.const	$push129=, 2
-	i32.add 	$push28=, $pop27, $pop129
-	i32.const	$push128=, 0
-	i32.call	$push29=, bar@FUNCTION, $pop28, $pop128
-	i32.const	$push30=, 19
-	i32.ne  	$push31=, $pop29, $pop30
-	br_if   	0, $pop31       # 0: down to label6
-# BB#4:                                 # %if.end14
-	i32.const	$push149=, 0
-	i64.load	$push148=, v5($pop149)
-	tee_local	$push147=, $2=, $pop148
-	i32.const	$push146=, 0
-	i64.load	$push145=, v5+8($pop146)
-	tee_local	$push144=, $3=, $pop145
-	i64.const	$push33=, 0
-	i64.const	$push32=, -4611967493404098560
-	call    	__addtf3@FUNCTION, $4, $pop147, $pop144, $pop33, $pop32
-	i32.const	$push35=, 92
-	i32.add 	$push36=, $4, $pop35
-	i32.const	$push143=, 0
-	i32.load	$push34=, v4+12($pop143):p2align=0
-	i32.store	0($pop36), $pop34
-	i32.const	$push82=, 80
-	i32.add 	$push83=, $4, $pop82
-	i32.const	$push38=, 8
-	i32.add 	$push39=, $pop83, $pop38
-	i32.const	$push142=, 0
-	i32.load	$push37=, v4+8($pop142):p2align=0
-	i32.store	0($pop39), $pop37
-	i32.const	$push41=, 84
-	i32.add 	$push42=, $4, $pop41
-	i32.const	$push141=, 0
-	i32.load	$push40=, v4+4($pop141):p2align=0
-	i32.store	0($pop42), $pop40
-	i32.const	$push140=, 0
-	i32.const	$push139=, 8
-	i32.add 	$push43=, $4, $pop139
-	i64.load	$push44=, 0($pop43)
-	i64.store	v5+8($pop140), $pop44
-	i32.const	$push138=, 0
-	i64.load	$push45=, 0($4)
-	i64.store	v5($pop138), $pop45
-	i32.const	$push137=, 0
-	i32.load	$push46=, v4($pop137):p2align=0
-	i32.store	80($4), $pop46
-	i32.const	$push136=, 0
-	i32.load	$0=, v1($pop136)
-	i32.const	$push135=, 0
-	i32.load	$1=, v3($pop135)
-	i32.const	$push84=, 64
-	i32.add 	$push85=, $4, $pop84
-	i32.const	$push134=, 8
-	i32.add 	$push47=, $pop85, $pop134
-	i32.const	$push133=, 0
-	i64.load	$push48=, v4+8($pop133):p2align=0
-	i64.store	0($pop47):p2align=2, $pop48
-	i32.const	$push132=, 0
-	i64.load	$push49=, v4($pop132):p2align=0
-	i64.store	64($4):p2align=2, $pop49
-	i32.const	$push50=, 48
-	i32.add 	$push51=, $4, $pop50
-	i64.const	$push52=, 16
-	i64.store	0($pop51), $pop52
-	i32.const	$push53=, 40
-	i32.add 	$push54=, $4, $pop53
-	i32.store	0($pop54), $1
-	i64.store	16($4), $2
-	i32.const	$push86=, 16
-	i32.add 	$push87=, $4, $pop86
-	i32.const	$push55=, 20
-	i32.add 	$push56=, $pop87, $pop55
-	i32.const	$push88=, 64
-	i32.add 	$push89=, $4, $pop88
-	i32.store	0($pop56), $pop89
-	i32.const	$push57=, 32
-	i32.add 	$push58=, $4, $pop57
-	i32.const	$push90=, 80
-	i32.add 	$push91=, $4, $pop90
-	i32.store	0($pop58), $pop91
-	i64.store	24($4), $3
-	i32.const	$push59=, 3
-	i32.add 	$push60=, $0, $pop59
-	i32.const	$push92=, 16
-	i32.add 	$push93=, $4, $pop92
-	i32.call	$push61=, bar@FUNCTION, $pop60, $pop93
-	i32.const	$push131=, 20
-	i32.ne  	$push62=, $pop61, $pop131
-	br_if   	0, $pop62       # 0: down to label6
+	i32.load	$push44=, v1($pop116)
+	i32.const	$push45=, 3
+	i32.add 	$push46=, $pop44, $pop45
+	i32.const	$push78=, 16
+	i32.add 	$push79=, $5, $pop78
+	i32.call	$push47=, bar@FUNCTION, $pop46, $pop79
+	i32.const	$push115=, 20
+	i32.ne  	$push48=, $pop47, $pop115
+	br_if   	0, $pop48       # 0: down to label5
 # BB#5:                                 # %if.end19
-	i32.const	$push69=, 0
-	i32.const	$push67=, 176
-	i32.add 	$push68=, $4, $pop67
-	i32.store	__stack_pointer($pop69), $pop68
-	i32.const	$push150=, 0
-	return  	$pop150
-.LBB3_6:                                # %if.then18
-	end_block                       # label6:
+	i32.const	$push55=, 0
+	i32.const	$push53=, 176
+	i32.add 	$push54=, $5, $pop53
+	i32.store	__stack_pointer($pop55), $pop54
+	i32.const	$push134=, 0
+	return  	$pop134
+.LBB3_6:                                # %if.then
+	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end3:
 	.size	main, .Lfunc_end3-main
-
+                                        # -- End function
 	.hidden	v1                      # @v1
 	.type	v1,@object
 	.section	.data.v1,"aw",@progbits
@@ -676,7 +614,7 @@ cnt:
 	.size	cnt, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	memcmp, i32, i32, i32, i32
 	.functype	bar, i32, i32
diff --git a/test/torture-s/va-arg-trap-1.c.s b/test/torture-s/va-arg-trap-1.c.s
index 6668f29e4..81e9d7d88 100644
--- a/test/torture-s/va-arg-trap-1.c.s
+++ b/test/torture-s/va-arg-trap-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/va-arg-trap-1.c"
+	.file	"va-arg-trap-1.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -13,9 +13,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.bar,"ax",@progbits
-	.hidden	bar
+	.hidden	bar                     # -- Begin function bar
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
@@ -28,9 +28,9 @@ bar:                                    # @bar
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -38,10 +38,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push4=, 0
-	i32.const	$push1=, 0
-	i32.load	$push2=, __stack_pointer($pop1)
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop2, $pop3
+	i32.sub 	$push6=, $pop1, $pop3
 	tee_local	$push5=, $0=, $pop6
 	i32.store	__stack_pointer($pop4), $pop5
 	i32.const	$push0=, 0
@@ -51,7 +51,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	ap                      # @ap
 	.type	ap,@object
 	.section	.bss.ap,"aw",@nobits
@@ -71,5 +71,5 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vfprintf-1.c.s b/test/torture-s/vfprintf-1.c.s
index f92d47b7b..f55d5db4d 100644
--- a/test/torture-s/vfprintf-1.c.s
+++ b/test/torture-s/vfprintf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-1.c"
+	.file	"vfprintf-1.c"
 	.section	.text.inner,"ax",@progbits
-	.hidden	inner
+	.hidden	inner                   # -- Begin function inner
 	.globl	inner
 	.type	inner,@function
 inner:                                  # @inner
@@ -9,21 +9,18 @@ inner:                                  # @inner
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push78=, 0
-	i32.const	$push75=, 0
-	i32.load	$push76=, __stack_pointer($pop75)
+	i32.const	$push76=, 0
+	i32.load	$push75=, __stack_pointer($pop76)
 	i32.const	$push77=, 16
-	i32.sub 	$push83=, $pop76, $pop77
+	i32.sub 	$push83=, $pop75, $pop77
 	tee_local	$push82=, $2=, $pop83
 	i32.store	__stack_pointer($pop78), $pop82
-	i32.store	12($2), $1
 	i32.store	8($2), $1
-	block   	
-	block   	
-	block   	
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label3
+	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %entry
 	block   	
 	block   	
@@ -35,217 +32,198 @@ inner:                                  # @inner
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 0, 1, 2, 3, 4, 5, 6, 7, 11, 8, 9, 0 # 0: down to label13
-                                        # 1: down to label12
-                                        # 2: down to label11
-                                        # 3: down to label10
-                                        # 4: down to label9
-                                        # 5: down to label8
-                                        # 6: down to label7
-                                        # 7: down to label6
-                                        # 11: down to label2
-                                        # 8: down to label5
-                                        # 9: down to label4
+	block   	
+	block   	
+	br_table 	$0, 0, 3, 4, 5, 1, 7, 8, 6, 9, 2, 10, 0 # 0: down to label12
+                                        # 3: down to label9
+                                        # 4: down to label8
+                                        # 5: down to label7
+                                        # 1: down to label11
+                                        # 7: down to label5
+                                        # 8: down to label4
+                                        # 6: down to label6
+                                        # 9: down to label3
+                                        # 2: down to label10
+                                        # 10: down to label2
 .LBB0_2:                                # %sw.bb
-	end_block                       # label13:
+	end_block                       # label12:
 	i32.const	$push68=, 0
 	i32.load	$push86=, stdout($pop68)
-	tee_local	$push85=, $1=, $pop86
+	tee_local	$push85=, $0=, $pop86
 	i32.const	$push70=, .L.str
 	i32.load	$push69=, 12($2)
 	i32.call	$drop=, vfprintf@FUNCTION, $pop85, $pop70, $pop69
 	i32.const	$push84=, .L.str
 	i32.load	$push71=, 8($2)
-	i32.call	$push72=, vfprintf@FUNCTION, $1, $pop84, $pop71
+	i32.call	$push72=, vfprintf@FUNCTION, $0, $pop84, $pop71
 	i32.const	$push73=, 5
 	i32.eq  	$push74=, $pop72, $pop73
-	br_if   	11, $pop74      # 11: down to label1
-# BB#3:                                 # %if.then
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_4:                                # %sw.bb4
-	end_block                       # label12:
+	br_if   	10, $pop74      # 10: down to label1
+	br      	11              # 11: down to label0
+.LBB0_3:                                # %sw.bb22
+	end_block                       # label11:
+	i32.const	$push42=, 0
+	i32.load	$push89=, stdout($pop42)
+	tee_local	$push88=, $0=, $pop89
+	i32.const	$push44=, .L.str.4
+	i32.load	$push43=, 12($2)
+	i32.call	$drop=, vfprintf@FUNCTION, $pop88, $pop44, $pop43
+	i32.const	$push87=, .L.str.4
+	i32.load	$push45=, 8($2)
+	i32.call	$push46=, vfprintf@FUNCTION, $0, $pop87, $pop45
+	i32.const	$push47=, 5
+	i32.eq  	$push48=, $pop46, $pop47
+	br_if   	9, $pop48       # 9: down to label1
+	br      	10              # 10: down to label0
+.LBB0_4:                                # %sw.bb52
+	end_block                       # label10:
+	i32.const	$push9=, 0
+	i32.load	$push92=, stdout($pop9)
+	tee_local	$push91=, $0=, $pop92
+	i32.const	$push11=, .L.str.6
+	i32.load	$push10=, 12($2)
+	i32.call	$drop=, vfprintf@FUNCTION, $pop91, $pop11, $pop10
+	i32.const	$push90=, .L.str.6
+	i32.load	$push12=, 8($2)
+	i32.call	$push13=, vfprintf@FUNCTION, $0, $pop90, $pop12
+	i32.const	$push14=, 7
+	i32.ne  	$push15=, $pop13, $pop14
+	br_if   	9, $pop15       # 9: down to label0
+	br      	8               # 8: down to label1
+.LBB0_5:                                # %sw.bb4
+	end_block                       # label9:
 	i32.const	$push61=, 0
-	i32.load	$push89=, stdout($pop61)
-	tee_local	$push88=, $1=, $pop89
+	i32.load	$push95=, stdout($pop61)
+	tee_local	$push94=, $0=, $pop95
 	i32.const	$push63=, .L.str.1
 	i32.load	$push62=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop88, $pop63, $pop62
-	i32.const	$push87=, .L.str.1
+	i32.call	$drop=, vfprintf@FUNCTION, $pop94, $pop63, $pop62
+	i32.const	$push93=, .L.str.1
 	i32.load	$push64=, 8($2)
-	i32.call	$push65=, vfprintf@FUNCTION, $1, $pop87, $pop64
+	i32.call	$push65=, vfprintf@FUNCTION, $0, $pop93, $pop64
 	i32.const	$push66=, 6
 	i32.eq  	$push67=, $pop65, $pop66
-	br_if   	10, $pop67      # 10: down to label1
-# BB#5:                                 # %if.then8
-	call    	abort@FUNCTION
-	unreachable
+	br_if   	7, $pop67       # 7: down to label1
+	br      	8               # 8: down to label0
 .LBB0_6:                                # %sw.bb10
-	end_block                       # label11:
+	end_block                       # label8:
 	i32.const	$push54=, 0
-	i32.load	$push92=, stdout($pop54)
-	tee_local	$push91=, $1=, $pop92
+	i32.load	$push98=, stdout($pop54)
+	tee_local	$push97=, $0=, $pop98
 	i32.const	$push56=, .L.str.2
 	i32.load	$push55=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop91, $pop56, $pop55
-	i32.const	$push90=, .L.str.2
+	i32.call	$drop=, vfprintf@FUNCTION, $pop97, $pop56, $pop55
+	i32.const	$push96=, .L.str.2
 	i32.load	$push57=, 8($2)
-	i32.call	$push58=, vfprintf@FUNCTION, $1, $pop90, $pop57
+	i32.call	$push58=, vfprintf@FUNCTION, $0, $pop96, $pop57
 	i32.const	$push59=, 1
 	i32.eq  	$push60=, $pop58, $pop59
-	br_if   	9, $pop60       # 9: down to label1
-# BB#7:                                 # %if.then14
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_8:                                # %sw.bb16
-	end_block                       # label10:
+	br_if   	6, $pop60       # 6: down to label1
+	br      	7               # 7: down to label0
+.LBB0_7:                                # %sw.bb16
+	end_block                       # label7:
 	i32.const	$push49=, 0
-	i32.load	$push95=, stdout($pop49)
-	tee_local	$push94=, $1=, $pop95
+	i32.load	$push101=, stdout($pop49)
+	tee_local	$push100=, $0=, $pop101
 	i32.const	$push51=, .L.str.3
 	i32.load	$push50=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop94, $pop51, $pop50
-	i32.const	$push93=, .L.str.3
+	i32.call	$drop=, vfprintf@FUNCTION, $pop100, $pop51, $pop50
+	i32.const	$push99=, .L.str.3
 	i32.load	$push52=, 8($2)
-	i32.call	$push53=, vfprintf@FUNCTION, $1, $pop93, $pop52
+	i32.call	$push53=, vfprintf@FUNCTION, $0, $pop99, $pop52
 	i32.eqz 	$push117=, $pop53
-	br_if   	8, $pop117      # 8: down to label1
-# BB#9:                                 # %if.then20
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_10:                               # %sw.bb22
-	end_block                       # label9:
-	i32.const	$push42=, 0
-	i32.load	$push98=, stdout($pop42)
-	tee_local	$push97=, $1=, $pop98
-	i32.const	$push44=, .L.str.4
-	i32.load	$push43=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop97, $pop44, $pop43
-	i32.const	$push96=, .L.str.4
-	i32.load	$push45=, 8($2)
-	i32.call	$push46=, vfprintf@FUNCTION, $1, $pop96, $pop45
-	i32.const	$push47=, 5
-	i32.eq  	$push48=, $pop46, $pop47
-	br_if   	7, $pop48       # 7: down to label1
-# BB#11:                                # %if.then26
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_12:                               # %sw.bb28
-	end_block                       # label8:
+	br_if   	5, $pop117      # 5: down to label1
+	br      	6               # 6: down to label0
+.LBB0_8:                                # %sw.bb40
+	end_block                       # label6:
+	i32.const	$push23=, 0
+	i32.load	$push104=, stdout($pop23)
+	tee_local	$push103=, $0=, $pop104
+	i32.const	$push25=, .L.str.4
+	i32.load	$push24=, 12($2)
+	i32.call	$drop=, vfprintf@FUNCTION, $pop103, $pop25, $pop24
+	i32.const	$push102=, .L.str.4
+	i32.load	$push26=, 8($2)
+	i32.call	$push27=, vfprintf@FUNCTION, $0, $pop102, $pop26
+	i32.eqz 	$push118=, $pop27
+	br_if   	4, $pop118      # 4: down to label1
+	br      	5               # 5: down to label0
+.LBB0_9:                                # %sw.bb28
+	end_block                       # label5:
 	i32.const	$push35=, 0
-	i32.load	$push101=, stdout($pop35)
-	tee_local	$push100=, $1=, $pop101
+	i32.load	$push107=, stdout($pop35)
+	tee_local	$push106=, $0=, $pop107
 	i32.const	$push37=, .L.str.4
 	i32.load	$push36=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop100, $pop37, $pop36
-	i32.const	$push99=, .L.str.4
+	i32.call	$drop=, vfprintf@FUNCTION, $pop106, $pop37, $pop36
+	i32.const	$push105=, .L.str.4
 	i32.load	$push38=, 8($2)
-	i32.call	$push39=, vfprintf@FUNCTION, $1, $pop99, $pop38
+	i32.call	$push39=, vfprintf@FUNCTION, $0, $pop105, $pop38
 	i32.const	$push40=, 6
 	i32.eq  	$push41=, $pop39, $pop40
-	br_if   	6, $pop41       # 6: down to label1
-# BB#13:                                # %if.then32
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_14:                               # %sw.bb34
-	end_block                       # label7:
+	br_if   	3, $pop41       # 3: down to label1
+	br      	4               # 4: down to label0
+.LBB0_10:                               # %sw.bb34
+	end_block                       # label4:
 	i32.const	$push28=, 0
-	i32.load	$push104=, stdout($pop28)
-	tee_local	$push103=, $1=, $pop104
+	i32.load	$push110=, stdout($pop28)
+	tee_local	$push109=, $0=, $pop110
 	i32.const	$push30=, .L.str.4
 	i32.load	$push29=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop103, $pop30, $pop29
-	i32.const	$push102=, .L.str.4
+	i32.call	$drop=, vfprintf@FUNCTION, $pop109, $pop30, $pop29
+	i32.const	$push108=, .L.str.4
 	i32.load	$push31=, 8($2)
-	i32.call	$push32=, vfprintf@FUNCTION, $1, $pop102, $pop31
+	i32.call	$push32=, vfprintf@FUNCTION, $0, $pop108, $pop31
 	i32.const	$push33=, 1
 	i32.eq  	$push34=, $pop32, $pop33
-	br_if   	5, $pop34       # 5: down to label1
-# BB#15:                                # %if.then38
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_16:                               # %sw.bb40
-	end_block                       # label6:
-	i32.const	$push23=, 0
-	i32.load	$push107=, stdout($pop23)
-	tee_local	$push106=, $1=, $pop107
-	i32.const	$push25=, .L.str.4
-	i32.load	$push24=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop106, $pop25, $pop24
-	i32.const	$push105=, .L.str.4
-	i32.load	$push26=, 8($2)
-	i32.call	$push27=, vfprintf@FUNCTION, $1, $pop105, $pop26
-	i32.eqz 	$push118=, $pop27
-	br_if   	4, $pop118      # 4: down to label1
-# BB#17:                                # %if.then44
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_18:                               # %sw.bb52
-	end_block                       # label5:
-	i32.const	$push9=, 0
-	i32.load	$push110=, stdout($pop9)
-	tee_local	$push109=, $1=, $pop110
-	i32.const	$push11=, .L.str.6
-	i32.load	$push10=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop109, $pop11, $pop10
-	i32.const	$push108=, .L.str.6
-	i32.load	$push12=, 8($2)
-	i32.call	$push13=, vfprintf@FUNCTION, $1, $pop108, $pop12
-	i32.const	$push14=, 7
-	i32.eq  	$push15=, $pop13, $pop14
-	br_if   	3, $pop15       # 3: down to label1
-# BB#19:                                # %if.then56
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_20:                               # %sw.bb58
-	end_block                       # label4:
-	i32.const	$push2=, 0
-	i32.load	$push113=, stdout($pop2)
-	tee_local	$push112=, $1=, $pop113
-	i32.const	$push4=, .L.str.7
-	i32.load	$push3=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop112, $pop4, $pop3
-	i32.const	$push111=, .L.str.7
-	i32.load	$push5=, 8($2)
-	i32.call	$push6=, vfprintf@FUNCTION, $1, $pop111, $pop5
-	i32.const	$push7=, 2
-	i32.eq  	$push8=, $pop6, $pop7
-	br_if   	2, $pop8        # 2: down to label1
-.LBB0_21:                               # %sw.default
+	br_if   	2, $pop34       # 2: down to label1
+	br      	3               # 3: down to label0
+.LBB0_11:                               # %sw.bb46
 	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_22:                               # %sw.bb46
-	end_block                       # label2:
 	i32.const	$push16=, 0
-	i32.load	$push116=, stdout($pop16)
-	tee_local	$push115=, $1=, $pop116
+	i32.load	$push113=, stdout($pop16)
+	tee_local	$push112=, $0=, $pop113
 	i32.const	$push18=, .L.str.5
 	i32.load	$push17=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop115, $pop18, $pop17
-	i32.const	$push114=, .L.str.5
+	i32.call	$drop=, vfprintf@FUNCTION, $pop112, $pop18, $pop17
+	i32.const	$push111=, .L.str.5
 	i32.load	$push19=, 8($2)
-	i32.call	$push20=, vfprintf@FUNCTION, $1, $pop114, $pop19
+	i32.call	$push20=, vfprintf@FUNCTION, $0, $pop111, $pop19
 	i32.const	$push21=, 1
-	i32.ne  	$push22=, $pop20, $pop21
-	br_if   	1, $pop22       # 1: down to label0
-.LBB0_23:                               # %sw.epilog
+	i32.eq  	$push22=, $pop20, $pop21
+	br_if   	1, $pop22       # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_12:                               # %sw.bb58
+	end_block                       # label2:
+	i32.const	$push2=, 0
+	i32.load	$push116=, stdout($pop2)
+	tee_local	$push115=, $0=, $pop116
+	i32.const	$push4=, .L.str.7
+	i32.load	$push3=, 12($2)
+	i32.call	$drop=, vfprintf@FUNCTION, $pop115, $pop4, $pop3
+	i32.const	$push114=, .L.str.7
+	i32.load	$push5=, 8($2)
+	i32.call	$push6=, vfprintf@FUNCTION, $0, $pop114, $pop5
+	i32.const	$push7=, 2
+	i32.ne  	$push8=, $pop6, $pop7
+	br_if   	1, $pop8        # 1: down to label0
+.LBB0_13:                               # %sw.epilog
 	end_block                       # label1:
 	i32.const	$push81=, 0
 	i32.const	$push79=, 16
 	i32.add 	$push80=, $2, $pop79
 	i32.store	__stack_pointer($pop81), $pop80
 	return
-.LBB0_24:                               # %if.then50
+.LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	inner, .Lfunc_end0-inner
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -253,10 +231,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop17, $pop18
+	i32.sub 	$push43=, $pop16, $pop18
 	tee_local	$push42=, $0=, $pop43
 	i32.store	__stack_pointer($pop19), $pop42
 	i32.const	$push0=, 0
@@ -320,7 +298,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -363,7 +341,8 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	vfprintf, i32, i32, i32, i32
 	.functype	abort, void
 	.import_global	stdout
+	.size	stdout, 4
diff --git a/test/torture-s/vfprintf-chk-1.c.s b/test/torture-s/vfprintf-chk-1.c.s
index 6f3e671a2..0ce1aac74 100644
--- a/test/torture-s/vfprintf-chk-1.c.s
+++ b/test/torture-s/vfprintf-chk-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-chk-1.c"
+	.file	"vfprintf-chk-1.c"
 	.section	.text.__vfprintf_chk,"ax",@progbits
-	.hidden	__vfprintf_chk
+	.hidden	__vfprintf_chk          # -- Begin function __vfprintf_chk
 	.globl	__vfprintf_chk
 	.type	__vfprintf_chk,@function
 __vfprintf_chk:                         # @__vfprintf_chk
@@ -25,9 +25,9 @@ __vfprintf_chk:                         # @__vfprintf_chk
 	.endfunc
 .Lfunc_end0:
 	.size	__vfprintf_chk, .Lfunc_end0-__vfprintf_chk
-
+                                        # -- End function
 	.section	.text.inner,"ax",@progbits
-	.hidden	inner
+	.hidden	inner                   # -- Begin function inner
 	.globl	inner
 	.type	inner,@function
 inner:                                  # @inner
@@ -35,14 +35,14 @@ inner:                                  # @inner
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push91=, 0
-	i32.const	$push88=, 0
-	i32.load	$push89=, __stack_pointer($pop88)
+	i32.const	$push89=, 0
+	i32.load	$push88=, __stack_pointer($pop89)
 	i32.const	$push90=, 16
-	i32.sub 	$push96=, $pop89, $pop90
+	i32.sub 	$push96=, $pop88, $pop90
 	tee_local	$push95=, $2=, $pop96
 	i32.store	__stack_pointer($pop91), $pop95
-	i32.store	12($2), $1
 	i32.store	8($2), $1
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
@@ -60,16 +60,16 @@ inner:                                  # @inner
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0 # 0: down to label13
+	br_table 	$0, 0, 1, 2, 3, 4, 5, 8, 6, 9, 7, 10, 0 # 0: down to label13
                                         # 1: down to label12
                                         # 2: down to label11
                                         # 3: down to label10
                                         # 4: down to label9
                                         # 5: down to label8
-                                        # 6: down to label7
-                                        # 7: down to label6
                                         # 8: down to label5
+                                        # 6: down to label7
                                         # 9: down to label4
+                                        # 7: down to label6
                                         # 10: down to label3
 .LBB1_2:                                # %sw.bb
 	end_block                       # label13:
@@ -78,7 +78,7 @@ inner:                                  # @inner
 	i32.store	should_optimize($pop102), $pop79
 	i32.const	$push101=, 0
 	i32.load	$push100=, stdout($pop101)
-	tee_local	$push99=, $1=, $pop100
+	tee_local	$push99=, $0=, $pop100
 	i32.const	$push98=, .L.str
 	i32.load	$push80=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop99, $2, $pop98, $pop80
@@ -92,7 +92,7 @@ inner:                                  # @inner
 	i32.store	should_optimize($pop105), $pop104
 	i32.const	$push103=, .L.str
 	i32.load	$push82=, 8($2)
-	i32.call	$push83=, __vfprintf_chk@FUNCTION, $1, $2, $pop103, $pop82
+	i32.call	$push83=, __vfprintf_chk@FUNCTION, $0, $2, $pop103, $pop82
 	i32.const	$push84=, 5
 	i32.ne  	$push85=, $pop83, $pop84
 	br_if   	11, $pop85      # 11: down to label1
@@ -100,17 +100,15 @@ inner:                                  # @inner
 	i32.const	$push86=, 0
 	i32.load	$push87=, should_optimize($pop86)
 	br_if   	10, $pop87      # 10: down to label2
-# BB#5:                                 # %if.then7
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_6:                                # %sw.bb9
+	br      	11              # 11: down to label1
+.LBB1_5:                                # %sw.bb9
 	end_block                       # label12:
 	i32.const	$push111=, 0
 	i32.const	$push70=, 1
 	i32.store	should_optimize($pop111), $pop70
 	i32.const	$push110=, 0
 	i32.load	$push109=, stdout($pop110)
-	tee_local	$push108=, $1=, $pop109
+	tee_local	$push108=, $0=, $pop109
 	i32.const	$push107=, .L.str.1
 	i32.load	$push71=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop108, $2, $pop107, $pop71
@@ -118,31 +116,29 @@ inner:                                  # @inner
 	i32.load	$push72=, should_optimize($pop106)
 	i32.eqz 	$push206=, $pop72
 	br_if   	10, $pop206     # 10: down to label1
-# BB#7:                                 # %if.end13
+# BB#6:                                 # %if.end13
 	i32.const	$push114=, 0
 	i32.const	$push113=, 0
 	i32.store	should_optimize($pop114), $pop113
 	i32.const	$push112=, .L.str.1
 	i32.load	$push73=, 8($2)
-	i32.call	$push74=, __vfprintf_chk@FUNCTION, $1, $2, $pop112, $pop73
+	i32.call	$push74=, __vfprintf_chk@FUNCTION, $0, $2, $pop112, $pop73
 	i32.const	$push75=, 6
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	10, $pop76      # 10: down to label1
-# BB#8:                                 # %if.end17
+# BB#7:                                 # %if.end17
 	i32.const	$push77=, 0
 	i32.load	$push78=, should_optimize($pop77)
 	br_if   	9, $pop78       # 9: down to label2
-# BB#9:                                 # %if.then19
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_10:                               # %sw.bb21
+	br      	10              # 10: down to label1
+.LBB1_8:                                # %sw.bb21
 	end_block                       # label11:
 	i32.const	$push121=, 0
 	i32.const	$push120=, 1
 	i32.store	should_optimize($pop121), $pop120
 	i32.const	$push119=, 0
 	i32.load	$push118=, stdout($pop119)
-	tee_local	$push117=, $1=, $pop118
+	tee_local	$push117=, $0=, $pop118
 	i32.const	$push116=, .L.str.2
 	i32.load	$push63=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop117, $2, $pop116, $pop63
@@ -150,31 +146,29 @@ inner:                                  # @inner
 	i32.load	$push64=, should_optimize($pop115)
 	i32.eqz 	$push207=, $pop64
 	br_if   	9, $pop207      # 9: down to label1
-# BB#11:                                # %if.end25
+# BB#9:                                 # %if.end25
 	i32.const	$push125=, 0
 	i32.const	$push124=, 0
 	i32.store	should_optimize($pop125), $pop124
 	i32.const	$push123=, .L.str.2
 	i32.load	$push65=, 8($2)
-	i32.call	$push66=, __vfprintf_chk@FUNCTION, $1, $2, $pop123, $pop65
+	i32.call	$push66=, __vfprintf_chk@FUNCTION, $0, $2, $pop123, $pop65
 	i32.const	$push122=, 1
 	i32.ne  	$push67=, $pop66, $pop122
 	br_if   	9, $pop67       # 9: down to label1
-# BB#12:                                # %if.end29
+# BB#10:                                # %if.end29
 	i32.const	$push68=, 0
 	i32.load	$push69=, should_optimize($pop68)
 	br_if   	8, $pop69       # 8: down to label2
-# BB#13:                                # %if.then31
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_14:                               # %sw.bb33
+	br      	9               # 9: down to label1
+.LBB1_11:                               # %sw.bb33
 	end_block                       # label10:
 	i32.const	$push131=, 0
 	i32.const	$push56=, 1
 	i32.store	should_optimize($pop131), $pop56
 	i32.const	$push130=, 0
 	i32.load	$push129=, stdout($pop130)
-	tee_local	$push128=, $1=, $pop129
+	tee_local	$push128=, $0=, $pop129
 	i32.const	$push127=, .L.str.3
 	i32.load	$push57=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop128, $2, $pop127, $pop57
@@ -182,29 +176,27 @@ inner:                                  # @inner
 	i32.load	$push58=, should_optimize($pop126)
 	i32.eqz 	$push208=, $pop58
 	br_if   	8, $pop208      # 8: down to label1
-# BB#15:                                # %if.end37
+# BB#12:                                # %if.end37
 	i32.const	$push134=, 0
 	i32.const	$push133=, 0
 	i32.store	should_optimize($pop134), $pop133
 	i32.const	$push132=, .L.str.3
 	i32.load	$push59=, 8($2)
-	i32.call	$push60=, __vfprintf_chk@FUNCTION, $1, $2, $pop132, $pop59
+	i32.call	$push60=, __vfprintf_chk@FUNCTION, $0, $2, $pop132, $pop59
 	br_if   	8, $pop60       # 8: down to label1
-# BB#16:                                # %if.end41
+# BB#13:                                # %if.end41
 	i32.const	$push61=, 0
 	i32.load	$push62=, should_optimize($pop61)
 	br_if   	7, $pop62       # 7: down to label2
-# BB#17:                                # %if.then43
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_18:                               # %sw.bb45
+	br      	8               # 8: down to label1
+.LBB1_14:                               # %sw.bb45
 	end_block                       # label9:
 	i32.const	$push141=, 0
 	i32.const	$push140=, 0
 	i32.store	should_optimize($pop141), $pop140
 	i32.const	$push139=, 0
 	i32.load	$push138=, stdout($pop139)
-	tee_local	$push137=, $1=, $pop138
+	tee_local	$push137=, $0=, $pop138
 	i32.const	$push136=, .L.str.4
 	i32.load	$push48=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop137, $2, $pop136, $pop48
@@ -212,31 +204,29 @@ inner:                                  # @inner
 	i32.load	$push49=, should_optimize($pop135)
 	i32.eqz 	$push209=, $pop49
 	br_if   	7, $pop209      # 7: down to label1
-# BB#19:                                # %if.end49
+# BB#15:                                # %if.end49
 	i32.const	$push144=, 0
 	i32.const	$push143=, 0
 	i32.store	should_optimize($pop144), $pop143
 	i32.const	$push142=, .L.str.4
 	i32.load	$push50=, 8($2)
-	i32.call	$push51=, __vfprintf_chk@FUNCTION, $1, $2, $pop142, $pop50
+	i32.call	$push51=, __vfprintf_chk@FUNCTION, $0, $2, $pop142, $pop50
 	i32.const	$push52=, 5
 	i32.ne  	$push53=, $pop51, $pop52
 	br_if   	7, $pop53       # 7: down to label1
-# BB#20:                                # %if.end53
+# BB#16:                                # %if.end53
 	i32.const	$push54=, 0
 	i32.load	$push55=, should_optimize($pop54)
 	br_if   	6, $pop55       # 6: down to label2
-# BB#21:                                # %if.then55
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_22:                               # %sw.bb57
+	br      	7               # 7: down to label1
+.LBB1_17:                               # %sw.bb57
 	end_block                       # label8:
 	i32.const	$push151=, 0
 	i32.const	$push150=, 0
 	i32.store	should_optimize($pop151), $pop150
 	i32.const	$push149=, 0
 	i32.load	$push148=, stdout($pop149)
-	tee_local	$push147=, $1=, $pop148
+	tee_local	$push147=, $0=, $pop148
 	i32.const	$push146=, .L.str.4
 	i32.load	$push40=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop147, $2, $pop146, $pop40
@@ -244,157 +234,147 @@ inner:                                  # @inner
 	i32.load	$push41=, should_optimize($pop145)
 	i32.eqz 	$push210=, $pop41
 	br_if   	6, $pop210      # 6: down to label1
-# BB#23:                                # %if.end61
+# BB#18:                                # %if.end61
 	i32.const	$push154=, 0
 	i32.const	$push153=, 0
 	i32.store	should_optimize($pop154), $pop153
 	i32.const	$push152=, .L.str.4
 	i32.load	$push42=, 8($2)
-	i32.call	$push43=, __vfprintf_chk@FUNCTION, $1, $2, $pop152, $pop42
+	i32.call	$push43=, __vfprintf_chk@FUNCTION, $0, $2, $pop152, $pop42
 	i32.const	$push44=, 6
 	i32.ne  	$push45=, $pop43, $pop44
 	br_if   	6, $pop45       # 6: down to label1
-# BB#24:                                # %if.end65
+# BB#19:                                # %if.end65
 	i32.const	$push46=, 0
 	i32.load	$push47=, should_optimize($pop46)
 	br_if   	5, $pop47       # 5: down to label2
-# BB#25:                                # %if.then67
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_26:                               # %sw.bb69
+	br      	6               # 6: down to label1
+.LBB1_20:                               # %sw.bb81
 	end_block                       # label7:
 	i32.const	$push161=, 0
 	i32.const	$push160=, 0
 	i32.store	should_optimize($pop161), $pop160
 	i32.const	$push159=, 0
 	i32.load	$push158=, stdout($pop159)
-	tee_local	$push157=, $1=, $pop158
+	tee_local	$push157=, $0=, $pop158
 	i32.const	$push156=, .L.str.4
-	i32.load	$push32=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop157, $2, $pop156, $pop32
+	i32.load	$push26=, 12($2)
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop157, $2, $pop156, $pop26
 	i32.const	$push155=, 0
-	i32.load	$push33=, should_optimize($pop155)
-	i32.eqz 	$push211=, $pop33
+	i32.load	$push27=, should_optimize($pop155)
+	i32.eqz 	$push211=, $pop27
 	br_if   	5, $pop211      # 5: down to label1
-# BB#27:                                # %if.end73
+# BB#21:                                # %if.end85
 	i32.const	$push164=, 0
 	i32.const	$push163=, 0
 	i32.store	should_optimize($pop164), $pop163
 	i32.const	$push162=, .L.str.4
-	i32.load	$push34=, 8($2)
-	i32.call	$push35=, __vfprintf_chk@FUNCTION, $1, $2, $pop162, $pop34
-	i32.const	$push36=, 1
-	i32.ne  	$push37=, $pop35, $pop36
-	br_if   	5, $pop37       # 5: down to label1
-# BB#28:                                # %if.end77
-	i32.const	$push38=, 0
-	i32.load	$push39=, should_optimize($pop38)
-	br_if   	4, $pop39       # 4: down to label2
-# BB#29:                                # %if.then79
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_30:                               # %sw.bb81
+	i32.load	$push28=, 8($2)
+	i32.call	$push29=, __vfprintf_chk@FUNCTION, $0, $2, $pop162, $pop28
+	br_if   	5, $pop29       # 5: down to label1
+# BB#22:                                # %if.end89
+	i32.const	$push30=, 0
+	i32.load	$push31=, should_optimize($pop30)
+	br_if   	4, $pop31       # 4: down to label2
+	br      	5               # 5: down to label1
+.LBB1_23:                               # %sw.bb105
 	end_block                       # label6:
 	i32.const	$push171=, 0
 	i32.const	$push170=, 0
 	i32.store	should_optimize($pop171), $pop170
 	i32.const	$push169=, 0
 	i32.load	$push168=, stdout($pop169)
-	tee_local	$push167=, $1=, $pop168
-	i32.const	$push166=, .L.str.4
-	i32.load	$push26=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop167, $2, $pop166, $pop26
+	tee_local	$push167=, $0=, $pop168
+	i32.const	$push166=, .L.str.6
+	i32.load	$push10=, 12($2)
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop167, $2, $pop166, $pop10
 	i32.const	$push165=, 0
-	i32.load	$push27=, should_optimize($pop165)
-	i32.eqz 	$push212=, $pop27
+	i32.load	$push11=, should_optimize($pop165)
+	i32.eqz 	$push212=, $pop11
 	br_if   	4, $pop212      # 4: down to label1
-# BB#31:                                # %if.end85
+# BB#24:                                # %if.end109
 	i32.const	$push174=, 0
 	i32.const	$push173=, 0
 	i32.store	should_optimize($pop174), $pop173
-	i32.const	$push172=, .L.str.4
-	i32.load	$push28=, 8($2)
-	i32.call	$push29=, __vfprintf_chk@FUNCTION, $1, $2, $pop172, $pop28
-	br_if   	4, $pop29       # 4: down to label1
-# BB#32:                                # %if.end89
-	i32.const	$push30=, 0
-	i32.load	$push31=, should_optimize($pop30)
-	br_if   	3, $pop31       # 3: down to label2
-# BB#33:                                # %if.then91
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_34:                               # %sw.bb93
+	i32.const	$push172=, .L.str.6
+	i32.load	$push12=, 8($2)
+	i32.call	$push13=, __vfprintf_chk@FUNCTION, $0, $2, $pop172, $pop12
+	i32.const	$push14=, 7
+	i32.ne  	$push15=, $pop13, $pop14
+	br_if   	4, $pop15       # 4: down to label1
+# BB#25:                                # %if.end113
+	i32.const	$push16=, 0
+	i32.load	$push17=, should_optimize($pop16)
+	br_if   	3, $pop17       # 3: down to label2
+	br      	4               # 4: down to label1
+.LBB1_26:                               # %sw.bb69
 	end_block                       # label5:
 	i32.const	$push181=, 0
 	i32.const	$push180=, 0
 	i32.store	should_optimize($pop181), $pop180
 	i32.const	$push179=, 0
 	i32.load	$push178=, stdout($pop179)
-	tee_local	$push177=, $1=, $pop178
-	i32.const	$push176=, .L.str.5
-	i32.load	$push18=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop177, $2, $pop176, $pop18
+	tee_local	$push177=, $0=, $pop178
+	i32.const	$push176=, .L.str.4
+	i32.load	$push32=, 12($2)
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop177, $2, $pop176, $pop32
 	i32.const	$push175=, 0
-	i32.load	$push19=, should_optimize($pop175)
-	i32.eqz 	$push213=, $pop19
+	i32.load	$push33=, should_optimize($pop175)
+	i32.eqz 	$push213=, $pop33
 	br_if   	3, $pop213      # 3: down to label1
-# BB#35:                                # %if.end97
+# BB#27:                                # %if.end73
 	i32.const	$push184=, 0
 	i32.const	$push183=, 0
 	i32.store	should_optimize($pop184), $pop183
-	i32.const	$push182=, .L.str.5
-	i32.load	$push20=, 8($2)
-	i32.call	$push21=, __vfprintf_chk@FUNCTION, $1, $2, $pop182, $pop20
-	i32.const	$push22=, 1
-	i32.ne  	$push23=, $pop21, $pop22
-	br_if   	3, $pop23       # 3: down to label1
-# BB#36:                                # %if.end101
-	i32.const	$push24=, 0
-	i32.load	$push25=, should_optimize($pop24)
-	br_if   	2, $pop25       # 2: down to label2
-# BB#37:                                # %if.then103
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_38:                               # %sw.bb105
+	i32.const	$push182=, .L.str.4
+	i32.load	$push34=, 8($2)
+	i32.call	$push35=, __vfprintf_chk@FUNCTION, $0, $2, $pop182, $pop34
+	i32.const	$push36=, 1
+	i32.ne  	$push37=, $pop35, $pop36
+	br_if   	3, $pop37       # 3: down to label1
+# BB#28:                                # %if.end77
+	i32.const	$push38=, 0
+	i32.load	$push39=, should_optimize($pop38)
+	br_if   	2, $pop39       # 2: down to label2
+	br      	3               # 3: down to label1
+.LBB1_29:                               # %sw.bb93
 	end_block                       # label4:
 	i32.const	$push191=, 0
 	i32.const	$push190=, 0
 	i32.store	should_optimize($pop191), $pop190
 	i32.const	$push189=, 0
 	i32.load	$push188=, stdout($pop189)
-	tee_local	$push187=, $1=, $pop188
-	i32.const	$push186=, .L.str.6
-	i32.load	$push10=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop187, $2, $pop186, $pop10
+	tee_local	$push187=, $0=, $pop188
+	i32.const	$push186=, .L.str.5
+	i32.load	$push18=, 12($2)
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop187, $2, $pop186, $pop18
 	i32.const	$push185=, 0
-	i32.load	$push11=, should_optimize($pop185)
-	i32.eqz 	$push214=, $pop11
+	i32.load	$push19=, should_optimize($pop185)
+	i32.eqz 	$push214=, $pop19
 	br_if   	2, $pop214      # 2: down to label1
-# BB#39:                                # %if.end109
+# BB#30:                                # %if.end97
 	i32.const	$push194=, 0
 	i32.const	$push193=, 0
 	i32.store	should_optimize($pop194), $pop193
-	i32.const	$push192=, .L.str.6
-	i32.load	$push12=, 8($2)
-	i32.call	$push13=, __vfprintf_chk@FUNCTION, $1, $2, $pop192, $pop12
-	i32.const	$push14=, 7
-	i32.ne  	$push15=, $pop13, $pop14
-	br_if   	2, $pop15       # 2: down to label1
-# BB#40:                                # %if.end113
-	i32.const	$push16=, 0
-	i32.load	$push17=, should_optimize($pop16)
-	br_if   	1, $pop17       # 1: down to label2
-# BB#41:                                # %if.then115
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_42:                               # %sw.bb117
+	i32.const	$push192=, .L.str.5
+	i32.load	$push20=, 8($2)
+	i32.call	$push21=, __vfprintf_chk@FUNCTION, $0, $2, $pop192, $pop20
+	i32.const	$push22=, 1
+	i32.ne  	$push23=, $pop21, $pop22
+	br_if   	2, $pop23       # 2: down to label1
+# BB#31:                                # %if.end101
+	i32.const	$push24=, 0
+	i32.load	$push25=, should_optimize($pop24)
+	br_if   	1, $pop25       # 1: down to label2
+	br      	2               # 2: down to label1
+.LBB1_32:                               # %sw.bb117
 	end_block                       # label3:
 	i32.const	$push201=, 0
 	i32.const	$push200=, 0
 	i32.store	should_optimize($pop201), $pop200
 	i32.const	$push199=, 0
 	i32.load	$push198=, stdout($pop199)
-	tee_local	$push197=, $1=, $pop198
+	tee_local	$push197=, $0=, $pop198
 	i32.const	$push196=, .L.str.7
 	i32.load	$push2=, 12($2)
 	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop197, $2, $pop196, $pop2
@@ -402,38 +382,38 @@ inner:                                  # @inner
 	i32.load	$push3=, should_optimize($pop195)
 	i32.eqz 	$push215=, $pop3
 	br_if   	1, $pop215      # 1: down to label1
-# BB#43:                                # %if.end121
+# BB#33:                                # %if.end121
 	i32.const	$push204=, 0
 	i32.const	$push203=, 0
 	i32.store	should_optimize($pop204), $pop203
 	i32.const	$push202=, .L.str.7
 	i32.load	$push4=, 8($2)
-	i32.call	$push5=, __vfprintf_chk@FUNCTION, $1, $2, $pop202, $pop4
+	i32.call	$push5=, __vfprintf_chk@FUNCTION, $0, $2, $pop202, $pop4
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	1, $pop7        # 1: down to label1
-# BB#44:                                # %if.end125
+# BB#34:                                # %if.end125
 	i32.const	$push8=, 0
 	i32.load	$push9=, should_optimize($pop8)
 	i32.eqz 	$push216=, $pop9
 	br_if   	1, $pop216      # 1: down to label1
-.LBB1_45:                               # %sw.epilog
+.LBB1_35:                               # %sw.epilog
 	end_block                       # label2:
 	i32.const	$push94=, 0
 	i32.const	$push92=, 16
 	i32.add 	$push93=, $2, $pop92
 	i32.store	__stack_pointer($pop94), $pop93
 	return
-.LBB1_46:                               # %sw.default
+.LBB1_36:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	inner, .Lfunc_end1-inner
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -441,10 +421,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop17, $pop18
+	i32.sub 	$push43=, $pop16, $pop18
 	tee_local	$push42=, $0=, $pop43
 	i32.store	__stack_pointer($pop19), $pop42
 	i32.const	$push0=, 0
@@ -508,7 +488,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	should_optimize         # @should_optimize
 	.type	should_optimize,@object
 	.section	.bss.should_optimize,"aw",@nobits
@@ -560,7 +540,8 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
 	.import_global	stdout
+	.size	stdout, 4
diff --git a/test/torture-s/vla-dealloc-1.c.s b/test/torture-s/vla-dealloc-1.c.s
index 3437c9b2c..a67cf102e 100644
--- a/test/torture-s/vla-dealloc-1.c.s
+++ b/test/torture-s/vla-dealloc-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vla-dealloc-1.c"
+	.file	"vla-dealloc-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -50,7 +50,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	p                       # @p
 	.type	p,@object
 	.section	.bss.p,"aw",@nobits
@@ -61,4 +61,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
diff --git a/test/torture-s/vprintf-1.c.s b/test/torture-s/vprintf-1.c.s
index 80e3ae780..05434f798 100644
--- a/test/torture-s/vprintf-1.c.s
+++ b/test/torture-s/vprintf-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vprintf-1.c"
+	.file	"vprintf-1.c"
 	.section	.text.inner,"ax",@progbits
-	.hidden	inner
+	.hidden	inner                   # -- Begin function inner
 	.globl	inner
 	.type	inner,@function
 inner:                                  # @inner
@@ -9,21 +9,18 @@ inner:                                  # @inner
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push67=, 0
-	i32.const	$push64=, 0
-	i32.load	$push65=, __stack_pointer($pop64)
+	i32.const	$push65=, 0
+	i32.load	$push64=, __stack_pointer($pop65)
 	i32.const	$push66=, 16
-	i32.sub 	$push72=, $pop65, $pop66
+	i32.sub 	$push72=, $pop64, $pop66
 	tee_local	$push71=, $2=, $pop72
 	i32.store	__stack_pointer($pop67), $pop71
-	i32.store	12($2), $1
 	i32.store	8($2), $1
-	block   	
-	block   	
-	block   	
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label3
+	br_if   	0, $pop1        # 0: down to label0
 # BB#1:                                 # %entry
 	block   	
 	block   	
@@ -35,19 +32,21 @@ inner:                                  # @inner
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 0, 1, 2, 3, 4, 5, 6, 7, 11, 8, 9, 0 # 0: down to label13
-                                        # 1: down to label12
-                                        # 2: down to label11
-                                        # 3: down to label10
-                                        # 4: down to label9
-                                        # 5: down to label8
-                                        # 6: down to label7
-                                        # 7: down to label6
-                                        # 11: down to label2
-                                        # 8: down to label5
-                                        # 9: down to label4
+	block   	
+	block   	
+	br_table 	$0, 0, 3, 4, 5, 1, 7, 8, 6, 9, 2, 10, 0 # 0: down to label12
+                                        # 3: down to label9
+                                        # 4: down to label8
+                                        # 5: down to label7
+                                        # 1: down to label11
+                                        # 7: down to label5
+                                        # 8: down to label4
+                                        # 6: down to label6
+                                        # 9: down to label3
+                                        # 2: down to label10
+                                        # 10: down to label2
 .LBB0_2:                                # %sw.bb
-	end_block                       # label13:
+	end_block                       # label12:
 	i32.const	$push59=, .L.str
 	i32.load	$push58=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop59, $pop58
@@ -56,163 +55,142 @@ inner:                                  # @inner
 	i32.call	$push61=, vprintf@FUNCTION, $pop73, $pop60
 	i32.const	$push62=, 5
 	i32.eq  	$push63=, $pop61, $pop62
-	br_if   	11, $pop63      # 11: down to label1
-# BB#3:                                 # %if.then
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_4:                                # %sw.bb4
-	end_block                       # label12:
+	br_if   	10, $pop63      # 10: down to label1
+	br      	11              # 11: down to label0
+.LBB0_3:                                # %sw.bb22
+	end_block                       # label11:
+	i32.const	$push37=, .L.str.4
+	i32.load	$push36=, 12($2)
+	i32.call	$drop=, vprintf@FUNCTION, $pop37, $pop36
+	i32.const	$push74=, .L.str.4
+	i32.load	$push38=, 8($2)
+	i32.call	$push39=, vprintf@FUNCTION, $pop74, $pop38
+	i32.const	$push40=, 5
+	i32.eq  	$push41=, $pop39, $pop40
+	br_if   	9, $pop41       # 9: down to label1
+	br      	10              # 10: down to label0
+.LBB0_4:                                # %sw.bb52
+	end_block                       # label10:
+	i32.const	$push9=, .L.str.6
+	i32.load	$push8=, 12($2)
+	i32.call	$drop=, vprintf@FUNCTION, $pop9, $pop8
+	i32.const	$push75=, .L.str.6
+	i32.load	$push10=, 8($2)
+	i32.call	$push11=, vprintf@FUNCTION, $pop75, $pop10
+	i32.const	$push12=, 7
+	i32.ne  	$push13=, $pop11, $pop12
+	br_if   	9, $pop13       # 9: down to label0
+	br      	8               # 8: down to label1
+.LBB0_5:                                # %sw.bb4
+	end_block                       # label9:
 	i32.const	$push53=, .L.str.1
 	i32.load	$push52=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop53, $pop52
-	i32.const	$push74=, .L.str.1
+	i32.const	$push76=, .L.str.1
 	i32.load	$push54=, 8($2)
-	i32.call	$push55=, vprintf@FUNCTION, $pop74, $pop54
+	i32.call	$push55=, vprintf@FUNCTION, $pop76, $pop54
 	i32.const	$push56=, 6
 	i32.eq  	$push57=, $pop55, $pop56
-	br_if   	10, $pop57      # 10: down to label1
-# BB#5:                                 # %if.then8
-	call    	abort@FUNCTION
-	unreachable
+	br_if   	7, $pop57       # 7: down to label1
+	br      	8               # 8: down to label0
 .LBB0_6:                                # %sw.bb10
-	end_block                       # label11:
+	end_block                       # label8:
 	i32.const	$push47=, .L.str.2
 	i32.load	$push46=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop47, $pop46
-	i32.const	$push75=, .L.str.2
+	i32.const	$push77=, .L.str.2
 	i32.load	$push48=, 8($2)
-	i32.call	$push49=, vprintf@FUNCTION, $pop75, $pop48
+	i32.call	$push49=, vprintf@FUNCTION, $pop77, $pop48
 	i32.const	$push50=, 1
 	i32.eq  	$push51=, $pop49, $pop50
-	br_if   	9, $pop51       # 9: down to label1
-# BB#7:                                 # %if.then14
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_8:                                # %sw.bb16
-	end_block                       # label10:
+	br_if   	6, $pop51       # 6: down to label1
+	br      	7               # 7: down to label0
+.LBB0_7:                                # %sw.bb16
+	end_block                       # label7:
 	i32.const	$push43=, .L.str.3
 	i32.load	$push42=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop43, $pop42
-	i32.const	$push76=, .L.str.3
+	i32.const	$push78=, .L.str.3
 	i32.load	$push44=, 8($2)
-	i32.call	$push45=, vprintf@FUNCTION, $pop76, $pop44
+	i32.call	$push45=, vprintf@FUNCTION, $pop78, $pop44
 	i32.eqz 	$push84=, $pop45
-	br_if   	8, $pop84       # 8: down to label1
-# BB#9:                                 # %if.then20
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_10:                               # %sw.bb22
-	end_block                       # label9:
-	i32.const	$push37=, .L.str.4
-	i32.load	$push36=, 12($2)
-	i32.call	$drop=, vprintf@FUNCTION, $pop37, $pop36
-	i32.const	$push77=, .L.str.4
-	i32.load	$push38=, 8($2)
-	i32.call	$push39=, vprintf@FUNCTION, $pop77, $pop38
-	i32.const	$push40=, 5
-	i32.eq  	$push41=, $pop39, $pop40
-	br_if   	7, $pop41       # 7: down to label1
-# BB#11:                                # %if.then26
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_12:                               # %sw.bb28
-	end_block                       # label8:
+	br_if   	5, $pop84       # 5: down to label1
+	br      	6               # 6: down to label0
+.LBB0_8:                                # %sw.bb40
+	end_block                       # label6:
+	i32.const	$push21=, .L.str.4
+	i32.load	$push20=, 12($2)
+	i32.call	$drop=, vprintf@FUNCTION, $pop21, $pop20
+	i32.const	$push79=, .L.str.4
+	i32.load	$push22=, 8($2)
+	i32.call	$push23=, vprintf@FUNCTION, $pop79, $pop22
+	i32.eqz 	$push85=, $pop23
+	br_if   	4, $pop85       # 4: down to label1
+	br      	5               # 5: down to label0
+.LBB0_9:                                # %sw.bb28
+	end_block                       # label5:
 	i32.const	$push31=, .L.str.4
 	i32.load	$push30=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop31, $pop30
-	i32.const	$push78=, .L.str.4
+	i32.const	$push80=, .L.str.4
 	i32.load	$push32=, 8($2)
-	i32.call	$push33=, vprintf@FUNCTION, $pop78, $pop32
+	i32.call	$push33=, vprintf@FUNCTION, $pop80, $pop32
 	i32.const	$push34=, 6
 	i32.eq  	$push35=, $pop33, $pop34
-	br_if   	6, $pop35       # 6: down to label1
-# BB#13:                                # %if.then32
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_14:                               # %sw.bb34
-	end_block                       # label7:
+	br_if   	3, $pop35       # 3: down to label1
+	br      	4               # 4: down to label0
+.LBB0_10:                               # %sw.bb34
+	end_block                       # label4:
 	i32.const	$push25=, .L.str.4
 	i32.load	$push24=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop25, $pop24
-	i32.const	$push79=, .L.str.4
+	i32.const	$push81=, .L.str.4
 	i32.load	$push26=, 8($2)
-	i32.call	$push27=, vprintf@FUNCTION, $pop79, $pop26
+	i32.call	$push27=, vprintf@FUNCTION, $pop81, $pop26
 	i32.const	$push28=, 1
 	i32.eq  	$push29=, $pop27, $pop28
-	br_if   	5, $pop29       # 5: down to label1
-# BB#15:                                # %if.then38
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_16:                               # %sw.bb40
-	end_block                       # label6:
-	i32.const	$push21=, .L.str.4
-	i32.load	$push20=, 12($2)
-	i32.call	$drop=, vprintf@FUNCTION, $pop21, $pop20
-	i32.const	$push80=, .L.str.4
-	i32.load	$push22=, 8($2)
-	i32.call	$push23=, vprintf@FUNCTION, $pop80, $pop22
-	i32.eqz 	$push85=, $pop23
-	br_if   	4, $pop85       # 4: down to label1
-# BB#17:                                # %if.then44
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_18:                               # %sw.bb52
-	end_block                       # label5:
-	i32.const	$push9=, .L.str.6
-	i32.load	$push8=, 12($2)
-	i32.call	$drop=, vprintf@FUNCTION, $pop9, $pop8
-	i32.const	$push81=, .L.str.6
-	i32.load	$push10=, 8($2)
-	i32.call	$push11=, vprintf@FUNCTION, $pop81, $pop10
-	i32.const	$push12=, 7
-	i32.eq  	$push13=, $pop11, $pop12
-	br_if   	3, $pop13       # 3: down to label1
-# BB#19:                                # %if.then56
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_20:                               # %sw.bb58
-	end_block                       # label4:
-	i32.const	$push3=, .L.str.7
-	i32.load	$push2=, 12($2)
-	i32.call	$drop=, vprintf@FUNCTION, $pop3, $pop2
-	i32.const	$push82=, .L.str.7
-	i32.load	$push4=, 8($2)
-	i32.call	$push5=, vprintf@FUNCTION, $pop82, $pop4
-	i32.const	$push6=, 2
-	i32.eq  	$push7=, $pop5, $pop6
-	br_if   	2, $pop7        # 2: down to label1
-.LBB0_21:                               # %sw.default
+	br_if   	2, $pop29       # 2: down to label1
+	br      	3               # 3: down to label0
+.LBB0_11:                               # %sw.bb46
 	end_block                       # label3:
-	call    	abort@FUNCTION
-	unreachable
-.LBB0_22:                               # %sw.bb46
-	end_block                       # label2:
 	i32.const	$push15=, .L.str.5
 	i32.load	$push14=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop15, $pop14
-	i32.const	$push83=, .L.str.5
+	i32.const	$push82=, .L.str.5
 	i32.load	$push16=, 8($2)
-	i32.call	$push17=, vprintf@FUNCTION, $pop83, $pop16
+	i32.call	$push17=, vprintf@FUNCTION, $pop82, $pop16
 	i32.const	$push18=, 1
-	i32.ne  	$push19=, $pop17, $pop18
-	br_if   	1, $pop19       # 1: down to label0
-.LBB0_23:                               # %sw.epilog
+	i32.eq  	$push19=, $pop17, $pop18
+	br_if   	1, $pop19       # 1: down to label1
+	br      	2               # 2: down to label0
+.LBB0_12:                               # %sw.bb58
+	end_block                       # label2:
+	i32.const	$push3=, .L.str.7
+	i32.load	$push2=, 12($2)
+	i32.call	$drop=, vprintf@FUNCTION, $pop3, $pop2
+	i32.const	$push83=, .L.str.7
+	i32.load	$push4=, 8($2)
+	i32.call	$push5=, vprintf@FUNCTION, $pop83, $pop4
+	i32.const	$push6=, 2
+	i32.ne  	$push7=, $pop5, $pop6
+	br_if   	1, $pop7        # 1: down to label0
+.LBB0_13:                               # %sw.epilog
 	end_block                       # label1:
 	i32.const	$push70=, 0
 	i32.const	$push68=, 16
 	i32.add 	$push69=, $2, $pop68
 	i32.store	__stack_pointer($pop70), $pop69
 	return
-.LBB0_24:                               # %if.then50
+.LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	inner, .Lfunc_end0-inner
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -220,10 +198,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop17, $pop18
+	i32.sub 	$push43=, $pop16, $pop18
 	tee_local	$push42=, $0=, $pop43
 	i32.store	__stack_pointer($pop19), $pop42
 	i32.const	$push0=, 0
@@ -287,7 +265,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.type	.L.str,@object          # @.str
 	.section	.rodata.str1.1,"aMS",@progbits,1
 .L.str:
@@ -330,6 +308,6 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	vprintf, i32, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/vprintf-chk-1.c.s b/test/torture-s/vprintf-chk-1.c.s
index f4e7b5c2e..673c30c20 100644
--- a/test/torture-s/vprintf-chk-1.c.s
+++ b/test/torture-s/vprintf-chk-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vprintf-chk-1.c"
+	.file	"vprintf-chk-1.c"
 	.section	.text.__vprintf_chk,"ax",@progbits
-	.hidden	__vprintf_chk
+	.hidden	__vprintf_chk           # -- Begin function __vprintf_chk
 	.globl	__vprintf_chk
 	.type	__vprintf_chk,@function
 __vprintf_chk:                          # @__vprintf_chk
@@ -25,9 +25,9 @@ __vprintf_chk:                          # @__vprintf_chk
 	.endfunc
 .Lfunc_end0:
 	.size	__vprintf_chk, .Lfunc_end0-__vprintf_chk
-
+                                        # -- End function
 	.section	.text.inner,"ax",@progbits
-	.hidden	inner
+	.hidden	inner                   # -- Begin function inner
 	.globl	inner
 	.type	inner,@function
 inner:                                  # @inner
@@ -35,14 +35,14 @@ inner:                                  # @inner
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push90=, 0
-	i32.const	$push87=, 0
-	i32.load	$push88=, __stack_pointer($pop87)
+	i32.const	$push88=, 0
+	i32.load	$push87=, __stack_pointer($pop88)
 	i32.const	$push89=, 16
-	i32.sub 	$push95=, $pop88, $pop89
+	i32.sub 	$push95=, $pop87, $pop89
 	tee_local	$push94=, $2=, $pop95
 	i32.store	__stack_pointer($pop90), $pop94
-	i32.store	12($2), $1
 	i32.store	8($2), $1
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
@@ -60,16 +60,16 @@ inner:                                  # @inner
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0 # 0: down to label13
+	br_table 	$0, 0, 1, 2, 3, 4, 5, 8, 6, 9, 7, 10, 0 # 0: down to label13
                                         # 1: down to label12
                                         # 2: down to label11
                                         # 3: down to label10
                                         # 4: down to label9
                                         # 5: down to label8
-                                        # 6: down to label7
-                                        # 7: down to label6
                                         # 8: down to label5
+                                        # 6: down to label7
                                         # 9: down to label4
+                                        # 7: down to label6
                                         # 10: down to label3
 .LBB1_2:                                # %sw.bb
 	end_block                       # label13:
@@ -97,10 +97,8 @@ inner:                                  # @inner
 	i32.const	$push85=, 0
 	i32.load	$push86=, should_optimize($pop85)
 	br_if   	10, $pop86      # 10: down to label2
-# BB#5:                                 # %if.then7
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_6:                                # %sw.bb9
+	br      	11              # 11: down to label1
+.LBB1_5:                                # %sw.bb9
 	end_block                       # label12:
 	i32.const	$push105=, 0
 	i32.const	$push70=, 1
@@ -112,7 +110,7 @@ inner:                                  # @inner
 	i32.load	$push72=, should_optimize($pop103)
 	i32.eqz 	$push173=, $pop72
 	br_if   	10, $pop173     # 10: down to label1
-# BB#7:                                 # %if.end13
+# BB#6:                                 # %if.end13
 	i32.const	$push108=, 0
 	i32.const	$push107=, 0
 	i32.store	should_optimize($pop108), $pop107
@@ -122,14 +120,12 @@ inner:                                  # @inner
 	i32.const	$push75=, 6
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	10, $pop76      # 10: down to label1
-# BB#8:                                 # %if.end17
+# BB#7:                                 # %if.end17
 	i32.const	$push77=, 0
 	i32.load	$push78=, should_optimize($pop77)
 	br_if   	9, $pop78       # 9: down to label2
-# BB#9:                                 # %if.then19
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_10:                               # %sw.bb21
+	br      	10              # 10: down to label1
+.LBB1_8:                                # %sw.bb21
 	end_block                       # label11:
 	i32.const	$push112=, 0
 	i32.const	$push111=, 1
@@ -141,7 +137,7 @@ inner:                                  # @inner
 	i32.load	$push64=, should_optimize($pop109)
 	i32.eqz 	$push174=, $pop64
 	br_if   	9, $pop174      # 9: down to label1
-# BB#11:                                # %if.end25
+# BB#9:                                 # %if.end25
 	i32.const	$push116=, 0
 	i32.const	$push115=, 0
 	i32.store	should_optimize($pop116), $pop115
@@ -151,14 +147,12 @@ inner:                                  # @inner
 	i32.const	$push113=, 1
 	i32.ne  	$push67=, $pop66, $pop113
 	br_if   	9, $pop67       # 9: down to label1
-# BB#12:                                # %if.end29
+# BB#10:                                # %if.end29
 	i32.const	$push68=, 0
 	i32.load	$push69=, should_optimize($pop68)
 	br_if   	8, $pop69       # 8: down to label2
-# BB#13:                                # %if.then31
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_14:                               # %sw.bb33
+	br      	9               # 9: down to label1
+.LBB1_11:                               # %sw.bb33
 	end_block                       # label10:
 	i32.const	$push119=, 0
 	i32.const	$push56=, 1
@@ -170,7 +164,7 @@ inner:                                  # @inner
 	i32.load	$push58=, should_optimize($pop117)
 	i32.eqz 	$push175=, $pop58
 	br_if   	8, $pop175      # 8: down to label1
-# BB#15:                                # %if.end37
+# BB#12:                                # %if.end37
 	i32.const	$push122=, 0
 	i32.const	$push121=, 0
 	i32.store	should_optimize($pop122), $pop121
@@ -178,14 +172,12 @@ inner:                                  # @inner
 	i32.load	$push59=, 8($2)
 	i32.call	$push60=, __vprintf_chk@FUNCTION, $2, $pop120, $pop59
 	br_if   	8, $pop60       # 8: down to label1
-# BB#16:                                # %if.end41
+# BB#13:                                # %if.end41
 	i32.const	$push61=, 0
 	i32.load	$push62=, should_optimize($pop61)
 	br_if   	7, $pop62       # 7: down to label2
-# BB#17:                                # %if.then43
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_18:                               # %sw.bb45
+	br      	8               # 8: down to label1
+.LBB1_14:                               # %sw.bb45
 	end_block                       # label9:
 	i32.const	$push126=, 0
 	i32.const	$push125=, 0
@@ -197,7 +189,7 @@ inner:                                  # @inner
 	i32.load	$push49=, should_optimize($pop123)
 	i32.eqz 	$push176=, $pop49
 	br_if   	7, $pop176      # 7: down to label1
-# BB#19:                                # %if.end49
+# BB#15:                                # %if.end49
 	i32.const	$push129=, 0
 	i32.const	$push128=, 0
 	i32.store	should_optimize($pop129), $pop128
@@ -207,14 +199,12 @@ inner:                                  # @inner
 	i32.const	$push52=, 5
 	i32.ne  	$push53=, $pop51, $pop52
 	br_if   	7, $pop53       # 7: down to label1
-# BB#20:                                # %if.end53
+# BB#16:                                # %if.end53
 	i32.const	$push54=, 0
 	i32.load	$push55=, should_optimize($pop54)
 	br_if   	6, $pop55       # 6: down to label2
-# BB#21:                                # %if.then55
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_22:                               # %sw.bb57
+	br      	7               # 7: down to label1
+.LBB1_17:                               # %sw.bb57
 	end_block                       # label8:
 	i32.const	$push133=, 0
 	i32.const	$push132=, 0
@@ -226,7 +216,7 @@ inner:                                  # @inner
 	i32.load	$push41=, should_optimize($pop130)
 	i32.eqz 	$push177=, $pop41
 	br_if   	6, $pop177      # 6: down to label1
-# BB#23:                                # %if.end61
+# BB#18:                                # %if.end61
 	i32.const	$push136=, 0
 	i32.const	$push135=, 0
 	i32.store	should_optimize($pop136), $pop135
@@ -236,128 +226,118 @@ inner:                                  # @inner
 	i32.const	$push44=, 6
 	i32.ne  	$push45=, $pop43, $pop44
 	br_if   	6, $pop45       # 6: down to label1
-# BB#24:                                # %if.end65
+# BB#19:                                # %if.end65
 	i32.const	$push46=, 0
 	i32.load	$push47=, should_optimize($pop46)
 	br_if   	5, $pop47       # 5: down to label2
-# BB#25:                                # %if.then67
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_26:                               # %sw.bb69
+	br      	6               # 6: down to label1
+.LBB1_20:                               # %sw.bb81
 	end_block                       # label7:
 	i32.const	$push140=, 0
 	i32.const	$push139=, 0
 	i32.store	should_optimize($pop140), $pop139
 	i32.const	$push138=, .L.str.4
-	i32.load	$push32=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop138, $pop32
+	i32.load	$push26=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop138, $pop26
 	i32.const	$push137=, 0
-	i32.load	$push33=, should_optimize($pop137)
-	i32.eqz 	$push178=, $pop33
+	i32.load	$push27=, should_optimize($pop137)
+	i32.eqz 	$push178=, $pop27
 	br_if   	5, $pop178      # 5: down to label1
-# BB#27:                                # %if.end73
+# BB#21:                                # %if.end85
 	i32.const	$push143=, 0
 	i32.const	$push142=, 0
 	i32.store	should_optimize($pop143), $pop142
 	i32.const	$push141=, .L.str.4
-	i32.load	$push34=, 8($2)
-	i32.call	$push35=, __vprintf_chk@FUNCTION, $2, $pop141, $pop34
-	i32.const	$push36=, 1
-	i32.ne  	$push37=, $pop35, $pop36
-	br_if   	5, $pop37       # 5: down to label1
-# BB#28:                                # %if.end77
-	i32.const	$push38=, 0
-	i32.load	$push39=, should_optimize($pop38)
-	br_if   	4, $pop39       # 4: down to label2
-# BB#29:                                # %if.then79
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_30:                               # %sw.bb81
+	i32.load	$push28=, 8($2)
+	i32.call	$push29=, __vprintf_chk@FUNCTION, $2, $pop141, $pop28
+	br_if   	5, $pop29       # 5: down to label1
+# BB#22:                                # %if.end89
+	i32.const	$push30=, 0
+	i32.load	$push31=, should_optimize($pop30)
+	br_if   	4, $pop31       # 4: down to label2
+	br      	5               # 5: down to label1
+.LBB1_23:                               # %sw.bb105
 	end_block                       # label6:
 	i32.const	$push147=, 0
 	i32.const	$push146=, 0
 	i32.store	should_optimize($pop147), $pop146
-	i32.const	$push145=, .L.str.4
-	i32.load	$push26=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop145, $pop26
+	i32.const	$push145=, .L.str.6
+	i32.load	$push10=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop145, $pop10
 	i32.const	$push144=, 0
-	i32.load	$push27=, should_optimize($pop144)
-	i32.eqz 	$push179=, $pop27
+	i32.load	$push11=, should_optimize($pop144)
+	i32.eqz 	$push179=, $pop11
 	br_if   	4, $pop179      # 4: down to label1
-# BB#31:                                # %if.end85
+# BB#24:                                # %if.end109
 	i32.const	$push150=, 0
 	i32.const	$push149=, 0
 	i32.store	should_optimize($pop150), $pop149
-	i32.const	$push148=, .L.str.4
-	i32.load	$push28=, 8($2)
-	i32.call	$push29=, __vprintf_chk@FUNCTION, $2, $pop148, $pop28
-	br_if   	4, $pop29       # 4: down to label1
-# BB#32:                                # %if.end89
-	i32.const	$push30=, 0
-	i32.load	$push31=, should_optimize($pop30)
-	br_if   	3, $pop31       # 3: down to label2
-# BB#33:                                # %if.then91
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_34:                               # %sw.bb93
+	i32.const	$push148=, .L.str.6
+	i32.load	$push12=, 8($2)
+	i32.call	$push13=, __vprintf_chk@FUNCTION, $2, $pop148, $pop12
+	i32.const	$push14=, 7
+	i32.ne  	$push15=, $pop13, $pop14
+	br_if   	4, $pop15       # 4: down to label1
+# BB#25:                                # %if.end113
+	i32.const	$push16=, 0
+	i32.load	$push17=, should_optimize($pop16)
+	br_if   	3, $pop17       # 3: down to label2
+	br      	4               # 4: down to label1
+.LBB1_26:                               # %sw.bb69
 	end_block                       # label5:
 	i32.const	$push154=, 0
 	i32.const	$push153=, 0
 	i32.store	should_optimize($pop154), $pop153
-	i32.const	$push152=, .L.str.5
-	i32.load	$push18=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop152, $pop18
+	i32.const	$push152=, .L.str.4
+	i32.load	$push32=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop152, $pop32
 	i32.const	$push151=, 0
-	i32.load	$push19=, should_optimize($pop151)
-	i32.eqz 	$push180=, $pop19
+	i32.load	$push33=, should_optimize($pop151)
+	i32.eqz 	$push180=, $pop33
 	br_if   	3, $pop180      # 3: down to label1
-# BB#35:                                # %if.end97
+# BB#27:                                # %if.end73
 	i32.const	$push157=, 0
 	i32.const	$push156=, 0
 	i32.store	should_optimize($pop157), $pop156
-	i32.const	$push155=, .L.str.5
-	i32.load	$push20=, 8($2)
-	i32.call	$push21=, __vprintf_chk@FUNCTION, $2, $pop155, $pop20
-	i32.const	$push22=, 1
-	i32.ne  	$push23=, $pop21, $pop22
-	br_if   	3, $pop23       # 3: down to label1
-# BB#36:                                # %if.end101
-	i32.const	$push24=, 0
-	i32.load	$push25=, should_optimize($pop24)
-	br_if   	2, $pop25       # 2: down to label2
-# BB#37:                                # %if.then103
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_38:                               # %sw.bb105
+	i32.const	$push155=, .L.str.4
+	i32.load	$push34=, 8($2)
+	i32.call	$push35=, __vprintf_chk@FUNCTION, $2, $pop155, $pop34
+	i32.const	$push36=, 1
+	i32.ne  	$push37=, $pop35, $pop36
+	br_if   	3, $pop37       # 3: down to label1
+# BB#28:                                # %if.end77
+	i32.const	$push38=, 0
+	i32.load	$push39=, should_optimize($pop38)
+	br_if   	2, $pop39       # 2: down to label2
+	br      	3               # 3: down to label1
+.LBB1_29:                               # %sw.bb93
 	end_block                       # label4:
 	i32.const	$push161=, 0
 	i32.const	$push160=, 0
 	i32.store	should_optimize($pop161), $pop160
-	i32.const	$push159=, .L.str.6
-	i32.load	$push10=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop159, $pop10
+	i32.const	$push159=, .L.str.5
+	i32.load	$push18=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop159, $pop18
 	i32.const	$push158=, 0
-	i32.load	$push11=, should_optimize($pop158)
-	i32.eqz 	$push181=, $pop11
+	i32.load	$push19=, should_optimize($pop158)
+	i32.eqz 	$push181=, $pop19
 	br_if   	2, $pop181      # 2: down to label1
-# BB#39:                                # %if.end109
+# BB#30:                                # %if.end97
 	i32.const	$push164=, 0
 	i32.const	$push163=, 0
 	i32.store	should_optimize($pop164), $pop163
-	i32.const	$push162=, .L.str.6
-	i32.load	$push12=, 8($2)
-	i32.call	$push13=, __vprintf_chk@FUNCTION, $2, $pop162, $pop12
-	i32.const	$push14=, 7
-	i32.ne  	$push15=, $pop13, $pop14
-	br_if   	2, $pop15       # 2: down to label1
-# BB#40:                                # %if.end113
-	i32.const	$push16=, 0
-	i32.load	$push17=, should_optimize($pop16)
-	br_if   	1, $pop17       # 1: down to label2
-# BB#41:                                # %if.then115
-	call    	abort@FUNCTION
-	unreachable
-.LBB1_42:                               # %sw.bb117
+	i32.const	$push162=, .L.str.5
+	i32.load	$push20=, 8($2)
+	i32.call	$push21=, __vprintf_chk@FUNCTION, $2, $pop162, $pop20
+	i32.const	$push22=, 1
+	i32.ne  	$push23=, $pop21, $pop22
+	br_if   	2, $pop23       # 2: down to label1
+# BB#31:                                # %if.end101
+	i32.const	$push24=, 0
+	i32.load	$push25=, should_optimize($pop24)
+	br_if   	1, $pop25       # 1: down to label2
+	br      	2               # 2: down to label1
+.LBB1_32:                               # %sw.bb117
 	end_block                       # label3:
 	i32.const	$push168=, 0
 	i32.const	$push167=, 0
@@ -369,7 +349,7 @@ inner:                                  # @inner
 	i32.load	$push3=, should_optimize($pop165)
 	i32.eqz 	$push182=, $pop3
 	br_if   	1, $pop182      # 1: down to label1
-# BB#43:                                # %if.end121
+# BB#33:                                # %if.end121
 	i32.const	$push171=, 0
 	i32.const	$push170=, 0
 	i32.store	should_optimize($pop171), $pop170
@@ -379,28 +359,28 @@ inner:                                  # @inner
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	1, $pop7        # 1: down to label1
-# BB#44:                                # %if.end125
+# BB#34:                                # %if.end125
 	i32.const	$push8=, 0
 	i32.load	$push9=, should_optimize($pop8)
 	i32.eqz 	$push183=, $pop9
 	br_if   	1, $pop183      # 1: down to label1
-.LBB1_45:                               # %sw.epilog
+.LBB1_35:                               # %sw.epilog
 	end_block                       # label2:
 	i32.const	$push93=, 0
 	i32.const	$push91=, 16
 	i32.add 	$push92=, $2, $pop91
 	i32.store	__stack_pointer($pop93), $pop92
 	return
-.LBB1_46:                               # %sw.default
+.LBB1_36:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	inner, .Lfunc_end1-inner
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -408,10 +388,10 @@ main:                                   # @main
 	.local  	i32
 # BB#0:                                 # %entry
 	i32.const	$push19=, 0
-	i32.const	$push16=, 0
-	i32.load	$push17=, __stack_pointer($pop16)
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop17, $pop18
+	i32.sub 	$push43=, $pop16, $pop18
 	tee_local	$push42=, $0=, $pop43
 	i32.store	__stack_pointer($pop19), $pop42
 	i32.const	$push0=, 0
@@ -475,7 +455,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
-
+                                        # -- End function
 	.hidden	should_optimize         # @should_optimize
 	.type	should_optimize,@object
 	.section	.bss.should_optimize,"aw",@nobits
@@ -527,6 +507,6 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	vprintf, i32, i32, i32
diff --git a/test/torture-s/vrp-1.c.s b/test/torture-s/vrp-1.c.s
index 463d1c25c..75d4a06b6 100644
--- a/test/torture-s/vrp-1.c.s
+++ b/test/torture-s/vrp-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-1.c"
+	.file	"vrp-1.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -14,9 +14,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -29,7 +29,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-2.c.s b/test/torture-s/vrp-2.c.s
index db621f6ae..6155385c8 100644
--- a/test/torture-s/vrp-2.c.s
+++ b/test/torture-s/vrp-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-2.c"
+	.file	"vrp-2.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -29,9 +29,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-3.c.s b/test/torture-s/vrp-3.c.s
index 991fcd3a8..13f6ffbb0 100644
--- a/test/torture-s/vrp-3.c.s
+++ b/test/torture-s/vrp-3.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-3.c"
+	.file	"vrp-3.c"
 	.section	.text.f,"ax",@progbits
-	.hidden	f
+	.hidden	f                       # -- Begin function f
 	.globl	f
 	.type	f,@function
 f:                                      # @f
@@ -31,9 +31,9 @@ f:                                      # @f
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -46,7 +46,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-4.c.s b/test/torture-s/vrp-4.c.s
index 0c0158449..0d8630433 100644
--- a/test/torture-s/vrp-4.c.s
+++ b/test/torture-s/vrp-4.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-4.c"
+	.file	"vrp-4.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -22,16 +22,16 @@ test:                                   # @test
 	br_if   	0, $pop4        # 0: down to label0
 # BB#3:                                 # %if.end6
 	return
-.LBB0_4:                                # %if.then5
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -43,8 +43,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-5.c.s b/test/torture-s/vrp-5.c.s
index 9c370d987..a5e558bfd 100644
--- a/test/torture-s/vrp-5.c.s
+++ b/test/torture-s/vrp-5.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-5.c"
+	.file	"vrp-5.c"
 	.section	.text.test,"ax",@progbits
-	.hidden	test
+	.hidden	test                    # -- Begin function test
 	.globl	test
 	.type	test,@function
 test:                                   # @test
@@ -18,20 +18,20 @@ test:                                   # @test
 # BB#2:                                 # %if.end3
 	i32.const	$push2=, 0
 	i32.sub 	$push3=, $pop2, $1
-	i32.ne  	$push4=, $0, $pop3
+	i32.ne  	$push4=, $pop3, $0
 	br_if   	0, $pop4        # 0: down to label0
 # BB#3:                                 # %if.end6
 	return
-.LBB0_4:                                # %if.then5
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,8 +44,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-6.c.s b/test/torture-s/vrp-6.c.s
index 099004097..5a8ad2a39 100644
--- a/test/torture-s/vrp-6.c.s
+++ b/test/torture-s/vrp-6.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-6.c"
+	.file	"vrp-6.c"
 	.section	.text.test01,"ax",@progbits
-	.hidden	test01
+	.hidden	test01                  # -- Begin function test01
 	.globl	test01
 	.type	test01,@function
 test01:                                 # @test01
@@ -22,16 +22,16 @@ test01:                                 # @test01
 	br_if   	0, $pop4        # 0: down to label0
 # BB#3:                                 # %if.end6
 	return
-.LBB0_4:                                # %if.then5
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	test01, .Lfunc_end0-test01
-
+                                        # -- End function
 	.section	.text.test02,"ax",@progbits
-	.hidden	test02
+	.hidden	test02                  # -- Begin function test02
 	.globl	test02
 	.type	test02,@function
 test02:                                 # @test02
@@ -61,9 +61,9 @@ test02:                                 # @test02
 	.endfunc
 .Lfunc_end1:
 	.size	test02, .Lfunc_end1-test02
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -76,8 +76,8 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-7.c.s b/test/torture-s/vrp-7.c.s
index 0409107d7..9ad653992 100644
--- a/test/torture-s/vrp-7.c.s
+++ b/test/torture-s/vrp-7.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vrp-7.c"
+	.file	"vrp-7.c"
 	.section	.text.foo,"ax",@progbits
-	.hidden	foo
+	.hidden	foo                     # -- Begin function foo
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
@@ -22,9 +22,9 @@ foo:                                    # @foo
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -49,7 +49,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	t                       # @t
 	.type	t,@object
 	.section	.bss.t,"aw",@nobits
@@ -60,5 +60,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/wchar_t-1.c.s b/test/torture-s/wchar_t-1.c.s
index 92091430b..867650608 100644
--- a/test/torture-s/wchar_t-1.c.s
+++ b/test/torture-s/wchar_t-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/wchar_t-1.c"
+	.file	"wchar_t-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -27,14 +27,14 @@ main:                                   # @main
 	i32.const	$push10=, 0
 	call    	exit@FUNCTION, $pop10
 	unreachable
-.LBB0_4:                                # %if.then3
+.LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.hidden	x                       # @x
 	.type	x,@object
 	.section	.data.x,"aw",@progbits
@@ -55,6 +55,6 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/widechar-1.c.s b/test/torture-s/widechar-1.c.s
index f64709644..ac58abb92 100644
--- a/test/torture-s/widechar-1.c.s
+++ b/test/torture-s/widechar-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/widechar-1.c"
+	.file	"widechar-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -13,7 +13,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/zero-struct-1.c.s b/test/torture-s/zero-struct-1.c.s
index fda18eca1..7cbac054b 100644
--- a/test/torture-s/zero-struct-1.c.s
+++ b/test/torture-s/zero-struct-1.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/zero-struct-1.c"
+	.file	"zero-struct-1.c"
 	.section	.text.h,"ax",@progbits
-	.hidden	h
+	.hidden	h                       # -- Begin function h
 	.globl	h
 	.type	h,@function
 h:                                      # @h
@@ -22,9 +22,9 @@ h:                                      # @h
 	.endfunc
 .Lfunc_end0:
 	.size	h, .Lfunc_end0-h
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -56,14 +56,14 @@ main:                                   # @main
 # BB#2:                                 # %if.end3
 	i32.const	$push6=, 0
 	return  	$pop6
-.LBB1_3:                                # %if.then2
+.LBB1_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	y                       # @y
 	.type	y,@object
 	.section	.bss.y,"aw",@nobits
@@ -91,5 +91,5 @@ ff:
 	.size	ff, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/zero-struct-2.c.s b/test/torture-s/zero-struct-2.c.s
index 4df2d48b7..b69184dba 100644
--- a/test/torture-s/zero-struct-2.c.s
+++ b/test/torture-s/zero-struct-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/zero-struct-2.c"
+	.file	"zero-struct-2.c"
 	.section	.text.one_raw_spinlock,"ax",@progbits
-	.hidden	one_raw_spinlock
+	.hidden	one_raw_spinlock        # -- Begin function one_raw_spinlock
 	.globl	one_raw_spinlock
 	.type	one_raw_spinlock,@function
 one_raw_spinlock:                       # @one_raw_spinlock
@@ -16,9 +16,9 @@ one_raw_spinlock:                       # @one_raw_spinlock
 	.endfunc
 .Lfunc_end0:
 	.size	one_raw_spinlock, .Lfunc_end0-one_raw_spinlock
-
+                                        # -- End function
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -44,7 +44,7 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
-
+                                        # -- End function
 	.hidden	ii                      # @ii
 	.type	ii,@object
 	.section	.bss.ii,"aw",@nobits
@@ -55,5 +55,5 @@ ii:
 	.size	ii, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	abort, void
diff --git a/test/torture-s/zerolen-1.c.s b/test/torture-s/zerolen-1.c.s
index ae014030f..68952dbc6 100644
--- a/test/torture-s/zerolen-1.c.s
+++ b/test/torture-s/zerolen-1.c.s
@@ -1,12 +1,12 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/zerolen-1.c"
+	.file	"zerolen-1.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# BB#0:                                 # %if.then
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store16	entry($pop1):p2align=0, $pop0
@@ -16,9 +16,9 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
-
+                                        # -- End function
 	.section	.text.set,"ax",@progbits
-	.hidden	set
+	.hidden	set                     # -- Begin function set
 	.globl	set
 	.type	set,@function
 set:                                    # @set
@@ -30,7 +30,7 @@ set:                                    # @set
 	.endfunc
 .Lfunc_end1:
 	.size	set, .Lfunc_end1-set
-
+                                        # -- End function
 	.hidden	entry                   # @entry
 	.type	entry,@object
 	.section	.bss.entry,"aw",@nobits
@@ -40,5 +40,5 @@ entry:
 	.size	entry, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/zerolen-2.c.s b/test/torture-s/zerolen-2.c.s
index 72677d04a..de3a64c53 100644
--- a/test/torture-s/zerolen-2.c.s
+++ b/test/torture-s/zerolen-2.c.s
@@ -1,7 +1,7 @@
 	.text
-	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/zerolen-2.c"
+	.file	"zerolen-2.c"
 	.section	.text.main,"ax",@progbits
-	.hidden	main
+	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
@@ -12,6 +12,6 @@ main:                                   # @main
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
+                                        # -- End function
 
-
-	.ident	"clang version 4.0.0 "
+	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"